diff --git a/src/Android/Resources/Resource.designer.cs b/src/Android/Resources/Resource.designer.cs
index 306673134..728903762 100644
--- a/src/Android/Resources/Resource.designer.cs
+++ b/src/Android/Resources/Resource.designer.cs
@@ -6722,44 +6722,44 @@ namespace Bit.Droid
 		public partial class Color
 		{
 			
-			// aapt resource value: 0x7f0b0088
-			public const int abc_background_cache_hint_selector_material_dark = 2131427464;
-			
-			// aapt resource value: 0x7f0b0089
-			public const int abc_background_cache_hint_selector_material_light = 2131427465;
-			
 			// aapt resource value: 0x7f0b008a
-			public const int abc_btn_colored_borderless_text_material = 2131427466;
+			public const int abc_background_cache_hint_selector_material_dark = 2131427466;
 			
 			// aapt resource value: 0x7f0b008b
-			public const int abc_btn_colored_text_material = 2131427467;
+			public const int abc_background_cache_hint_selector_material_light = 2131427467;
 			
 			// aapt resource value: 0x7f0b008c
-			public const int abc_color_highlight_material = 2131427468;
+			public const int abc_btn_colored_borderless_text_material = 2131427468;
 			
 			// aapt resource value: 0x7f0b008d
-			public const int abc_hint_foreground_material_dark = 2131427469;
+			public const int abc_btn_colored_text_material = 2131427469;
 			
 			// aapt resource value: 0x7f0b008e
-			public const int abc_hint_foreground_material_light = 2131427470;
+			public const int abc_color_highlight_material = 2131427470;
+			
+			// aapt resource value: 0x7f0b008f
+			public const int abc_hint_foreground_material_dark = 2131427471;
+			
+			// aapt resource value: 0x7f0b0090
+			public const int abc_hint_foreground_material_light = 2131427472;
 			
 			// aapt resource value: 0x7f0b000c
 			public const int abc_input_method_navigation_guard = 2131427340;
 			
-			// aapt resource value: 0x7f0b008f
-			public const int abc_primary_text_disable_only_material_dark = 2131427471;
-			
-			// aapt resource value: 0x7f0b0090
-			public const int abc_primary_text_disable_only_material_light = 2131427472;
-			
 			// aapt resource value: 0x7f0b0091
-			public const int abc_primary_text_material_dark = 2131427473;
+			public const int abc_primary_text_disable_only_material_dark = 2131427473;
 			
 			// aapt resource value: 0x7f0b0092
-			public const int abc_primary_text_material_light = 2131427474;
+			public const int abc_primary_text_disable_only_material_light = 2131427474;
 			
 			// aapt resource value: 0x7f0b0093
-			public const int abc_search_url_text = 2131427475;
+			public const int abc_primary_text_material_dark = 2131427475;
+			
+			// aapt resource value: 0x7f0b0094
+			public const int abc_primary_text_material_light = 2131427476;
+			
+			// aapt resource value: 0x7f0b0095
+			public const int abc_search_url_text = 2131427477;
 			
 			// aapt resource value: 0x7f0b000d
 			public const int abc_search_url_text_normal = 2131427341;
@@ -6770,29 +6770,29 @@ namespace Bit.Droid
 			// aapt resource value: 0x7f0b000f
 			public const int abc_search_url_text_selected = 2131427343;
 			
-			// aapt resource value: 0x7f0b0094
-			public const int abc_secondary_text_material_dark = 2131427476;
-			
-			// aapt resource value: 0x7f0b0095
-			public const int abc_secondary_text_material_light = 2131427477;
-			
 			// aapt resource value: 0x7f0b0096
-			public const int abc_tint_btn_checkable = 2131427478;
+			public const int abc_secondary_text_material_dark = 2131427478;
 			
 			// aapt resource value: 0x7f0b0097
-			public const int abc_tint_default = 2131427479;
+			public const int abc_secondary_text_material_light = 2131427479;
 			
 			// aapt resource value: 0x7f0b0098
-			public const int abc_tint_edittext = 2131427480;
+			public const int abc_tint_btn_checkable = 2131427480;
 			
 			// aapt resource value: 0x7f0b0099
-			public const int abc_tint_seek_thumb = 2131427481;
+			public const int abc_tint_default = 2131427481;
 			
 			// aapt resource value: 0x7f0b009a
-			public const int abc_tint_spinner = 2131427482;
+			public const int abc_tint_edittext = 2131427482;
 			
 			// aapt resource value: 0x7f0b009b
-			public const int abc_tint_switch_track = 2131427483;
+			public const int abc_tint_seek_thumb = 2131427483;
+			
+			// aapt resource value: 0x7f0b009c
+			public const int abc_tint_spinner = 2131427484;
+			
+			// aapt resource value: 0x7f0b009d
+			public const int abc_tint_switch_track = 2131427485;
 			
 			// aapt resource value: 0x7f0b0010
 			public const int accent_material_dark = 2131427344;
@@ -6812,11 +6812,11 @@ namespace Bit.Droid
 			// aapt resource value: 0x7f0b0015
 			public const int background_material_light = 2131427349;
 			
-			// aapt resource value: 0x7f0b0083
-			public const int black = 2131427459;
+			// aapt resource value: 0x7f0b0085
+			public const int black = 2131427461;
 			
-			// aapt resource value: 0x7f0b0075
-			public const int black_border = 2131427445;
+			// aapt resource value: 0x7f0b0076
+			public const int black_border = 2131427446;
 			
 			// aapt resource value: 0x7f0b0071
 			public const int border = 2131427441;
@@ -6875,8 +6875,8 @@ namespace Bit.Droid
 			// aapt resource value: 0x7f0b006e
 			public const int colorPrimaryDark = 2131427438;
 			
-			// aapt resource value: 0x7f0b009c
-			public const int common_google_signin_btn_text_dark = 2131427484;
+			// aapt resource value: 0x7f0b009e
+			public const int common_google_signin_btn_text_dark = 2131427486;
 			
 			// aapt resource value: 0x7f0b0000
 			public const int common_google_signin_btn_text_dark_default = 2131427328;
@@ -6890,8 +6890,8 @@ namespace Bit.Droid
 			// aapt resource value: 0x7f0b0003
 			public const int common_google_signin_btn_text_dark_pressed = 2131427331;
 			
-			// aapt resource value: 0x7f0b009d
-			public const int common_google_signin_btn_text_light = 2131427485;
+			// aapt resource value: 0x7f0b009f
+			public const int common_google_signin_btn_text_light = 2131427487;
 			
 			// aapt resource value: 0x7f0b0004
 			public const int common_google_signin_btn_text_light_default = 2131427332;
@@ -6905,20 +6905,23 @@ namespace Bit.Droid
 			// aapt resource value: 0x7f0b0007
 			public const int common_google_signin_btn_text_light_pressed = 2131427335;
 			
-			// aapt resource value: 0x7f0b009e
-			public const int common_google_signin_btn_tint = 2131427486;
+			// aapt resource value: 0x7f0b00a0
+			public const int common_google_signin_btn_tint = 2131427488;
 			
 			// aapt resource value: 0x7f0b0074
 			public const int dark_border = 2131427444;
 			
+			// aapt resource value: 0x7f0b0075
+			public const int dark_navigationBarBackground = 2131427445;
+			
 			// aapt resource value: 0x7f0b0073
 			public const int dark_notificationBar = 2131427443;
 			
 			// aapt resource value: 0x7f0b0072
 			public const int dark_primary = 2131427442;
 			
-			// aapt resource value: 0x7f0b0084
-			public const int darkgray = 2131427460;
+			// aapt resource value: 0x7f0b0086
+			public const int darkgray = 2131427462;
 			
 			// aapt resource value: 0x7f0b0049
 			public const int design_bottom_navigation_shadow_color = 2131427401;
@@ -6929,8 +6932,8 @@ namespace Bit.Droid
 			// aapt resource value: 0x7f0b004b
 			public const int design_default_color_primary_dark = 2131427403;
 			
-			// aapt resource value: 0x7f0b009f
-			public const int design_error = 2131427487;
+			// aapt resource value: 0x7f0b00a1
+			public const int design_error = 2131427489;
 			
 			// aapt resource value: 0x7f0b004c
 			public const int design_fab_shadow_end_color = 2131427404;
@@ -6956,8 +6959,8 @@ namespace Bit.Droid
 			// aapt resource value: 0x7f0b0053
 			public const int design_snackbar_background_color = 2131427411;
 			
-			// aapt resource value: 0x7f0b00a0
-			public const int design_tint_password_toggle = 2131427488;
+			// aapt resource value: 0x7f0b00a2
+			public const int design_tint_password_toggle = 2131427490;
 			
 			// aapt resource value: 0x7f0b001e
 			public const int dim_foreground_disabled_material_dark = 2131427358;
@@ -6986,8 +6989,8 @@ namespace Bit.Droid
 			// aapt resource value: 0x7f0b0025
 			public const int foreground_material_light = 2131427365;
 			
-			// aapt resource value: 0x7f0b0085
-			public const int gray = 2131427461;
+			// aapt resource value: 0x7f0b0087
+			public const int gray = 2131427463;
 			
 			// aapt resource value: 0x7f0b0026
 			public const int highlighted_text_material_dark = 2131427366;
@@ -7025,14 +7028,14 @@ namespace Bit.Droid
 			// aapt resource value: 0x7f0b006c
 			public const int hockeyapp_text_white = 2131427436;
 			
-			// aapt resource value: 0x7f0b0087
-			public const int ic_launcher_background = 2131427463;
+			// aapt resource value: 0x7f0b0089
+			public const int ic_launcher_background = 2131427465;
 			
-			// aapt resource value: 0x7f0b0081
-			public const int launcher_background = 2131427457;
+			// aapt resource value: 0x7f0b0083
+			public const int launcher_background = 2131427459;
 			
-			// aapt resource value: 0x7f0b0086
-			public const int lightgray = 2131427462;
+			// aapt resource value: 0x7f0b0088
+			public const int lightgray = 2131427464;
 			
 			// aapt resource value: 0x7f0b0028
 			public const int material_blue_grey_800 = 2131427368;
@@ -7070,71 +7073,71 @@ namespace Bit.Droid
 			// aapt resource value: 0x7f0b0033
 			public const int material_grey_900 = 2131427379;
 			
-			// aapt resource value: 0x7f0b00a1
-			public const int mtrl_bottom_nav_colored_item_tint = 2131427489;
+			// aapt resource value: 0x7f0b00a3
+			public const int mtrl_bottom_nav_colored_item_tint = 2131427491;
 			
-			// aapt resource value: 0x7f0b00a2
-			public const int mtrl_bottom_nav_item_tint = 2131427490;
+			// aapt resource value: 0x7f0b00a4
+			public const int mtrl_bottom_nav_item_tint = 2131427492;
 			
 			// aapt resource value: 0x7f0b0054
 			public const int mtrl_btn_bg_color_disabled = 2131427412;
 			
-			// aapt resource value: 0x7f0b00a3
-			public const int mtrl_btn_bg_color_selector = 2131427491;
-			
-			// aapt resource value: 0x7f0b00a4
-			public const int mtrl_btn_ripple_color = 2131427492;
-			
 			// aapt resource value: 0x7f0b00a5
-			public const int mtrl_btn_stroke_color_selector = 2131427493;
+			public const int mtrl_btn_bg_color_selector = 2131427493;
 			
 			// aapt resource value: 0x7f0b00a6
-			public const int mtrl_btn_text_btn_ripple_color = 2131427494;
+			public const int mtrl_btn_ripple_color = 2131427494;
+			
+			// aapt resource value: 0x7f0b00a7
+			public const int mtrl_btn_stroke_color_selector = 2131427495;
+			
+			// aapt resource value: 0x7f0b00a8
+			public const int mtrl_btn_text_btn_ripple_color = 2131427496;
 			
 			// aapt resource value: 0x7f0b0055
 			public const int mtrl_btn_text_color_disabled = 2131427413;
 			
-			// aapt resource value: 0x7f0b00a7
-			public const int mtrl_btn_text_color_selector = 2131427495;
+			// aapt resource value: 0x7f0b00a9
+			public const int mtrl_btn_text_color_selector = 2131427497;
 			
 			// aapt resource value: 0x7f0b0056
 			public const int mtrl_btn_transparent_bg_color = 2131427414;
 			
-			// aapt resource value: 0x7f0b00a8
-			public const int mtrl_chip_background_color = 2131427496;
-			
-			// aapt resource value: 0x7f0b00a9
-			public const int mtrl_chip_close_icon_tint = 2131427497;
-			
 			// aapt resource value: 0x7f0b00aa
-			public const int mtrl_chip_ripple_color = 2131427498;
+			public const int mtrl_chip_background_color = 2131427498;
 			
 			// aapt resource value: 0x7f0b00ab
-			public const int mtrl_chip_text_color = 2131427499;
+			public const int mtrl_chip_close_icon_tint = 2131427499;
 			
 			// aapt resource value: 0x7f0b00ac
-			public const int mtrl_fab_ripple_color = 2131427500;
+			public const int mtrl_chip_ripple_color = 2131427500;
+			
+			// aapt resource value: 0x7f0b00ad
+			public const int mtrl_chip_text_color = 2131427501;
+			
+			// aapt resource value: 0x7f0b00ae
+			public const int mtrl_fab_ripple_color = 2131427502;
 			
 			// aapt resource value: 0x7f0b0057
 			public const int mtrl_scrim_color = 2131427415;
 			
-			// aapt resource value: 0x7f0b00ad
-			public const int mtrl_tabs_colored_ripple_color = 2131427501;
-			
-			// aapt resource value: 0x7f0b00ae
-			public const int mtrl_tabs_icon_color_selector = 2131427502;
-			
 			// aapt resource value: 0x7f0b00af
-			public const int mtrl_tabs_icon_color_selector_colored = 2131427503;
+			public const int mtrl_tabs_colored_ripple_color = 2131427503;
 			
 			// aapt resource value: 0x7f0b00b0
-			public const int mtrl_tabs_legacy_text_color_selector = 2131427504;
+			public const int mtrl_tabs_icon_color_selector = 2131427504;
 			
 			// aapt resource value: 0x7f0b00b1
-			public const int mtrl_tabs_ripple_color = 2131427505;
+			public const int mtrl_tabs_icon_color_selector_colored = 2131427505;
 			
 			// aapt resource value: 0x7f0b00b2
-			public const int mtrl_text_btn_text_color_selector = 2131427506;
+			public const int mtrl_tabs_legacy_text_color_selector = 2131427506;
+			
+			// aapt resource value: 0x7f0b00b3
+			public const int mtrl_tabs_ripple_color = 2131427507;
+			
+			// aapt resource value: 0x7f0b00b4
+			public const int mtrl_text_btn_text_color_selector = 2131427508;
 			
 			// aapt resource value: 0x7f0b0058
 			public const int mtrl_textinput_default_box_stroke_color = 2131427416;
@@ -7148,38 +7151,41 @@ namespace Bit.Droid
 			// aapt resource value: 0x7f0b005b
 			public const int mtrl_textinput_hovered_box_stroke_color = 2131427419;
 			
-			// aapt resource value: 0x7f0b0079
-			public const int nord_actionBar = 2131427449;
-			
 			// aapt resource value: 0x7f0b007a
-			public const int nord_actionBarText = 2131427450;
-			
-			// aapt resource value: 0x7f0b0076
-			public const int nord_background = 2131427446;
-			
-			// aapt resource value: 0x7f0b007d
-			public const int nord_border = 2131427453;
-			
-			// aapt resource value: 0x7f0b0080
-			public const int nord_buttonBackground = 2131427456;
-			
-			// aapt resource value: 0x7f0b007c
-			public const int nord_dialogBackground = 2131427452;
+			public const int nord_actionBar = 2131427450;
 			
 			// aapt resource value: 0x7f0b007b
-			public const int nord_notificationBar = 2131427451;
-			
-			// aapt resource value: 0x7f0b007e
-			public const int nord_popupBackground = 2131427454;
-			
-			// aapt resource value: 0x7f0b007f
-			public const int nord_popupText = 2131427455;
-			
-			// aapt resource value: 0x7f0b0078
-			public const int nord_primary = 2131427448;
+			public const int nord_actionBarText = 2131427451;
 			
 			// aapt resource value: 0x7f0b0077
-			public const int nord_text = 2131427447;
+			public const int nord_background = 2131427447;
+			
+			// aapt resource value: 0x7f0b007e
+			public const int nord_border = 2131427454;
+			
+			// aapt resource value: 0x7f0b0081
+			public const int nord_buttonBackground = 2131427457;
+			
+			// aapt resource value: 0x7f0b007d
+			public const int nord_dialogBackground = 2131427453;
+			
+			// aapt resource value: 0x7f0b0082
+			public const int nord_navigationBarBackground = 2131427458;
+			
+			// aapt resource value: 0x7f0b007c
+			public const int nord_notificationBar = 2131427452;
+			
+			// aapt resource value: 0x7f0b007f
+			public const int nord_popupBackground = 2131427455;
+			
+			// aapt resource value: 0x7f0b0080
+			public const int nord_popupText = 2131427456;
+			
+			// aapt resource value: 0x7f0b0079
+			public const int nord_primary = 2131427449;
+			
+			// aapt resource value: 0x7f0b0078
+			public const int nord_text = 2131427448;
 			
 			// aapt resource value: 0x7f0b0070
 			public const int notificationBar = 2131427440;
@@ -7244,11 +7250,11 @@ namespace Bit.Droid
 			// aapt resource value: 0x7f0b0043
 			public const int switch_thumb_disabled_material_light = 2131427395;
 			
-			// aapt resource value: 0x7f0b00b3
-			public const int switch_thumb_material_dark = 2131427507;
+			// aapt resource value: 0x7f0b00b5
+			public const int switch_thumb_material_dark = 2131427509;
 			
-			// aapt resource value: 0x7f0b00b4
-			public const int switch_thumb_material_light = 2131427508;
+			// aapt resource value: 0x7f0b00b6
+			public const int switch_thumb_material_light = 2131427510;
 			
 			// aapt resource value: 0x7f0b0044
 			public const int switch_thumb_normal_material_dark = 2131427396;
@@ -7262,8 +7268,8 @@ namespace Bit.Droid
 			// aapt resource value: 0x7f0b0047
 			public const int tooltip_background_light = 2131427399;
 			
-			// aapt resource value: 0x7f0b0082
-			public const int white = 2131427458;
+			// aapt resource value: 0x7f0b0084
+			public const int white = 2131427460;
 			
 			static Color()
 			{
diff --git a/src/Android/Resources/values/colors.xml b/src/Android/Resources/values/colors.xml
index e7d2623b2..e913af04e 100644
--- a/src/Android/Resources/values/colors.xml
+++ b/src/Android/Resources/values/colors.xml
@@ -11,6 +11,7 @@
   <color name="dark_primary">#52bdfb</color>
   <color name="dark_notificationBar">#191919</color>
   <color name="dark_border">#191919</color>
+  <color name="dark_navigationBarBackground">#191919</color>
 
   <!-- Black theme -->
   <color name="black_border">#282828</color>
@@ -27,6 +28,7 @@
   <color name="nord_popupBackground">#4c566a</color>
   <color name="nord_popupText">#e5e9f0</color>
   <color name="nord_buttonBackground">#4c566a</color>
+  <color name="nord_navigationBarBackground">#20242D</color>
 
   <!-- Other -->
   <color name="launcher_background">#FFFFFF</color>
diff --git a/src/Android/Resources/values/styles.xml b/src/Android/Resources/values/styles.xml
index fdd2fcc93..30699be3c 100644
--- a/src/Android/Resources/values/styles.xml
+++ b/src/Android/Resources/values/styles.xml
@@ -16,6 +16,7 @@
     <item name="colorPrimaryDark">@color/notificationBar</item>
     <item name="colorAccent">@color/primary</item>
     <item name="colorControlNormal">@color/border</item>
+    <item name="android:navigationBarColor">@android:color/black</item>
     <item name="windowActionModeOverlay">true</item>
     <item name="android:datePickerDialogTheme">@style/AppCompatDialogStyle</item>
     <item name="android:colorActivatedHighlight">@android:color/transparent</item>
@@ -38,7 +39,7 @@
     <item name="colorPrimaryDark">@color/dark_notificationBar</item>
     <item name="colorAccent">@color/dark_primary</item>
     <item name="colorControlNormal">@color/dark_border</item>
-    <item name="android:navigationBarColor">@android:color/black</item>
+    <item name="android:navigationBarColor">@color/dark_navigationBarBackground</item>
     <item name="windowActionModeOverlay">true</item>
     <item name="android:datePickerDialogTheme">@style/AppCompatDialogStyle</item>
     <item name="android:colorActivatedHighlight">@android:color/transparent</item>
@@ -58,6 +59,7 @@
     <item name="colorPrimary">@android:color/black</item>
     <item name="colorPrimaryDark">@android:color/black</item>
     <item name="colorControlNormal">@color/black_border</item>
+    <item name="android:navigationBarColor">@android:color/black</item>
   </style>
 
   <!-- Nord theme -->
@@ -75,6 +77,7 @@
     <item name="colorPrimary">@color/nord_actionBar</item>
     <item name="colorPrimaryDark">@color/nord_notificationBar</item>
     <item name="colorControlNormal">@color/nord_border</item>
+    <item name="android:navigationBarColor">@color/nord_navigationBarBackground</item>
     <item name="colorBackgroundFloating">@color/nord_dialogBackground</item>
     <item name="android:colorBackgroundFloating" tools:targetApi="23">@color/nord_dialogBackground</item>
     <item name="popupTheme">@style/NordTheme.Popup</item>