diff --git a/vector/src/main/res/layout/activity_call.xml b/vector/src/main/res/layout/activity_call.xml
index 0df28cf16a..e5de7f6e16 100644
--- a/vector/src/main/res/layout/activity_call.xml
+++ b/vector/src/main/res/layout/activity_call.xml
@@ -76,7 +76,6 @@
         android:id="@+id/otherMemberAvatar"
         android:layout_width="80dp"
         android:layout_height="80dp"
-        android:contentDescription="@string/avatar"
         android:importantForAccessibility="no"
         android:scaleType="centerCrop"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -186,4 +185,4 @@
 
     </FrameLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/alerter_verification_layout.xml b/vector/src/main/res/layout/alerter_verification_layout.xml
index d9c1794a60..86dcd41340 100644
--- a/vector/src/main/res/layout/alerter_verification_layout.xml
+++ b/vector/src/main/res/layout/alerter_verification_layout.xml
@@ -12,7 +12,7 @@
         android:id="@+id/ivUserAvatar"
         android:layout_width="40dp"
         android:layout_height="40dp"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/alerter_texts"
         app:layout_constraintStart_toStartOf="parent"
@@ -78,4 +78,4 @@
 
     </LinearLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/bottom_sheet_invited_to_space.xml b/vector/src/main/res/layout/bottom_sheet_invited_to_space.xml
index 6dbf4d91ee..5686c8879e 100644
--- a/vector/src/main/res/layout/bottom_sheet_invited_to_space.xml
+++ b/vector/src/main/res/layout/bottom_sheet_invited_to_space.xml
@@ -25,7 +25,7 @@
                 android:id="@+id/inviterAvatarImage"
                 android:layout_width="40dp"
                 android:layout_height="40dp"
-                android:contentDescription="@string/avatar"
+                android:importantForAccessibility="no"
                 android:transitionName="profile"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="0"
@@ -75,4 +75,4 @@
 
     </LinearLayout>
 
-</androidx.core.widget.NestedScrollView>
\ No newline at end of file
+</androidx.core.widget.NestedScrollView>
diff --git a/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
index 3195877b5b..d082c407d1 100644
--- a/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
+++ b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
@@ -45,7 +45,7 @@
             android:layout_width="40dp"
             android:layout_height="40dp"
             android:layout_gravity="center"
-            android:contentDescription="@string/avatar"
+            android:importantForAccessibility="no"
             tools:src="@sample/user_round_avatars" />
 
         <LinearLayout
@@ -118,4 +118,4 @@
 
     </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/vector/src/main/res/layout/bottom_sheet_verification.xml b/vector/src/main/res/layout/bottom_sheet_verification.xml
index a6c6ded739..dc1fec20ef 100644
--- a/vector/src/main/res/layout/bottom_sheet_verification.xml
+++ b/vector/src/main/res/layout/bottom_sheet_verification.xml
@@ -21,7 +21,7 @@
             android:layout_marginStart="16dp"
             android:layout_marginTop="16dp"
             android:adjustViewBounds="true"
-            android:contentDescription="@string/avatar"
+            android:importantForAccessibility="no"
             android:scaleType="centerCrop"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
diff --git a/vector/src/main/res/layout/composer_layout.xml b/vector/src/main/res/layout/composer_layout.xml
index 2dec5c23c0..ffb5b839c7 100644
--- a/vector/src/main/res/layout/composer_layout.xml
+++ b/vector/src/main/res/layout/composer_layout.xml
@@ -29,7 +29,7 @@
         android:id="@+id/composerRelatedMessageAvatar"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
         tools:ignore="MissingConstraints" />
 
     <TextView
diff --git a/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml b/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
index a098606ab9..eae8457121 100644
--- a/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
+++ b/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
@@ -32,7 +32,7 @@
         android:id="@+id/composerRelatedMessageAvatar"
         android:layout_width="40dp"
         android:layout_height="40dp"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
         android:visibility="invisible"
         app:layout_constraintBottom_toTopOf="parent"
         app:layout_constraintEnd_toStartOf="parent" />
@@ -192,4 +192,4 @@
         app:layout_constraintEnd_toEndOf="parent" />
     -->
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml b/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
index 1ef31900f7..c09b95f6f7 100644
--- a/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
+++ b/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
@@ -33,7 +33,7 @@
         android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="8dp"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
         app:layout_constraintBottom_toTopOf="@id/composerRelatedMessageActionIcon"
         app:layout_constraintEnd_toStartOf="@+id/composerRelatedMessageTitle"
         app:layout_constraintStart_toStartOf="parent"
