diff --git a/res/layout/conversation_activity.xml b/res/layout/conversation_activity.xml
index 7ee9106ffc..fc87bafa80 100644
--- a/res/layout/conversation_activity.xml
+++ b/res/layout/conversation_activity.xml
@@ -9,7 +9,8 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        android:theme="@style/TextSecure.LightActionBar"
+        android:background="?attr/conversation_list_toolbar_background"
+        android:theme="?attr/actionBarStyle"
         app:contentInsetStartWithNavigation="0dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"