diff --git a/res/layout/contact_filter_toolbar.xml b/res/layout/contact_filter_toolbar.xml
index b2f4234a4..307c925c5 100644
--- a/res/layout/contact_filter_toolbar.xml
+++ b/res/layout/contact_filter_toolbar.xml
@@ -45,6 +45,7 @@
                            android:visibility="gone"
                            android:focusable="true"
                            android:background="@drawable/circle_touch_highlight_background"
+                           android:contentDescription="@string/clear_search"
                            android:src="@drawable/ic_clear_white_24dp" />
 
             </org.thoughtcrime.securesms.components.AnimatingToggle>
diff --git a/res/layout/conversation_item_received.xml b/res/layout/conversation_item_received.xml
index 256a948d5..5d7ac82b2 100644
--- a/res/layout/conversation_item_received.xml
+++ b/res/layout/conversation_item_received.xml
@@ -52,7 +52,7 @@
                 android:layout_height="36dp"
                 android:layout_marginBottom="1dp"
                 android:cropToPadding="true"
-                android:contentDescription="@null" />
+                android:contentDescription="@string/pref_profile_photo" />
 
         </FrameLayout>
 
diff --git a/res/layout/conversation_list_activity.xml b/res/layout/conversation_list_activity.xml
index 84de7a888..cf2e05c65 100644
--- a/res/layout/conversation_list_activity.xml
+++ b/res/layout/conversation_list_activity.xml
@@ -48,7 +48,8 @@
                        android:layout_marginBottom="4dp"
                        android:layout_alignParentRight="true"
                        android:layout_alignParentEnd="true"
-                       android:layout_centerVertical="true"/>
+                       android:layout_centerVertical="true"
+                       android:contentDescription="@string/search"/>
 
         </RelativeLayout>
 
@@ -68,4 +69,4 @@
             android:visibility="invisible"
             tools:visibility="visible"/>
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/res/layout/conversation_list_item_view.xml b/res/layout/conversation_list_item_view.xml
index 64adfba13..70281026c 100644
--- a/res/layout/conversation_list_item_view.xml
+++ b/res/layout/conversation_list_item_view.xml
@@ -20,7 +20,7 @@
         android:layout_centerVertical="true"
         android:cropToPadding="true"
         tools:src="@drawable/ic_contact_picture"
-        android:contentDescription="@string/pref_profile_photo"
+        android:importantForAccessibility="no"
         android:layout_marginLeft="12dp"
         android:layout_marginRight="12dp" />
 
diff --git a/res/layout/conversation_title_view.xml b/res/layout/conversation_title_view.xml
index ec40d4d70..3881ecdb7 100644
--- a/res/layout/conversation_title_view.xml
+++ b/res/layout/conversation_title_view.xml
@@ -22,6 +22,7 @@
                android:layout_alignParentLeft="true"
                android:layout_alignParentStart="true"
                android:layout_centerVertical="true"
+               android:contentDescription="@string/back"
                android:visibility="visible"/>
 
     <org.thoughtcrime.securesms.components.AvatarImageView
@@ -97,4 +98,4 @@
 
     </LinearLayout>
 
-</org.thoughtcrime.securesms.ConversationTitleView>
\ No newline at end of file
+</org.thoughtcrime.securesms.ConversationTitleView>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 54fe6aa38..4616db0fb 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_name">Delta Chat</string>
     <string name="ok">OK</string>
     <string name="cancel">Cancelar</string>
+    <string name="clear_search">Borrar búsqueda</string>
     <string name="yes">Sí</string>
     <string name="no">No</string>
     <string name="select">Seleccionar</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8ce0997c1..07f720242 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_name">Delta Chat</string>
     <string name="ok">OK</string>
     <string name="cancel">Cancel</string>
+    <string name="clear_search">Clear search</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
     <string name="select">Select</string>