diff --git a/launcher/src/main/res/layout/activity_intent_factory.xml b/launcher/src/main/res/layout/activity_intent_factory.xml
index c1811d76..7e7d97eb 100644
--- a/launcher/src/main/res/layout/activity_intent_factory.xml
+++ b/launcher/src/main/res/layout/activity_intent_factory.xml
@@ -62,6 +62,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:background="?selectableItemBackgroundBorderless"
+                    android:contentDescription="@string/cd_select_intent_action"
                     android:padding="8dp"
                     android:src="@drawable/ic_intent_select_action"
                     app:layout_constraintBottom_toBottomOf="parent"
@@ -104,6 +105,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:background="?selectableItemBackgroundBorderless"
+                    android:contentDescription="@string/cd_select_component"
                     android:padding="8dp"
                     android:src="@drawable/ic_intent_select_action"
                     app:layout_constraintBottom_toBottomOf="parent"
diff --git a/launcher/src/main/res/layout/fragment_settings_app_details.xml b/launcher/src/main/res/layout/fragment_settings_app_details.xml
index 440551b1..8ac88995 100644
--- a/launcher/src/main/res/layout/fragment_settings_app_details.xml
+++ b/launcher/src/main/res/layout/fragment_settings_app_details.xml
@@ -15,6 +15,7 @@
             android:layout_height="32dp"
             android:layout_marginStart="16dp"
             android:layout_marginTop="16dp"
+            android:contentDescription="@string/cd_application_icon"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             tools:src="@mipmap/ic_launcher" />
@@ -54,6 +55,7 @@
             android:layout_marginStart="16dp"
             android:layout_marginEnd="16dp"
             android:background="?selectableItemBackgroundBorderless"
+            android:contentDescription="@string/cd_app_system_settings"
             android:padding="8dp"
             android:src="@drawable/ic_app_info"
             app:layout_constraintBottom_toBottomOf="@id/icon"
diff --git a/launcher/src/main/res/layout/item_add_widget.xml b/launcher/src/main/res/layout/item_add_widget.xml
index 6dd4b9cb..be84f99a 100644
--- a/launcher/src/main/res/layout/item_add_widget.xml
+++ b/launcher/src/main/res/layout/item_add_widget.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="56dp"
     android:gravity="end"
@@ -11,8 +10,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="?selectableItemBackgroundBorderless"
+        android:contentDescription="@string/cd_add_widget_button"
         android:padding="16dp"
-        android:src="@drawable/ic_add_widget"
-        tools:ignore="ContentDescription" />
+        android:src="@drawable/ic_add_widget" />
 
 </LinearLayout>
diff --git a/launcher/src/main/res/layout/item_intent_extra.xml b/launcher/src/main/res/layout/item_intent_extra.xml
index 4f1929d2..558eec97 100644
--- a/launcher/src/main/res/layout/item_intent_extra.xml
+++ b/launcher/src/main/res/layout/item_intent_extra.xml
@@ -55,6 +55,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="?selectableItemBackgroundBorderless"
+        android:contentDescription="@string/cd_delete_extra"
         android:padding="8dp"
         android:src="@drawable/ic_action_delete"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/launcher/src/main/res/layout/item_popup_shortcut.xml b/launcher/src/main/res/layout/item_popup_shortcut.xml
index c863ce29..8a58d069 100644
--- a/launcher/src/main/res/layout/item_popup_shortcut.xml
+++ b/launcher/src/main/res/layout/item_popup_shortcut.xml
@@ -40,7 +40,7 @@
         android:layout_height="32dp"
         android:layout_marginStart="12dp"
         android:background="?selectableItemBackgroundBorderless"
-        android:contentDescription="@string/cd_pin"
+        android:contentDescription="@string/cd_pin_item"
         android:padding="4dp"
         android:src="@drawable/ic_popup_action_pin"
         android:visibility="gone"