@@ -192,4 +192,4 @@
         tools:ignore="MissingPrefix"
         tools:visibility="visible" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/fragment_home_drawer.xml b/vector/src/main/res/layout/fragment_home_drawer.xml
index d1af004490..36d9d8fca3 100644
--- a/vector/src/main/res/layout/fragment_home_drawer.xml
+++ b/vector/src/main/res/layout/fragment_home_drawer.xml
@@ -22,7 +22,7 @@
             android:layout_height="40dp"
             android:layout_marginStart="@dimen/layout_horizontal_margin"
             android:layout_marginTop="24dp"
-            android:contentDescription="@string/avatar"
+            android:importantForAccessibility="no"
             android:transitionName="profile"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -174,4 +174,4 @@
         app:tint="?vctr_content_secondary"
         tools:ignore="MissingPrefix" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/fragment_login_account_created.xml b/vector/src/main/res/layout/fragment_login_account_created.xml
index 0ec4881544..61a8710f88 100644
--- a/vector/src/main/res/layout/fragment_login_account_created.xml
+++ b/vector/src/main/res/layout/fragment_login_account_created.xml
@@ -60,7 +60,7 @@
                     android:id="@+id/loginAccountCreatedAvatar"
                     android:layout_width="44dp"
                     android:layout_height="44dp"
-                    android:contentDescription="@string/avatar"
+                    android:importantForAccessibility="no"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
                     tools:src="@tools:sample/avatars" />
diff --git a/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml b/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
index cdbf53b8f9..81188bddf0 100644
--- a/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
+++ b/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
@@ -19,7 +19,7 @@
             android:layout_width="60dp"
             android:layout_height="60dp"
             android:layout_marginTop="20dp"
-            android:contentDescription="@string/avatar"
+            android:importantForAccessibility="no"
             android:elevation="4dp"
             android:transitionName="profile"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/fragment_room_detail.xml b/vector/src/main/res/layout/fragment_room_detail.xml
index 623cd91b2a..69a19af555 100644
--- a/vector/src/main/res/layout/fragment_room_detail.xml
+++ b/vector/src/main/res/layout/fragment_room_detail.xml
@@ -29,7 +29,7 @@
                     android:layout_height="40dp"
                     android:layout_marginTop="8dp"
                     android:layout_marginBottom="8dp"
-                    android:contentDescription="@string/avatar"
+                    android:importantForAccessibility="no"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
diff --git a/vector/src/main/res/layout/fragment_room_preview_no_preview.xml b/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
index acbd5a1f4f..af9fdf0a8d 100644
--- a/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
+++ b/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
@@ -31,7 +31,7 @@
                         android:layout_height="40dp"
                         android:layout_marginTop="8dp"
                         android:layout_marginBottom="8dp"
-                        android:contentDescription="@string/avatar"
+                        android:importantForAccessibility="no"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent"
@@ -149,4 +149,4 @@
 
     </LinearLayout>
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/vector/src/main/res/layout/fragment_room_setting_generic.xml b/vector/src/main/res/layout/fragment_room_setting_generic.xml
index 7d63c140f3..981bf64a4e 100644
--- a/vector/src/main/res/layout/fragment_room_setting_generic.xml
+++ b/vector/src/main/res/layout/fragment_room_setting_generic.xml
@@ -31,7 +31,7 @@
                     android:layout_height="40dp"
                     android:layout_marginTop="8dp"
                     android:layout_marginBottom="8dp"
-                    android:contentDescription="@string/avatar"
+                    android:importantForAccessibility="no"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
diff --git a/vector/src/main/res/layout/fragment_room_uploads.xml b/vector/src/main/res/layout/fragment_room_uploads.xml
index 9d4155229f..50e26ba72b 100644
--- a/vector/src/main/res/layout/fragment_room_uploads.xml
+++ b/vector/src/main/res/layout/fragment_room_uploads.xml
@@ -29,7 +29,7 @@
                     android:layout_height="40dp"
                     android:layout_marginTop="8dp"
                     android:layout_marginBottom="8dp"
-                    android:contentDescription="@string/avatar"
+                    android:importantForAccessibility="no"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
@@ -81,4 +81,4 @@
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/vector/src/main/res/layout/fragment_space_preview.xml b/vector/src/main/res/layout/fragment_space_preview.xml
index e5c0a933d7..86d514b2f8 100644
--- a/vector/src/main/res/layout/fragment_space_preview.xml
+++ b/vector/src/main/res/layout/fragment_space_preview.xml
@@ -33,7 +33,7 @@
                         android:layout_height="40dp"
                         android:layout_marginTop="8dp"
                         android:layout_marginBottom="8dp"
