diff --git a/res/layout/conversation_list_activity.xml b/res/layout/conversation_list_activity.xml
index 0c1e04ee12..468e90a2b6 100644
--- a/res/layout/conversation_list_activity.xml
+++ b/res/layout/conversation_list_activity.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:app="http://schemas.android.com/apk/res-auto"
                 xmlns:tools="http://schemas.android.com/tools"
                 android:id="@id/container"
                 android:orientation="vertical"
@@ -14,8 +13,6 @@
             android:layout_height="?attr/actionBarSize"
             android:minHeight="?attr/actionBarSize"
             android:background="?attr/conversation_list_toolbar_background"
-            app:contentInsetStart="14dp"
-            app:contentInsetLeft="14dp"
             android:elevation="4dp"
             android:theme="?attr/actionBarStyle">
 
@@ -25,11 +22,12 @@
 
             <ImageView android:id="@+id/toolbar_icon"
                        android:contentDescription="@string/conversation_list_settings_shortcut"
-                       android:layout_width="36dp"
-                       android:layout_height="36dp"
-                       android:layout_marginStart="8dp"
+                       android:layout_width="48dp"
+                       android:layout_height="48dp"
                        android:layout_alignParentStart="true"
-                       android:layout_centerVertical="true"/>
+                       android:layout_centerVertical="true"
+                       android:padding="6dp"
+                       tools:src="@drawable/ic_contact_picture" />
 
             <TextView android:layout_width="wrap_content"
                       android:layout_height="wrap_content"
@@ -39,15 +37,17 @@
                       android:layout_alignParentStart="true"
                       android:layout_centerVertical="true"
                       android:layout_toStartOf="@+id/search_action"
-                      android:layout_marginStart="66dp"/>
+                      android:layout_marginStart="66dp"
+                      android:textAlignment="viewStart" />
 
             <ImageView android:id="@+id/search_action"
-                       android:layout_width="wrap_content"
-                       android:layout_height="wrap_content"
+                       android:layout_width="48dp"
+                       android:layout_height="48dp"
                        android:src="@drawable/ic_search_white_24dp"
-                       android:paddingEnd="16dp"
                        android:layout_alignParentEnd="true"
-                       android:layout_centerVertical="true"/>
+                       android:layout_centerVertical="true"
+                       android:contentDescription="@string/conversation_list_search_description"
+                       android:padding="12dp" />
 
         </RelativeLayout>
 
@@ -64,7 +64,6 @@
             android:layout_height="wrap_content"
             android:layout_alignParentTop="true"
             android:elevation="4dp"
-            android:visibility="invisible"
-            tools:visibility="visible"/>
+            android:visibility="invisible" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 741f994f7c..2be4080de9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1422,6 +1422,7 @@
 
     <!-- conversation_list -->
     <string name="conversation_list_settings_shortcut">Settings shortcut</string>
+    <string name="conversation_list_search_description">Search</string>
 
     <!-- conversation_list_item_view -->
     <string name="conversation_list_item_view__contact_photo_image">Contact Photo Image</string>