diff --git a/launcher/src/main/res/layout/item_search_match.xml b/launcher/src/main/res/layout/item_search_match.xml
index 2e4b6fed..ac2c503b 100644
--- a/launcher/src/main/res/layout/item_search_match.xml
+++ b/launcher/src/main/res/layout/item_search_match.xml
@@ -41,7 +41,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="?selectableItemBackgroundBorderless"
-        android:contentDescription="@string/cd_pin"
+        android:contentDescription="@string/cd_pin_item"
         android:padding="8dp"
         android:scaleType="centerInside"
         android:src="@drawable/ic_action_pin"
diff --git a/launcher/src/main/res/layout/item_settings_app_alias.xml b/launcher/src/main/res/layout/item_settings_app_alias.xml
index 1f88cedf..d1d702eb 100644
--- a/launcher/src/main/res/layout/item_settings_app_alias.xml
+++ b/launcher/src/main/res/layout/item_settings_app_alias.xml
@@ -24,6 +24,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="?selectableItemBackgroundBorderless"
+        android:contentDescription="@string/cd_delete_alias"
         android:padding="16dp"
         android:src="@drawable/ic_action_delete" />
 
diff --git a/launcher/src/main/res/layout/item_widget_preview.xml b/launcher/src/main/res/layout/item_widget_preview.xml
index 223e268e..faad3b4a 100644
--- a/launcher/src/main/res/layout/item_widget_preview.xml
+++ b/launcher/src/main/res/layout/item_widget_preview.xml
@@ -12,6 +12,7 @@
         android:id="@+id/widget_preview"
         android:layout_width="wrap_content"
         android:layout_height="96dp"
+        android:contentDescription="@string/cd_widget_preview"
         android:padding="8dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -22,6 +23,7 @@
         android:id="@+id/widget_icon"
         android:layout_width="32dp"
         android:layout_height="32dp"
+        android:contentDescription="@string/cd_application_icon"
         app:layout_constraintBottom_toBottomOf="@id/widget_preview"
         app:layout_constraintEnd_toEndOf="parent"
         tools:src="@tools:sample/avatars" />
diff --git a/launcher/src/main/res/layout/widget_edit_mode_panel.xml b/launcher/src/main/res/layout/widget_edit_mode_panel.xml
index 76acb252..b15ee7d1 100644
--- a/launcher/src/main/res/layout/widget_edit_mode_panel.xml
+++ b/launcher/src/main/res/layout/widget_edit_mode_panel.xml
@@ -15,6 +15,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="?selectableItemBackgroundBorderless"
+        android:contentDescription="@string/cd_add_item"
         android:padding="16dp"
         android:src="@drawable/ic_add_widget"
         android:visibility="gone"
@@ -49,7 +50,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="?selectableItemBackgroundBorderless"
-        android:contentDescription="@string/cd_save"
+        android:contentDescription="@string/cd_save_changes"
         android:padding="16dp"
         android:src="@drawable/ic_customize_save" />
 
diff --git a/launcher/src/main/res/values/strings_cd.xml b/launcher/src/main/res/values/strings_cd.xml
index 6334cfbf..d6859026 100644
--- a/launcher/src/main/res/values/strings_cd.xml
+++ b/launcher/src/main/res/values/strings_cd.xml
@@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="cd_settings">Settings</string>
-    <string name="cd_application_icon">App icon</string>
-    <string name="cd_application_visibility">App visibility</string>
+    <string name="cd_application_icon">Application icon</string>
+    <string name="cd_application_visibility">Application visibility</string>
     <string name="cd_search">Search</string>
-    <string name="cd_pin">Pin</string>
+    <string name="cd_pin_item">Pin item</string>
     <string name="cd_wallpaper">Wallpaper</string>
     <string name="cd_undo">Undo</string>
-    <string name="cd_save">Save</string>
+    <string name="cd_save_changes">Save changes</string>
+    <string name="cd_add_widget_button">Add widget button</string>
+    <string name="cd_select_intent_action">Select Intent action</string>
+    <string name="cd_select_component">Select component</string>
+    <string name="cd_app_system_settings">Application system settings</string>
+    <string name="cd_delete_extra">Delete Intent extra</string>
+    <string name="cd_delete_alias">Delete application alias</string>
+    <string name="cd_widget_preview">Widget preview</string>
+    <string name="cd_add_item">Add item</string>
 </resources>