-                        android:contentDescription="@string/avatar"
+                        android:importantForAccessibility="no"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent"
@@ -120,4 +120,4 @@
 
     </LinearLayout>
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/vector/src/main/res/layout/fragment_user_code_show.xml b/vector/src/main/res/layout/fragment_user_code_show.xml
index 10a5998d1d..1810a37a24 100644
--- a/vector/src/main/res/layout/fragment_user_code_show.xml
+++ b/vector/src/main/res/layout/fragment_user_code_show.xml
@@ -135,6 +135,7 @@
                         android:id="@+id/showUserCodeQRImage"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
+                        android:contentDescription="@string/a11y_qr_code_for_verification"
                         tools:src="@drawable/ic_qr_code_add" />
 
                 </com.google.android.material.card.MaterialCardView>
@@ -147,7 +148,7 @@
             android:id="@+id/showUserCodeAvatar"
             android:layout_width="76dp"
             android:layout_height="76dp"
-            android:contentDescription="@string/avatar"
+            android:importantForAccessibility="no"
             android:elevation="4dp"
             android:transitionName="profile"
             app:layout_constraintBottom_toTopOf="@id/showUserCodeCard"
@@ -203,4 +204,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</ScrollView>
\ No newline at end of file
+</ScrollView>
diff --git a/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml b/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml
index 20899f8075..ca213332b9 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml
@@ -16,7 +16,6 @@
         android:layout_marginBottom="8dp"
         android:adjustViewBounds="true"
         android:background="@drawable/circle"
-        android:contentDescription="@string/avatar"
         android:importantForAccessibility="no"
         android:scaleType="centerCrop"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/vector/src/main/res/layout/item_contact_main.xml b/vector/src/main/res/layout/item_contact_main.xml
index 6df60344fe..b9f3eaacd9 100644
--- a/vector/src/main/res/layout/item_contact_main.xml
+++ b/vector/src/main/res/layout/item_contact_main.xml
@@ -14,7 +14,7 @@
         android:id="@+id/contactAvatar"
         android:layout_width="48dp"
         android:layout_height="48dp"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -37,4 +37,4 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:text="@tools:sample/full_names" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_create_direct_room_user.xml b/vector/src/main/res/layout/item_create_direct_room_user.xml
index 18e9d1d3ec..fb32c809d8 100644
--- a/vector/src/main/res/layout/item_create_direct_room_user.xml
+++ b/vector/src/main/res/layout/item_create_direct_room_user.xml
@@ -24,7 +24,7 @@
             android:id="@+id/createDirectRoomUserAvatar"
             android:layout_width="40dp"
             android:layout_height="40dp"
-            android:contentDescription="@string/avatar"
+            android:importantForAccessibility="no"
             tools:src="@sample/user_round_avatars" />
 
         <ImageView
@@ -72,4 +72,4 @@
         app:layout_constraintTop_toBottomOf="@+id/createDirectRoomUserName"
         tools:text="@sample/users.json/data/id" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_display_read_receipt.xml b/vector/src/main/res/layout/item_display_read_receipt.xml
index 58ddf8e5ad..6f3498ac59 100644
--- a/vector/src/main/res/layout/item_display_read_receipt.xml
+++ b/vector/src/main/res/layout/item_display_read_receipt.xml
@@ -16,7 +16,7 @@
         android:layout_width="32dp"
         android:layout_height="32dp"
         android:layout_marginEnd="8dp"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
         tools:src="@sample/user_round_avatars" />
 
     <TextView
@@ -29,4 +29,4 @@
         style="@style/BottomSheetItemTime"
         tools:text="10:44" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/vector/src/main/res/layout/item_group.xml b/vector/src/main/res/layout/item_group.xml
index bc17752cbc..668d56ba66 100644
--- a/vector/src/main/res/layout/item_group.xml
+++ b/vector/src/main/res/layout/item_group.xml
@@ -16,7 +16,7 @@
         android:layout_height="42dp"
         android:layout_gravity="center"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
         android:duplicateParentState="true"
         app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
         app:layout_constraintStart_toStartOf="parent"
