diff --git a/res/layout/recipient_preference_activity.xml b/res/layout/recipient_preference_activity.xml
index 8ef073ad7d..c51914605d 100644
--- a/res/layout/recipient_preference_activity.xml
+++ b/res/layout/recipient_preference_activity.xml
@@ -49,7 +49,6 @@
                     android:background="@color/transparent"
                     android:layout_marginTop="24dp"
                     android:theme="@style/TextSecure.DarkActionBar.Conversation"
-                    app:navigationIcon="@drawable/ic_arrow_left_24"
                     app:layout_collapseMode="pin" >
 
             </androidx.appcompat.widget.Toolbar>
diff --git a/res/values-v21/themes.xml b/res/values-v21/themes.xml
index d60cfabc2e..202968077a 100644
--- a/res/values-v21/themes.xml
+++ b/res/values-v21/themes.xml
@@ -6,13 +6,13 @@
     </style>
 
     <style name="TextSecure.DarkTheme" parent="@style/TextSecure.BaseDarkTheme">
-        <item name="android:statusBarColor">?android:attr/windowBackground</item>
-        <item name="android:navigationBarColor">?android:attr/windowBackground</item>
+        <item name="android:statusBarColor">@color/core_grey_95</item>
+        <item name="android:navigationBarColor">@color/core_grey_95</item>
     </style>
 
     <style name="TextSecure.DarkNoActionBar" parent="@style/TextSecure.BaseDarkNoActionBar">
-        <item name="android:statusBarColor">?android:attr/windowBackground</item>
-        <item name="android:navigationBarColor">?android:attr/windowBackground</item>
+        <item name="android:statusBarColor">@color/core_grey_95</item>
+        <item name="android:navigationBarColor">@color/core_grey_95</item>
         <item name="android:colorControlActivated">@color/signal_primary_dark</item>
     </style>
 
diff --git a/res/values-v23/themes.xml b/res/values-v23/themes.xml
index 77087bdad1..930480efa8 100644
--- a/res/values-v23/themes.xml
+++ b/res/values-v23/themes.xml
@@ -2,34 +2,34 @@
 <resources>
     <style name="TextSecure.LightTheme" parent="TextSecure.BaseLightTheme">
         <item name="android:windowLightStatusBar">true</item>
-        <item name="android:statusBarColor">?android:attr/windowBackground</item>
+        <item name="android:statusBarColor">@color/white</item>
     </style>
 
     <style name="TextSecure.DarkTheme" parent="TextSecure.BaseDarkTheme">
-        <item name="android:navigationBarColor">?android:attr/windowBackground</item>
-        <item name="android:statusBarColor">?android:attr/windowBackground</item>
+        <item name="android:navigationBarColor">@color/core_grey_95</item>
+        <item name="android:statusBarColor">@color/core_grey_95</item>
         <item name="android:windowLightStatusBar">false</item>
     </style>
 
     <style name="TextSecure.LightRegistrationTheme" parent="TextSecure.LightNoActionBar">
         <item name="android:windowLightStatusBar">true</item>
-        <item name="android:statusBarColor">@color/core_grey_02</item>
+        <item name="android:statusBarColor">@color/white</item>
     </style>
 
     <style name="TextSecure.DarkRegistrationTheme" parent="TextSecure.DarkNoActionBar">
         <item name="android:windowLightStatusBar">false</item>
-        <item name="android:statusBarColor">@color/core_black</item>
-        <item name="android:navigationBarColor">?android:attr/windowBackground</item>
+        <item name="android:statusBarColor">@color/core_grey_95</item>
+        <item name="android:navigationBarColor">@color/core_grey_95</item>
     </style>
 
     <style name="TextSecure.LightNoActionBar" parent="TextSecure.BaseLightNoActionBar">
-        <item name="android:statusBarColor">?android:attr/windowBackground</item>
+        <item name="android:statusBarColor">@color/white</item>
         <item name="android:windowLightStatusBar">true</item>
     </style>
 
     <style name="TextSecure.DarkNoActionBar" parent="TextSecure.BaseDarkNoActionBar">
