diff --git a/res/values-v21/themes.xml b/res/values-v21/themes.xml
index 98d57e0ffd..96adeb5cf0 100644
--- a/res/values-v21/themes.xml
+++ b/res/values-v21/themes.xml
@@ -24,6 +24,17 @@
         <item name="android:statusBarColor">@color/core_grey_60</item>
     </style>
 
+
+    <style name="TextSecure.LightRegistrationTheme" parent="TextSecure.LightNoActionBar">
+        <item name="android:statusBarColor">@color/white</item>
+        <item name="android:navigationBarColor">@color/core_black</item>
+    </style>
+
+    <style name="TextSecure.DarkRegistrationTheme" parent="TextSecure.DarkNoActionBar">
+        <item name="android:statusBarColor">@color/core_grey_95</item>
+        <item name="android:navigationBarColor">@color/core_black</item>
+    </style>
+
     <style name="TextSecure.MediaPreview" parent="@style/TextSecure.BaseMediaPreview">
         <item name="android:navigationBarColor">@color/media_preview_bar_background</item>
     </style>
diff --git a/res/values-v23/themes.xml b/res/values-v23/themes.xml
index 930480efa8..786e49e3f5 100644
--- a/res/values-v23/themes.xml
+++ b/res/values-v23/themes.xml
@@ -14,12 +14,13 @@
     <style name="TextSecure.LightRegistrationTheme" parent="TextSecure.LightNoActionBar">
         <item name="android:windowLightStatusBar">true</item>
         <item name="android:statusBarColor">@color/white</item>
+        <item name="android:navigationBarColor">@color/core_black</item>
     </style>
 
     <style name="TextSecure.DarkRegistrationTheme" parent="TextSecure.DarkNoActionBar">
         <item name="android:windowLightStatusBar">false</item>
         <item name="android:statusBarColor">@color/core_grey_95</item>
-        <item name="android:navigationBarColor">@color/core_grey_95</item>
+        <item name="android:navigationBarColor">@color/core_black</item>
     </style>
 
     <style name="TextSecure.LightNoActionBar" parent="TextSecure.BaseLightNoActionBar">
diff --git a/res/values-v27/themes.xml b/res/values-v27/themes.xml
index 5efbc7f5ad..82f4e31780 100644
--- a/res/values-v27/themes.xml
+++ b/res/values-v27/themes.xml
@@ -16,15 +16,15 @@
     <style name="TextSecure.DarkTheme" parent="TextSecure.BaseDarkTheme">
         <item name="android:statusBarColor">@color/core_grey_95</item>
         <item name="android:windowLightStatusBar">false</item>
-        <item name="android:navigationBarColor">@color/core_grey_95</item>
+        <item name="android:navigationBarColor">@color/core_black</item>
         <item name="android:windowLightNavigationBar">false</item>
     </style>
 
     <style name="TextSecure.LightRegistrationTheme" parent="TextSecure.LightNoActionBar">
         <item name="android:windowLightStatusBar">true</item>
         <item name="android:statusBarColor">@color/white</item>
-        <item name="android:navigationBarColor">@color/white</item>
-        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:navigationBarColor">@color/core_black</item>
+        <item name="android:windowLightNavigationBar">false</item>
     </style>
 
     <style name="TextSecure.DarkRegistrationTheme" parent="TextSecure.DarkNoActionBar">
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 33972b96d2..a8b7119214 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -626,6 +626,8 @@
     <style name="TextSecure.LightTheme.WebRTCCall">
         <item name="android:statusBarColor" tools:ignore="NewApi">@color/signal_primary</item>
         <item name="android:windowLightStatusBar" tools:ignore="NewApi">false</item>
+        <item name="android:navigationBarColor" tools:ignore="NewApi">@color/core_black</item>
+        <item name="android:windowLightNavigationBar" tools:ignore="NewApi">false</item>
     </style>
 
 </resources>