@@ -62,4 +62,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
-</im.vector.app.core.platform.CheckableConstraintLayout>
\ No newline at end of file
+</im.vector.app.core.platform.CheckableConstraintLayout>
diff --git a/vector/src/main/res/layout/item_known_user.xml b/vector/src/main/res/layout/item_known_user.xml
index 48b180de5f..7494356bb1 100644
--- a/vector/src/main/res/layout/item_known_user.xml
+++ b/vector/src/main/res/layout/item_known_user.xml
@@ -24,7 +24,7 @@
             android:id="@+id/knownUserAvatar"
             android:layout_width="40dp"
             android:layout_height="40dp"
-            android:contentDescription="@string/avatar"
+            android:importantForAccessibility="no"
             tools:src="@sample/user_round_avatars" />
 
         <ImageView
@@ -71,4 +71,4 @@
         app:layout_constraintTop_toBottomOf="@+id/knownUserName"
         tools:text="@sample/users.json/data/id" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_profile_matrix_item.xml b/vector/src/main/res/layout/item_profile_matrix_item.xml
index 51818250cd..636113752b 100644
--- a/vector/src/main/res/layout/item_profile_matrix_item.xml
+++ b/vector/src/main/res/layout/item_profile_matrix_item.xml
@@ -19,7 +19,7 @@
         android:layout_width="32dp"
         android:layout_height="32dp"
         android:layout_centerVertical="true"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
         android:scaleType="centerInside"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/item_profile_matrix_item_progress.xml b/vector/src/main/res/layout/item_profile_matrix_item_progress.xml
index 4662cd9e58..89853a8878 100644
--- a/vector/src/main/res/layout/item_profile_matrix_item_progress.xml
+++ b/vector/src/main/res/layout/item_profile_matrix_item_progress.xml
@@ -19,7 +19,7 @@
         android:layout_width="32dp"
         android:layout_height="32dp"
         android:layout_centerVertical="true"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
         android:scaleType="centerInside"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/item_public_room.xml b/vector/src/main/res/layout/item_public_room.xml
index 12aaf8a653..0410e4b4f8 100644
--- a/vector/src/main/res/layout/item_public_room.xml
+++ b/vector/src/main/res/layout/item_public_room.xml
@@ -17,7 +17,7 @@
         android:layout_width="56dp"
         android:layout_height="56dp"
         android:layout_marginStart="8dp"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
         app:layout_constraintBottom_toTopOf="@+id/itemPublicRoomBottomSeparator"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -116,4 +116,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_room.xml b/vector/src/main/res/layout/item_room.xml
index 11fe6c5b54..601ee14799 100644
--- a/vector/src/main/res/layout/item_room.xml
+++ b/vector/src/main/res/layout/item_room.xml
@@ -34,7 +34,7 @@
             android:id="@+id/roomAvatarImageView"
             android:layout_width="56dp"
             android:layout_height="56dp"
-            android:contentDescription="@string/avatar"
+            android:importantForAccessibility="no"
             tools:src="@sample/room_round_avatars" />
 
         <ImageView
diff --git a/vector/src/main/res/layout/item_room_directory.xml b/vector/src/main/res/layout/item_room_directory.xml
index 355f14cef3..a0ff909c07 100644
--- a/vector/src/main/res/layout/item_room_directory.xml
+++ b/vector/src/main/res/layout/item_room_directory.xml
@@ -18,7 +18,7 @@
         android:layout_marginTop="4dp"
         android:layout_marginBottom="4dp"
         android:background="@drawable/circle"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
         android:padding="8dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -71,7 +71,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
-        android:contentDescription="@string/avatar"
+        android:contentDescription="@string/a11y_selected"
         android:padding="8dp"
         android:src="@drawable/ic_check_on"
         android:visibility="gone"
@@ -80,4 +80,4 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:visibility="visible" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_room_directory_server.xml b/vector/src/main/res/layout/item_room_directory_server.xml
index 63c81c3aab..674d48fe72 100644
--- a/vector/src/main/res/layout/item_room_directory_server.xml
+++ b/vector/src/main/res/layout/item_room_directory_server.xml
@@ -53,7 +53,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
-        android:contentDescription="@string/avatar"
+        android:contentDescription="@string/remove"
         android:padding="8dp"
         android:src="@drawable/ic_delete"
         android:visibility="gone"
@@ -64,4 +64,4 @@
         tools:ignore="MissingPrefix"
         tools:visibility="visible" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_room_invitation.xml b/vector/src/main/res/layout/item_room_invitation.xml