-        <item name="android:statusBarColor">?android:attr/windowBackground</item>
+        <item name="android:statusBarColor">@color/core_grey_95</item>
         <item name="android:windowLightStatusBar">false</item>
-        <item name="android:navigationBarColor">?android:attr/windowBackground</item>
+        <item name="android:navigationBarColor">@color/core_grey_95</item>
     </style>
 </resources>
diff --git a/res/values-v27/themes.xml b/res/values-v27/themes.xml
index 83d8b03333..0d4ac24649 100644
--- a/res/values-v27/themes.xml
+++ b/res/values-v27/themes.xml
@@ -2,43 +2,43 @@
 <resources>
     <style name="TextSecure.LightTheme" parent="TextSecure.BaseLightTheme">
         <item name="android:windowLightStatusBar">true</item>
-        <item name="android:statusBarColor">?android:attr/windowBackground</item>
-        <item name="android:navigationBarColor">?android:attr/windowBackground</item>
+        <item name="android:statusBarColor">@color/white</item>
+        <item name="android:navigationBarColor">@color/white</item>
         <item name="android:windowLightNavigationBar">true</item>
     </style>
 
     <style name="TextSecure.DarkTheme" parent="TextSecure.BaseDarkTheme">
-        <item name="android:statusBarColor">?android:attr/windowBackground</item>
+        <item name="android:statusBarColor">@color/core_grey_95</item>
         <item name="android:windowLightStatusBar">false</item>
-        <item name="android:navigationBarColor">?android:attr/windowBackground</item>
+        <item name="android:navigationBarColor">@color/core_grey_95</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/core_grey_02</item>
-        <item name="android:navigationBarColor">?android:attr/windowBackground</item>
+        <item name="android:statusBarColor">@color/white</item>
+        <item name="android:navigationBarColor">@color/white</item>
         <item name="android:windowLightNavigationBar">true</item>
     </style>
 
     <style name="TextSecure.DarkRegistrationTheme" parent="TextSecure.DarkNoActionBar">
         <item name="android:windowLightStatusBar">false</item>
-        <item name="android:statusBarColor">@color/core_black</item>
-        <item name="android:navigationBarColor">?android:attr/windowBackground</item>
+        <item name="android:statusBarColor">@color/core_grey_95</item>
+        <item name="android:navigationBarColor">@color/core_grey_95</item>
         <item name="android:windowLightNavigationBar">false</item>
     </style>
 
     <style name="TextSecure.LightNoActionBar" parent="TextSecure.BaseLightNoActionBar">
-        <item name="android:statusBarColor">?android:attr/windowBackground</item>
+        <item name="android:statusBarColor">@color/white</item>
         <item name="android:windowLightStatusBar">true</item>
-        <item name="android:navigationBarColor">?android:attr/windowBackground</item>
+        <item name="android:navigationBarColor">@color/white</item>
         <item name="android:windowLightNavigationBar">true</item>
     </style>
 
     <style name="TextSecure.DarkNoActionBar" parent="TextSecure.BaseDarkNoActionBar">
-        <item name="android:statusBarColor">?android:attr/windowBackground</item>
+        <item name="android:statusBarColor">@color/core_grey_95</item>
         <item name="android:windowLightStatusBar">false</item>
-        <item name="android:navigationBarColor">?android:attr/windowBackground</item>
+        <item name="android:navigationBarColor">@color/core_grey_95</item>
         <item name="android:windowLightNavigationBar">false</item>
     </style>
 </resources>
diff --git a/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java b/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java
index 2bbe7dcc96..633f594b42 100644
--- a/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java
+++ b/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java
@@ -199,7 +199,6 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
     });
 
     Toolbar toolbar = ViewUtil.findById(this, R.id.toolbar);
-    DrawableCompat.setTint(toolbar.getNavigationIcon(), ThemeUtil.getThemedColor(this, R.attr.conversation_subtitle_color));
     setSupportActionBar(toolbar);
     getSupportActionBar().setDisplayHomeAsUpEnabled(true);
     getSupportActionBar().setLogo(null);