diff --git a/vector/src/main/res/layout/item_editable_square_avatar.xml b/vector/src/main/res/layout/item_editable_square_avatar.xml
index b3ec057fd4..3112b36a65 100644
--- a/vector/src/main/res/layout/item_editable_square_avatar.xml
+++ b/vector/src/main/res/layout/item_editable_square_avatar.xml
@@ -57,6 +57,7 @@
         android:backgroundTint="?riotx_background"
         android:padding="8dp"
         android:src="@drawable/ic_camera_plain"
+        android:contentDescription="@string/a11y_change_avatar"
         app:tint="?riotx_text_secondary"
         app:layout_constraintCircle="@+id/itemEditableAvatarImageContainer"
         app:layout_constraintCircleAngle="135"
diff --git a/vector/src/main/res/layout/item_space.xml b/vector/src/main/res/layout/item_space.xml
index f52ef31ead..25b685b999 100644
--- a/vector/src/main/res/layout/item_space.xml
+++ b/vector/src/main/res/layout/item_space.xml
@@ -50,7 +50,7 @@
         android:layout_marginEnd="4dp"
         android:importantForAccessibility="no"
         android:src="@drawable/ic_room_actions_leave"
-        android:tint="@color/riotx_destructive_accent"
+        app:tint="@color/riotx_destructive_accent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/groupAvatarChevron"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/vector/src/main/res/layout/item_space_subspace.xml b/vector/src/main/res/layout/item_space_subspace.xml
index ac654dc2b3..d3b243132e 100644
--- a/vector/src/main/res/layout/item_space_subspace.xml
+++ b/vector/src/main/res/layout/item_space_subspace.xml
@@ -28,6 +28,7 @@
         android:layout_height="24dp"
         android:scaleType="centerInside"
         android:visibility="visible"
+        android:contentDescription="@string/a11y_image"
         android:layout_marginStart="8dp"
         app:layout_constraintBottom_toBottomOf="@id/childSpaceName"
         app:layout_constraintStart_toEndOf="@id/childSpaceTab"