index e526b10c53..e662dbf33a 100644
--- a/vector/src/main/res/layout/item_room_invitation.xml
+++ b/vector/src/main/res/layout/item_room_invitation.xml
@@ -16,7 +16,7 @@
         android:layout_height="56dp"
         android:layout_marginStart="8dp"
         android:layout_marginTop="12dp"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:src="@sample/room_round_avatars" />
diff --git a/vector/src/main/res/layout/item_room_to_add_in_space.xml b/vector/src/main/res/layout/item_room_to_add_in_space.xml
index 5b04d49d81..809e58a912 100644
--- a/vector/src/main/res/layout/item_room_to_add_in_space.xml
+++ b/vector/src/main/res/layout/item_room_to_add_in_space.xml
@@ -16,7 +16,7 @@
         android:layout_width="32dp"
         android:layout_height="32dp"
         android:layout_marginStart="16dp"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -53,4 +53,4 @@
         tools:src="@drawable/ic_checkbox_on" />
 
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_room_to_manage_in_space.xml b/vector/src/main/res/layout/item_room_to_manage_in_space.xml
index 1299fa4440..bc30eec1c5 100644
--- a/vector/src/main/res/layout/item_room_to_manage_in_space.xml
+++ b/vector/src/main/res/layout/item_room_to_manage_in_space.xml
@@ -16,7 +16,7 @@
         android:layout_width="32dp"
         android:layout_height="32dp"
         android:layout_marginStart="16dp"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -70,4 +70,4 @@
         tools:src="@drawable/ic_checkbox_on" />
 
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_search_result.xml b/vector/src/main/res/layout/item_search_result.xml
index e62be19333..3342c19590 100644
--- a/vector/src/main/res/layout/item_search_result.xml
+++ b/vector/src/main/res/layout/item_search_result.xml
@@ -12,7 +12,7 @@
         android:layout_height="44dp"
         android:layout_marginStart="8dp"
         android:layout_marginTop="4dp"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:src="@sample/user_round_avatars" />
@@ -61,4 +61,4 @@
         app:layout_constraintTop_toBottomOf="@+id/messageMemberNameView"
         tools:text="@sample/messages.json/data/message" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_space.xml b/vector/src/main/res/layout/item_space.xml
index 147112ebb1..d91fc09a2a 100644
--- a/vector/src/main/res/layout/item_space.xml
+++ b/vector/src/main/res/layout/item_space.xml
@@ -26,7 +26,7 @@
         android:layout_height="42dp"
         android:layout_gravity="center"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
         android:duplicateParentState="true"
         app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
         app:layout_constraintStart_toEndOf="@id/indent"
@@ -148,4 +148,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
-</im.vector.app.core.platform.CheckableConstraintLayout>
\ No newline at end of file
+</im.vector.app.core.platform.CheckableConstraintLayout>
diff --git a/vector/src/main/res/layout/item_space_add.xml b/vector/src/main/res/layout/item_space_add.xml
index 538709dfbb..f45f03297d 100644
--- a/vector/src/main/res/layout/item_space_add.xml
+++ b/vector/src/main/res/layout/item_space_add.xml
@@ -18,7 +18,6 @@
         android:layout_marginStart="@dimen/layout_horizontal_margin"
         android:background="@drawable/rounded_rect_shape_8"
         android:backgroundTint="?colorPrimary"
-        android:contentDescription="@string/avatar"
         android:duplicateParentState="true"
         android:importantForAccessibility="no"
         android:padding="10dp"
@@ -43,4 +42,4 @@
         app:layout_constraintStart_toEndOf="@+id/groupAvatarImageView"
         app:layout_constraintTop_toTopOf="parent" />
 
-</im.vector.app.core.platform.CheckableConstraintLayout>
\ No newline at end of file
+</im.vector.app.core.platform.CheckableConstraintLayout>
diff --git a/vector/src/main/res/layout/item_space_roomchild.xml b/vector/src/main/res/layout/item_space_roomchild.xml
index e1d8b8edd6..354d875b78 100644
--- a/vector/src/main/res/layout/item_space_roomchild.xml
+++ b/vector/src/main/res/layout/item_space_roomchild.xml
@@ -31,7 +31,7 @@
             android:layout_height="40dp"
             android:layout_marginStart="8dp"
             android:layout_marginTop="12dp"
-            android:contentDescription="@string/avatar"
+            android:importantForAccessibility="no"
             android:scaleType="centerInside"
             android:visibility="visible"
             app:layout_constraintStart_toStartOf="parent"
