diff --git a/vector/src/main/res/layout/fragment_space_preview.xml b/vector/src/main/res/layout/fragment_space_preview.xml
index 257797548e..5781ddb570 100644
--- a/vector/src/main/res/layout/fragment_space_preview.xml
+++ b/vector/src/main/res/layout/fragment_space_preview.xml
@@ -16,25 +16,25 @@
             style="@style/VectorToolbarStyle"
             android:layout_width="match_parent"
             android:layout_height="?actionBarSize"
-            app:navigationIcon="@drawable/ic_x_18dp"
-            android:elevation="4dp">
+            android:elevation="4dp"
+            app:navigationIcon="@drawable/ic_x_18dp">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
-<!--                <ImageView-->
-<!--                    android:id="@+id/spacePreviewClose"-->
-<!--                    android:layout_width="@dimen/layout_touch_size"-->
-<!--                    android:layout_height="@dimen/layout_touch_size"-->
-<!--                    android:clickable="true"-->
-<!--                    android:focusable="true"-->
-<!--                    android:foreground="?attr/selectableItemBackground"-->
-<!--                    android:scaleType="center"-->
-<!--                    android:src="@drawable/ic_x_18dp"-->
-<!--                    app:layout_constraintBottom_toBottomOf="parent"-->
-<!--                    app:layout_constraintStart_toStartOf="parent"-->
-<!--                    app:layout_constraintTop_toTopOf="parent" />-->
+                <!--                <ImageView-->
+                <!--                    android:id="@+id/spacePreviewClose"-->
+                <!--                    android:layout_width="@dimen/layout_touch_size"-->
+                <!--                    android:layout_height="@dimen/layout_touch_size"-->
+                <!--                    android:clickable="true"-->
+                <!--                    android:focusable="true"-->
+                <!--                    android:foreground="?attr/selectableItemBackground"-->
+                <!--                    android:scaleType="center"-->
+                <!--                    android:src="@drawable/ic_x_18dp"-->
+                <!--                    app:layout_constraintBottom_toBottomOf="parent"-->
+                <!--                    app:layout_constraintStart_toStartOf="parent"-->
+                <!--                    app:layout_constraintTop_toTopOf="parent" />-->
 
                 <ImageView
                     android:id="@+id/spacePreviewToolbarAvatar"
@@ -42,6 +42,7 @@
                     android:layout_height="40dp"
                     android:layout_marginTop="8dp"
                     android:layout_marginBottom="8dp"
+                    android:contentDescription="@string/avatar"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
@@ -96,16 +97,16 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:background="?list_divider_color"/>
+            android:background="?list_divider_color" />
 
         <LinearLayout
             android:id="@+id/spacePreviewButtonBar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
+            android:layout_margin="8dp"
             android:elevation="2dp"
-            android:orientation="horizontal"
-            android:layout_margin="8dp">
+            android:gravity="center_horizontal"
+            android:orientation="horizontal">
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/spacePreviewDeclineInviteButton"
diff --git a/vector/src/main/res/layout/item_space.xml b/vector/src/main/res/layout/item_space.xml
index be23a5e546..9cd07f3215 100644
--- a/vector/src/main/res/layout/item_space.xml
+++ b/vector/src/main/res/layout/item_space.xml
@@ -16,6 +16,7 @@
         android:layout_height="42dp"
         android:layout_gravity="center"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
+        android:contentDescription="@string/avatar"
         android:duplicateParentState="true"
         app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
         app:layout_constraintStart_toStartOf="parent"
@@ -44,6 +45,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="21dp"
+        android:importantForAccessibility="no"
         android:src="@drawable/ic_arrow_right"
         app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/item_space_roomchild.xml b/vector/src/main/res/layout/item_space_roomchild.xml
index 0fdbd833f4..e12653077e 100644
--- a/vector/src/main/res/layout/item_space_roomchild.xml
+++ b/vector/src/main/res/layout/item_space_roomchild.xml
@@ -10,8 +10,8 @@
     <im.vector.app.features.spaces.preview.SpaceTabView
         android:id="@+id/spaceChildTabView"
         android:layout_width="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        android:layout_marginStart="8dp" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -31,6 +31,7 @@
             android:layout_height="40dp"
             android:layout_marginStart="8dp"
             android:layout_marginTop="12dp"
+            android:contentDescription="@string/avatar"
             android:scaleType="centerInside"
             android:visibility="visible"
             app:layout_constraintStart_toStartOf="parent"
@@ -77,6 +78,7 @@
             android:layout_width="18dp"
             android:layout_height="18dp"
             android:layout_marginEnd="4dp"
+            android:importantForAccessibility="no"
             android:src="@drawable/ic_room_profile_member_list"
             app:layout_constraintBottom_toBottomOf="@+id/spaceChildMemberCountText"
             app:layout_constraintEnd_toStartOf="@+id/spaceChildMemberCountText"