WIP

res/layout/conversation_activity.xml

@@ -52,12 +52,6 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1" />
 
-            <ImageView
-                android:id="@+id/settingsButton"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:src="@drawable/ic_gear" />
-
         </LinearLayout>
 
     </android.support.v7.widget.Toolbar>

res/layout/conversation_search_nav.xml

@@ -6,7 +6,7 @@
     android:id="@+id/conversation_search_nav"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?conversation_background"
+    android:background="@color/compose_view_background"
     android:visibility="gone"
     tools:visibility="visible"
     tools:parentTag="android.support.constraint.ConstraintLayout">

res/menu/conversation.xml

@@ -8,7 +8,6 @@
     <!-- <item android:title="@string/conversation__menu_conversation_settings"
           android:id="@+id/menu_conversation_settings"/> -->
 
-
     <item android:title="@string/SearchToolbar_search"
           android:id="@+id/menu_search"
           app:actionViewClass="android.support.v7.widget.SearchView"

res/values/colors.xml

@@ -35,7 +35,7 @@
 
     <color name="signal_primary">@color/accent</color>
     <color name="signal_primary_dark">@color/accent</color>
-    <color name="signal_primary_alpha33">#5578be20</color>
+    <color name="signal_primary_alpha33">#5500F782</color>
     <color name="signal_primary_alpha_focus">#882090ea</color>
 
     <color name="textsecure_primary">@color/signal_primary</color>