@@ -115,4 +115,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/vector/src/main/res/layout/item_sub_space.xml b/vector/src/main/res/layout/item_sub_space.xml
index d915ce28aa..b5b6f6927f 100644
--- a/vector/src/main/res/layout/item_sub_space.xml
+++ b/vector/src/main/res/layout/item_sub_space.xml
@@ -26,7 +26,7 @@
         android:layout_height="26dp"
         android:layout_gravity="center"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
         android:duplicateParentState="true"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@id/indent"
@@ -119,4 +119,4 @@
         app:tint="?vctr_content_primary"
         tools:ignore="MissingPrefix" />
 
-</im.vector.app.core.platform.CheckableConstraintLayout>
\ No newline at end of file
+</im.vector.app.core.platform.CheckableConstraintLayout>
diff --git a/vector/src/main/res/layout/item_suggested_room.xml b/vector/src/main/res/layout/item_suggested_room.xml
index 011aea8dae..e791f63079 100644
--- a/vector/src/main/res/layout/item_suggested_room.xml
+++ b/vector/src/main/res/layout/item_suggested_room.xml
@@ -21,7 +21,7 @@
             android:id="@+id/roomAvatarImageView"
             android:layout_width="56dp"
             android:layout_height="56dp"
-            android:contentDescription="@string/avatar"
+            android:importantForAccessibility="no"
             tools:src="@sample/room_round_avatars" />
 
     </FrameLayout>
diff --git a/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml b/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
index 79e260f605..85ef522ce2 100644
--- a/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
@@ -11,7 +11,7 @@
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:layout_gravity="center_horizontal"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
         tools:src="@sample/user_round_avatars" />
 
     <TextView
@@ -92,4 +92,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/vector/src/main/res/layout/item_unknown_room.xml b/vector/src/main/res/layout/item_unknown_room.xml
index c6428861c3..95b8f36911 100644
--- a/vector/src/main/res/layout/item_unknown_room.xml
+++ b/vector/src/main/res/layout/item_unknown_room.xml
@@ -17,7 +17,7 @@
         android:layout_width="56dp"
         android:layout_height="56dp"
         android:layout_marginStart="8dp"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
         app:layout_constraintBottom_toTopOf="@+id/itemPublicRoomBottomSeparator"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -50,4 +50,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_user.xml b/vector/src/main/res/layout/item_user.xml
index 5ea46822ac..7f625e8308 100644
--- a/vector/src/main/res/layout/item_user.xml
+++ b/vector/src/main/res/layout/item_user.xml
@@ -16,7 +16,7 @@
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:layout_marginStart="8dp"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:src="@sample/user_round_avatars" />
@@ -56,4 +56,4 @@
         tools:text="@sample/users.json/data/displayName"
         tools:visibility="visible" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/vector_invite_view.xml b/vector/src/main/res/layout/vector_invite_view.xml
index 6dc5fd41c7..deaaaa9902 100644
--- a/vector/src/main/res/layout/vector_invite_view.xml
+++ b/vector/src/main/res/layout/vector_invite_view.xml
@@ -13,7 +13,7 @@
         android:layout_marginStart="8dp"
         android:layout_marginTop="86dp"
         android:layout_marginEnd="8dp"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -94,4 +94,4 @@
         app:layout_constraintTop_toBottomOf="@id/inviteAcceptView" />
 
 
-</merge>
\ No newline at end of file
+</merge>
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 1956a0cc01..acc4c1f9f1 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -3305,7 +3305,7 @@
     <string name="a11y_change_avatar">Change avatar</string>
     <string name="a11y_delete_avatar">Delete avatar</string>
     <string name="a11y_error_some_message_not_sent">Some messages have not been sent</string>
-    <string name="a11y_unsent_draft">This room has unsent draft</string>
+    <string name="a11y_unsent_draft">has unsent draft</string>
     <string name="a11y_video">Video</string>
     <string name="a11y_selected">Selected</string>
     <string name="a11y_trust_level_default">Default trust level</string>
@@ -3320,8 +3320,8 @@
     <string name="a11y_rule_notify_silent">Notify without sound</string>
     <string name="a11y_rule_notify_off">Do not notify</string>
     <string name="a11y_view_read_receipts">View read receipts</string>
-    <string name="a11y_public_room">This room is public</string>
-    <string name="a11y_public_space">This Space is public</string>
+    <string name="a11y_public_room">Public room</string>
+    <string name="a11y_public_space">Public space</string>
 
     <string name="dev_tools_menu_name">Dev Tools</string>
     <string name="dev_tools_explore_room_state">Explore Room State</string>