diff --git a/vector/src/main/res/layout/bottom_sheet_space_invite.xml b/vector/src/main/res/layout/bottom_sheet_space_invite.xml
index bf985dbcbb..125335e8af 100644
--- a/vector/src/main/res/layout/bottom_sheet_space_invite.xml
+++ b/vector/src/main/res/layout/bottom_sheet_space_invite.xml
@@ -35,46 +35,32 @@
         app:layout_constraintVertical_bias="1"
         tools:text="@string/invite_people_to_your_space_desc" />
 
-
     <im.vector.app.features.spaces.create.WizardButtonView
         android:id="@+id/inviteByMailButton"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
         app:icon="@drawable/ic_mail"
         app:iconTint="?riotx_text_secondary"
         app:title="@string/invite_by_email" />
 
-    <Space
-        android:layout_width="match_parent"
-        android:layout_height="16dp" />
-
     <im.vector.app.features.spaces.create.WizardButtonView
         android:id="@+id/inviteByMxidButton"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
         app:icon="@drawable/ic_add_people"
         app:iconTint="?riotx_text_secondary"
         app:title="@string/invite_by_mxid" />
 
-    <Space
-        android:layout_width="match_parent"
-        android:layout_height="16dp" />
-
-
     <im.vector.app.features.spaces.create.WizardButtonView
         android:id="@+id/inviteByLinkButton"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="20dp"
         app:icon="@drawable/ic_share_link"
         app:iconTint="?riotx_text_secondary"
-        app:title="@string/invite_by_link">
-
-    </im.vector.app.features.spaces.create.WizardButtonView>
-
-
-    <Space
-        android:layout_width="match_parent"
-        android:layout_height="20dp" />
+        app:title="@string/invite_by_link" />
 
     <!--    <com.google.android.material.button.MaterialButton-->
     <!--        android:id="@+id/skipButton"-->
diff --git a/vector/src/main/res/layout/bottom_sheet_space_invite_chooser.xml b/vector/src/main/res/layout/bottom_sheet_space_invite_chooser.xml
index 8c259d13b0..78fc07885c 100644
--- a/vector/src/main/res/layout/bottom_sheet_space_invite_chooser.xml
+++ b/vector/src/main/res/layout/bottom_sheet_space_invite_chooser.xml
@@ -21,34 +21,24 @@
         android:textStyle="bold"
         app:layout_constraintTop_toTopOf="parent" />
 
-
     <im.vector.app.features.spaces.create.WizardButtonView
         android:id="@+id/inviteToSpaceButton"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
         app:icon="@drawable/ic_invite_people"
         app:iconTint="?riotx_text_secondary"
-        app:title="@string/invite_to_space_with_name"
         app:subTitle="@string/invite_to_space_with_name_desc"
-        />
-
-    <Space
-        android:layout_width="match_parent"
-        android:layout_height="16dp" />
+        app:title="@string/invite_to_space_with_name" />
 
     <im.vector.app.features.spaces.create.WizardButtonView
         android:id="@+id/inviteToRoomOnly"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
         app:icon="@drawable/ic_invite_people"
         app:iconTint="?riotx_text_secondary"
-        app:title="@string/invite_just_to_this_room"
-        app:subTitle="@string/invite_just_to_this_room_desc"/>
-
-    <Space
-        android:layout_width="match_parent"
-        android:layout_height="16dp" />
-
-
+        app:subTitle="@string/invite_just_to_this_room_desc"
+        app:title="@string/invite_just_to_this_room" />
 
 </LinearLayout>
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 198574cab8..c87a0d9e4b 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
@@ -75,7 +75,8 @@
             android:layout_marginEnd="4dp"
             android:importantForAccessibility="no"
             android:src="@drawable/ic_room_profile_member_list"
-            app:tint="?riotx_text_primary" />
+            app:tint="?riotx_text_primary"
+            tools:ignore="MissingPrefix" />
 
         <TextView
             android:id="@+id/spaceChildMemberCountText"
@@ -220,5 +221,4 @@
         app:constraint_referenced_ids="matrixToCardNameText,matrixToCardAvatar,matrixToCardNameText,matrixToCardDescText, matrixToCardMainButton, matrixToCardAliasText, matrixToCardSecondaryButton, matrixToMemberPills,matrixToCardPeopleYouKnowVisibility"
         tools:visibility="visible" />
 
-
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/fragment_space_create_choose_type.xml b/vector/src/main/res/layout/fragment_space_create_choose_type.xml
index 73e6044a37..b668fd2f37 100644
--- a/vector/src/main/res/layout/fragment_space_create_choose_type.xml
+++ b/vector/src/main/res/layout/fragment_space_create_choose_type.xml
@@ -60,8 +60,8 @@
             android:id="@+id/privateButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:icon="@drawable/ic_room_private"
             android:layout_marginBottom="16dp"
+            app:icon="@drawable/ic_room_private"
             app:layout_constraintBottom_toTopOf="@id/changeLaterText"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -77,7 +77,8 @@
             android:text="@string/create_spaces_you_can_change_later"
             android:textColor="?riotx_text_secondary"
             android:textSize="14sp"
-            app:layout_constraintBottom_toBottomOf="parent"/>
+            app:layout_constraintBottom_toBottomOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
+
 </ScrollView>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/fragment_space_create_generic_epoxy_form.xml b/vector/src/main/res/layout/fragment_space_create_generic_epoxy_form.xml
