diff --git a/res/values-v21/themes.xml b/res/values-v21/themes.xml
index 202968077a..98d57e0ffd 100644
--- a/res/values-v21/themes.xml
+++ b/res/values-v21/themes.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+    <style name="TextSecure.HighlightTheme" parent="TextSecure.BaseHighlightTheme">
+        <item name="android:statusBarColor">@color/signal_primary</item>
+    </style>
+
     <style name="TextSecure.LightTheme" parent="TextSecure.BaseLightTheme">
         <item name="android:statusBarColor">@color/core_grey_60</item>
     </style>
diff --git a/res/values-v27/themes.xml b/res/values-v27/themes.xml
index 0d4ac24649..5efbc7f5ad 100644
--- a/res/values-v27/themes.xml
+++ b/res/values-v27/themes.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
+    <style name="TextSecure.HighlightTheme" parent="TextSecure.BaseHighlightTheme">
+        <item name="android:statusBarColor">@color/signal_primary</item>
+        <item name="android:navigationBarColor">@color/signal_primary</item>
+    </style>
+
     <style name="TextSecure.LightTheme" parent="TextSecure.BaseLightTheme">
         <item name="android:windowLightStatusBar">true</item>
         <item name="android:statusBarColor">@color/white</item>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index f14c79248d..62f62d5f56 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -65,7 +65,11 @@
         <item name="media_overview_document_secondary">@color/core_grey_25</item>
     </style>
 
-    <style name="TextSecure.HighlightTheme" parent="@style/TextSecure.LightNoActionBar.DarkToolbar">
+    <style name="TextSecure.HighlightTheme" parent="TextSecure.BaseHighlightTheme">
+        <!-- Empty for override -->
+    </style>
+
+    <style name="TextSecure.BaseHighlightTheme" parent="@style/TextSecure.LightNoActionBar.DarkToolbar">
         <item name="actionBarStyle">@style/TextSecure.HighlightActionBar</item>
         <item name="android:actionBarStyle">@style/TextSecure.HighlightActionBar</item>
         <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>