index 7652a540dc..aea5000274 100644
--- a/vector/src/main/res/layout/fragment_space_create_generic_epoxy_form.xml
+++ b/vector/src/main/res/layout/fragment_space_create_generic_epoxy_form.xml
@@ -34,4 +34,5 @@
             android:text="@string/next_pf" />
 
     </FrameLayout>
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/fragment_space_preview.xml b/vector/src/main/res/layout/fragment_space_preview.xml
index 5781ddb570..7e89ab9070 100644
--- a/vector/src/main/res/layout/fragment_space_preview.xml
+++ b/vector/src/main/res/layout/fragment_space_preview.xml
@@ -93,7 +93,6 @@
             app:layout_constraintTop_toBottomOf="@+id/spacePreviewPeekingProgress"
             tools:listitem="@layout/item_space_subspace" />
 
-
         <View
             android:layout_width="match_parent"
             android:layout_height="1dp"
@@ -122,7 +121,9 @@
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:text="@string/accept" />
+
         </LinearLayout>
+
     </LinearLayout>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_space_subspace.xml b/vector/src/main/res/layout/item_space_subspace.xml
index d3b243132e..5dcf2fa4c6 100644
--- a/vector/src/main/res/layout/item_space_subspace.xml
+++ b/vector/src/main/res/layout/item_space_subspace.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -26,10 +24,10 @@
         android:id="@+id/childSpaceAvatar"
         android:layout_width="24dp"
         android:layout_height="24dp"
+        android:layout_marginStart="8dp"
+        android:contentDescription="@string/a11y_image"
         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"
         app:layout_constraintTop_toTopOf="@id/childSpaceName"
@@ -39,14 +37,12 @@
     <View
         android:layout_width="2dp"
         android:layout_height="0dp"
+        android:layout_marginStart="15dp"
         android:layout_marginTop="2dp"
         android:background="?riotx_list_bottom_sheet_divider_color"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        android:layout_marginStart="15dp"
-        app:layout_constraintTop_toBottomOf="@id/childSpaceAvatar">
-
-    </View>
+        app:layout_constraintTop_toBottomOf="@id/childSpaceAvatar" />
 
     <TextView
         android:id="@+id/childSpaceName"
@@ -68,5 +64,4 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:text="@tools:sample/full_names" />
 
-
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_space_tab.xml b/vector/src/main/res/layout/item_space_tab.xml
index ea08fabea3..ae0b62fe46 100644
--- a/vector/src/main/res/layout/item_space_tab.xml
+++ b/vector/src/main/res/layout/item_space_tab.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="16dp"
     android:layout_height="match_parent">
 
     <View
         android:layout_width="2dp"
         android:layout_height="match_parent"
-        android:layout_centerInParent="true"
+        android:layout_gravity="center"
         android:background="?riotx_list_bottom_sheet_divider_color" />
-</RelativeLayout>
+
+</FrameLayout>
diff --git a/vector/src/main/res/layout/item_space_top_summary.xml b/vector/src/main/res/layout/item_space_top_summary.xml
index 35ca5ebf34..27b21ece9b 100644
--- a/vector/src/main/res/layout/item_space_top_summary.xml
+++ b/vector/src/main/res/layout/item_space_top_summary.xml
@@ -10,21 +10,22 @@
         android:id="@+id/spaceSummaryMemberCountIcon"
         android:layout_width="16dp"
         android:layout_height="16dp"
-        android:src="@drawable/ic_room_profile_member_list"
         android:importantForAccessibility="no"
+        android:src="@drawable/ic_room_profile_member_list"
         app:layout_constraintBottom_toBottomOf="@+id/spaceSummaryMemberCountText"
         app:layout_constraintStart_toEndOf="@+id/spaceSummaryMemberCountText"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:tint="?riotx_text_secondary" />
+        app:tint="?riotx_text_secondary"
+        tools:ignore="MissingPrefix" />
 
     <TextView
         android:id="@+id/spaceSummaryMemberCountText"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
-        android:maxLines="1"
         android:ellipsize="end"
+        android:maxLines="1"
         android:textColor="?riotx_text_secondary"
         app:layout_constraintBottom_toBottomOf="@+id/spaceSummaryMemberCountIcon"
         app:layout_constraintEnd_toEndOf="parent"
@@ -37,11 +38,12 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
-        android:textColor="?riotx_text_primary"
         android:autoLink="all"
+        android:textColor="?riotx_text_primary"
         android:textSize="15sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/spaceSummaryMemberCountIcon"
         tools:text="@sample/matrix.json/data/roomTopic" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/view_space_type_button.xml b/vector/src/main/res/layout/view_space_type_button.xml
index d48f123bdc..1f73caad13 100644
--- a/vector/src/main/res/layout/view_space_type_button.xml
+++ b/vector/src/main/res/layout/view_space_type_button.xml
@@ -12,9 +12,9 @@
         android:id="@+id/buttonImageView"
         android:layout_width="24dp"
         android:layout_height="24dp"
-        android:minHeight="56dp"
         android:layout_margin="8dp"
         android:importantForAccessibility="no"
+        android:minHeight="56dp"
         android:src="@drawable/ic_public_room"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -30,14 +30,13 @@
         android:textColor="?riotx_text_primary"
         android:textSize="16sp"
         android:textStyle="bold"
+        app:layout_constraintBottom_toTopOf="@id/subTitle"
         app:layout_constraintEnd_toStartOf="@id/rightChevron"
         app:layout_constraintStart_toEndOf="@id/buttonImageView"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/subTitle"
         app:layout_goneMarginBottom="0dp"
         tools:text="Public" />
 
-
     <TextView
         android:id="@+id/subTitle"
         android:layout_width="0dp"
@@ -64,6 +63,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:tint="?riotx_text_secondary" />
+        app:tint="?riotx_text_secondary"
+        tools:ignore="MissingPrefix" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file