diff --git a/changelog.d/4604.misc b/changelog.d/4604.misc
new file mode 100644
index 0000000000..2a3d3f70c3
--- /dev/null
+++ b/changelog.d/4604.misc
@@ -0,0 +1 @@
+Cleanup the layout files
\ No newline at end of file
diff --git a/library/ui-styles/src/debug/res/layout/activity_debug_material_theme.xml b/library/ui-styles/src/debug/res/layout/activity_debug_material_theme.xml
index 4828810e34..c1ae9ef117 100644
--- a/library/ui-styles/src/debug/res/layout/activity_debug_material_theme.xml
+++ b/library/ui-styles/src/debug/res/layout/activity_debug_material_theme.xml
@@ -34,7 +34,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/appBarLayout">
+            app:layout_constraintTop_toBottomOf="@id/appBarLayout">
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -334,7 +334,6 @@
 
                 </com.google.android.material.textfield.TextInputLayout>
 
-
                 <com.google.android.material.textfield.TextInputLayout
                     style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
                     android:layout_width="match_parent"
diff --git a/library/ui-styles/src/debug/res/values/debug_styles.xml b/library/ui-styles/src/debug/res/values/debug_styles.xml
index d025ba1784..0abf50863d 100644
--- a/library/ui-styles/src/debug/res/values/debug_styles.xml
+++ b/library/ui-styles/src/debug/res/values/debug_styles.xml
@@ -5,7 +5,6 @@
         <item name="android:visibility">visible</item>
     </style>
 
-
     <style name="Theme.Debug.Light" parent="Theme.MaterialComponents.Light.NoActionBar">
         <!-- Keep all default value -->
     </style>
diff --git a/library/ui-styles/src/main/res/transition/image_preview_transition.xml b/library/ui-styles/src/main/res/transition/image_preview_transition.xml
index 3674324c4e..c1af6d7973 100644
--- a/library/ui-styles/src/main/res/transition/image_preview_transition.xml
+++ b/library/ui-styles/src/main/res/transition/image_preview_transition.xml
@@ -11,5 +11,3 @@
     <changeImageTransform />
 
 </transitionSet>
-
-
diff --git a/library/ui-styles/src/main/res/values/dimens.xml b/library/ui-styles/src/main/res/values/dimens.xml
index e2e50449ce..519920786c 100644
--- a/library/ui-styles/src/main/res/values/dimens.xml
+++ b/library/ui-styles/src/main/res/values/dimens.xml
@@ -32,7 +32,6 @@
     <dimen name="call_pip_width">88dp</dimen>
     <dimen name="call_pip_radius">8dp</dimen>
 
-
     <dimen name="item_form_min_height">76dp</dimen>
 
     <!-- Max width for some buttons -->
@@ -40,5 +39,4 @@
 
     <!-- Navigation Drawer -->
     <dimen name="navigation_drawer_max_width">320dp</dimen>
-
 </resources>
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/values/palette.xml b/library/ui-styles/src/main/res/values/palette.xml
index ed12f10af3..e37fd8a7c6 100644
--- a/library/ui-styles/src/main/res/values/palette.xml
+++ b/library/ui-styles/src/main/res/values/palette.xml
@@ -20,7 +20,6 @@
     <color name="palette_prune">#5C56F5</color>
     <color name="palette_links">#0086E6</color>
 
-
     <!-- For light themes -->
     <color name="palette_gray_25">#F4F6FA</color>
     <color name="palette_gray_50">#E3E8F0</color>
diff --git a/library/ui-styles/src/main/res/values/stylable_badge_floating_action_button.xml b/library/ui-styles/src/main/res/values/stylable_badge_floating_action_button.xml
index c9be5175e0..88bee99f84 100644
--- a/library/ui-styles/src/main/res/values/stylable_badge_floating_action_button.xml
+++ b/library/ui-styles/src/main/res/values/stylable_badge_floating_action_button.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <resources>
 
     <declare-styleable name="BadgeFloatingActionButton">
diff --git a/library/ui-styles/src/main/res/values/styles_social_login.xml b/library/ui-styles/src/main/res/values/styles_social_login.xml
index f601f36480..5a76f70f2e 100644
--- a/library/ui-styles/src/main/res/values/styles_social_login.xml
+++ b/library/ui-styles/src/main/res/values/styles_social_login.xml
@@ -49,7 +49,6 @@
         <item name="android:backgroundTint">@android:color/black</item>
     </style>
 
-
     <style name="Widget.Vector.Button.Outlined.SocialLogin.Facebook">
         <item name="icon">@drawable/ic_social_facebook</item>
     </style>
@@ -68,7 +67,6 @@
         <item name="android:backgroundTint">#3877EA</item>
     </style>
 
-
     <style name="Widget.Vector.Button.Outlined.SocialLogin.Twitter">
         <item name="icon">@drawable/ic_social_twitter</item>
     </style>
@@ -85,7 +83,6 @@
         <item name="android:backgroundTint">#5D9EC9</item>
     </style>
 
-
     <style name="Widget.Vector.Button.Outlined.SocialLogin.Apple">
         <item name="icon">@drawable/ic_social_apple</item>
     </style>
@@ -118,5 +115,4 @@
         <item name="android:backgroundTint">@android:color/black</item>
     </style>
 
-
 </resources>
\ No newline at end of file
diff --git a/tools/check/forbidden_strings_in_layout.txt b/tools/check/forbidden_strings_in_layout.txt
index 09f0d01f69..545983f844 100644
--- a/tools/check/forbidden_strings_in_layout.txt
+++ b/tools/check/forbidden_strings_in_layout.txt
@@ -25,3 +25,8 @@
 
 ### Use style="@style/Widget.Vector.TextView.*" instead of textSize attribute
 android:textSize===9
+
+### Use `@id` and not `@+id` when referencing ids in layouts
+layout_(.*)="@\+id
+accessibilityTraversal(.*)="@\+id
+toolbarId="@\+id
diff --git a/tools/templates/ElementFeature/template.xml b/tools/templates/ElementFeature/template.xml
index 14c718c993..71cf74f19b 100644
--- a/tools/templates/ElementFeature/template.xml
+++ b/tools/templates/ElementFeature/template.xml
@@ -105,8 +105,6 @@
         suggest="${underscoreToCamelCase(classToResource(fragmentClass))}ViewEvents"
 	    default="MainViewEvents"
 	    help="The name of the view events to create" />
-
-
 		
     <parameter
         id="packageName"
diff --git a/vector/src/debug/res/layout/demo_theme_sample.xml b/vector/src/debug/res/layout/demo_theme_sample.xml
index b9102f1b29..1d2820ea7b 100644
--- a/vector/src/debug/res/layout/demo_theme_sample.xml
+++ b/vector/src/debug/res/layout/demo_theme_sample.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!--
- The aim of this file is to test the different themes of Riot
+ The aim of this file is to test the different themes of Element
   -->
-
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
diff --git a/vector/src/debug/res/layout/demo_themes.xml b/vector/src/debug/res/layout/demo_themes.xml
index 3b2f5acbf0..ebf74d2f24 100644
--- a/vector/src/debug/res/layout/demo_themes.xml
+++ b/vector/src/debug/res/layout/demo_themes.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!--
- The aim of this file is to test the different themes of Riot
+ The aim of this file is to test the different themes of Element
  Unfortunately, this does not work in the preview.
   -->
-
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/vector/src/main/res/drawable/bg_attachment_type_selector.xml b/vector/src/main/res/drawable/bg_attachment_type_selector.xml
index 40c4337a28..2cbad6a855 100644
--- a/vector/src/main/res/drawable/bg_attachment_type_selector.xml
+++ b/vector/src/main/res/drawable/bg_attachment_type_selector.xml
@@ -20,5 +20,4 @@
 
     </item>
 
-
 </layer-list>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/bg_rounded_button.xml b/vector/src/main/res/drawable/bg_rounded_button.xml
index 4b5503a92f..a316195792 100644
--- a/vector/src/main/res/drawable/bg_rounded_button.xml
+++ b/vector/src/main/res/drawable/bg_rounded_button.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
     android:color="?android:attr/colorControlHighlight">
     <item android:id="@android:id/mask">
diff --git a/vector/src/main/res/drawable/bg_tombstone_predecessor.xml b/vector/src/main/res/drawable/bg_tombstone_predecessor.xml
index 65c214d2cd..4b7a8d2d4f 100644
--- a/vector/src/main/res/drawable/bg_tombstone_predecessor.xml
+++ b/vector/src/main/res/drawable/bg_tombstone_predecessor.xml
@@ -18,5 +18,4 @@
         </shape>
     </item>
 
-
 </layer-list>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/bg_unread_notification.xml b/vector/src/main/res/drawable/bg_unread_notification.xml
index 2b6c1051ca..7c9ea18eec 100644
--- a/vector/src/main/res/drawable/bg_unread_notification.xml
+++ b/vector/src/main/res/drawable/bg_unread_notification.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
diff --git a/vector/src/main/res/drawable/highlighted_message_background.xml b/vector/src/main/res/drawable/highlighted_message_background.xml
index 10f745fb4d..9eeded4853 100644
--- a/vector/src/main/res/drawable/highlighted_message_background.xml
+++ b/vector/src/main/res/drawable/highlighted_message_background.xml
@@ -31,5 +31,4 @@
         </shape>
     </item>
 
-
 </selector>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/activity_big_image_viewer.xml b/vector/src/main/res/layout/activity_big_image_viewer.xml
index 3865e26261..8f1cf88aff 100644
--- a/vector/src/main/res/layout/activity_big_image_viewer.xml
+++ b/vector/src/main/res/layout/activity_big_image_viewer.xml
@@ -25,7 +25,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/appBarLayout"
+        app:layout_constraintTop_toBottomOf="@id/appBarLayout"
         app:optimizeDisplay="true" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/activity_call.xml b/vector/src/main/res/layout/activity_call.xml
index 342ae11562..2238f96c9f 100644
--- a/vector/src/main/res/layout/activity_call.xml
+++ b/vector/src/main/res/layout/activity_call.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!-- tools:ignore is needed because lint thinks this can be replaced with a merge. Replacing this
      with a merge causes the fullscreen SurfaceView not to be centered. -->
-
 <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"
@@ -33,10 +31,10 @@
         android:id="@+id/pipContainer"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@+id/callControlsView"
+        app:layout_constraintBottom_toTopOf="@id/callControlsView"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/callToolbar">
+        app:layout_constraintTop_toBottomOf="@id/callToolbar">
 
         <com.google.android.material.card.MaterialCardView
             android:id="@+id/pipRendererWrapper"
@@ -94,7 +92,6 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/callToolbar"
         android:layout_width="match_parent"
diff --git a/vector/src/main/res/layout/activity_call_transfer.xml b/vector/src/main/res/layout/activity_call_transfer.xml
index 046c8ce569..c3febc96a7 100644
--- a/vector/src/main/res/layout/activity_call_transfer.xml
+++ b/vector/src/main/res/layout/activity_call_transfer.xml
@@ -35,7 +35,7 @@
             android:layout_width="0dp"
             android:layout_height="0dp"
             app:layout_behavior="@string/appbar_scrolling_view_behavior"
-            app:layout_constraintBottom_toTopOf="@+id/callTransferActionsLayout"
+            app:layout_constraintBottom_toTopOf="@id/callTransferActionsLayout"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/appBarLayout" />
@@ -65,7 +65,7 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_marginEnd="8dp"
-                android:layout_toStartOf="@+id/callTransferConnectAction"
+                android:layout_toStartOf="@id/callTransferConnectAction"
                 android:layout_toEndOf="@id/callTransferConsultCheckBox"
                 android:ellipsize="end"
                 android:text="@string/call_transfer_consult_first" />
diff --git a/vector/src/main/res/layout/activity_filtered_rooms.xml b/vector/src/main/res/layout/activity_filtered_rooms.xml
index 270de8f514..07a2bc7a2e 100644
--- a/vector/src/main/res/layout/activity_filtered_rooms.xml
+++ b/vector/src/main/res/layout/activity_filtered_rooms.xml
@@ -39,7 +39,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/appBarLayout" />
+            app:layout_constraintTop_toBottomOf="@id/appBarLayout" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/vector/src/main/res/layout/activity_home.xml b/vector/src/main/res/layout/activity_home.xml
index a41256fb84..9899c15aa6 100644
--- a/vector/src/main/res/layout/activity_home.xml
+++ b/vector/src/main/res/layout/activity_home.xml
@@ -22,12 +22,10 @@
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
-
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/homeDrawerFragmentContainer"
         android:layout_width="@dimen/navigation_drawer_max_width"
         android:layout_height="match_parent"
         android:layout_gravity="start" />
 
-
 </androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/activity_incoming_share.xml b/vector/src/main/res/layout/activity_incoming_share.xml
index f0e0c0a485..0de417f57b 100644
--- a/vector/src/main/res/layout/activity_incoming_share.xml
+++ b/vector/src/main/res/layout/activity_incoming_share.xml
@@ -39,7 +39,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/appBarLayout" />
+            app:layout_constraintTop_toBottomOf="@id/appBarLayout" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/vector/src/main/res/layout/activity_main.xml b/vector/src/main/res/layout/activity_main.xml
index f341a710fa..c7bca50acb 100644
--- a/vector/src/main/res/layout/activity_main.xml
+++ b/vector/src/main/res/layout/activity_main.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!-- The background of this Activity is in the theme (so just added as tools here, for preview),
  so we just add a ProgressBar here -->
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/vector/src/main/res/layout/activity_room_detail.xml b/vector/src/main/res/layout/activity_room_detail.xml
index aca4ee4e63..c3d34363c6 100644
--- a/vector/src/main/res/layout/activity_room_detail.xml
+++ b/vector/src/main/res/layout/activity_room_detail.xml
@@ -28,7 +28,6 @@
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
-
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/roomDetailDrawerContainer"
         android:layout_width="wrap_content"
diff --git a/vector/src/main/res/layout/activity_search.xml b/vector/src/main/res/layout/activity_search.xml
index 7c71217f64..6f8980c656 100644
--- a/vector/src/main/res/layout/activity_search.xml
+++ b/vector/src/main/res/layout/activity_search.xml
@@ -39,7 +39,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/appBarLayout" />
+            app:layout_constraintTop_toBottomOf="@id/appBarLayout" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/vector/src/main/res/layout/activity_vector_web_view.xml b/vector/src/main/res/layout/activity_vector_web_view.xml
index d691f4de5d..a8d1521159 100644
--- a/vector/src/main/res/layout/activity_vector_web_view.xml
+++ b/vector/src/main/res/layout/activity_vector_web_view.xml
@@ -25,7 +25,7 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/appBarLayout" />
+        app:layout_constraintTop_toBottomOf="@id/appBarLayout" />
 
     <ProgressBar
         android:id="@+id/simple_webview_loader"
diff --git a/vector/src/main/res/layout/alerter_incoming_call_layout.xml b/vector/src/main/res/layout/alerter_incoming_call_layout.xml
index 8f737fb085..d6ca8bfeec 100644
--- a/vector/src/main/res/layout/alerter_incoming_call_layout.xml
+++ b/vector/src/main/res/layout/alerter_incoming_call_layout.xml
@@ -31,7 +31,7 @@
         android:maxLines="1"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
-        app:layout_constraintEnd_toStartOf="@+id/incomingCallRejectView"
+        app:layout_constraintEnd_toStartOf="@id/incomingCallRejectView"
         app:layout_constraintStart_toEndOf="@id/incomingCallAvatar"
         app:layout_constraintTop_toTopOf="@id/incomingCallAvatar"
         tools:text="@sample/users.json/data/displayName" />
@@ -48,7 +48,7 @@
         android:maxLines="1"
         android:textColor="?vctr_content_secondary"
         app:drawableTint="?vctr_content_secondary"
-        app:layout_constraintEnd_toStartOf="@+id/incomingCallRejectView"
+        app:layout_constraintEnd_toStartOf="@id/incomingCallRejectView"
         app:layout_constraintStart_toStartOf="@id/incomingCallNameView"
         app:layout_constraintTop_toBottomOf="@id/incomingCallNameView"
         tools:drawableStart="@drawable/ic_call_audio_small"
diff --git a/vector/src/main/res/layout/alerter_verification_layout.xml b/vector/src/main/res/layout/alerter_verification_layout.xml
index 86dcd41340..d532a10dc2 100644
--- a/vector/src/main/res/layout/alerter_verification_layout.xml
+++ b/vector/src/main/res/layout/alerter_verification_layout.xml
@@ -14,7 +14,7 @@
         android:layout_height="40dp"
         android:importantForAccessibility="no"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/alerter_texts"
+        app:layout_constraintEnd_toStartOf="@id/alerter_texts"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:src="@sample/user_round_avatars" />
@@ -26,7 +26,7 @@
         android:layout_height="24dp"
         android:importantForAccessibility="no"
         android:src="@drawable/ic_shield_warning"
-        app:layout_constraintCircle="@+id/ivUserAvatar"
+        app:layout_constraintCircle="@id/ivUserAvatar"
         app:layout_constraintCircleAngle="135"
         app:layout_constraintCircleRadius="20dp"
         tools:ignore="MissingConstraints"
diff --git a/vector/src/main/res/layout/bottom_sheet_add_rooms_or_spaces_to_space.xml b/vector/src/main/res/layout/bottom_sheet_add_rooms_or_spaces_to_space.xml
index e80a55bc16..25c2d1c3e5 100644
--- a/vector/src/main/res/layout/bottom_sheet_add_rooms_or_spaces_to_space.xml
+++ b/vector/src/main/res/layout/bottom_sheet_add_rooms_or_spaces_to_space.xml
@@ -41,5 +41,4 @@
         app:titleTextColor="?vctr_content_primary"
         tools:actionDescription="" />
 
-
 </LinearLayout>
diff --git a/vector/src/main/res/layout/bottom_sheet_bootstrap.xml b/vector/src/main/res/layout/bottom_sheet_bootstrap.xml
index 52784bc6af..c3fa9d2931 100644
--- a/vector/src/main/res/layout/bottom_sheet_bootstrap.xml
+++ b/vector/src/main/res/layout/bottom_sheet_bootstrap.xml
@@ -41,7 +41,7 @@
             android:textStyle="bold"
             app:layout_constraintBottom_toBottomOf="@id/bootstrapIcon"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/bootstrapIcon"
+            app:layout_constraintStart_toEndOf="@id/bootstrapIcon"
             app:layout_constraintTop_toTopOf="@id/bootstrapIcon"
             tools:text="@string/bottom_sheet_setup_secure_backup_title" />
 
diff --git a/vector/src/main/res/layout/bottom_sheet_call_dialer_choice.xml b/vector/src/main/res/layout/bottom_sheet_call_dialer_choice.xml
index f07e6fff8c..0539c648b4 100644
--- a/vector/src/main/res/layout/bottom_sheet_call_dialer_choice.xml
+++ b/vector/src/main/res/layout/bottom_sheet_call_dialer_choice.xml
@@ -24,5 +24,4 @@
         app:tint="?vctr_content_primary"
         app:titleTextColor="?vctr_content_primary" />
 
-
 </LinearLayout>
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 5686c8879e..a1ecf80dd5 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
@@ -33,7 +33,6 @@
                 app:layout_constraintTop_toTopOf="parent"
                 tools:src="@sample/user_round_avatars" />
 
-
             <TextView
                 android:id="@+id/inviterText"
                 style="@style/Widget.Vector.TextView.Subtitle"
@@ -61,7 +60,6 @@
                 app:layout_constraintTop_toBottomOf="@id/inviterText"
                 tools:text="@sample/users.json/data/id" />
 
-
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <View
diff --git a/vector/src/main/res/layout/bottom_sheet_leave_space.xml b/vector/src/main/res/layout/bottom_sheet_leave_space.xml
index b9626bf785..e47639f752 100644
--- a/vector/src/main/res/layout/bottom_sheet_leave_space.xml
+++ b/vector/src/main/res/layout/bottom_sheet_leave_space.xml
@@ -88,7 +88,6 @@
             android:layout_gravity="center_horizontal"
             android:text="@string/leave_space" />
 
-
     </FrameLayout>
 
     <Button
@@ -103,5 +102,4 @@
         android:layout_marginBottom="8dp"
         android:text="@string/cancel" />
 
-
 </LinearLayout>
\ No newline at end of file
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 d082c407d1..40bb28f3a2 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
@@ -9,7 +9,6 @@
     android:paddingTop="8dp"
     android:paddingBottom="8dp">
 
-
     <TextView
         style="@style/Widget.Vector.TextView.HeadlineMedium"
         android:layout_width="match_parent"
diff --git a/vector/src/main/res/layout/bottom_sheet_space_advertise_restricted.xml b/vector/src/main/res/layout/bottom_sheet_space_advertise_restricted.xml
index b0f8c3893d..92465a9b43 100644
--- a/vector/src/main/res/layout/bottom_sheet_space_advertise_restricted.xml
+++ b/vector/src/main/res/layout/bottom_sheet_space_advertise_restricted.xml
@@ -39,7 +39,6 @@
         android:textColor="?vctr_content_secondary"
         tools:text="@string/help_people_in_spaces_find_and_join" />
 
-
     <ImageView
         android:id="@+id/imageHint"
         android:layout_width="match_parent"
@@ -62,7 +61,6 @@
         android:visibility="gone"
         tools:visibility="visible" />
 
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -88,5 +86,4 @@
             android:textAllCaps="true" />
     </LinearLayout>
 
-
 </LinearLayout>
diff --git a/vector/src/main/res/layout/bottom_sheet_space_settings.xml b/vector/src/main/res/layout/bottom_sheet_space_settings.xml
index 33b879ae45..4ea71ca5e7 100644
--- a/vector/src/main/res/layout/bottom_sheet_space_settings.xml
+++ b/vector/src/main/res/layout/bottom_sheet_space_settings.xml
@@ -37,14 +37,13 @@
             android:textColor="?vctr_content_primary"
             android:textStyle="bold"
             app:layout_constrainedWidth="true"
-            app:layout_constraintBottom_toTopOf="@+id/spaceDescription"
+            app:layout_constraintBottom_toTopOf="@id/spaceDescription"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/spaceAvatarImageView"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintVertical_chainStyle="packed"
             tools:text="@sample/spaces.json/data/name" />
 
-
         <TextView
             android:id="@+id/spaceDescription"
             style="@style/Widget.Vector.TextView.Body"
@@ -60,7 +59,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/spaceAvatarImageView"
-            app:layout_constraintTop_toBottomOf="@+id/spaceNameView"
+            app:layout_constraintTop_toBottomOf="@id/spaceNameView"
             tools:text="@sample/spaces.json/data/topic"
             tools:visibility="visible" />
 
@@ -109,7 +108,6 @@
         app:titleTextColor="?vctr_content_primary"
         tools:actionDescription="" />
 
-
     <im.vector.app.core.ui.views.BottomSheetActionButton
         android:id="@+id/addRooms"
         android:layout_width="match_parent"
diff --git a/vector/src/main/res/layout/bottom_sheet_verification.xml b/vector/src/main/res/layout/bottom_sheet_verification.xml
index dc1fec20ef..ea06d505cf 100644
--- a/vector/src/main/res/layout/bottom_sheet_verification.xml
+++ b/vector/src/main/res/layout/bottom_sheet_verification.xml
@@ -31,7 +31,7 @@
             android:id="@+id/otherUserShield"
             android:layout_width="16dp"
             android:layout_height="16dp"
-            app:layout_constraintCircle="@+id/otherUserAvatarImageView"
+            app:layout_constraintCircle="@id/otherUserAvatarImageView"
             app:layout_constraintCircleAngle="135"
             app:layout_constraintCircleRadius="16dp"
             tools:ignore="MissingConstraints" />
@@ -47,10 +47,10 @@
             android:maxLines="2"
             android:textColor="?vctr_content_primary"
             android:textStyle="bold"
-            app:layout_constraintBottom_toBottomOf="@+id/otherUserAvatarImageView"
+            app:layout_constraintBottom_toBottomOf="@id/otherUserAvatarImageView"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/otherUserAvatarImageView"
-            app:layout_constraintTop_toTopOf="@+id/otherUserAvatarImageView"
+            app:layout_constraintStart_toEndOf="@id/otherUserAvatarImageView"
+            app:layout_constraintTop_toTopOf="@id/otherUserAvatarImageView"
             tools:text="@string/verification_verify_user" />
 
         <FrameLayout
@@ -59,7 +59,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/otherUserAvatarImageView" />
+            app:layout_constraintTop_toBottomOf="@id/otherUserAvatarImageView" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/vector/src/main/res/layout/bottom_sheet_with_fragments.xml b/vector/src/main/res/layout/bottom_sheet_with_fragments.xml
index bcdf0839a9..a53881477a 100644
--- a/vector/src/main/res/layout/bottom_sheet_with_fragments.xml
+++ b/vector/src/main/res/layout/bottom_sheet_with_fragments.xml
@@ -3,6 +3,4 @@
     android:id="@+id/bottomSheetFragmentContainer"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?colorSurface" />
-
-
+    android:background="?colorSurface" />
\ No newline at end of file
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 f42551d39a..3378878ac6 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
@@ -115,7 +115,7 @@
         android:contentDescription="@string/option_send_files"
         android:src="@drawable/ic_attachment"
         app:layout_constraintBottom_toBottomOf="@id/sendButton"
-        app:layout_constraintEnd_toStartOf="@+id/composerEditTextOuterBorder"
+        app:layout_constraintEnd_toStartOf="@id/composerEditTextOuterBorder"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@id/sendButton"
         app:layout_goneMarginBottom="57dp"
@@ -142,8 +142,8 @@
         android:nextFocusLeft="@id/composerEditText"
         android:nextFocusUp="@id/composerEditText"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/composerEmojiButton"
-        app:layout_constraintStart_toStartOf="@+id/composerEditTextOuterBorder"
+        app:layout_constraintEnd_toStartOf="@id/composerEmojiButton"
+        app:layout_constraintStart_toStartOf="@id/composerEditTextOuterBorder"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="@tools:sample/lorem/random" />
 
@@ -156,7 +156,7 @@
         android:contentDescription="@string/a11y_open_emoji_picker"
         android:src="@drawable/ic_insert_emoji"
         app:layout_constraintBottom_toBottomOf="@id/attachmentButton"
-        app:layout_constraintEnd_toEndOf="@+id/composerEditTextOuterBorder"
+        app:layout_constraintEnd_toEndOf="@id/composerEditTextOuterBorder"
         app:layout_constraintStart_toEndOf="@id/composerEditText"
         app:layout_constraintTop_toTopOf="@id/attachmentButton"
         app:layout_goneMarginEnd="8dp"
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 d6a5b57884..8057957941 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
@@ -23,7 +23,7 @@
         android:layout_height="1dp"
         android:background="?vctr_list_separator"
         app:layout_constraintEnd_toEndOf="@id/related_message_background"
-        app:layout_constraintStart_toStartOf="@+id/related_message_background"
+        app:layout_constraintStart_toStartOf="@id/related_message_background"
         app:layout_constraintTop_toTopOf="@id/related_message_background" />
 
     <ImageView
@@ -35,7 +35,7 @@
         android:layout_marginBottom="8dp"
         android:importantForAccessibility="no"
         app:layout_constraintBottom_toTopOf="@id/composerRelatedMessageActionIcon"
-        app:layout_constraintEnd_toStartOf="@+id/composerRelatedMessageTitle"
+        app:layout_constraintEnd_toStartOf="@id/composerRelatedMessageTitle"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@id/composerRelatedMessageTitle"
         tools:src="@sample/user_round_avatars" />
@@ -60,8 +60,8 @@
         android:importantForAccessibility="no"
         android:scaleType="centerCrop"
         android:visibility="gone"
-        app:layout_constraintStart_toStartOf="@+id/composerRelatedMessageTitle"
-        app:layout_constraintTop_toBottomOf="@+id/composerRelatedMessageTitle"
+        app:layout_constraintStart_toStartOf="@id/composerRelatedMessageTitle"
+        app:layout_constraintTop_toBottomOf="@id/composerRelatedMessageTitle"
         tools:ignore="MissingPrefix"
         tools:src="@tools:sample/backgrounds/scenic"
         tools:visibility="visible" />
@@ -127,9 +127,9 @@
         android:background="?android:attr/selectableItemBackground"
         android:contentDescription="@string/option_send_files"
         android:src="@drawable/ic_attachment"
-        app:layout_constraintBottom_toBottomOf="@+id/sendButton"
+        app:layout_constraintBottom_toBottomOf="@id/sendButton"
         app:layout_constraintEnd_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/sendButton"
+        app:layout_constraintTop_toTopOf="@id/sendButton"
         tools:ignore="MissingPrefix" />
 
     <FrameLayout
@@ -153,8 +153,8 @@
         android:nextFocusLeft="@id/composerEditText"
         android:nextFocusUp="@id/composerEditText"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/composerEmojiButton"
-        app:layout_constraintStart_toStartOf="@+id/composerEditTextOuterBorder"
+        app:layout_constraintEnd_toStartOf="@id/composerEmojiButton"
+        app:layout_constraintStart_toStartOf="@id/composerEditTextOuterBorder"
         app:layout_constraintTop_toBottomOf="@id/composer_preview_barrier"
         tools:text="@tools:sample/lorem/random" />
 
@@ -167,7 +167,7 @@
         android:contentDescription="@string/a11y_open_emoji_picker"
         android:src="@drawable/ic_insert_emoji"
         app:layout_constraintBottom_toBottomOf="@id/sendButton"
-        app:layout_constraintEnd_toEndOf="@+id/composerEditTextOuterBorder"
+        app:layout_constraintEnd_toEndOf="@id/composerEditTextOuterBorder"
         app:layout_constraintStart_toEndOf="@id/composerEditText"
         app:layout_constraintTop_toTopOf="@id/sendButton"
         app:layout_goneMarginBottom="52dp"
diff --git a/vector/src/main/res/layout/custom_action_item_layout_badge.xml b/vector/src/main/res/layout/custom_action_item_layout_badge.xml
index bce8a2ef4e..e9c750b6d7 100644
--- a/vector/src/main/res/layout/custom_action_item_layout_badge.xml
+++ b/vector/src/main/res/layout/custom_action_item_layout_badge.xml
@@ -30,7 +30,7 @@
         android:background="@drawable/bg_unread_highlight"
         android:gravity="center"
         android:textColor="?colorOnError"
-        app:layout_constraintCircle="@+id/action_view_icon_image"
+        app:layout_constraintCircle="@id/action_view_icon_image"
         app:layout_constraintCircleAngle="45"
         app:layout_constraintCircleRadius="12dp"
         tools:ignore="MissingConstraints"
diff --git a/vector/src/main/res/layout/dialog_confirmation_with_reason.xml b/vector/src/main/res/layout/dialog_confirmation_with_reason.xml
index 421c723d3a..d59cb6d917 100644
--- a/vector/src/main/res/layout/dialog_confirmation_with_reason.xml
+++ b/vector/src/main/res/layout/dialog_confirmation_with_reason.xml
@@ -26,7 +26,7 @@
         android:checked="true"
         android:text="@string/delete_event_dialog_reason_checkbox"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/dialogConfirmationText" />
+        app:layout_constraintTop_toBottomOf="@id/dialogConfirmationText" />
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/dialogReasonTextInputLayout"
@@ -36,7 +36,7 @@
         app:counterMaxLength="240"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/dialogReasonCheck"
+        app:layout_constraintTop_toBottomOf="@id/dialogReasonCheck"
         tools:hint="@string/delete_event_dialog_reason_hint">
 
         <com.google.android.material.textfield.TextInputEditText
diff --git a/vector/src/main/res/layout/dialog_edit_power_level.xml b/vector/src/main/res/layout/dialog_edit_power_level.xml
index 491d521340..bf91dc3367 100644
--- a/vector/src/main/res/layout/dialog_edit_power_level.xml
+++ b/vector/src/main/res/layout/dialog_edit_power_level.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/vector/src/main/res/layout/dialog_export_e2e_keys.xml b/vector/src/main/res/layout/dialog_export_e2e_keys.xml
index f9d2f458f2..635d4837b9 100644
--- a/vector/src/main/res/layout/dialog_export_e2e_keys.xml
+++ b/vector/src/main/res/layout/dialog_export_e2e_keys.xml
@@ -35,7 +35,6 @@
 
     </com.google.android.material.textfield.TextInputLayout>
 
-
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/exportDialogTilConfirm"
         style="@style/Widget.Vector.TextInputLayout.Password"
diff --git a/vector/src/main/res/layout/dialog_import_e2e_keys.xml b/vector/src/main/res/layout/dialog_import_e2e_keys.xml
index 86de622622..f8ad99fff4 100644
--- a/vector/src/main/res/layout/dialog_import_e2e_keys.xml
+++ b/vector/src/main/res/layout/dialog_import_e2e_keys.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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"
     android:id="@+id/layout_root"
     android:layout_width="match_parent"
@@ -27,10 +26,7 @@
         android:id="@+id/importDialogTil"
         style="@style/Widget.Vector.TextInputLayout.Password"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintEnd_toStartOf="@+id/importDialogShowPassword"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/dialog_e2e_keys_passphrase_filename">
+        android:layout_height="wrap_content">
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/dialog_e2e_keys_passphrase_edit_text"
diff --git a/vector/src/main/res/layout/dialog_preference_edit_text.xml b/vector/src/main/res/layout/dialog_preference_edit_text.xml
index 3933231a34..eaab12fa2c 100644
--- a/vector/src/main/res/layout/dialog_preference_edit_text.xml
+++ b/vector/src/main/res/layout/dialog_preference_edit_text.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!-- This file is here to fix Google issue https://code.google.com/p/android/issues/detail?id=231576 -->
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/vector/src/main/res/layout/fragment_attachments_preview.xml b/vector/src/main/res/layout/fragment_attachments_preview.xml
index 259ef38924..c7290bc474 100644
--- a/vector/src/main/res/layout/fragment_attachments_preview.xml
+++ b/vector/src/main/res/layout/fragment_attachments_preview.xml
@@ -48,7 +48,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:padding="8dp"
-            app:layout_constraintBottom_toTopOf="@+id/attachmentPreviewerSendImageOriginalSize"
+            app:layout_constraintBottom_toTopOf="@id/attachmentPreviewerSendImageOriginalSize"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -64,7 +64,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/attachmentPreviewerMiniatureList"
+            app:layout_constraintTop_toBottomOf="@id/attachmentPreviewerMiniatureList"
             tools:text="@plurals/send_images_with_original_size" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml b/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml
index 9b8d6918f4..b8eefc52ec 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml
@@ -1,5 +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"
@@ -25,7 +24,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
         app:errorEnabled="true"
-        app:layout_constraintBottom_toTopOf="@+id/bootstrapPasswordButton"
+        app:layout_constraintBottom_toTopOf="@id/bootstrapPasswordButton"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/bootstrapDescriptionText">
@@ -51,6 +50,6 @@
         android:text="@string/_continue"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/bootstrapAccountPasswordTil" />
+        app:layout_constraintTop_toBottomOf="@id/bootstrapAccountPasswordTil" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml b/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml
index 78782b0b45..46ec6dc2d4 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml
@@ -71,7 +71,7 @@
         android:text="@string/_continue"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/ssss_passphrase_enter_til" />
+        app:layout_constraintTop_toBottomOf="@id/ssss_passphrase_enter_til" />
 
     <!--    <TextView-->
     <!--        android:id="@+id/bootstrapWarningInfo"-->
diff --git a/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml b/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml
index 04f547d500..bec16ef0b4 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml
@@ -1,5 +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"
@@ -70,6 +69,6 @@
         android:text="@string/_continue"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/bootstrapRecoveryKeyEnterTil" />
+        app:layout_constraintTop_toBottomOf="@id/bootstrapRecoveryKeyEnterTil" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/fragment_bootstrap_reauth.xml b/vector/src/main/res/layout/fragment_bootstrap_reauth.xml
index bb527db292..49854997b6 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_reauth.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_reauth.xml
@@ -1,5 +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"
@@ -24,7 +23,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
         app:layout_constraintBottom_toTopOf="@id/reAuthFailureText"
-        app:layout_constraintTop_toBottomOf="@+id/bootstrapDescriptionText" />
+        app:layout_constraintTop_toBottomOf="@id/bootstrapDescriptionText" />
 
     <TextView
         android:id="@+id/reAuthFailureText"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_save_key.xml b/vector/src/main/res/layout/fragment_bootstrap_save_key.xml
index d7c26a316a..2578aed2fc 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_save_key.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_save_key.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <LinearLayout 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"
@@ -32,7 +31,6 @@
         android:textColor="?vctr_notice_secondary"
         tools:text="HHWJ Y8DK RDR4\nBQEN FQ4V M4F8\nBQEN FQ4V M4A8" />
 
-
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
@@ -83,5 +81,4 @@
         android:layout_height="1dp"
         android:background="?vctr_list_separator_on_surface" />
 
-
 </LinearLayout>
diff --git a/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml b/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml
index 32bee53581..5bb0fc8dee 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <LinearLayout 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"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_waiting.xml b/vector/src/main/res/layout/fragment_bootstrap_waiting.xml
index ee411a94d6..4f7edddc6a 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_waiting.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_waiting.xml
@@ -1,5 +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"
@@ -24,7 +23,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/bootstrapDescriptionText" />
+        app:layout_constraintTop_toBottomOf="@id/bootstrapDescriptionText" />
 
     <TextView
         android:id="@+id/bootstrapLoadingStatusText"
@@ -37,5 +36,4 @@
         app:layout_constraintTop_toBottomOf="@id/bootstrapWaitingProgress"
         tools:text="Bending the spoon..." />
 
-
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/fragment_contacts_book.xml b/vector/src/main/res/layout/fragment_contacts_book.xml
index 9c704f3a42..ad23fc9f8f 100644
--- a/vector/src/main/res/layout/fragment_contacts_book.xml
+++ b/vector/src/main/res/layout/fragment_contacts_book.xml
@@ -56,7 +56,7 @@
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintHorizontal_bias="0.0"
-                        app:layout_constraintStart_toEndOf="@+id/phoneBookClose"
+                        app:layout_constraintStart_toEndOf="@id/phoneBookClose"
                         app:layout_constraintTop_toTopOf="parent" />
 
                 </androidx.constraintlayout.widget.ConstraintLayout>
@@ -114,7 +114,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/appBarLayout"
+            app:layout_constraintTop_toBottomOf="@id/appBarLayout"
             tools:listitem="@layout/item_contact_main" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/fragment_create_direct_room_directory_users.xml b/vector/src/main/res/layout/fragment_create_direct_room_directory_users.xml
index 130186deed..85c92c5225 100644
--- a/vector/src/main/res/layout/fragment_create_direct_room_directory_users.xml
+++ b/vector/src/main/res/layout/fragment_create_direct_room_directory_users.xml
@@ -56,7 +56,7 @@
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintHorizontal_bias="0.0"
-                        app:layout_constraintStart_toEndOf="@+id/createDirectRoomClose"
+                        app:layout_constraintStart_toEndOf="@id/createDirectRoomClose"
                         app:layout_constraintTop_toTopOf="parent" />
 
                 </androidx.constraintlayout.widget.ConstraintLayout>
@@ -92,7 +92,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/appBarLayout"
+            app:layout_constraintTop_toBottomOf="@id/appBarLayout"
             tools:listitem="@layout/item_create_direct_room_user" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/fragment_create_poll.xml b/vector/src/main/res/layout/fragment_create_poll.xml
index b82342558c..3a9baef270 100644
--- a/vector/src/main/res/layout/fragment_create_poll.xml
+++ b/vector/src/main/res/layout/fragment_create_poll.xml
@@ -52,7 +52,7 @@
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintHorizontal_bias="0.0"
-                    app:layout_constraintStart_toEndOf="@+id/createPollClose"
+                    app:layout_constraintStart_toEndOf="@id/createPollClose"
                     app:layout_constraintTop_toTopOf="parent" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
@@ -68,7 +68,7 @@
         android:overScrollMode="always"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         app:layout_constraintBottom_toTopOf="@id/createPollButton"
-        app:layout_constraintTop_toBottomOf="@+id/appBarLayout"
+        app:layout_constraintTop_toBottomOf="@id/appBarLayout"
         tools:listitem="@layout/item_form_text_input_with_delete" />
 
     <Button
diff --git a/vector/src/main/res/layout/fragment_create_room.xml b/vector/src/main/res/layout/fragment_create_room.xml
index a41256711e..5607f2be69 100644
--- a/vector/src/main/res/layout/fragment_create_room.xml
+++ b/vector/src/main/res/layout/fragment_create_room.xml
@@ -53,7 +53,7 @@
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintHorizontal_bias="0.0"
-                        app:layout_constraintStart_toEndOf="@+id/createRoomClose"
+                        app:layout_constraintStart_toEndOf="@id/createRoomClose"
                         app:layout_constraintTop_toTopOf="parent" />
 
                 </androidx.constraintlayout.widget.ConstraintLayout>
@@ -69,7 +69,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/appBarLayout"
+            app:layout_constraintTop_toBottomOf="@id/appBarLayout"
             tools:listitem="@layout/item_form_switch" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/fragment_deactivate_account.xml b/vector/src/main/res/layout/fragment_deactivate_account.xml
index 458d338986..150c0aa6c5 100644
--- a/vector/src/main/res/layout/fragment_deactivate_account.xml
+++ b/vector/src/main/res/layout/fragment_deactivate_account.xml
@@ -29,7 +29,7 @@
             android:textColor="?vctr_content_primary"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/deactivateAccountContent" />
+            app:layout_constraintTop_toBottomOf="@id/deactivateAccountContent" />
 
         <Button
             android:id="@+id/deactivateAccountSubmit"
@@ -40,7 +40,7 @@
             android:text="@string/deactivate_account_submit"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/deactivateAccountEraseCheckbox" />
+            app:layout_constraintTop_toBottomOf="@id/deactivateAccountEraseCheckbox" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/vector/src/main/res/layout/fragment_devtool_keyrequests.xml b/vector/src/main/res/layout/fragment_devtool_keyrequests.xml
index 67fcfebfa1..17cfc0d2c1 100644
--- a/vector/src/main/res/layout/fragment_devtool_keyrequests.xml
+++ b/vector/src/main/res/layout/fragment_devtool_keyrequests.xml
@@ -4,7 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
     tools:background="#FFFFFF">
 
     <com.google.android.material.tabs.TabLayout
diff --git a/vector/src/main/res/layout/fragment_home_detail.xml b/vector/src/main/res/layout/fragment_home_detail.xml
index b84ab29bea..7bdcbca5d5 100644
--- a/vector/src/main/res/layout/fragment_home_detail.xml
+++ b/vector/src/main/res/layout/fragment_home_detail.xml
@@ -123,7 +123,7 @@
         android:layout_height="wrap_content"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/appBarLayout" />
+        app:layout_constraintTop_toBottomOf="@id/appBarLayout" />
 
     <im.vector.app.core.ui.views.KeysBackupBanner
         android:id="@+id/homeKeysBackupBanner"
@@ -141,8 +141,8 @@
         android:id="@+id/roomListContainer"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@+id/bottomNavigationView"
-        app:layout_constraintTop_toBottomOf="@+id/homeKeysBackupBanner" />
+        app:layout_constraintBottom_toTopOf="@id/bottomNavigationView"
+        app:layout_constraintTop_toBottomOf="@id/homeKeysBackupBanner" />
 
     <com.google.android.material.bottomnavigation.BottomNavigationView
         android:id="@+id/bottomNavigationView"
diff --git a/vector/src/main/res/layout/fragment_home_drawer.xml b/vector/src/main/res/layout/fragment_home_drawer.xml
index 36d9d8fca3..3cd6d0ba75 100644
--- a/vector/src/main/res/layout/fragment_home_drawer.xml
+++ b/vector/src/main/res/layout/fragment_home_drawer.xml
@@ -38,10 +38,10 @@
             android:maxLines="1"
             android:singleLine="true"
             android:textColor="?vctr_content_primary"
-            app:layout_constraintBottom_toTopOf="@+id/homeDrawerUserIdView"
-            app:layout_constraintEnd_toStartOf="@+id/homeDrawerQRCodeButton"
-            app:layout_constraintStart_toEndOf="@+id/homeDrawerHeaderAvatarView"
-            app:layout_constraintTop_toTopOf="@+id/homeDrawerHeaderAvatarView"
+            app:layout_constraintBottom_toTopOf="@id/homeDrawerUserIdView"
+            app:layout_constraintEnd_toStartOf="@id/homeDrawerQRCodeButton"
+            app:layout_constraintStart_toEndOf="@id/homeDrawerHeaderAvatarView"
+            app:layout_constraintTop_toTopOf="@id/homeDrawerHeaderAvatarView"
             app:layout_constraintVertical_chainStyle="packed"
             tools:text="@sample/users.json/data/displayName" />
 
@@ -55,10 +55,10 @@
             android:maxLines="1"
             android:singleLine="true"
             android:textColor="?vctr_content_secondary"
-            app:layout_constraintBottom_toBottomOf="@+id/homeDrawerHeaderAvatarView"
-            app:layout_constraintEnd_toStartOf="@+id/homeDrawerQRCodeButton"
-            app:layout_constraintStart_toStartOf="@+id/homeDrawerUsernameView"
-            app:layout_constraintTop_toBottomOf="@+id/homeDrawerUsernameView"
+            app:layout_constraintBottom_toBottomOf="@id/homeDrawerHeaderAvatarView"
+            app:layout_constraintEnd_toStartOf="@id/homeDrawerQRCodeButton"
+            app:layout_constraintStart_toStartOf="@id/homeDrawerUsernameView"
+            app:layout_constraintTop_toBottomOf="@id/homeDrawerUsernameView"
             tools:text="@sample/users.json/data/id" />
 
         <ImageView
@@ -93,8 +93,8 @@
             app:iconGravity="textStart"
             app:iconSize="20dp"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="@+id/homeDrawerHeaderAvatarView"
-            app:layout_constraintTop_toBottomOf="@+id/homeDrawerHeaderAvatarView"
+            app:layout_constraintStart_toStartOf="@id/homeDrawerHeaderAvatarView"
+            app:layout_constraintTop_toBottomOf="@id/homeDrawerHeaderAvatarView"
             tools:ignore="MissingPrefix" />
 
         <ImageView
@@ -117,24 +117,24 @@
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:background="?vctr_list_separator"
-        app:layout_constraintTop_toBottomOf="@+id/homeDrawerHeader" />
+        app:layout_constraintTop_toBottomOf="@id/homeDrawerHeader" />
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/homeDrawerGroupListContainer"
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintBottom_toTopOf="@+id/homeDrawerBottomSeparator"
+        app:layout_constraintBottom_toTopOf="@id/homeDrawerBottomSeparator"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/homeDrawerHeaderSeparator" />
+        app:layout_constraintTop_toBottomOf="@id/homeDrawerHeaderSeparator" />
 
     <View
         android:id="@+id/homeDrawerBottomSeparator"
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:background="?vctr_list_separator"
-        app:layout_constraintBottom_toTopOf="@+id/homeDrawerHeaderSettingsView" />
+        app:layout_constraintBottom_toTopOf="@id/homeDrawerHeaderSettingsView" />
 
     <TextView
         android:id="@+id/homeDrawerHeaderSettingsView"
diff --git a/vector/src/main/res/layout/fragment_incoming_share.xml b/vector/src/main/res/layout/fragment_incoming_share.xml
index ee92e7c353..adc2722e62 100644
--- a/vector/src/main/res/layout/fragment_incoming_share.xml
+++ b/vector/src/main/res/layout/fragment_incoming_share.xml
@@ -40,7 +40,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/appBarLayout"
+            app:layout_constraintTop_toBottomOf="@id/appBarLayout"
             tools:listitem="@layout/item_room" />
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
diff --git a/vector/src/main/res/layout/fragment_join_rules_recycler.xml b/vector/src/main/res/layout/fragment_join_rules_recycler.xml
index fb5e1cfafe..c31b111e15 100644
--- a/vector/src/main/res/layout/fragment_join_rules_recycler.xml
+++ b/vector/src/main/res/layout/fragment_join_rules_recycler.xml
@@ -11,12 +11,11 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         app:itemSpacing="1dp"
-        app:layout_constraintBottom_toTopOf="@+id/buttonBar"
+        app:layout_constraintBottom_toTopOf="@id/buttonBar"
         app:layout_constraintTop_toTopOf="parent"
         tools:itemCount="1"
         tools:listitem="@layout/item_bottom_sheet_joinrule_restricted" />
 
-
     <LinearLayout
         android:id="@+id/buttonBar"
         android:layout_width="match_parent"
@@ -46,7 +45,6 @@
             android:text="@string/save" />
     </LinearLayout>
 
-
     <FrameLayout
         android:layout_width="match_parent"
         android:elevation="2dp"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml b/vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml
index db4393dccc..313d3be5d7 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml
@@ -36,7 +36,7 @@
             android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/keys_backup_shield" />
+            app:layout_constraintTop_toBottomOf="@id/keys_backup_shield" />
 
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/key_input_layout"
@@ -45,9 +45,9 @@
             android:layout_marginStart="16dp"
             android:layout_marginTop="16dp"
             app:errorEnabled="true"
-            app:layout_constraintEnd_toStartOf="@+id/keys_backup_import"
+            app:layout_constraintEnd_toStartOf="@id/keys_backup_import"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/keys_restore_with_key">
+            app:layout_constraintTop_toBottomOf="@id/keys_restore_with_key">
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/key_text_edit"
@@ -86,7 +86,7 @@
             android:textColor="?vctr_content_secondary"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/key_input_layout" />
+            app:layout_constraintTop_toBottomOf="@id/key_input_layout" />
 
         <Button
             android:id="@+id/keys_restore_button"
@@ -97,7 +97,7 @@
             android:minWidth="200dp"
             android:text="@string/keys_backup_unlock_button"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/keys_restore_key_help_with_link"
+            app:layout_constraintTop_toBottomOf="@id/keys_restore_key_help_with_link"
             app:layout_constraintVertical_bias="0" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml b/vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml
index 8360cb3a4f..c06fa48319 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml
@@ -72,7 +72,7 @@
             android:textColor="?vctr_content_secondary"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/keys_backup_passphrase_enter_til"
+            app:layout_constraintTop_toBottomOf="@id/keys_backup_passphrase_enter_til"
             tools:text="@string/keys_backup_restore_with_passphrase_helper_with_link" />
 
         <Button
@@ -85,7 +85,7 @@
             android:text="@string/keys_backup_unlock_button"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/helperTextWithLink" />
+            app:layout_constraintTop_toBottomOf="@id/helperTextWithLink" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/fragment_keys_backup_restore_success.xml b/vector/src/main/res/layout/fragment_keys_backup_restore_success.xml
index fc69167bc0..ec478ae339 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_restore_success.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_restore_success.xml
@@ -30,7 +30,7 @@
         android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/keys_backup_shield"
+        app:layout_constraintTop_toBottomOf="@id/keys_backup_shield"
         tools:text="@string/keys_backup_restore_success_title" />
 
     <TextView
@@ -43,7 +43,7 @@
         android:textColor="?vctr_content_secondary"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/success_text"
+        app:layout_constraintTop_toBottomOf="@id/success_text"
         tools:text="Restored a backup with 34 keys.\n22 new keys have been added to this session." />
 
     <Button
@@ -55,6 +55,6 @@
         android:text="@string/done"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/success_details_text" />
+        app:layout_constraintTop_toBottomOf="@id/success_details_text" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml b/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml
index c13175728f..0ff017c7e7 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml
@@ -14,7 +14,7 @@
         android:layout_marginTop="@dimen/layout_vertical_margin"
         android:importantForAccessibility="no"
         android:src="@drawable/backup_keys"
-        app:layout_constraintBottom_toTopOf="@+id/keys_backup_setup_step1_title"
+        app:layout_constraintBottom_toTopOf="@id/keys_backup_setup_step1_title"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -33,8 +33,8 @@
         android:textAlignment="center"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@+id/keys_backup_setup_step1_description"
-        app:layout_constraintTop_toBottomOf="@+id/keys_backup_setup_step1_image"
+        app:layout_constraintBottom_toTopOf="@id/keys_backup_setup_step1_description"
+        app:layout_constraintTop_toBottomOf="@id/keys_backup_setup_step1_image"
         app:layout_constraintVertical_chainStyle="packed" />
 
     <TextView
@@ -46,7 +46,7 @@
         android:text="@string/keys_backup_setup_step1_description"
         android:textAlignment="center"
         android:textColor="?vctr_content_secondary"
-        app:layout_constraintBottom_toTopOf="@+id/keys_backup_setup_step1_button"
+        app:layout_constraintBottom_toTopOf="@id/keys_backup_setup_step1_button"
         app:layout_constraintTop_toBottomOf="@id/keys_backup_setup_step1_title" />
 
     <!-- Centered button -->
diff --git a/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml b/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
index 673c2fee29..f28ec81d02 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
@@ -40,7 +40,7 @@
             android:textColor="?vctr_content_secondary"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/keys_backup_setup_step2_text_title" />
+            app:layout_constraintTop_toBottomOf="@id/keys_backup_setup_step2_text_title" />
 
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/keys_backup_setup_step2_passphrase_enter_til"
@@ -110,7 +110,7 @@
             android:text="@string/keys_backup_setup_step1_recovery_key_alternative"
             android:textAlignment="center"
             android:textColor="?vctr_content_primary"
-            app:layout_constraintTop_toBottomOf="@+id/keys_backup_setup_step2_button" />
+            app:layout_constraintTop_toBottomOf="@id/keys_backup_setup_step2_button" />
 
         <Button
             android:id="@+id/keys_backup_setup_step2_skip_button"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml b/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
index 63fe41b36a..a0753529fa 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
@@ -40,7 +40,6 @@
             android:visibility="gone"
             tools:visibility="visible" />
 
-
         <TextView
             android:id="@+id/keys_backup_setup_step3_line1_text"
             style="@style/Widget.Vector.TextView.Subtitle"
@@ -65,7 +64,6 @@
             android:textColor="?vctr_content_secondary"
             tools:text="@string/keys_backup_setup_step3_text_line2" />
 
-
         <TextView
             android:id="@+id/keys_backup_setup_step3_recovery_key_text"
             style="@style/Widget.Vector.TextView.Title"
@@ -79,7 +77,6 @@
             tools:text="HHWJ Y8DK RDR4\nBQEN FQ4V M4F8\nBQEN FQ4V M4A8"
             tools:visibility="visible" />
 
-
         <Button
             android:id="@+id/keys_backup_setup_step3_copy_button"
             style="@style/Widget.Vector.Button.Text"
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 61a8710f88..2f02da71d7 100644
--- a/vector/src/main/res/layout/fragment_login_account_created.xml
+++ b/vector/src/main/res/layout/fragment_login_account_created.xml
@@ -77,8 +77,8 @@
                     android:maxLines="1"
                     android:textColor="?vctr_content_primary"
                     android:textStyle="bold"
-                    app:layout_constraintEnd_toStartOf="@+id/loginAccountCreatedTime"
-                    app:layout_constraintStart_toEndOf="@+id/loginAccountCreatedAvatar"
+                    app:layout_constraintEnd_toStartOf="@id/loginAccountCreatedTime"
+                    app:layout_constraintStart_toEndOf="@id/loginAccountCreatedAvatar"
                     app:layout_constraintTop_toTopOf="parent"
                     tools:text="\@user:domain.org" />
 
@@ -91,7 +91,7 @@
                     android:layout_marginStart="8dp"
                     android:layout_marginEnd="8dp"
                     android:textColor="?vctr_content_secondary"
-                    app:layout_constraintBaseline_toBaselineOf="@+id/loginAccountCreatedMemberName"
+                    app:layout_constraintBaseline_toBaselineOf="@id/loginAccountCreatedMemberName"
                     app:layout_constraintEnd_toEndOf="parent"
                     tools:text="@tools:sample/date/hhmm" />
 
@@ -102,8 +102,8 @@
                     android:text="@string/login_account_created_message"
                     android:textColor="?vctr_content_primary"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="@+id/loginAccountCreatedMemberName"
-                    app:layout_constraintTop_toBottomOf="@+id/loginAccountCreatedMemberName" />
+                    app:layout_constraintStart_toStartOf="@id/loginAccountCreatedMemberName"
+                    app:layout_constraintTop_toBottomOf="@id/loginAccountCreatedMemberName" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/vector/src/main/res/layout/fragment_login_generic_text_input_form.xml b/vector/src/main/res/layout/fragment_login_generic_text_input_form.xml
index 0412c4e0cb..f389ad5b73 100644
--- a/vector/src/main/res/layout/fragment_login_generic_text_input_form.xml
+++ b/vector/src/main/res/layout/fragment_login_generic_text_input_form.xml
@@ -65,8 +65,7 @@
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:orientation="horizontal">
+                android:layout_marginTop="8dp">
 
                 <Button
                     android:id="@+id/loginGenericTextInputFormOtherButton"
diff --git a/vector/src/main/res/layout/fragment_login_server_selection.xml b/vector/src/main/res/layout/fragment_login_server_selection.xml
index a7b065c29d..1ea923d7f3 100644
--- a/vector/src/main/res/layout/fragment_login_server_selection.xml
+++ b/vector/src/main/res/layout/fragment_login_server_selection.xml
@@ -41,7 +41,7 @@
                 android:textColor="?vctr_content_secondary"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginServerTitle" />
+                app:layout_constraintTop_toBottomOf="@id/loginServerTitle" />
 
             <!-- Use a CheckableConstraintLayout to keep the pressed state when retrieving login flow -->
             <im.vector.app.core.platform.CheckableConstraintLayout
@@ -56,7 +56,7 @@
                 android:paddingEnd="@dimen/layout_horizontal_margin"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginServerText">
+                app:layout_constraintTop_toBottomOf="@id/loginServerText">
 
                 <ImageView
                     android:id="@+id/loginServerChoiceMatrixOrgIcon"
@@ -64,7 +64,7 @@
                     android:layout_height="wrap_content"
                     android:importantForAccessibility="no"
                     android:src="@drawable/ic_logo_matrix_org"
-                    app:layout_constraintBottom_toTopOf="@+id/loginServerChoiceMatrixOrgText"
+                    app:layout_constraintBottom_toTopOf="@id/loginServerChoiceMatrixOrgText"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintVertical_chainStyle="packed"
@@ -83,7 +83,7 @@
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/loginServerChoiceMatrixOrgIcon" />
+                    app:layout_constraintTop_toBottomOf="@id/loginServerChoiceMatrixOrgIcon" />
 
             </im.vector.app.core.platform.CheckableConstraintLayout>
 
@@ -99,7 +99,7 @@
                 android:paddingEnd="0dp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginServerChoiceMatrixOrg">
+                app:layout_constraintTop_toBottomOf="@id/loginServerChoiceMatrixOrg">
 
                 <ImageView
                     android:id="@+id/loginServerChoiceEmsIcon"
@@ -107,7 +107,7 @@
                     android:layout_height="wrap_content"
                     android:importantForAccessibility="no"
                     android:src="@drawable/ic_logo_element_matrix_services"
-                    app:layout_constraintBottom_toTopOf="@+id/loginServerChoiceEmsText"
+                    app:layout_constraintBottom_toTopOf="@id/loginServerChoiceEmsText"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintVertical_chainStyle="packed"
@@ -124,9 +124,9 @@
                     android:text="@string/login_server_modular_text"
                     android:textColor="?vctr_content_secondary"
                     app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toStartOf="@+id/loginServerChoiceEmsLearnMore"
+                    app:layout_constraintEnd_toStartOf="@id/loginServerChoiceEmsLearnMore"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/loginServerChoiceEmsIcon" />
+                    app:layout_constraintTop_toBottomOf="@id/loginServerChoiceEmsIcon" />
 
                 <TextView
                     android:id="@+id/loginServerChoiceEmsLearnMore"
@@ -136,9 +136,9 @@
                     android:padding="16dp"
                     android:text="@string/login_server_modular_learn_more"
                     android:textColor="?colorPrimary"
-                    app:layout_constraintBottom_toBottomOf="@+id/loginServerChoiceEmsText"
+                    app:layout_constraintBottom_toBottomOf="@id/loginServerChoiceEmsText"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="@+id/loginServerChoiceEmsText" />
+                    app:layout_constraintTop_toTopOf="@id/loginServerChoiceEmsText" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -154,7 +154,7 @@
                 android:paddingEnd="@dimen/layout_horizontal_margin"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginServerChoiceEms">
+                app:layout_constraintTop_toBottomOf="@id/loginServerChoiceEms">
 
                 <TextView
                     android:id="@+id/loginServerChoiceOtherTitle"
@@ -164,7 +164,7 @@
                     android:gravity="start"
                     android:text="@string/login_server_other_title"
                     android:textColor="?vctr_content_primary"
-                    app:layout_constraintBottom_toTopOf="@+id/loginServerChoiceOtherText"
+                    app:layout_constraintBottom_toTopOf="@id/loginServerChoiceOtherText"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintVertical_chainStyle="packed" />
@@ -181,7 +181,7 @@
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/loginServerChoiceOtherTitle" />
+                    app:layout_constraintTop_toBottomOf="@id/loginServerChoiceOtherTitle" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -196,7 +196,7 @@
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginServerChoiceOther" />
+                app:layout_constraintTop_toBottomOf="@id/loginServerChoiceOther" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/vector/src/main/res/layout/fragment_login_server_selection_2.xml b/vector/src/main/res/layout/fragment_login_server_selection_2.xml
index 6a7f2c43e0..9113e5e84b 100644
--- a/vector/src/main/res/layout/fragment_login_server_selection_2.xml
+++ b/vector/src/main/res/layout/fragment_login_server_selection_2.xml
@@ -52,7 +52,7 @@
                     android:layout_height="wrap_content"
                     android:importantForAccessibility="no"
                     android:src="@drawable/ic_logo_matrix_org"
-                    app:layout_constraintBottom_toTopOf="@+id/loginServerChoiceMatrixOrgText"
+                    app:layout_constraintBottom_toTopOf="@id/loginServerChoiceMatrixOrgText"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintVertical_chainStyle="packed"
@@ -71,7 +71,7 @@
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/loginServerChoiceMatrixOrgIcon" />
+                    app:layout_constraintTop_toBottomOf="@id/loginServerChoiceMatrixOrgIcon" />
 
             </im.vector.app.core.platform.CheckableConstraintLayout>
 
@@ -104,7 +104,7 @@
                     android:gravity="start"
                     android:text="@string/login_element_matrix_server_and_others"
                     android:textColor="?vctr_content_primary"
-                    app:layout_constraintBottom_toTopOf="@+id/loginServerChoiceOtherText"
+                    app:layout_constraintBottom_toTopOf="@id/loginServerChoiceOtherText"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintVertical_chainStyle="packed" />
@@ -121,7 +121,7 @@
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/loginServerChoiceOtherTitle" />
+                    app:layout_constraintTop_toBottomOf="@id/loginServerChoiceOtherTitle" />
 
             </im.vector.app.core.platform.CheckableConstraintLayout>
 
@@ -135,9 +135,9 @@
                 android:paddingBottom="16dp"
                 android:text="@string/login_server_modular_learn_more_about_ems"
                 android:textColor="?vctr_content_secondary"
-                app:layout_constraintBottom_toBottomOf="@+id/loginServerChoiceEmsText"
+                app:layout_constraintBottom_toBottomOf="@id/loginServerChoiceEmsText"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="@+id/loginServerChoiceEmsText" />
+                app:layout_constraintTop_toTopOf="@id/loginServerChoiceEmsText" />
 
         </LinearLayout>
 
diff --git a/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml b/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
index eb3b1b703c..52ca661ae5 100644
--- a/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
+++ b/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
@@ -39,7 +39,7 @@
                 android:layout_marginTop="27dp"
                 android:textColor="?vctr_content_primary"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginSignupSigninServerIcon"
+                app:layout_constraintTop_toBottomOf="@id/loginSignupSigninServerIcon"
                 app:layout_goneMarginTop="0dp"
                 tools:text="@string/login_connect_to" />
 
@@ -53,7 +53,7 @@
                 android:textColor="?vctr_content_secondary"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginSignupSigninTitle"
+                app:layout_constraintTop_toBottomOf="@id/loginSignupSigninTitle"
                 tools:text="@string/login_server_matrix_org_text" />
 
             <!-- Sign up or sign in SSO -->
@@ -65,7 +65,7 @@
                 android:layout_marginTop="38dp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginSignupSigninText"
+                app:layout_constraintTop_toBottomOf="@id/loginSignupSigninText"
                 tools:text="@string/login_signup" />
 
             <!-- Sign in or gone -->
@@ -80,7 +80,7 @@
                 app:layout_constraintBottom_toTopOf="@id/loginSignupSigninSignInSocialLoginContainer"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginSignupSigninSubmit"
+                app:layout_constraintTop_toBottomOf="@id/loginSignupSigninSubmit"
                 tools:visibility="visible" />
 
             <!-- Social Login buttons -->
diff --git a/vector/src/main/res/layout/fragment_login_splash.xml b/vector/src/main/res/layout/fragment_login_splash.xml
index 1d69cde723..96b3a7cbfb 100644
--- a/vector/src/main/res/layout/fragment_login_splash.xml
+++ b/vector/src/main/res/layout/fragment_login_splash.xml
@@ -16,7 +16,7 @@
         android:id="@+id/loginSplashSpace1"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@+id/loginSplashLogoContainer"
+        app:layout_constraintBottom_toTopOf="@id/loginSplashLogoContainer"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="spread_inside"
         app:layout_constraintVertical_weight="4" />
@@ -27,10 +27,10 @@
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
         android:orientation="vertical"
-        app:layout_constraintBottom_toTopOf="@+id/loginSplashSpace2"
+        app:layout_constraintBottom_toTopOf="@id/loginSplashSpace2"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/loginSplashSpace1">
+        app:layout_constraintTop_toBottomOf="@id/loginSplashSpace1">
 
         <ImageView
             android:id="@+id/loginSplashLogo"
@@ -56,8 +56,8 @@
         android:id="@+id/loginSplashSpace2"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@+id/loginSplashTitle"
-        app:layout_constraintTop_toBottomOf="@+id/loginSplashLogoContainer"
+        app:layout_constraintBottom_toTopOf="@id/loginSplashTitle"
+        app:layout_constraintTop_toBottomOf="@id/loginSplashLogoContainer"
         app:layout_constraintVertical_weight="1" />
 
     <TextView
@@ -69,27 +69,27 @@
         android:text="@string/login_splash_title"
         android:textColor="?vctr_content_primary"
         android:transitionName="loginTitleTransition"
-        app:layout_constraintBottom_toTopOf="@+id/loginSplashSpace3"
+        app:layout_constraintBottom_toTopOf="@id/loginSplashSpace3"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/loginSplashSpace2" />
+        app:layout_constraintTop_toBottomOf="@id/loginSplashSpace2" />
 
     <Space
         android:id="@+id/loginSplashSpace3"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@+id/loginSplashContent"
-        app:layout_constraintTop_toBottomOf="@+id/loginSplashTitle"
+        app:layout_constraintBottom_toTopOf="@id/loginSplashContent"
+        app:layout_constraintTop_toBottomOf="@id/loginSplashTitle"
         app:layout_constraintVertical_weight="2" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/loginSplashContent"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        app:layout_constraintBottom_toTopOf="@+id/loginSplashSpace4"
+        app:layout_constraintBottom_toTopOf="@id/loginSplashSpace4"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/loginSplashSpace3">
+        app:layout_constraintTop_toBottomOf="@id/loginSplashSpace3">
 
         <ImageView
             android:id="@+id/loginSplashPicto1"
@@ -99,7 +99,7 @@
             android:importantForAccessibility="no"
             android:src="@drawable/ic_login_splash_message_circle"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/loginSplashText1"
+            app:layout_constraintTop_toTopOf="@id/loginSplashText1"
             app:tint="?vctr_content_secondary"
             tools:ignore="MissingPrefix" />
 
@@ -112,7 +112,7 @@
             android:gravity="start"
             android:text="@string/login_splash_text1"
             android:textColor="?vctr_content_secondary"
-            app:layout_constraintBottom_toTopOf="@+id/loginSplashText2"
+            app:layout_constraintBottom_toTopOf="@id/loginSplashText2"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/loginSplashPicto1"
             app:layout_constraintTop_toTopOf="parent" />
@@ -124,7 +124,7 @@
             android:importantForAccessibility="no"
             android:src="@drawable/ic_login_splash_lock"
             app:layout_constraintStart_toStartOf="@id/loginSplashPicto1"
-            app:layout_constraintTop_toTopOf="@+id/loginSplashText2"
+            app:layout_constraintTop_toTopOf="@id/loginSplashText2"
             app:tint="?vctr_content_secondary"
             tools:ignore="MissingPrefix" />
 
@@ -140,7 +140,7 @@
             app:layout_constraintBottom_toTopOf="@id/loginSplashText3"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="@id/loginSplashText1"
-            app:layout_constraintTop_toBottomOf="@+id/loginSplashText1" />
+            app:layout_constraintTop_toBottomOf="@id/loginSplashText1" />
 
         <ImageView
             android:id="@+id/loginSplashPicto3"
@@ -148,8 +148,8 @@
             android:layout_height="wrap_content"
             android:importantForAccessibility="no"
             android:src="@drawable/ic_login_splash_sliders"
-            app:layout_constraintStart_toStartOf="@+id/loginSplashPicto1"
-            app:layout_constraintTop_toTopOf="@+id/loginSplashText3"
+            app:layout_constraintStart_toStartOf="@id/loginSplashPicto1"
+            app:layout_constraintTop_toTopOf="@id/loginSplashText3"
             app:tint="?vctr_content_secondary"
             tools:ignore="MissingPrefix" />
 
@@ -164,8 +164,8 @@
             android:textColor="?vctr_content_secondary"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@+id/loginSplashText1"
-            app:layout_constraintTop_toBottomOf="@+id/loginSplashText2" />
+            app:layout_constraintStart_toStartOf="@id/loginSplashText1"
+            app:layout_constraintTop_toBottomOf="@id/loginSplashText2" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -173,8 +173,8 @@
         android:id="@+id/loginSplashSpace4"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@+id/loginSplashSubmit"
-        app:layout_constraintTop_toBottomOf="@+id/loginSplashContent"
+        app:layout_constraintBottom_toTopOf="@id/loginSplashSubmit"
+        app:layout_constraintTop_toBottomOf="@id/loginSplashContent"
         app:layout_constraintVertical_weight="2" />
 
     <Button
@@ -184,17 +184,17 @@
         android:layout_height="wrap_content"
         android:text="@string/login_splash_submit"
         android:transitionName="loginSubmitTransition"
-        app:layout_constraintBottom_toTopOf="@+id/loginSplashSpace5"
+        app:layout_constraintBottom_toTopOf="@id/loginSplashSpace5"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/loginSplashSpace4" />
+        app:layout_constraintTop_toBottomOf="@id/loginSplashSpace4" />
 
     <Space
         android:id="@+id/loginSplashSpace5"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/loginSplashSubmit"
+        app:layout_constraintTop_toBottomOf="@id/loginSplashSubmit"
         app:layout_constraintVertical_weight="4" />
 
     <TextView
diff --git a/vector/src/main/res/layout/fragment_login_splash_2.xml b/vector/src/main/res/layout/fragment_login_splash_2.xml
index 08d3d3b6a4..33f8399c16 100644
--- a/vector/src/main/res/layout/fragment_login_splash_2.xml
+++ b/vector/src/main/res/layout/fragment_login_splash_2.xml
@@ -16,7 +16,7 @@
         android:id="@+id/loginSplashSpace1"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@+id/loginSplashLogoContainer"
+        app:layout_constraintBottom_toTopOf="@id/loginSplashLogoContainer"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="spread_inside"
         app:layout_constraintVertical_weight="4" />
@@ -27,10 +27,10 @@
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
         android:orientation="vertical"
-        app:layout_constraintBottom_toTopOf="@+id/loginSplashSpace2"
+        app:layout_constraintBottom_toTopOf="@id/loginSplashSpace2"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/loginSplashSpace1">
+        app:layout_constraintTop_toBottomOf="@id/loginSplashSpace1">
 
         <ImageView
             android:id="@+id/loginSplashLogo"
@@ -56,8 +56,8 @@
         android:id="@+id/loginSplashSpace2"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@+id/loginSplashTitle"
-        app:layout_constraintTop_toBottomOf="@+id/loginSplashLogoContainer"
+        app:layout_constraintBottom_toTopOf="@id/loginSplashTitle"
+        app:layout_constraintTop_toBottomOf="@id/loginSplashLogoContainer"
         app:layout_constraintVertical_weight="1" />
 
     <TextView
@@ -69,27 +69,27 @@
         android:text="@string/login_splash_title"
         android:textColor="?vctr_content_primary"
         android:transitionName="loginTitleTransition"
-        app:layout_constraintBottom_toTopOf="@+id/loginSplashSpace25"
+        app:layout_constraintBottom_toTopOf="@id/loginSplashSpace25"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/loginSplashSpace2" />
+        app:layout_constraintTop_toBottomOf="@id/loginSplashSpace2" />
 
     <Space
         android:id="@+id/loginSplashSpace25"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@+id/loginSplashContent"
-        app:layout_constraintTop_toBottomOf="@+id/loginSplashTitle"
+        app:layout_constraintBottom_toTopOf="@id/loginSplashContent"
+        app:layout_constraintTop_toBottomOf="@id/loginSplashTitle"
         app:layout_constraintVertical_weight="3" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/loginSplashContent"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        app:layout_constraintBottom_toTopOf="@+id/loginSplashSpace3"
+        app:layout_constraintBottom_toTopOf="@id/loginSplashSpace3"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/loginSplashSpace25">
+        app:layout_constraintTop_toBottomOf="@id/loginSplashSpace25">
 
         <ImageView
             android:id="@+id/loginSplashPicto1"
@@ -99,7 +99,7 @@
             android:importantForAccessibility="no"
             android:src="@drawable/ic_login_splash_message_circle"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/loginSplashText1"
+            app:layout_constraintTop_toTopOf="@id/loginSplashText1"
             app:tint="?vctr_content_secondary"
             tools:ignore="MissingPrefix" />
 
@@ -112,7 +112,7 @@
             android:gravity="start"
             android:text="@string/login_splash_text1"
             android:textColor="?vctr_content_secondary"
-            app:layout_constraintBottom_toTopOf="@+id/loginSplashText2"
+            app:layout_constraintBottom_toTopOf="@id/loginSplashText2"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/loginSplashPicto1"
             app:layout_constraintTop_toTopOf="parent" />
@@ -124,7 +124,7 @@
             android:importantForAccessibility="no"
             android:src="@drawable/ic_login_splash_lock"
             app:layout_constraintStart_toStartOf="@id/loginSplashPicto1"
-            app:layout_constraintTop_toTopOf="@+id/loginSplashText2"
+            app:layout_constraintTop_toTopOf="@id/loginSplashText2"
             app:tint="?vctr_content_secondary"
             tools:ignore="MissingPrefix" />
 
@@ -140,7 +140,7 @@
             app:layout_constraintBottom_toTopOf="@id/loginSplashText3"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="@id/loginSplashText1"
-            app:layout_constraintTop_toBottomOf="@+id/loginSplashText1" />
+            app:layout_constraintTop_toBottomOf="@id/loginSplashText1" />
 
         <ImageView
             android:id="@+id/loginSplashPicto3"
@@ -148,8 +148,8 @@
             android:layout_height="wrap_content"
             android:importantForAccessibility="no"
             android:src="@drawable/ic_login_splash_sliders"
-            app:layout_constraintStart_toStartOf="@+id/loginSplashPicto1"
-            app:layout_constraintTop_toTopOf="@+id/loginSplashText3"
+            app:layout_constraintStart_toStartOf="@id/loginSplashPicto1"
+            app:layout_constraintTop_toTopOf="@id/loginSplashText3"
             app:tint="?vctr_content_secondary"
             tools:ignore="MissingPrefix" />
 
@@ -164,8 +164,8 @@
             android:textColor="?vctr_content_secondary"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@+id/loginSplashText1"
-            app:layout_constraintTop_toBottomOf="@+id/loginSplashText2" />
+            app:layout_constraintStart_toStartOf="@id/loginSplashText1"
+            app:layout_constraintTop_toBottomOf="@id/loginSplashText2" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -173,8 +173,8 @@
         android:id="@+id/loginSplashSpace3"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@+id/loginFormContent"
-        app:layout_constraintTop_toBottomOf="@+id/loginSplashContent"
+        app:layout_constraintBottom_toTopOf="@id/loginFormContent"
+        app:layout_constraintTop_toBottomOf="@id/loginSplashContent"
         app:layout_constraintVertical_weight="3" />
 
     <LinearLayout
@@ -182,10 +182,10 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        app:layout_constraintBottom_toTopOf="@+id/loginSplashSpace5"
+        app:layout_constraintBottom_toTopOf="@id/loginSplashSpace5"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/loginSplashSpace3">
+        app:layout_constraintTop_toBottomOf="@id/loginSplashSpace3">
 
         <Button
             android:id="@+id/loginSignupSigninSignUp"
@@ -211,7 +211,7 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/loginFormContent"
+        app:layout_constraintTop_toBottomOf="@id/loginFormContent"
         app:layout_constraintVertical_weight="6" />
 
     <TextView
diff --git a/vector/src/main/res/layout/fragment_login_terms.xml b/vector/src/main/res/layout/fragment_login_terms.xml
index 84ae53ab92..3aae6de504 100644
--- a/vector/src/main/res/layout/fragment_login_terms.xml
+++ b/vector/src/main/res/layout/fragment_login_terms.xml
@@ -40,7 +40,7 @@
             android:paddingEnd="36dp"
             android:text="@string/auth_accept_policies"
             android:textColor="?vctr_content_secondary"
-            app:layout_constraintTop_toBottomOf="@+id/loginTermsTitle" />
+            app:layout_constraintTop_toBottomOf="@id/loginTermsTitle" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/loginTermsPolicyList"
@@ -48,8 +48,8 @@
             android:layout_height="0dp"
             android:layout_marginTop="10dp"
             android:layout_marginBottom="16dp"
-            app:layout_constraintBottom_toTopOf="@+id/loginTermsSubmit"
-            app:layout_constraintTop_toBottomOf="@+id/loginTermsNotice"
+            app:layout_constraintBottom_toTopOf="@id/loginTermsSubmit"
+            app:layout_constraintTop_toBottomOf="@id/loginTermsNotice"
             tools:listitem="@layout/item_policy" />
 
         <Button
diff --git a/vector/src/main/res/layout/fragment_login_terms_2.xml b/vector/src/main/res/layout/fragment_login_terms_2.xml
index b4034b7c7b..25a461ff35 100644
--- a/vector/src/main/res/layout/fragment_login_terms_2.xml
+++ b/vector/src/main/res/layout/fragment_login_terms_2.xml
@@ -44,7 +44,7 @@
             android:paddingEnd="36dp"
             android:text="@string/auth_accept_policies"
             android:textColor="?vctr_content_secondary"
-            app:layout_constraintTop_toBottomOf="@+id/loginTermsTitle" />
+            app:layout_constraintTop_toBottomOf="@id/loginTermsTitle" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/loginTermsPolicyList"
@@ -52,8 +52,8 @@
             android:layout_height="0dp"
             android:layout_marginTop="10dp"
             android:layout_marginBottom="16dp"
-            app:layout_constraintBottom_toTopOf="@+id/loginTermsSubmit"
-            app:layout_constraintTop_toBottomOf="@+id/loginTermsNotice"
+            app:layout_constraintBottom_toTopOf="@id/loginTermsSubmit"
+            app:layout_constraintTop_toBottomOf="@id/loginTermsNotice"
             tools:listitem="@layout/item_policy" />
 
         <Button
diff --git a/vector/src/main/res/layout/fragment_matrix_profile.xml b/vector/src/main/res/layout/fragment_matrix_profile.xml
index 4fb1328abc..f6f6af96ea 100644
--- a/vector/src/main/res/layout/fragment_matrix_profile.xml
+++ b/vector/src/main/res/layout/fragment_matrix_profile.xml
@@ -21,7 +21,7 @@
             app:scrimAnimationDuration="250"
             app:scrimVisibleHeightTrigger="80dp"
             app:titleEnabled="false"
-            app:toolbarId="@+id/matrixProfileToolbar">
+            app:toolbarId="@id/matrixProfileToolbar">
 
             <ViewStub
                 android:id="@+id/matrixProfileHeaderView"
@@ -63,7 +63,7 @@
                         android:layout_width="24dp"
                         android:layout_height="24dp"
                         android:alpha="0"
-                        app:layout_constraintCircle="@+id/matrixProfileToolbarAvatarImageView"
+                        app:layout_constraintCircle="@id/matrixProfileToolbarAvatarImageView"
                         app:layout_constraintCircleAngle="135"
                         app:layout_constraintCircleRadius="20dp"
                         tools:alpha="1"
@@ -82,7 +82,7 @@
                         android:textColor="?vctr_content_primary"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toEndOf="@+id/matrixProfileToolbarAvatarImageView"
+                        app:layout_constraintStart_toEndOf="@id/matrixProfileToolbarAvatarImageView"
                         app:layout_constraintTop_toTopOf="parent"
                         tools:alpha="1"
                         tools:text="@sample/rooms.json/data/name" />
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 0bdecf4471..5af96c7d2b 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
@@ -39,7 +39,7 @@
             android:textAlignment="textStart"
             android:textColor="?vctr_content_primary"
             android:textStyle="bold"
-            app:layout_constraintTop_toBottomOf="@+id/matrixToCardAvatar"
+            app:layout_constraintTop_toBottomOf="@id/matrixToCardAvatar"
             tools:text="@sample/rooms.json/data/name" />
 
         <TextView
@@ -58,7 +58,6 @@
             tools:text="@sample/rooms.json/data/alias"
             tools:visibility="visible" />
 
-
         <ImageView
             android:id="@+id/matrixToAccessImage"
             android:layout_width="16dp"
diff --git a/vector/src/main/res/layout/fragment_matrix_to_user_card.xml b/vector/src/main/res/layout/fragment_matrix_to_user_card.xml
index fbe504a2d6..9fa2be7913 100644
--- a/vector/src/main/res/layout/fragment_matrix_to_user_card.xml
+++ b/vector/src/main/res/layout/fragment_matrix_to_user_card.xml
@@ -31,7 +31,7 @@
         android:singleLine="true"
         android:textAlignment="center"
         android:textColor="?vctr_content_primary"
-        app:layout_constraintTop_toBottomOf="@+id/matrixToCardAvatar"
+        app:layout_constraintTop_toBottomOf="@id/matrixToCardAvatar"
         tools:text="@sample/users.json/data/displayName" />
 
     <TextView
diff --git a/vector/src/main/res/layout/fragment_public_rooms.xml b/vector/src/main/res/layout/fragment_public_rooms.xml
index a16d45591c..49d48d6801 100644
--- a/vector/src/main/res/layout/fragment_public_rooms.xml
+++ b/vector/src/main/res/layout/fragment_public_rooms.xml
@@ -48,7 +48,7 @@
             app:iconPadding="13dp"
             app:iconTint="?colorPrimary"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/publicRoomsToolbar" />
+            app:layout_constraintTop_toBottomOf="@id/publicRoomsToolbar" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/vector/src/main/res/layout/fragment_recyclerview_with_search.xml b/vector/src/main/res/layout/fragment_recyclerview_with_search.xml
index b685044e84..1ea9c0cbf4 100644
--- a/vector/src/main/res/layout/fragment_recyclerview_with_search.xml
+++ b/vector/src/main/res/layout/fragment_recyclerview_with_search.xml
@@ -64,7 +64,6 @@
 
         </com.google.android.material.appbar.MaterialToolbar>
 
-
         <androidx.appcompat.widget.SearchView
             android:id="@+id/memberNameFilter"
             android:layout_width="match_parent"
@@ -73,7 +72,7 @@
             android:layout_marginBottom="8dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/addRoomToSpaceToolbar"
+            app:layout_constraintTop_toBottomOf="@id/addRoomToSpaceToolbar"
             app:queryHint="@string/search_hint_room_name" />
 
     </com.google.android.material.appbar.AppBarLayout>
diff --git a/vector/src/main/res/layout/fragment_review_terms.xml b/vector/src/main/res/layout/fragment_review_terms.xml
index 58c13262e7..30c6abf69f 100644
--- a/vector/src/main/res/layout/fragment_review_terms.xml
+++ b/vector/src/main/res/layout/fragment_review_terms.xml
@@ -9,7 +9,7 @@
         android:id="@+id/reviewTermsRecyclerView"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@+id/reviewTermsBottomBar"
+        app:layout_constraintBottom_toTopOf="@id/reviewTermsBottomBar"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/vector/src/main/res/layout/fragment_room_detail.xml b/vector/src/main/res/layout/fragment_room_detail.xml
index 356907cd4e..81d515f28c 100644
--- a/vector/src/main/res/layout/fragment_room_detail.xml
+++ b/vector/src/main/res/layout/fragment_room_detail.xml
@@ -49,9 +49,9 @@
                     android:layout_height="17dp"
                     android:layout_marginStart="5dp"
                     android:layout_marginTop="2dp"
-                    app:layout_constraintBottom_toBottomOf="@+id/roomToolbarTitleView"
-                    app:layout_constraintStart_toEndOf="@+id/roomToolbarAvatarImageView"
-                    app:layout_constraintTop_toTopOf="@+id/roomToolbarTitleView" />
+                    app:layout_constraintBottom_toBottomOf="@id/roomToolbarTitleView"
+                    app:layout_constraintStart_toEndOf="@id/roomToolbarAvatarImageView"
+                    app:layout_constraintTop_toTopOf="@id/roomToolbarTitleView" />
 
                 <im.vector.app.core.ui.views.PresenceStateImageView
                     android:id="@+id/roomToolbarPresenceImageView"
@@ -60,7 +60,7 @@
                     android:background="@drawable/background_circle"
                     android:padding="2dp"
                     android:visibility="gone"
-                    app:layout_constraintCircle="@+id/roomToolbarAvatarImageView"
+                    app:layout_constraintCircle="@id/roomToolbarAvatarImageView"
                     app:layout_constraintCircleAngle="135"
                     app:layout_constraintCircleRadius="20dp"
                     tools:ignore="MissingConstraints"
@@ -77,7 +77,7 @@
                     android:padding="1dp"
                     android:src="@drawable/ic_public_room"
                     android:visibility="gone"
-                    app:layout_constraintCircle="@+id/roomToolbarAvatarImageView"
+                    app:layout_constraintCircle="@id/roomToolbarAvatarImageView"
                     app:layout_constraintCircleAngle="135"
                     app:layout_constraintCircleRadius="20dp"
                     tools:ignore="MissingConstraints"
@@ -93,10 +93,10 @@
                     android:ellipsize="end"
                     android:maxLines="1"
                     android:textColor="?vctr_content_primary"
-                    app:layout_constraintBottom_toTopOf="@+id/roomToolbarSubtitleView"
+                    app:layout_constraintBottom_toTopOf="@id/roomToolbarSubtitleView"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintHorizontal_bias="0.0"
-                    app:layout_constraintStart_toEndOf="@+id/roomToolbarDecorationImageView"
+                    app:layout_constraintStart_toEndOf="@id/roomToolbarDecorationImageView"
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintVertical_chainStyle="packed"
                     app:layout_goneMarginStart="7dp"
@@ -115,8 +115,8 @@
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintHorizontal_bias="0.0"
-                    app:layout_constraintStart_toEndOf="@+id/roomToolbarAvatarImageView"
-                    app:layout_constraintTop_toBottomOf="@+id/roomToolbarTitleView"
+                    app:layout_constraintStart_toEndOf="@id/roomToolbarAvatarImageView"
+                    app:layout_constraintTop_toBottomOf="@id/roomToolbarTitleView"
                     tools:text="@sample/rooms.json/data/topic"
                     tools:visibility="visible" />
 
@@ -150,13 +150,12 @@
         android:visibility="visible"
         app:layout_constraintTop_toBottomOf="@id/syncStateView" />
 
-
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/timelineRecyclerView"
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:overScrollMode="always"
-        app:layout_constraintBottom_toTopOf="@+id/timelineRecyclerViewBarrier"
+        app:layout_constraintBottom_toTopOf="@id/timelineRecyclerViewBarrier"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/removeJitsiWidgetView"
@@ -179,7 +178,6 @@
         app:layout_constraintTop_toBottomOf="@id/removeJitsiWidgetView"
         tools:visibility="visible" />
 
-
     <im.vector.app.core.ui.views.NotificationAreaView
         android:id="@+id/notificationAreaView"
         android:layout_width="0dp"
@@ -231,7 +229,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/appBarLayout" />
+        app:layout_constraintTop_toBottomOf="@id/appBarLayout" />
 
     <androidx.constraintlayout.widget.Barrier
         android:id="@+id/badgeBarrier"
diff --git a/vector/src/main/res/layout/fragment_room_directory_picker.xml b/vector/src/main/res/layout/fragment_room_directory_picker.xml
index 60dccd6e37..59dc28d7d5 100644
--- a/vector/src/main/res/layout/fragment_room_directory_picker.xml
+++ b/vector/src/main/res/layout/fragment_room_directory_picker.xml
@@ -32,7 +32,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/appBarLayout"
+            app:layout_constraintTop_toBottomOf="@id/appBarLayout"
             tools:listitem="@layout/item_room_directory" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/fragment_room_list.xml b/vector/src/main/res/layout/fragment_room_list.xml
index fac0c0f170..a8eec6ff3a 100644
--- a/vector/src/main/res/layout/fragment_room_list.xml
+++ b/vector/src/main/res/layout/fragment_room_list.xml
@@ -31,7 +31,7 @@
         android:layout_gravity="bottom|end"
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="16dp"
-        android:accessibilityTraversalBefore="@+id/roomListView"
+        android:accessibilityTraversalBefore="@id/roomListView"
         android:contentDescription="@string/a11y_create_direct_message"
         android:scaleType="center"
         android:src="@drawable/ic_fab_add_chat"
@@ -47,7 +47,7 @@
         android:layout_gravity="bottom|end"
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="16dp"
-        android:accessibilityTraversalBefore="@+id/roomListView"
+        android:accessibilityTraversalBefore="@id/roomListView"
         android:contentDescription="@string/a11y_create_room"
         android:src="@drawable/ic_fab_add_room"
         android:visibility="gone"
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 af9fdf0a8d..264dd83c16 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
@@ -50,7 +50,7 @@
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintHorizontal_bias="0.0"
-                        app:layout_constraintStart_toEndOf="@+id/roomPreviewNoPreviewToolbarAvatar"
+                        app:layout_constraintStart_toEndOf="@id/roomPreviewNoPreviewToolbarAvatar"
                         app:layout_constraintTop_toTopOf="parent"
                         tools:text="@sample/users.json/data/displayName" />
 
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 981bf64a4e..b342a2cbbb 100644
--- a/vector/src/main/res/layout/fragment_room_setting_generic.xml
+++ b/vector/src/main/res/layout/fragment_room_setting_generic.xml
@@ -41,7 +41,7 @@
                     android:id="@+id/roomSettingsDecorationToolbarAvatarImageView"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
-                    app:layout_constraintCircle="@+id/roomSettingsToolbarAvatarImageView"
+                    app:layout_constraintCircle="@id/roomSettingsToolbarAvatarImageView"
                     app:layout_constraintCircleAngle="135"
                     app:layout_constraintCircleRadius="20dp"
                     tools:ignore="MissingConstraints" />
@@ -58,7 +58,7 @@
                     android:textColor="?vctr_content_primary"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toEndOf="@+id/roomSettingsToolbarAvatarImageView"
+                    app:layout_constraintStart_toEndOf="@id/roomSettingsToolbarAvatarImageView"
                     app:layout_constraintTop_toTopOf="parent"
                     tools:text="@sample/rooms.json/data/name" />
 
@@ -75,7 +75,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/appBarLayout">
+        app:layout_constraintTop_toBottomOf="@id/appBarLayout">
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/roomSettingsRecyclerView"
diff --git a/vector/src/main/res/layout/fragment_room_uploads.xml b/vector/src/main/res/layout/fragment_room_uploads.xml
index 50e26ba72b..a38201d79e 100644
--- a/vector/src/main/res/layout/fragment_room_uploads.xml
+++ b/vector/src/main/res/layout/fragment_room_uploads.xml
@@ -39,7 +39,7 @@
                     android:id="@+id/roomUploadsDecorationToolbarAvatarImageView"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
-                    app:layout_constraintCircle="@+id/roomUploadsToolbarAvatarImageView"
+                    app:layout_constraintCircle="@id/roomUploadsToolbarAvatarImageView"
                     app:layout_constraintCircleAngle="135"
                     app:layout_constraintCircleRadius="20dp"
                     tools:ignore="MissingConstraints" />
@@ -56,7 +56,7 @@
                     android:textColor="?vctr_content_primary"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toEndOf="@+id/roomUploadsToolbarAvatarImageView"
+                    app:layout_constraintStart_toEndOf="@id/roomUploadsToolbarAvatarImageView"
                     app:layout_constraintTop_toTopOf="parent"
                     tools:text="@sample/rooms.json/data/name" />
 
@@ -68,7 +68,7 @@
             android:id="@+id/roomUploadsTabs"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:layout_constraintTop_toBottomOf="@+id/roomUploadsToolbarAvatarImageView"
+            app:layout_constraintTop_toBottomOf="@id/roomUploadsToolbarAvatarImageView"
             app:tabGravity="fill"
             app:tabMaxWidth="0dp"
             app:tabMode="fixed" />
diff --git a/vector/src/main/res/layout/fragment_room_widget.xml b/vector/src/main/res/layout/fragment_room_widget.xml
index 7c464caf4c..abd85fff4d 100644
--- a/vector/src/main/res/layout/fragment_room_widget.xml
+++ b/vector/src/main/res/layout/fragment_room_widget.xml
@@ -2,8 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:layout_height="match_parent">
 
     <WebView
         android:id="@+id/widgetWebView"
diff --git a/vector/src/main/res/layout/fragment_space_add_rooms.xml b/vector/src/main/res/layout/fragment_space_add_rooms.xml
index 4a761532e6..e622a7b4d9 100644
--- a/vector/src/main/res/layout/fragment_space_add_rooms.xml
+++ b/vector/src/main/res/layout/fragment_space_add_rooms.xml
@@ -61,7 +61,6 @@
 
         </com.google.android.material.appbar.MaterialToolbar>
 
-
         <androidx.appcompat.widget.SearchView
             android:id="@+id/publicRoomsFilter"
             android:layout_width="match_parent"
@@ -70,7 +69,7 @@
             android:layout_marginBottom="8dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/addRoomToSpaceToolbar"
+            app:layout_constraintTop_toBottomOf="@id/addRoomToSpaceToolbar"
             app:queryHint="@string/search_hint_room_name" />
 
         <Button
@@ -87,7 +86,7 @@
             app:iconPadding="13dp"
             app:iconTint="?colorPrimary"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/addRoomToSpaceToolbar"
+            app:layout_constraintTop_toBottomOf="@id/addRoomToSpaceToolbar"
             tools:ignore="MissingPrefix" />
 
     </com.google.android.material.appbar.AppBarLayout>
diff --git a/vector/src/main/res/layout/fragment_space_directory.xml b/vector/src/main/res/layout/fragment_space_directory.xml
index 3d5932df4a..beb18e559a 100644
--- a/vector/src/main/res/layout/fragment_space_directory.xml
+++ b/vector/src/main/res/layout/fragment_space_directory.xml
@@ -20,7 +20,7 @@
             app:scrimAnimationDuration="250"
             app:scrimVisibleHeightTrigger="120dp"
             app:titleEnabled="false"
-            app:toolbarId="@+id/toolbar">
+            app:toolbarId="@id/toolbar">
 
             <FrameLayout
                 android:layout_width="match_parent"
@@ -43,7 +43,6 @@
 
     </com.google.android.material.appbar.AppBarLayout>
 
-
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/spaceDirectoryList"
         android:layout_width="match_parent"
diff --git a/vector/src/main/res/layout/fragment_space_leave_advanced.xml b/vector/src/main/res/layout/fragment_space_leave_advanced.xml
index 4985ca5aeb..137ba8262d 100644
--- a/vector/src/main/res/layout/fragment_space_leave_advanced.xml
+++ b/vector/src/main/res/layout/fragment_space_leave_advanced.xml
@@ -50,7 +50,6 @@
 
         </com.google.android.material.appbar.MaterialToolbar>
 
-
         <androidx.appcompat.widget.SearchView
             android:id="@+id/publicRoomsFilter"
             android:layout_width="match_parent"
@@ -59,7 +58,7 @@
             android:layout_marginBottom="8dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/addRoomToSpaceToolbar"
+            app:layout_constraintTop_toBottomOf="@id/addRoomToSpaceToolbar"
             app:queryHint="@string/search_hint_room_name" />
 
     </com.google.android.material.appbar.AppBarLayout>
diff --git a/vector/src/main/res/layout/fragment_space_preview.xml b/vector/src/main/res/layout/fragment_space_preview.xml
index 86d514b2f8..117464fc1d 100644
--- a/vector/src/main/res/layout/fragment_space_preview.xml
+++ b/vector/src/main/res/layout/fragment_space_preview.xml
@@ -52,7 +52,7 @@
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintHorizontal_bias="0.0"
-                        app:layout_constraintStart_toEndOf="@+id/spacePreviewToolbarAvatar"
+                        app:layout_constraintStart_toEndOf="@id/spacePreviewToolbarAvatar"
                         app:layout_constraintTop_toTopOf="parent"
                         tools:text="@sample/users.json/data/displayName" />
 
@@ -82,7 +82,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/spacePreviewPeekingProgress"
+            app:layout_constraintTop_toBottomOf="@id/spacePreviewPeekingProgress"
             tools:listitem="@layout/item_space_subspace" />
 
         <View
diff --git a/vector/src/main/res/layout/fragment_space_restricted_select.xml b/vector/src/main/res/layout/fragment_space_restricted_select.xml
index d2cdcccfba..1f60e6851d 100644
--- a/vector/src/main/res/layout/fragment_space_restricted_select.xml
+++ b/vector/src/main/res/layout/fragment_space_restricted_select.xml
@@ -20,7 +20,7 @@
             app:scrimAnimationDuration="250"
             app:scrimVisibleHeightTrigger="120dp"
             app:titleEnabled="false"
-            app:toolbarId="@+id/toolbar">
+            app:toolbarId="@id/toolbar">
 
             <com.google.android.material.appbar.MaterialToolbar
                 android:layout_width="match_parent"
@@ -49,7 +49,6 @@
 
             </com.google.android.material.appbar.MaterialToolbar>
 
-
             <!--            <com.google.android.material.appbar.MaterialToolbar-->
             <!--                android:id="@+id/toolbar"-->
             <!--                android:layout_width="match_parent"-->
@@ -63,7 +62,6 @@
             <!--                android:layout_height="wrap_content"-->
             <!--                android:text="@string/decide_which_spaces_can_access" />-->
 
-
         </com.google.android.material.appbar.CollapsingToolbarLayout>
 
         <androidx.appcompat.widget.SearchView
@@ -75,7 +73,6 @@
             app:queryHint="@string/search_hint_room_name" />
     </com.google.android.material.appbar.AppBarLayout>
 
-
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerView"
         android:layout_width="match_parent"
@@ -102,5 +99,4 @@
             android:text="@string/ok" />
     </LinearLayout>
 
-
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/fragment_ssss_access_from_key.xml b/vector/src/main/res/layout/fragment_ssss_access_from_key.xml
index 0b015f65f9..ea6edc6590 100644
--- a/vector/src/main/res/layout/fragment_ssss_access_from_key.xml
+++ b/vector/src/main/res/layout/fragment_ssss_access_from_key.xml
@@ -17,9 +17,9 @@
             android:layout_marginStart="16dp"
             android:importantForAccessibility="no"
             android:src="@drawable/ic_security_key_24dp"
-            app:layout_constraintBottom_toBottomOf="@+id/ssss_restore_with_key"
+            app:layout_constraintBottom_toBottomOf="@id/ssss_restore_with_key"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/ssss_restore_with_key"
+            app:layout_constraintTop_toTopOf="@id/ssss_restore_with_key"
             app:tint="?vctr_content_primary"
             tools:ignore="MissingPrefix" />
 
@@ -38,7 +38,6 @@
             app:layout_constraintStart_toEndOf="@id/ssss_shield"
             app:layout_constraintTop_toTopOf="parent" />
 
-
         <TextView
             android:id="@+id/ssss_restore_with_key_text"
             style="@style/Widget.Vector.TextView.Subtitle"
@@ -51,7 +50,6 @@
             app:layout_constraintTop_toBottomOf="@id/ssss_restore_with_key"
             tools:text="@string/enter_secret_storage_input_key" />
 
-
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/ssss_key_enter_til"
             android:layout_width="0dp"
@@ -78,7 +76,6 @@
 
         <!--        -->
 
-
         <Button
             android:id="@+id/ssss_key_use_file"
             style="@style/Widget.Vector.Button.Text"
@@ -105,11 +102,10 @@
             app:constraint_referenced_ids="ssss_key_use_file,ssss_key_submit"
             app:flow_horizontalStyle="spread_inside"
             app:flow_wrapMode="chain"
-            app:layout_constraintBottom_toTopOf="@+id/ssss_key_reset"
-            app:layout_constraintTop_toBottomOf="@+id/ssss_key_enter_til"
+            app:layout_constraintBottom_toTopOf="@id/ssss_key_reset"
+            app:layout_constraintTop_toBottomOf="@id/ssss_key_enter_til"
             app:layout_goneMarginBottom="@dimen/layout_vertical_margin_big" />
 
-
         <im.vector.app.core.ui.views.BottomSheetActionButton
             android:id="@+id/ssss_key_reset"
             android:layout_width="match_parent"
@@ -123,6 +119,5 @@
             app:tint="?colorError"
             app:titleTextColor="?vctr_content_secondary" />
 
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml b/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
index cf7a5f695f..74ee7cb9d5 100644
--- a/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
+++ b/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
@@ -19,9 +19,9 @@
             android:layout_marginStart="@dimen/layout_horizontal_margin"
             android:importantForAccessibility="no"
             android:src="@drawable/ic_security_phrase_24dp"
-            app:layout_constraintBottom_toBottomOf="@+id/ssss_restore_with_passphrase"
+            app:layout_constraintBottom_toBottomOf="@id/ssss_restore_with_passphrase"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/ssss_restore_with_passphrase"
+            app:layout_constraintTop_toTopOf="@id/ssss_restore_with_passphrase"
             app:tint="?vctr_content_primary"
             tools:ignore="MissingPrefix" />
 
@@ -84,7 +84,7 @@
             android:layout_marginEnd="@dimen/layout_horizontal_margin"
             android:text="@string/_continue"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/ssss_passphrase_enter_til" />
+            app:layout_constraintTop_toBottomOf="@id/ssss_passphrase_enter_til" />
 
         <TextView
             android:id="@+id/ssss_passphrase_or"
@@ -96,7 +96,7 @@
             android:textColor="?vctr_content_primary"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/ssss_passphrase_submit" />
+            app:layout_constraintTop_toBottomOf="@id/ssss_passphrase_submit" />
 
         <Button
             android:id="@+id/ssss_passphrase_use_key"
@@ -106,10 +106,10 @@
             android:layout_marginTop="16dp"
             android:text="@string/use_recovery_key"
             app:icon="@drawable/ic_security_key_24dp"
-            app:layout_constraintBottom_toTopOf="@+id/ssss_passphrase_reset"
+            app:layout_constraintBottom_toTopOf="@id/ssss_passphrase_reset"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/ssss_passphrase_or"
+            app:layout_constraintTop_toBottomOf="@id/ssss_passphrase_or"
             tools:ignore="MissingPrefix" />
 
         <im.vector.app.core.ui.views.BottomSheetActionButton
diff --git a/vector/src/main/res/layout/fragment_ssss_reset_all.xml b/vector/src/main/res/layout/fragment_ssss_reset_all.xml
index e46517e20b..f9baea52c0 100644
--- a/vector/src/main/res/layout/fragment_ssss_reset_all.xml
+++ b/vector/src/main/res/layout/fragment_ssss_reset_all.xml
@@ -42,7 +42,6 @@
             app:layout_constraintBottom_toTopOf="@id/ssss_reset_other_devices"
             app:layout_constraintTop_toBottomOf="@id/reset_title" />
 
-
         <TextView
             android:id="@+id/ssss_reset_other_devices"
             style="@style/Widget.Vector.TextView.Subtitle"
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 1810a37a24..a19f426abd 100644
--- a/vector/src/main/res/layout/fragment_user_code_show.xml
+++ b/vector/src/main/res/layout/fragment_user_code_show.xml
@@ -53,7 +53,7 @@
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintHorizontal_bias="0.0"
-                        app:layout_constraintStart_toEndOf="@+id/showUserCodeClose"
+                        app:layout_constraintStart_toEndOf="@id/showUserCodeClose"
                         app:layout_constraintTop_toTopOf="parent" />
 
                 </androidx.constraintlayout.widget.ConstraintLayout>
@@ -62,7 +62,6 @@
 
         </com.google.android.material.appbar.AppBarLayout>
 
-
         <com.google.android.material.card.MaterialCardView
             android:id="@+id/showUserCodeCard"
             android:layout_width="0dp"
@@ -73,7 +72,7 @@
             app:cardCornerRadius="8dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/appBarLayout"
+            app:layout_constraintTop_toBottomOf="@id/appBarLayout"
             app:layout_constraintWidth_percent="0.8">
 
             <androidx.constraintlayout.widget.ConstraintLayout
@@ -110,7 +109,6 @@
                     app:layout_constraintTop_toBottomOf="@id/showUserCodeCardNameText"
                     tools:text="@sample/users.json/data/id" />
 
-
                 <!--                android:id="@+id/itemShareQrCodeImage"-->
                 <!--                android:layout_width="300dp"-->
                 <!--                android:layout_height="300dp"-->
diff --git a/vector/src/main/res/layout/fragment_user_directory.xml b/vector/src/main/res/layout/fragment_user_directory.xml
index 1fced84471..039f04f8e4 100644
--- a/vector/src/main/res/layout/fragment_user_directory.xml
+++ b/vector/src/main/res/layout/fragment_user_directory.xml
@@ -56,7 +56,7 @@
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintHorizontal_bias="0.0"
-                        app:layout_constraintStart_toEndOf="@+id/userDirectoryClose"
+                        app:layout_constraintStart_toEndOf="@id/userDirectoryClose"
                         app:layout_constraintTop_toTopOf="parent" />
 
                 </androidx.constraintlayout.widget.ConstraintLayout>
@@ -73,7 +73,7 @@
                 android:layout_marginBottom="16dp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/appBarLayout">
+                app:layout_constraintTop_toBottomOf="@id/appBarLayout">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/userDirectorySearchById"
@@ -95,7 +95,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/appBarLayout"
+            app:layout_constraintTop_toBottomOf="@id/appBarLayout"
             tools:listitem="@layout/item_known_user" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/fragment_user_list.xml b/vector/src/main/res/layout/fragment_user_list.xml
index 36e62d2b31..ef5c6a7e6a 100644
--- a/vector/src/main/res/layout/fragment_user_list.xml
+++ b/vector/src/main/res/layout/fragment_user_list.xml
@@ -51,7 +51,7 @@
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintHorizontal_bias="0.0"
-                    app:layout_constraintStart_toEndOf="@+id/userListClose"
+                    app:layout_constraintStart_toEndOf="@id/userListClose"
                     app:layout_constraintTop_toTopOf="parent" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
@@ -69,7 +69,7 @@
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/appBarLayout"
+        app:layout_constraintTop_toBottomOf="@id/appBarLayout"
         app:maxHeight="64dp">
 
         <com.google.android.material.chip.ChipGroup
@@ -97,7 +97,7 @@
         android:paddingBottom="16dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/chipGroupScrollView" />
+        app:layout_constraintTop_toBottomOf="@id/chipGroupScrollView" />
 
     <View
         android:id="@+id/userListFilterDivider"
@@ -106,8 +106,7 @@
         android:background="?vctr_list_separator"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/userListSearch" />
-
+        app:layout_constraintTop_toBottomOf="@id/userListSearch" />
 
     <TextView
         android:id="@+id/userListE2EbyDefaultDisabled"
@@ -133,7 +132,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/userListE2EbyDefaultDisabled"
+        app:layout_constraintTop_toBottomOf="@id/userListE2EbyDefaultDisabled"
         tools:listitem="@layout/item_known_user" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_autocomplete_command.xml b/vector/src/main/res/layout/item_autocomplete_command.xml
index 1da92a5796..d519a50fdd 100644
--- a/vector/src/main/res/layout/item_autocomplete_command.xml
+++ b/vector/src/main/res/layout/item_autocomplete_command.xml
@@ -28,7 +28,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_marginStart="5dp"
-        android:layout_toEndOf="@+id/commandName"
+        android:layout_toEndOf="@id/commandName"
         android:maxLines="1"
         android:textColor="?vctr_content_secondary"
         android:textStyle="italic"
@@ -39,7 +39,7 @@
         style="@style/Widget.Vector.TextView.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/commandName"
+        android:layout_below="@id/commandName"
         android:layout_alignParentStart="true"
         android:layout_gravity="center_vertical"
         android:maxLines="2"
diff --git a/vector/src/main/res/layout/item_bottom_sheet_action.xml b/vector/src/main/res/layout/item_bottom_sheet_action.xml
index 483700c41f..d23dc5e1d8 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_action.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_action.xml
@@ -34,8 +34,8 @@
         android:importantForAccessibility="no"
         android:scaleType="center"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/actionTitleContainer"
-        app:layout_constraintStart_toEndOf="@+id/actionStartSpace"
+        app:layout_constraintEnd_toStartOf="@id/actionTitleContainer"
+        app:layout_constraintStart_toEndOf="@id/actionStartSpace"
         app:layout_constraintTop_toTopOf="parent"
         app:tint="?vctr_content_secondary"
         tools:ignore="MissingPrefix"
@@ -47,7 +47,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/actionSelected"
+        app:layout_constraintEnd_toStartOf="@id/actionSelected"
         app:layout_constraintStart_toEndOf="@id/actionIcon"
         app:layout_constraintTop_toTopOf="parent">
 
diff --git a/vector/src/main/res/layout/item_bottom_sheet_joinrule_restricted.xml b/vector/src/main/res/layout/item_bottom_sheet_joinrule_restricted.xml
index 6e72813981..0db6043a7b 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_joinrule_restricted.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_joinrule_restricted.xml
@@ -92,7 +92,6 @@
     <!--        tools:listitem="@layout/item_space_simple"-->
     <!--        tools:orientation="horizontal" />-->
 
-
     <ImageView
         android:id="@+id/rest1"
         android:layout_width="42dp"
@@ -157,7 +156,6 @@
         app:tint="?vctr_content_secondary"
         tools:ignore="MissingConstraints" />
 
-
     <androidx.constraintlayout.helper.widget.Flow
         android:id="@+id/spacesFlow"
         android:layout_width="0dp"
diff --git a/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml b/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
index 3e2c775643..a86c0defc4 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
@@ -34,7 +34,7 @@
         android:singleLine="true"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
-        app:layout_constraintEnd_toStartOf="@+id/bottom_sheet_message_preview_timestamp"
+        app:layout_constraintEnd_toStartOf="@id/bottom_sheet_message_preview_timestamp"
         app:layout_constraintStart_toEndOf="@id/bottom_sheet_message_preview_avatar"
         app:layout_constraintTop_toTopOf="@id/bottom_sheet_message_preview_avatar"
         tools:fontFamily="sans-serif"
@@ -59,7 +59,7 @@
         android:importantForAccessibility="no"
         android:scaleType="centerCrop"
         android:visibility="gone"
-        app:layout_constraintStart_toStartOf="@+id/bottom_sheet_message_preview_sender"
+        app:layout_constraintStart_toStartOf="@id/bottom_sheet_message_preview_sender"
         app:layout_constraintTop_toBottomOf="@id/bottom_sheet_message_preview_sender"
         tools:ignore="MissingPrefix"
         tools:src="@tools:sample/backgrounds/scenic"
@@ -77,7 +77,7 @@
         android:maxLines="3"
         android:textColor="?vctr_content_secondary"
         android:textIsSelectable="false"
-        app:layout_constraintBottom_toTopOf="@+id/bottom_sheet_message_preview_body_details"
+        app:layout_constraintBottom_toTopOf="@id/bottom_sheet_message_preview_body_details"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/bottom_sheet_message_preview_avatar"
         app:layout_constraintTop_toBottomOf="@id/bottom_sheet_message_preview_image"
diff --git a/vector/src/main/res/layout/item_bottom_sheet_quick_reaction.xml b/vector/src/main/res/layout/item_bottom_sheet_quick_reaction.xml
index db243184e5..869631baa6 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_quick_reaction.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_quick_reaction.xml
@@ -33,7 +33,6 @@
         android:textColor="@color/emoji_black"
         tools:text="😀" />
 
-
     <TextView
         android:id="@+id/quickReaction3"
         style="@style/Widget.Vector.TextView.Title"
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 ca213332b9..d18f573ed7 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
@@ -36,8 +36,8 @@
         android:singleLine="true"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="@+id/bottomSheetRoomPreviewAvatar"
-        app:layout_constraintEnd_toStartOf="@+id/bottomSheetRoomPreviewLowPriority"
+        app:layout_constraintBottom_toBottomOf="@id/bottomSheetRoomPreviewAvatar"
+        app:layout_constraintEnd_toStartOf="@id/bottomSheetRoomPreviewLowPriority"
         app:layout_constraintStart_toEndOf="@id/bottomSheetRoomPreviewAvatar"
         app:layout_constraintTop_toTopOf="@id/bottomSheetRoomPreviewAvatar"
         tools:fontFamily="sans-serif"
@@ -51,8 +51,8 @@
         android:contentDescription="@string/room_list_quick_actions_low_priority_add"
         android:scaleType="centerInside"
         android:src="@drawable/ic_low_priority_24"
-        app:layout_constraintBottom_toBottomOf="@+id/bottomSheetRoomPreviewAvatar"
-        app:layout_constraintEnd_toStartOf="@+id/bottomSheetRoomPreviewFavorite"
+        app:layout_constraintBottom_toBottomOf="@id/bottomSheetRoomPreviewAvatar"
+        app:layout_constraintEnd_toStartOf="@id/bottomSheetRoomPreviewFavorite"
         app:layout_constraintTop_toTopOf="@id/bottomSheetRoomPreviewAvatar"
         tools:contentDescription="@string/room_list_quick_actions_low_priority_add"
         tools:tint="?vctr_content_secondary" />
@@ -64,8 +64,8 @@
         android:background="?attr/selectableItemBackground"
         android:contentDescription="@string/room_list_quick_actions_favorite_add"
         android:scaleType="centerInside"
-        app:layout_constraintBottom_toBottomOf="@+id/bottomSheetRoomPreviewAvatar"
-        app:layout_constraintEnd_toStartOf="@+id/bottomSheetRoomPreviewSettings"
+        app:layout_constraintBottom_toBottomOf="@id/bottomSheetRoomPreviewAvatar"
+        app:layout_constraintEnd_toStartOf="@id/bottomSheetRoomPreviewSettings"
         app:layout_constraintTop_toTopOf="@id/bottomSheetRoomPreviewAvatar"
         tools:src="@drawable/ic_star_24dp"
         tools:tint="?vctr_content_secondary" />
@@ -78,7 +78,7 @@
         android:contentDescription="@string/room_list_quick_actions_settings"
         android:scaleType="centerInside"
         android:src="@drawable/ic_room_actions_settings"
-        app:layout_constraintBottom_toBottomOf="@+id/bottomSheetRoomPreviewAvatar"
+        app:layout_constraintBottom_toBottomOf="@id/bottomSheetRoomPreviewAvatar"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/bottomSheetRoomPreviewAvatar"
         app:tint="?vctr_content_secondary"
diff --git a/vector/src/main/res/layout/item_bottom_sheet_title.xml b/vector/src/main/res/layout/item_bottom_sheet_title.xml
index 4e5b4813f3..516f357ab6 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_title.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_title.xml
@@ -17,7 +17,7 @@
         android:layout_height="wrap_content"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@+id/itemBottomSheetTitleSubtitle"
+        app:layout_constraintBottom_toTopOf="@id/itemBottomSheetTitleSubtitle"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -34,7 +34,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/itemBottomSheetTitleTitle"
+        app:layout_constraintTop_toBottomOf="@id/itemBottomSheetTitleTitle"
         tools:text="@string/room_settings_room_read_history_dialog_subtitle"
         tools:visibility="visible" />
 
diff --git a/vector/src/main/res/layout/item_breadcrumbs.xml b/vector/src/main/res/layout/item_breadcrumbs.xml
index ef7b7a4faf..ab524b87b0 100644
--- a/vector/src/main/res/layout/item_breadcrumbs.xml
+++ b/vector/src/main/res/layout/item_breadcrumbs.xml
@@ -46,7 +46,7 @@
         android:minHeight="18dp"
         android:textColor="?colorOnError"
         android:visibility="gone"
-        app:layout_constraintCircle="@+id/breadcrumbsImageView"
+        app:layout_constraintCircle="@id/breadcrumbsImageView"
         app:layout_constraintCircleAngle="45"
         app:layout_constraintCircleRadius="28dp"
         tools:background="@drawable/bg_unread_highlight"
@@ -66,7 +66,7 @@
         android:textColor="?colorOnPrimary"
         android:textStyle="bold"
         android:visibility="gone"
-        app:layout_constraintCircle="@+id/breadcrumbsImageView"
+        app:layout_constraintCircle="@id/breadcrumbsImageView"
         app:layout_constraintCircleAngle="135"
         app:layout_constraintCircleRadius="28dp"
         tools:ignore="MissingConstraints"
@@ -81,7 +81,7 @@
         android:padding="3dp"
         android:src="@drawable/ic_edit"
         android:visibility="gone"
-        app:layout_constraintCircle="@+id/breadcrumbsImageView"
+        app:layout_constraintCircle="@id/breadcrumbsImageView"
         app:layout_constraintCircleAngle="225"
         app:layout_constraintCircleRadius="28dp"
         tools:ignore="MissingConstraints"
diff --git a/vector/src/main/res/layout/item_checkbox.xml b/vector/src/main/res/layout/item_checkbox.xml
index cf70b00006..c3dcb060c2 100644
--- a/vector/src/main/res/layout/item_checkbox.xml
+++ b/vector/src/main/res/layout/item_checkbox.xml
@@ -10,5 +10,5 @@
     android:layout_marginEnd="@dimen/layout_horizontal_margin"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toBottomOf="@+id/phoneBookFilterContainer"
+    app:layout_constraintTop_toBottomOf="@id/phoneBookFilterContainer"
     tools:text="@string/matrix_only_filter" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_contact_detail.xml b/vector/src/main/res/layout/item_contact_detail.xml
index b98adec5e6..5081651d81 100644
--- a/vector/src/main/res/layout/item_contact_detail.xml
+++ b/vector/src/main/res/layout/item_contact_detail.xml
@@ -38,8 +38,8 @@
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="@+id/contactDetailName"
-        app:layout_constraintTop_toBottomOf="@+id/contactDetailName"
+        app:layout_constraintStart_toStartOf="@id/contactDetailName"
+        app:layout_constraintTop_toBottomOf="@id/contactDetailName"
         tools:text="@sample/users.json/data/id"
         tools:visibility="visible" />
 
diff --git a/vector/src/main/res/layout/item_contact_main.xml b/vector/src/main/res/layout/item_contact_main.xml
index b9f3eaacd9..4b1fe42b84 100644
--- a/vector/src/main/res/layout/item_contact_main.xml
+++ b/vector/src/main/res/layout/item_contact_main.xml
@@ -33,7 +33,7 @@
         android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/contactAvatar"
+        app:layout_constraintStart_toEndOf="@id/contactAvatar"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="@tools:sample/full_names" />
 
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 fb32c809d8..a68fe69d74 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
@@ -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"
@@ -9,7 +7,6 @@
     android:background="?android:colorBackground"
     android:foreground="?attr/selectableItemBackground"
     android:gravity="center_vertical"
-    android:orientation="horizontal"
     android:padding="8dp">
 
     <FrameLayout
@@ -50,10 +47,10 @@
         android:maxLines="1"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@+id/createDirectRoomUserID"
+        app:layout_constraintBottom_toTopOf="@id/createDirectRoomUserID"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/createDirectRoomUserAvatarContainer"
+        app:layout_constraintStart_toEndOf="@id/createDirectRoomUserAvatarContainer"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="@sample/users.json/data/displayName" />
 
@@ -68,8 +65,8 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="@+id/createDirectRoomUserName"
-        app:layout_constraintTop_toBottomOf="@+id/createDirectRoomUserName"
+        app:layout_constraintStart_toStartOf="@id/createDirectRoomUserName"
+        app:layout_constraintTop_toBottomOf="@id/createDirectRoomUserName"
         tools:text="@sample/users.json/data/id" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_discovery_policy.xml b/vector/src/main/res/layout/item_discovery_policy.xml
index 1c03133111..5d8c7159e9 100644
--- a/vector/src/main/res/layout/item_discovery_policy.xml
+++ b/vector/src/main/res/layout/item_discovery_policy.xml
@@ -30,8 +30,8 @@
         android:paddingEnd="8dp"
         android:textColor="?vctr_content_secondary"
         app:layout_constraintEnd_toStartOf="@id/discovery_policy_arrow"
-        app:layout_constraintStart_toStartOf="@+id/discovery_policy_name"
-        app:layout_constraintTop_toBottomOf="@+id/discovery_policy_name"
+        app:layout_constraintStart_toStartOf="@id/discovery_policy_name"
+        app:layout_constraintTop_toBottomOf="@id/discovery_policy_name"
         tools:text="Use bots, bridges, widget and sticker packs." />
 
     <!-- Do not use drawableEnd on the TextView because of RTL support -->
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 6f3498ac59..f473e9c8cc 100644
--- a/vector/src/main/res/layout/item_display_read_receipt.xml
+++ b/vector/src/main/res/layout/item_display_read_receipt.xml
@@ -1,5 +1,4 @@
 <?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"
diff --git a/vector/src/main/res/layout/item_editable_avatar.xml b/vector/src/main/res/layout/item_editable_avatar.xml
index 0eabcf2745..794cb9c9eb 100644
--- a/vector/src/main/res/layout/item_editable_avatar.xml
+++ b/vector/src/main/res/layout/item_editable_avatar.xml
@@ -47,8 +47,8 @@
         android:scaleType="center"
         android:src="@drawable/ic_delete"
         android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="@+id/itemEditableAvatarImageContainer"
-        app:layout_constraintTop_toTopOf="@+id/itemEditableAvatarImageContainer"
+        app:layout_constraintEnd_toEndOf="@id/itemEditableAvatarImageContainer"
+        app:layout_constraintTop_toTopOf="@id/itemEditableAvatarImageContainer"
         app:tint="?colorError"
         tools:ignore="MissingPrefix"
         tools:visibility="visible" />
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 acd48a2465..4c3e4fd81a 100644
--- a/vector/src/main/res/layout/item_editable_square_avatar.xml
+++ b/vector/src/main/res/layout/item_editable_square_avatar.xml
@@ -20,7 +20,6 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-
         <ImageView
             android:id="@+id/itemEditableAvatarImage"
             android:layout_width="match_parent"
@@ -41,14 +40,13 @@
         android:scaleType="center"
         android:src="@drawable/ic_delete"
         android:visibility="gone"
-        app:layout_constraintCircle="@+id/itemEditableAvatarImageContainer"
+        app:layout_constraintCircle="@id/itemEditableAvatarImageContainer"
         app:layout_constraintCircleAngle="45"
         app:layout_constraintCircleRadius="48dp"
         app:tint="?colorError"
         tools:ignore="MissingConstraints,MissingPrefix"
         tools:visibility="visible" />
 
-
     <ImageView
         android:layout_width="32dp"
         android:layout_height="32dp"
@@ -57,11 +55,10 @@
         android:contentDescription="@string/a11y_change_avatar"
         android:padding="8dp"
         android:src="@drawable/ic_camera_plain"
-        app:layout_constraintCircle="@+id/itemEditableAvatarImageContainer"
+        app:layout_constraintCircle="@id/itemEditableAvatarImageContainer"
         app:layout_constraintCircleAngle="135"
         app:layout_constraintCircleRadius="48dp"
         app:tint="?vctr_content_secondary"
         tools:ignore="MissingConstraints,MissingPrefix" />
 
-
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_error_retry.xml b/vector/src/main/res/layout/item_error_retry.xml
index 9648ffc5ef..dc789ec309 100644
--- a/vector/src/main/res/layout/item_error_retry.xml
+++ b/vector/src/main/res/layout/item_error_retry.xml
@@ -25,7 +25,6 @@
         android:text="@string/global_retry"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/itemErrorRetryText" />
-
+        app:layout_constraintTop_toBottomOf="@id/itemErrorRetryText" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_expandable_textview.xml b/vector/src/main/res/layout/item_expandable_textview.xml
index 65a04af425..028b553184 100644
--- a/vector/src/main/res/layout/item_expandable_textview.xml
+++ b/vector/src/main/res/layout/item_expandable_textview.xml
@@ -14,7 +14,7 @@
         android:layout_height="wrap_content"
         android:autoLink="web"
         android:ellipsize="end"
-        app:layout_constraintBottom_toTopOf="@+id/expandableArrow"
+        app:layout_constraintBottom_toTopOf="@id/expandableArrow"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -30,7 +30,7 @@
         android:src="@drawable/ic_expand_more"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/expandableContent"
+        app:layout_constraintTop_toBottomOf="@id/expandableContent"
         app:tint="?vctr_content_secondary"
         tools:ignore="MissingPrefix" />
 
diff --git a/vector/src/main/res/layout/item_form_switch.xml b/vector/src/main/res/layout/item_form_switch.xml
index 93c14acbac..052e56b47c 100644
--- a/vector/src/main/res/layout/item_form_switch.xml
+++ b/vector/src/main/res/layout/item_form_switch.xml
@@ -17,8 +17,8 @@
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
         android:duplicateParentState="true"
         android:textColor="?vctr_content_primary"
-        app:layout_constraintBottom_toTopOf="@+id/formSwitchSummary"
-        app:layout_constraintEnd_toStartOf="@+id/formSwitchSwitch"
+        app:layout_constraintBottom_toTopOf="@id/formSwitchSummary"
+        app:layout_constraintEnd_toStartOf="@id/formSwitchSwitch"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed"
@@ -32,9 +32,9 @@
         android:layout_marginEnd="8dp"
         android:textColor="?vctr_content_secondary"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/formSwitchSwitch"
-        app:layout_constraintStart_toStartOf="@+id/formSwitchTitle"
-        app:layout_constraintTop_toBottomOf="@+id/formSwitchTitle"
+        app:layout_constraintEnd_toStartOf="@id/formSwitchSwitch"
+        app:layout_constraintStart_toStartOf="@id/formSwitchTitle"
+        app:layout_constraintTop_toBottomOf="@id/formSwitchTitle"
         tools:text="@string/create_room_public_description" />
 
     <com.google.android.material.switchmaterial.SwitchMaterial
diff --git a/vector/src/main/res/layout/item_generic_empty_state.xml b/vector/src/main/res/layout/item_generic_empty_state.xml
index 932f5666c6..5a489ebd11 100644
--- a/vector/src/main/res/layout/item_generic_empty_state.xml
+++ b/vector/src/main/res/layout/item_generic_empty_state.xml
@@ -50,10 +50,10 @@
         android:maxWidth="300dp"
         android:maxLines="10"
         android:textColor="?vctr_content_secondary"
-        app:layout_constraintBottom_toTopOf="@+id/emptyItemButton"
+        app:layout_constraintBottom_toTopOf="@id/emptyItemButton"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/emptyItemTitleView"
+        app:layout_constraintTop_toBottomOf="@id/emptyItemTitleView"
         tools:text="@string/this_space_has_no_rooms_admin" />
 
     <Button
diff --git a/vector/src/main/res/layout/item_generic_list.xml b/vector/src/main/res/layout/item_generic_list.xml
index a23d4e30a7..c11e65e575 100644
--- a/vector/src/main/res/layout/item_generic_list.xml
+++ b/vector/src/main/res/layout/item_generic_list.xml
@@ -35,8 +35,8 @@
         android:textStyle="bold"
         android:visibility="gone"
         app:layout_constrainedWidth="true"
-        app:layout_constraintBottom_toTopOf="@+id/item_generic_description_text"
-        app:layout_constraintEnd_toStartOf="@+id/item_generic_barrier"
+        app:layout_constraintBottom_toTopOf="@id/item_generic_description_text"
+        app:layout_constraintEnd_toStartOf="@id/item_generic_barrier"
         app:layout_constraintHorizontal_bias="0"
         app:layout_constraintStart_toEndOf="@id/item_generic_title_image"
         app:layout_constraintTop_toTopOf="parent"
@@ -57,9 +57,9 @@
         android:textColor="?vctr_content_secondary"
         android:visibility="gone"
         app:layout_constraintBottom_toTopOf="@id/item_generic_action_button"
-        app:layout_constraintEnd_toStartOf="@+id/item_generic_barrier"
+        app:layout_constraintEnd_toStartOf="@id/item_generic_barrier"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/item_generic_title_text"
+        app:layout_constraintTop_toBottomOf="@id/item_generic_title_text"
         tools:maxLines="3"
         tools:text="@tools:sample/lorem/random"
         tools:visibility="visible" />
@@ -79,9 +79,9 @@
         android:layout_margin="16dp"
         android:importantForAccessibility="no"
         android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="@+id/item_generic_description_text"
+        app:layout_constraintBottom_toBottomOf="@id/item_generic_description_text"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/item_generic_title_text"
+        app:layout_constraintTop_toTopOf="@id/item_generic_title_text"
         tools:srcCompat="@drawable/e2e_warning"
         tools:visibility="visible" />
 
@@ -92,9 +92,9 @@
         android:layout_height="20dp"
         android:layout_margin="16dp"
         android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="@+id/item_generic_description_text"
+        app:layout_constraintBottom_toBottomOf="@id/item_generic_description_text"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/item_generic_title_text"
+        app:layout_constraintTop_toTopOf="@id/item_generic_title_text"
         tools:visibility="visible" />
 
     <!-- Set a max width because the text can be long -->
@@ -107,9 +107,9 @@
         android:layout_marginBottom="16dp"
         android:maxWidth="@dimen/button_max_width"
         android:visibility="gone"
-        app:layout_constraintBottom_toTopOf="@+id/item_generic_destructive_action_button"
-        app:layout_constraintEnd_toStartOf="@+id/item_generic_barrier"
-        app:layout_constraintTop_toBottomOf="@+id/item_generic_description_text"
+        app:layout_constraintBottom_toTopOf="@id/item_generic_destructive_action_button"
+        app:layout_constraintEnd_toStartOf="@id/item_generic_barrier"
+        app:layout_constraintTop_toBottomOf="@id/item_generic_description_text"
         tools:text="@string/settings_troubleshoot_test_device_settings_quickfix"
         tools:visibility="visible" />
 
@@ -124,8 +124,8 @@
         android:maxWidth="@dimen/button_max_width"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/item_generic_barrier"
-        app:layout_constraintTop_toBottomOf="@+id/item_generic_action_button"
+        app:layout_constraintEnd_toStartOf="@id/item_generic_barrier"
+        app:layout_constraintTop_toBottomOf="@id/item_generic_action_button"
         tools:text="@string/delete"
         tools:visibility="visible" />
 
diff --git a/vector/src/main/res/layout/item_generic_with_value.xml b/vector/src/main/res/layout/item_generic_with_value.xml
index feb5ca788e..687c7b6790 100644
--- a/vector/src/main/res/layout/item_generic_with_value.xml
+++ b/vector/src/main/res/layout/item_generic_with_value.xml
@@ -28,7 +28,6 @@
         android:textColor="?vctr_content_primary"
         tools:text="Label" />
 
-
     <TextView
         android:id="@+id/itemGenericWithValueValueText"
         style="@style/Widget.Vector.TextView.Subtitle"
diff --git a/vector/src/main/res/layout/item_group.xml b/vector/src/main/res/layout/item_group.xml
index 668d56ba66..1766503453 100644
--- a/vector/src/main/res/layout/item_group.xml
+++ b/vector/src/main/res/layout/item_group.xml
@@ -18,7 +18,7 @@
         android:layout_marginStart="@dimen/layout_horizontal_margin"
         android:importantForAccessibility="no"
         android:duplicateParentState="true"
-        app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
+        app:layout_constraintBottom_toTopOf="@id/groupBottomSeparator"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:src="@sample/room_round_avatars" />
@@ -34,9 +34,9 @@
         android:maxLines="1"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
-        app:layout_constraintEnd_toStartOf="@+id/groupAvatarChevron"
-        app:layout_constraintStart_toEndOf="@+id/groupAvatarImageView"
+        app:layout_constraintBottom_toTopOf="@id/groupBottomSeparator"
+        app:layout_constraintEnd_toStartOf="@id/groupAvatarChevron"
+        app:layout_constraintStart_toEndOf="@id/groupAvatarImageView"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="@tools:sample/lorem/random" />
 
@@ -47,7 +47,7 @@
         android:layout_marginEnd="21dp"
         android:importantForAccessibility="no"
         android:src="@drawable/ic_arrow_right"
-        app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
+        app:layout_constraintBottom_toTopOf="@id/groupBottomSeparator"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:tint="?vctr_content_primary"
diff --git a/vector/src/main/res/layout/item_help_footer.xml b/vector/src/main/res/layout/item_help_footer.xml
index bde4f0a4ce..83a782f76e 100644
--- a/vector/src/main/res/layout/item_help_footer.xml
+++ b/vector/src/main/res/layout/item_help_footer.xml
@@ -14,7 +14,7 @@
         android:importantForAccessibility="no"
         android:src="@drawable/ic_idea"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/itemHelpText"
+        app:layout_constraintEnd_toStartOf="@id/itemHelpText"
         app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -32,7 +32,7 @@
         android:textColor="?vctr_content_secondary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/itemHelpPicto"
+        app:layout_constraintStart_toEndOf="@id/itemHelpPicto"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="@string/help_long_click_on_room_for_more_options" />
 
diff --git a/vector/src/main/res/layout/item_invite_by_mail.xml b/vector/src/main/res/layout/item_invite_by_mail.xml
index 1cd9e105cc..4cdc7ca3ad 100644
--- a/vector/src/main/res/layout/item_invite_by_mail.xml
+++ b/vector/src/main/res/layout/item_invite_by_mail.xml
@@ -7,7 +7,6 @@
     android:background="?android:colorBackground"
     android:foreground="?attr/selectableItemBackground"
     android:gravity="center_vertical"
-    android:orientation="horizontal"
     android:padding="8dp">
 
     <FrameLayout
@@ -53,10 +52,10 @@
         android:maxLines="1"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@+id/itemDescription"
+        app:layout_constraintBottom_toTopOf="@id/itemDescription"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/iconContainer"
+        app:layout_constraintStart_toEndOf="@id/iconContainer"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="foo@example.com" />
 
@@ -72,7 +71,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="@+id/itemTitle"
-        app:layout_constraintTop_toBottomOf="@+id/itemTitle" />
+        app:layout_constraintStart_toStartOf="@id/itemTitle"
+        app:layout_constraintTop_toBottomOf="@id/itemTitle" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_known_user.xml b/vector/src/main/res/layout/item_known_user.xml
index 7494356bb1..e513039df8 100644
--- a/vector/src/main/res/layout/item_known_user.xml
+++ b/vector/src/main/res/layout/item_known_user.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"
@@ -49,10 +47,10 @@
         android:maxLines="1"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@+id/knownUserID"
+        app:layout_constraintBottom_toTopOf="@id/knownUserID"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/knownUserAvatarContainer"
+        app:layout_constraintStart_toEndOf="@id/knownUserAvatarContainer"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="@sample/users.json/data/displayName" />
 
@@ -67,8 +65,8 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="@+id/knownUserName"
-        app:layout_constraintTop_toBottomOf="@+id/knownUserName"
+        app:layout_constraintStart_toStartOf="@id/knownUserName"
+        app:layout_constraintTop_toBottomOf="@id/knownUserName"
         tools:text="@sample/users.json/data/id" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_locale.xml b/vector/src/main/res/layout/item_locale.xml
index c6c7bfa09d..96fb530c92 100644
--- a/vector/src/main/res/layout/item_locale.xml
+++ b/vector/src/main/res/layout/item_locale.xml
@@ -15,7 +15,7 @@
         android:paddingStart="@dimen/layout_horizontal_margin"
         android:paddingEnd="@dimen/layout_horizontal_margin"
         android:textColor="?vctr_content_primary"
-        app:layout_constraintBottom_toTopOf="@+id/localeSubtitle"
+        app:layout_constraintBottom_toTopOf="@id/localeSubtitle"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -34,7 +34,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/localeTitle"
+        app:layout_constraintTop_toBottomOf="@id/localeTitle"
         tools:text="details"
         tools:visibility="visible" />
 
diff --git a/vector/src/main/res/layout/item_login_error_retry.xml b/vector/src/main/res/layout/item_login_error_retry.xml
index 0f0e5a1556..29948be03a 100644
--- a/vector/src/main/res/layout/item_login_error_retry.xml
+++ b/vector/src/main/res/layout/item_login_error_retry.xml
@@ -30,7 +30,6 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/itemLoginErrorRetryText" />
-
+        app:layout_constraintTop_toBottomOf="@id/itemLoginErrorRetryText" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_notification_troubleshoot.xml b/vector/src/main/res/layout/item_notification_troubleshoot.xml
index 1ec347f685..3c608aeb1d 100644
--- a/vector/src/main/res/layout/item_notification_troubleshoot.xml
+++ b/vector/src/main/res/layout/item_notification_troubleshoot.xml
@@ -7,7 +7,6 @@
     android:background="?android:attr/colorBackground"
     android:minHeight="50dp">
 
-
     <ImageView
         android:id="@+id/troubleshootStatusIcon"
         android:layout_width="20dp"
@@ -30,8 +29,8 @@
         android:paddingBottom="4dp"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@+id/troubleshootTestDescription"
-        app:layout_constraintEnd_toStartOf="@+id/troubleshootStatusIcon"
+        app:layout_constraintBottom_toTopOf="@id/troubleshootTestDescription"
+        app:layout_constraintEnd_toStartOf="@id/troubleshootStatusIcon"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintHorizontal_chainStyle="spread"
         app:layout_constraintStart_toStartOf="parent"
@@ -51,10 +50,10 @@
         android:textColor="?vctr_content_secondary"
         android:visibility="gone"
         app:layout_constraintBottom_toTopOf="@id/troubleshootTestButton"
-        app:layout_constraintEnd_toStartOf="@+id/troubleshootStatusIcon"
+        app:layout_constraintEnd_toStartOf="@id/troubleshootStatusIcon"
         app:layout_constraintHorizontal_bias="0"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/troubleshootTestTitle"
+        app:layout_constraintTop_toBottomOf="@id/troubleshootTestTitle"
         tools:text="@string/settings_troubleshoot_test_device_settings_failed"
         tools:visibility="visible" />
 
@@ -68,10 +67,10 @@
         android:padding="8dp"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/troubleshootProgressBar"
+        app:layout_constraintEnd_toStartOf="@id/troubleshootProgressBar"
         app:layout_constraintHorizontal_bias="1.0"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/troubleshootTestDescription"
+        app:layout_constraintTop_toBottomOf="@id/troubleshootTestDescription"
         tools:text="@string/settings_troubleshoot_test_device_settings_quickfix"
         tools:visibility="visible" />
 
@@ -83,7 +82,7 @@
         android:layout_margin="16dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/troubleshootTestTitle"
+        app:layout_constraintStart_toEndOf="@id/troubleshootTestTitle"
         app:layout_constraintTop_toTopOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_policy.xml b/vector/src/main/res/layout/item_policy.xml
index a22211711f..2306412d8d 100644
--- a/vector/src/main/res/layout/item_policy.xml
+++ b/vector/src/main/res/layout/item_policy.xml
@@ -24,9 +24,9 @@
         android:layout_height="wrap_content"
         android:drawablePadding="8dp"
         android:textColor="?vctr_content_primary"
-        app:layout_constraintBottom_toTopOf="@+id/adapter_item_policy_subtitle"
-        app:layout_constraintEnd_toStartOf="@+id/adapter_item_policy_arrow"
-        app:layout_constraintStart_toEndOf="@+id/adapter_item_policy_checkbox"
+        app:layout_constraintBottom_toTopOf="@id/adapter_item_policy_subtitle"
+        app:layout_constraintEnd_toStartOf="@id/adapter_item_policy_arrow"
+        app:layout_constraintStart_toEndOf="@id/adapter_item_policy_checkbox"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed"
         tools:text="Policy title" />
@@ -40,9 +40,9 @@
         android:drawablePadding="8dp"
         android:textColor="?vctr_content_secondary"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/adapter_item_policy_arrow"
-        app:layout_constraintStart_toEndOf="@+id/adapter_item_policy_checkbox"
-        app:layout_constraintTop_toBottomOf="@+id/adapter_item_policy_title"
+        app:layout_constraintEnd_toStartOf="@id/adapter_item_policy_arrow"
+        app:layout_constraintStart_toEndOf="@id/adapter_item_policy_checkbox"
+        app:layout_constraintTop_toBottomOf="@id/adapter_item_policy_title"
         tools:text="matrix.org" />
 
     <!-- Do not use drawableEnd on the TextView because of RTL support -->
diff --git a/vector/src/main/res/layout/item_profile_action.xml b/vector/src/main/res/layout/item_profile_action.xml
index 72ef166d02..85d7ac8427 100644
--- a/vector/src/main/res/layout/item_profile_action.xml
+++ b/vector/src/main/res/layout/item_profile_action.xml
@@ -40,8 +40,8 @@
         android:maxLines="2"
         android:textColor="?vctr_content_primary"
         app:layout_constrainedWidth="true"
-        app:layout_constraintBottom_toTopOf="@+id/actionSubtitle"
-        app:layout_constraintEnd_toStartOf="@+id/actionEditable"
+        app:layout_constraintBottom_toTopOf="@id/actionSubtitle"
+        app:layout_constraintEnd_toStartOf="@id/actionEditable"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toEndOf="@id/actionIcon"
         app:layout_constraintTop_toTopOf="parent"
@@ -60,7 +60,7 @@
         android:textColor="?vctr_content_secondary"
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/actionSecondaryAccessory"
+        app:layout_constraintEnd_toStartOf="@id/actionSecondaryAccessory"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toEndOf="@id/actionIcon"
         app:layout_constraintTop_toBottomOf="@id/actionTitle"
@@ -75,12 +75,11 @@
         android:importantForAccessibility="no"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/actionEditable"
+        app:layout_constraintEnd_toStartOf="@id/actionEditable"
         app:layout_constraintTop_toTopOf="parent"
         tools:src="@drawable/ic_shield_warning"
         tools:visibility="visible" />
 
-
     <ImageView
         android:id="@+id/actionEditable"
         android:layout_width="wrap_content"
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 cea2f62968..930cc9576d 100644
--- a/vector/src/main/res/layout/item_profile_matrix_item.xml
+++ b/vector/src/main/res/layout/item_profile_matrix_item.xml
@@ -33,9 +33,9 @@
         android:layout_height="16dp"
         android:layout_marginStart="5dp"
         android:layout_marginTop="2dp"
-        app:layout_constraintBottom_toBottomOf="@+id/matrixItemTitle"
-        app:layout_constraintStart_toEndOf="@+id/matrixItemAvatar"
-        app:layout_constraintTop_toTopOf="@+id/matrixItemTitle" />
+        app:layout_constraintBottom_toBottomOf="@id/matrixItemTitle"
+        app:layout_constraintStart_toEndOf="@id/matrixItemAvatar"
+        app:layout_constraintTop_toTopOf="@id/matrixItemTitle" />
 
     <im.vector.app.core.ui.views.PresenceStateImageView
         android:id="@+id/matrixItemPresenceImageView"
@@ -45,7 +45,7 @@
         android:importantForAccessibility="no"
         android:padding="2dp"
         android:visibility="gone"
-        app:layout_constraintCircle="@+id/matrixItemAvatar"
+        app:layout_constraintCircle="@id/matrixItemAvatar"
         app:layout_constraintCircleAngle="135"
         app:layout_constraintCircleRadius="16dp"
         tools:ignore="MissingConstraints"
@@ -63,9 +63,9 @@
         android:maxLines="1"
         android:textColor="?vctr_content_primary"
         app:layout_constrainedWidth="true"
-        app:layout_constraintBottom_toTopOf="@+id/matrixItemSubtitle"
-        app:layout_constraintEnd_toStartOf="@+id/matrixItemPowerLevelLabel"
-        app:layout_constraintStart_toEndOf="@+id/matrixItemAvatarDecoration"
+        app:layout_constraintBottom_toTopOf="@id/matrixItemSubtitle"
+        app:layout_constraintEnd_toStartOf="@id/matrixItemPowerLevelLabel"
+        app:layout_constraintStart_toEndOf="@id/matrixItemAvatarDecoration"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_goneMarginEnd="80dp"
         app:layout_goneMarginStart="7dp"
@@ -83,7 +83,7 @@
         android:textColor="?vctr_content_secondary"
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/matrixItemPowerLevelLabel"
+        app:layout_constraintEnd_toStartOf="@id/matrixItemPowerLevelLabel"
         app:layout_constraintStart_toEndOf="@id/matrixItemAvatar"
         app:layout_constraintTop_toBottomOf="@id/matrixItemTitle"
         app:layout_goneMarginEnd="8dp"
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 89853a8878..c96c9c3f2c 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
@@ -30,7 +30,7 @@
         android:id="@+id/matrixItemAvatarDecoration"
         android:layout_width="20dp"
         android:layout_height="20dp"
-        app:layout_constraintCircle="@+id/matrixItemAvatar"
+        app:layout_constraintCircle="@id/matrixItemAvatar"
         app:layout_constraintCircleAngle="135"
         app:layout_constraintCircleRadius="16dp"
         tools:ignore="MissingConstraints" />
@@ -46,8 +46,8 @@
         android:maxLines="1"
         android:textColor="?vctr_content_primary"
         app:layout_constrainedWidth="true"
-        app:layout_constraintBottom_toTopOf="@+id/matrixItemSubtitle"
-        app:layout_constraintEnd_toStartOf="@+id/matrixItemProgress"
+        app:layout_constraintBottom_toTopOf="@id/matrixItemSubtitle"
+        app:layout_constraintEnd_toStartOf="@id/matrixItemProgress"
         app:layout_constraintStart_toEndOf="@id/matrixItemAvatar"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_goneMarginEnd="80dp"
@@ -65,7 +65,7 @@
         android:textColor="?vctr_content_secondary"
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/matrixItemProgress"
+        app:layout_constraintEnd_toStartOf="@id/matrixItemProgress"
         app:layout_constraintStart_toEndOf="@id/matrixItemAvatar"
         app:layout_constraintTop_toBottomOf="@id/matrixItemTitle"
         app:layout_goneMarginEnd="8dp"
diff --git a/vector/src/main/res/layout/item_public_room.xml b/vector/src/main/res/layout/item_public_room.xml
index 0410e4b4f8..83ebe5ccc9 100644
--- a/vector/src/main/res/layout/item_public_room.xml
+++ b/vector/src/main/res/layout/item_public_room.xml
@@ -1,5 +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"
@@ -18,7 +17,7 @@
         android:layout_height="56dp"
         android:layout_marginStart="8dp"
         android:importantForAccessibility="no"
-        app:layout_constraintBottom_toTopOf="@+id/itemPublicRoomBottomSeparator"
+        app:layout_constraintBottom_toTopOf="@id/itemPublicRoomBottomSeparator"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:src="@sample/room_round_avatars" />
@@ -34,8 +33,8 @@
         android:maxLines="2"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@+id/itemPublicRoomTopic"
-        app:layout_constraintEnd_toStartOf="@+id/itemPublicRoomButtonState"
+        app:layout_constraintBottom_toTopOf="@id/itemPublicRoomTopic"
+        app:layout_constraintEnd_toStartOf="@id/itemPublicRoomButtonState"
         app:layout_constraintStart_toEndOf="@id/itemPublicRoomAvatar"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed"
@@ -53,10 +52,10 @@
         android:singleLine="true"
         android:textColor="?vctr_content_primary"
         android:visibility="gone"
-        app:layout_constraintBottom_toTopOf="@+id/itemPublicRoomMembersCount"
+        app:layout_constraintBottom_toTopOf="@id/itemPublicRoomMembersCount"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="@+id/itemPublicRoomName"
-        app:layout_constraintTop_toBottomOf="@+id/itemPublicRoomName"
+        app:layout_constraintStart_toStartOf="@id/itemPublicRoomName"
+        app:layout_constraintTop_toBottomOf="@id/itemPublicRoomName"
         tools:text="@sample/rooms.json/data/topic"
         tools:visibility="visible" />
 
@@ -73,9 +72,9 @@
         android:textColor="?vctr_content_secondary"
         app:drawableStartCompat="@drawable/ic_user"
         app:drawableTint="?vctr_content_secondary"
-        app:layout_constraintBottom_toTopOf="@+id/itemPublicRoomBottomSeparator"
-        app:layout_constraintStart_toStartOf="@+id/itemPublicRoomName"
-        app:layout_constraintTop_toBottomOf="@+id/itemPublicRoomTopic"
+        app:layout_constraintBottom_toTopOf="@id/itemPublicRoomBottomSeparator"
+        app:layout_constraintStart_toStartOf="@id/itemPublicRoomName"
+        app:layout_constraintTop_toBottomOf="@id/itemPublicRoomTopic"
         tools:text="148" />
 
     <TextView
@@ -90,9 +89,9 @@
         android:minWidth="40dp"
         android:singleLine="true"
         android:textColor="?vctr_content_secondary"
-        app:layout_constraintBaseline_toBaselineOf="@+id/itemPublicRoomMembersCount"
+        app:layout_constraintBaseline_toBaselineOf="@id/itemPublicRoomMembersCount"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/itemPublicRoomMembersCount"
+        app:layout_constraintStart_toEndOf="@id/itemPublicRoomMembersCount"
         tools:text="@sample/rooms.json/data/alias" />
 
     <im.vector.app.core.platform.ButtonStateView
diff --git a/vector/src/main/res/layout/item_pushgateway.xml b/vector/src/main/res/layout/item_pushgateway.xml
index d3b1f3ed76..e7b6aca3bf 100644
--- a/vector/src/main/res/layout/item_pushgateway.xml
+++ b/vector/src/main/res/layout/item_pushgateway.xml
@@ -25,7 +25,6 @@
         android:text="@string/push_gateway_item_app_id"
         android:textStyle="bold" />
 
-
     <TextView
         android:id="@+id/pushGatewayAppIdValue"
         style="@style/Widget.Vector.TextView.Body"
@@ -44,7 +43,6 @@
         android:text="@string/push_gateway_item_push_key"
         android:textStyle="bold" />
 
-
     <TextView
         android:id="@+id/pushGatewayKeyValue"
         style="@style/Widget.Vector.TextView.Body"
@@ -63,7 +61,6 @@
         android:text="@string/push_gateway_item_app_display_name"
         android:textStyle="bold" />
 
-
     <TextView
         android:id="@+id/pushGatewayAppNameValue"
         style="@style/Widget.Vector.TextView.Body"
@@ -82,7 +79,6 @@
         android:text="@string/push_gateway_item_device_name"
         android:textStyle="bold" />
 
-
     <TextView
         android:id="@+id/pushGatewayDeviceNameValue"
         style="@style/Widget.Vector.TextView.Body"
@@ -92,7 +88,6 @@
         android:textStyle=""
         tools:text="EBMDOLFJD" />
 
-
     <TextView
         android:id="@+id/pushGatewayURL"
         style="@style/Widget.Vector.TextView.Body"
diff --git a/vector/src/main/res/layout/item_pushrule_raw.xml b/vector/src/main/res/layout/item_pushrule_raw.xml
index 080e4f4835..14845bf7e4 100644
--- a/vector/src/main/res/layout/item_pushrule_raw.xml
+++ b/vector/src/main/res/layout/item_pushrule_raw.xml
@@ -6,7 +6,6 @@
     android:orientation="horizontal"
     android:padding="8dp">
 
-
     <LinearLayout
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -23,7 +22,6 @@
             android:textStyle="bold"
             tools:text=".m.rule.contains_user_name" />
 
-
         <TextView
             android:id="@+id/pushRuleDescription"
             style="@style/Widget.Vector.TextView.Body"
diff --git a/vector/src/main/res/layout/item_room.xml b/vector/src/main/res/layout/item_room.xml
index e690dd122c..1c0d420e8b 100644
--- a/vector/src/main/res/layout/item_room.xml
+++ b/vector/src/main/res/layout/item_room.xml
@@ -125,7 +125,7 @@
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
         app:layout_constrainedWidth="true"
-        app:layout_constraintEnd_toStartOf="@+id/roomDraftBadge"
+        app:layout_constraintEnd_toStartOf="@id/roomDraftBadge"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintStart_toEndOf="@id/roomAvatarContainer"
@@ -141,10 +141,10 @@
         android:contentDescription="@string/a11y_unsent_draft"
         android:src="@drawable/ic_edit"
         android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="@+id/roomNameView"
-        app:layout_constraintEnd_toStartOf="@+id/roomUnreadCounterBadgeView"
-        app:layout_constraintStart_toEndOf="@+id/roomNameView"
-        app:layout_constraintTop_toTopOf="@+id/roomNameView"
+        app:layout_constraintBottom_toBottomOf="@id/roomNameView"
+        app:layout_constraintEnd_toStartOf="@id/roomUnreadCounterBadgeView"
+        app:layout_constraintStart_toEndOf="@id/roomNameView"
+        app:layout_constraintTop_toTopOf="@id/roomNameView"
         app:tint="?vctr_content_primary"
         tools:ignore="MissingPrefix"
         tools:visibility="visible" />
@@ -162,10 +162,10 @@
         android:paddingEnd="4dp"
         android:textColor="?colorOnError"
         android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="@+id/roomNameView"
-        app:layout_constraintEnd_toStartOf="@+id/roomLastEventTimeView"
-        app:layout_constraintStart_toEndOf="@+id/roomDraftBadge"
-        app:layout_constraintTop_toTopOf="@+id/roomNameView"
+        app:layout_constraintBottom_toBottomOf="@id/roomNameView"
+        app:layout_constraintEnd_toStartOf="@id/roomLastEventTimeView"
+        app:layout_constraintStart_toEndOf="@id/roomDraftBadge"
+        app:layout_constraintTop_toTopOf="@id/roomNameView"
         tools:background="@drawable/bg_unread_highlight"
         tools:text="4"
         tools:visibility="visible" />
@@ -177,9 +177,9 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
         android:textColor="?vctr_content_secondary"
-        app:layout_constraintBottom_toBottomOf="@+id/roomNameView"
+        app:layout_constraintBottom_toBottomOf="@id/roomNameView"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/roomNameView"
+        app:layout_constraintTop_toTopOf="@id/roomNameView"
         tools:text="@tools:sample/date/hhmm" />
 
     <TextView
@@ -193,8 +193,8 @@
         android:maxLines="2"
         android:textColor="?vctr_content_secondary"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="@+id/roomNameView"
-        app:layout_constraintTop_toBottomOf="@+id/roomNameView"
+        app:layout_constraintStart_toStartOf="@id/roomNameView"
+        app:layout_constraintTop_toBottomOf="@id/roomNameView"
         tools:text="@sample/messages.json/data/message" />
 
     <TextView
@@ -209,8 +209,8 @@
         android:textColor="?colorPrimary"
         android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="@+id/roomNameView"
-        app:layout_constraintTop_toBottomOf="@+id/roomNameView"
+        app:layout_constraintStart_toStartOf="@id/roomNameView"
+        app:layout_constraintTop_toBottomOf="@id/roomNameView"
         tools:text="Alice is typing…" />
 
     <!-- Margin bottom does not work, so I use space -->
@@ -219,7 +219,7 @@
         android:layout_width="0dp"
         android:layout_height="7dp"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/roomLastEventView"
+        app:layout_constraintTop_toBottomOf="@id/roomLastEventView"
         tools:layout_marginStart="120dp" />
 
     <androidx.constraintlayout.widget.Barrier
@@ -238,6 +238,6 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/roomBottomBarrier" />
+        app:layout_constraintTop_toBottomOf="@id/roomBottomBarrier" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_room_directory.xml b/vector/src/main/res/layout/item_room_directory.xml
index a0ff909c07..ae8ecaf810 100644
--- a/vector/src/main/res/layout/item_room_directory.xml
+++ b/vector/src/main/res/layout/item_room_directory.xml
@@ -37,8 +37,8 @@
         android:maxLines="2"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@+id/itemRoomDirectoryDescription"
-        app:layout_constraintEnd_toStartOf="@+id/itemRoomDirectoryChecked"
+        app:layout_constraintBottom_toTopOf="@id/itemRoomDirectoryDescription"
+        app:layout_constraintEnd_toStartOf="@id/itemRoomDirectoryChecked"
         app:layout_constraintStart_toEndOf="@id/itemRoomDirectoryAvatar"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed"
@@ -58,7 +58,7 @@
         android:textColor="?vctr_content_primary"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/itemRoomDirectoryChecked"
+        app:layout_constraintEnd_toStartOf="@id/itemRoomDirectoryChecked"
         app:layout_constraintStart_toEndOf="@id/itemRoomDirectoryAvatar"
         app:layout_constraintTop_toBottomOf="@id/itemRoomDirectoryName"
         app:layout_goneMarginEnd="@dimen/layout_horizontal_margin"
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 674d48fe72..9b2e1e4a70 100644
--- a/vector/src/main/res/layout/item_room_directory_server.xml
+++ b/vector/src/main/res/layout/item_room_directory_server.xml
@@ -19,7 +19,7 @@
         android:maxLines="2"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@+id/itemRoomDirectoryServerDescription"
+        app:layout_constraintBottom_toTopOf="@id/itemRoomDirectoryServerDescription"
         app:layout_constraintEnd_toStartOf="@id/itemRoomDirectoryServerRemove"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -42,7 +42,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/itemRoomDirectoryServerRemove"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/itemRoomDirectoryServerName"
+        app:layout_constraintTop_toBottomOf="@id/itemRoomDirectoryServerName"
         app:layout_goneMarginEnd="@dimen/layout_horizontal_margin"
         tools:text="@string/directory_your_server"
         tools:visibility="visible" />
diff --git a/vector/src/main/res/layout/item_room_invitation.xml b/vector/src/main/res/layout/item_room_invitation.xml
index e662dbf33a..23422577d9 100644
--- a/vector/src/main/res/layout/item_room_invitation.xml
+++ b/vector/src/main/res/layout/item_room_invitation.xml
@@ -27,7 +27,7 @@
         android:layout_width="0dp"
         android:layout_height="12dp"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/roomInvitationAvatarImageView"
+        app:layout_constraintTop_toBottomOf="@id/roomInvitationAvatarImageView"
         tools:layout_marginStart="20dp" />
 
     <TextView
@@ -61,9 +61,9 @@
         android:ellipsize="end"
         android:maxLines="2"
         android:textColor="?vctr_content_secondary"
-        app:layout_constraintEnd_toEndOf="@+id/roomInvitationNameView"
-        app:layout_constraintStart_toStartOf="@+id/roomInvitationNameView"
-        app:layout_constraintTop_toBottomOf="@+id/roomInvitationNameView"
+        app:layout_constraintEnd_toEndOf="@id/roomInvitationNameView"
+        app:layout_constraintStart_toStartOf="@id/roomInvitationNameView"
+        app:layout_constraintTop_toBottomOf="@id/roomInvitationNameView"
         tools:text="@sample/rooms.json/data/topic" />
 
     <!-- Margin bottom does not work, so I use space -->
@@ -72,7 +72,7 @@
         android:layout_width="0dp"
         android:layout_height="7dp"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/roomInvitationSubTitle"
+        app:layout_constraintTop_toBottomOf="@id/roomInvitationSubTitle"
         tools:layout_marginStart="120dp" />
 
     <im.vector.app.core.platform.ButtonStateView
@@ -84,8 +84,8 @@
         app:bsv_button_text="@string/accept"
         app:bsv_loaded_image_src="@drawable/ic_tick"
         app:bsv_use_flat_button="false"
-        app:layout_constraintEnd_toEndOf="@+id/roomInvitationNameView"
-        app:layout_constraintTop_toBottomOf="@+id/roomLastEventBottomSpace" />
+        app:layout_constraintEnd_toEndOf="@id/roomInvitationNameView"
+        app:layout_constraintTop_toBottomOf="@id/roomLastEventBottomSpace" />
 
     <im.vector.app.core.platform.ButtonStateView
         android:id="@+id/roomInvitationReject"
@@ -96,8 +96,8 @@
         app:bsv_button_text="@string/reject"
         app:bsv_loaded_image_src="@drawable/ic_tick"
         app:bsv_use_flat_button="true"
-        app:layout_constraintEnd_toStartOf="@+id/roomInvitationAccept"
-        app:layout_constraintTop_toTopOf="@+id/roomInvitationAccept" />
+        app:layout_constraintEnd_toStartOf="@id/roomInvitationAccept"
+        app:layout_constraintTop_toTopOf="@id/roomInvitationAccept" />
 
     <!-- We use vctr_list_separator_system here for a better rendering -->
     <View
@@ -109,6 +109,6 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/roomInvitationAccept" />
+        app:layout_constraintTop_toBottomOf="@id/roomInvitationAccept" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_room_placeholder.xml b/vector/src/main/res/layout/item_room_placeholder.xml
index b8a145cf1d..ccb23676d6 100644
--- a/vector/src/main/res/layout/item_room_placeholder.xml
+++ b/vector/src/main/res/layout/item_room_placeholder.xml
@@ -10,7 +10,6 @@
     android:focusable="true"
     android:foreground="?attr/selectableItemBackground">
 
-
     <FrameLayout
         android:id="@+id/roomAvatarContainer"
         android:layout_width="wrap_content"
@@ -38,7 +37,6 @@
         app:layout_constraintTop_toBottomOf="@id/roomAvatarContainer"
         tools:layout_marginStart="20dp" />
 
-
     <View
         android:id="@+id/roomNameView"
         android:layout_width="wrap_content"
@@ -54,7 +52,6 @@
         app:layout_constraintStart_toEndOf="@id/roomAvatarContainer"
         app:layout_constraintTop_toTopOf="parent" />
 
-
     <View
         android:id="@+id/roomTypingView"
         android:layout_width="0dp"
@@ -63,8 +60,8 @@
         android:layout_marginEnd="20dp"
         android:background="@drawable/placeholder_shape_8"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="@+id/roomNameView"
-        app:layout_constraintTop_toBottomOf="@+id/roomNameView" />
+        app:layout_constraintStart_toStartOf="@id/roomNameView"
+        app:layout_constraintTop_toBottomOf="@id/roomNameView" />
 
     <!-- We use vctr_list_separator_system here for a better rendering -->
     <View
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 809e58a912..12a0783a58 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
@@ -34,7 +34,7 @@
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/itemAddRoomRoomCheckBox"
+        app:layout_constraintEnd_toStartOf="@id/itemAddRoomRoomCheckBox"
         app:layout_constraintStart_toEndOf="@id/itemAddRoomRoomAvatar"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed"
@@ -52,5 +52,4 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:src="@drawable/ic_checkbox_on" />
 
-
 </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 bc30eec1c5..da6adde55f 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
@@ -34,7 +34,7 @@
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/itemManageRoomSuggested"
+        app:layout_constraintEnd_toStartOf="@id/itemManageRoomSuggested"
         app:layout_constraintStart_toEndOf="@id/itemAddRoomRoomAvatar"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed"
@@ -52,7 +52,7 @@
         android:text="@string/space_suggested"
         android:textColor="?vctr_content_secondary"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/itemAddRoomRoomCheckBox"
+        app:layout_constraintEnd_toStartOf="@id/itemAddRoomRoomCheckBox"
         app:layout_constraintStart_toEndOf="@id/itemAddRoomRoomNameText"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed" />
@@ -69,5 +69,4 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:src="@drawable/ic_checkbox_on" />
 
-
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_room_widget.xml b/vector/src/main/res/layout/item_room_widget.xml
index 5a3905bf45..44a43fe819 100644
--- a/vector/src/main/res/layout/item_room_widget.xml
+++ b/vector/src/main/res/layout/item_room_widget.xml
@@ -7,7 +7,6 @@
     android:background="?attr/selectableItemBackground"
     android:gravity="center_vertical"
     android:minHeight="64dp"
-    android:orientation="horizontal"
     android:paddingStart="@dimen/layout_horizontal_margin"
     android:paddingEnd="@dimen/layout_horizontal_margin">
 
@@ -58,5 +57,4 @@
         app:tint="?vctr_content_secondary"
         tools:ignore="MissingPrefix" />
 
-
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_search_result.xml b/vector/src/main/res/layout/item_search_result.xml
index 3342c19590..b1532b6124 100644
--- a/vector/src/main/res/layout/item_search_result.xml
+++ b/vector/src/main/res/layout/item_search_result.xml
@@ -30,8 +30,8 @@
         android:maxLines="1"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
-        app:layout_constraintEnd_toStartOf="@+id/messageTimeView"
-        app:layout_constraintStart_toEndOf="@+id/messageAvatarImageView"
+        app:layout_constraintEnd_toStartOf="@id/messageTimeView"
+        app:layout_constraintStart_toEndOf="@id/messageAvatarImageView"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="@sample/users.json/data/displayName" />
 
@@ -40,11 +40,11 @@
         style="@style/Widget.Vector.TextView.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignBaseline="@+id/messageMemberNameView"
+        android:layout_alignBaseline="@id/messageMemberNameView"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
         android:textColor="?vctr_content_secondary"
-        app:layout_constraintBottom_toBottomOf="@+id/messageMemberNameView"
+        app:layout_constraintBottom_toBottomOf="@id/messageMemberNameView"
         app:layout_constraintEnd_toEndOf="parent"
         tools:text="@tools:sample/date/hhmm" />
 
@@ -57,8 +57,8 @@
         android:layout_marginEnd="8dp"
         android:layout_marginBottom="4dp"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="@+id/messageMemberNameView"
-        app:layout_constraintTop_toBottomOf="@+id/messageMemberNameView"
+        app:layout_constraintStart_toStartOf="@id/messageMemberNameView"
+        app:layout_constraintTop_toBottomOf="@id/messageMemberNameView"
         tools:text="@sample/messages.json/data/message" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_settings_button_single_line.xml b/vector/src/main/res/layout/item_settings_button_single_line.xml
index c6a8a220b9..4aea591ab9 100644
--- a/vector/src/main/res/layout/item_settings_button_single_line.xml
+++ b/vector/src/main/res/layout/item_settings_button_single_line.xml
@@ -20,7 +20,7 @@
         android:gravity="center_vertical"
         android:textColor="?vctr_content_primary"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/settings_item_button"
+        app:layout_constraintEnd_toStartOf="@id/settings_item_button"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:drawableStart="@drawable/ic_notification_privacy_warning"
diff --git a/vector/src/main/res/layout/item_settings_edit_text.xml b/vector/src/main/res/layout/item_settings_edit_text.xml
index 61cc1e3695..f3c9d8325b 100644
--- a/vector/src/main/res/layout/item_settings_edit_text.xml
+++ b/vector/src/main/res/layout/item_settings_edit_text.xml
@@ -27,7 +27,7 @@
         app:errorEnabled="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/settings_item_edit_text_description">
+        app:layout_constraintTop_toBottomOf="@id/settings_item_edit_text_description">
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/settings_item_edit_text"
diff --git a/vector/src/main/res/layout/item_settings_simple_item.xml b/vector/src/main/res/layout/item_settings_simple_item.xml
index b4e6e24b2f..5c55fe6786 100644
--- a/vector/src/main/res/layout/item_settings_simple_item.xml
+++ b/vector/src/main/res/layout/item_settings_simple_item.xml
@@ -32,7 +32,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="4dp"
-            android:orientation="vertical"
             android:textColor="?vctr_content_secondary"
             tools:text="Description / Value" />
     </LinearLayout>
diff --git a/vector/src/main/res/layout/item_settings_three_pid.xml b/vector/src/main/res/layout/item_settings_three_pid.xml
index 74ae731b0e..5428c0271a 100644
--- a/vector/src/main/res/layout/item_settings_three_pid.xml
+++ b/vector/src/main/res/layout/item_settings_three_pid.xml
@@ -17,7 +17,7 @@
         android:importantForAccessibility="no"
         android:scaleType="center"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/item_settings_three_pid_title"
+        app:layout_constraintEnd_toStartOf="@id/item_settings_three_pid_title"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:tint="?vctr_content_secondary"
@@ -32,8 +32,8 @@
         android:layout_marginBottom="4dp"
         android:textColor="?vctr_content_primary"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/item_settings_three_pid_delete"
-        app:layout_constraintStart_toEndOf="@+id/item_settings_three_pid_icon"
+        app:layout_constraintEnd_toStartOf="@id/item_settings_three_pid_delete"
+        app:layout_constraintStart_toEndOf="@id/item_settings_three_pid_icon"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="alice@email-provider.org" />
 
diff --git a/vector/src/main/res/layout/item_simple_reaction_info.xml b/vector/src/main/res/layout/item_simple_reaction_info.xml
index 6f473c209d..18b91d8f85 100644
--- a/vector/src/main/res/layout/item_simple_reaction_info.xml
+++ b/vector/src/main/res/layout/item_simple_reaction_info.xml
@@ -31,5 +31,4 @@
         style="@style/BottomSheetItemTime"
         tools:text="10:44" />
 
-
 </LinearLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_space.xml b/vector/src/main/res/layout/item_space.xml
index d91fc09a2a..b85c04a9e8 100644
--- a/vector/src/main/res/layout/item_space.xml
+++ b/vector/src/main/res/layout/item_space.xml
@@ -28,7 +28,7 @@
         android:layout_marginStart="@dimen/layout_horizontal_margin"
         android:importantForAccessibility="no"
         android:duplicateParentState="true"
-        app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
+        app:layout_constraintBottom_toTopOf="@id/groupBottomSeparator"
         app:layout_constraintStart_toEndOf="@id/indent"
         app:layout_constraintTop_toTopOf="parent"
         tools:src="@sample/space_avatars" />
@@ -47,14 +47,13 @@
         android:paddingEnd="4dp"
         android:textColor="?colorOnError"
         android:visibility="gone"
-        app:layout_constraintCircle="@+id/groupAvatarImageView"
+        app:layout_constraintCircle="@id/groupAvatarImageView"
         app:layout_constraintCircleAngle="45"
         app:layout_constraintCircleRadius="24dp"
         tools:background="@drawable/bg_unread_highlight"
         tools:text="147"
         tools:visibility="visible" />
 
-
     <TextView
         android:id="@+id/groupNameView"
         style="@style/Widget.Vector.TextView.Subtitle"
@@ -66,9 +65,9 @@
         android:maxLines="1"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@+id/groupDescView"
-        app:layout_constraintEnd_toStartOf="@+id/groupChildrenCollapse"
-        app:layout_constraintStart_toEndOf="@+id/groupAvatarImageView"
+        app:layout_constraintBottom_toTopOf="@id/groupDescView"
+        app:layout_constraintEnd_toStartOf="@id/groupChildrenCollapse"
+        app:layout_constraintStart_toEndOf="@id/groupAvatarImageView"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed"
         tools:text="@tools:sample/lorem/random" />
@@ -84,15 +83,14 @@
         android:maxLines="1"
         android:textColor="?vctr_content_secondary"
         android:visibility="gone"
-        app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
-        app:layout_constraintEnd_toStartOf="@+id/groupChildrenCollapse"
-        app:layout_constraintStart_toEndOf="@+id/groupAvatarImageView"
+        app:layout_constraintBottom_toTopOf="@id/groupBottomSeparator"
+        app:layout_constraintEnd_toStartOf="@id/groupChildrenCollapse"
+        app:layout_constraintStart_toEndOf="@id/groupAvatarImageView"
         app:layout_constraintTop_toBottomOf="@id/groupNameView"
         app:layout_constraintVertical_chainStyle="packed"
         tools:text="@tools:sample/lorem/random"
         tools:visibility="visible" />
 
-
     <ImageView
         android:id="@+id/groupChildrenCollapse"
         android:layout_width="wrap_content"
@@ -103,8 +101,8 @@
         android:importantForAccessibility="no"
         android:src="@drawable/ic_expand_less"
         android:visibility="gone"
-        app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
-        app:layout_constraintEnd_toStartOf="@+id/groupTmpLeave"
+        app:layout_constraintBottom_toTopOf="@id/groupBottomSeparator"
+        app:layout_constraintEnd_toStartOf="@id/groupTmpLeave"
         app:layout_constraintTop_toTopOf="parent"
         app:tint="?vctr_content_primary"
         tools:ignore="MissingPrefix"
@@ -133,7 +131,7 @@
         android:importantForAccessibility="no"
         android:src="@drawable/ic_arrow_right"
         android:visibility="gone"
-        app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
+        app:layout_constraintBottom_toTopOf="@id/groupBottomSeparator"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:tint="?vctr_content_primary"
diff --git a/vector/src/main/res/layout/item_space_add.xml b/vector/src/main/res/layout/item_space_add.xml
index f45f03297d..4965a06bb3 100644
--- a/vector/src/main/res/layout/item_space_add.xml
+++ b/vector/src/main/res/layout/item_space_add.xml
@@ -9,7 +9,6 @@
     android:focusable="true"
     android:foreground="?attr/selectableItemBackground">
 
-
     <ImageView
         android:id="@+id/groupAvatarImageView"
         android:layout_width="42dp"
@@ -39,7 +38,7 @@
         android:textColor="?colorPrimary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/groupAvatarImageView"
+        app:layout_constraintStart_toEndOf="@id/groupAvatarImageView"
         app:layout_constraintTop_toTopOf="parent" />
 
 </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 354d875b78..ce9bf8dad8 100644
--- a/vector/src/main/res/layout/item_space_roomchild.xml
+++ b/vector/src/main/res/layout/item_space_roomchild.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <LinearLayout 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"
@@ -52,10 +51,10 @@
             android:maxLines="1"
             android:textColor="?vctr_content_primary"
             android:textStyle="bold"
-            app:layout_constraintBottom_toTopOf="@+id/childRoomTopic"
+            app:layout_constraintBottom_toTopOf="@id/childRoomTopic"
             app:layout_constraintEnd_toStartOf="@id/spaceChildMemberCountIcon"
             app:layout_constraintHorizontal_bias="0.5"
-            app:layout_constraintStart_toEndOf="@+id/childRoomAvatar"
+            app:layout_constraintStart_toEndOf="@id/childRoomAvatar"
             app:layout_constraintTop_toTopOf="parent"
             tools:text="@sample/rooms.json/data/name" />
 
@@ -69,8 +68,8 @@
             app:layout_constraintBottom_toBottomOf="@id/spaceChildBarrier"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
-            app:layout_constraintStart_toStartOf="@+id/childRoomName"
-            app:layout_constraintTop_toBottomOf="@+id/childRoomName"
+            app:layout_constraintStart_toStartOf="@id/childRoomName"
+            app:layout_constraintTop_toBottomOf="@id/childRoomName"
             tools:text="@sample/rooms.json/data/topic" />
 
         <ImageView
@@ -80,9 +79,9 @@
             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"
-            app:layout_constraintTop_toTopOf="@+id/spaceChildMemberCountText"
+            app:layout_constraintBottom_toBottomOf="@id/spaceChildMemberCountText"
+            app:layout_constraintEnd_toStartOf="@id/spaceChildMemberCountText"
+            app:layout_constraintTop_toTopOf="@id/spaceChildMemberCountText"
             app:tint="?vctr_content_secondary" />
 
         <TextView
@@ -112,7 +111,6 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintTop_toBottomOf="@id/spaceChildBarrier" />
 
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </LinearLayout>
diff --git a/vector/src/main/res/layout/item_space_subspace.xml b/vector/src/main/res/layout/item_space_subspace.xml
index 3931c6c30d..08a5772bd0 100644
--- a/vector/src/main/res/layout/item_space_subspace.xml
+++ b/vector/src/main/res/layout/item_space_subspace.xml
@@ -60,7 +60,7 @@
         android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/childSpaceAvatar"
+        app:layout_constraintStart_toEndOf="@id/childSpaceAvatar"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="@sample/spaces.json/data/name" />
 
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 733e9d065f..c7e8b2efe1 100644
--- a/vector/src/main/res/layout/item_space_top_summary.xml
+++ b/vector/src/main/res/layout/item_space_top_summary.xml
@@ -12,8 +12,8 @@
         android:layout_height="16dp"
         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_constraintBottom_toBottomOf="@id/spaceSummaryMemberCountText"
+        app:layout_constraintStart_toEndOf="@id/spaceSummaryMemberCountText"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:tint="?vctr_content_secondary"
@@ -28,7 +28,7 @@
         android:ellipsize="end"
         android:maxLines="1"
         android:textColor="?vctr_content_secondary"
-        app:layout_constraintBottom_toBottomOf="@+id/spaceSummaryMemberCountIcon"
+        app:layout_constraintBottom_toBottomOf="@id/spaceSummaryMemberCountIcon"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/spaceSummaryMemberCountIcon"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/vector/src/main/res/layout/item_sub_space.xml b/vector/src/main/res/layout/item_sub_space.xml
index b5b6f6927f..5250f5ab37 100644
--- a/vector/src/main/res/layout/item_sub_space.xml
+++ b/vector/src/main/res/layout/item_sub_space.xml
@@ -47,14 +47,13 @@
         android:paddingEnd="4dp"
         android:textColor="?colorOnError"
         android:visibility="gone"
-        app:layout_constraintCircle="@+id/groupAvatarImageView"
+        app:layout_constraintCircle="@id/groupAvatarImageView"
         app:layout_constraintCircleAngle="45"
         app:layout_constraintCircleRadius="14dp"
         tools:background="@drawable/bg_unread_highlight"
         tools:text="147"
         tools:visibility="visible" />
 
-
     <TextView
         android:id="@+id/groupNameView"
         style="@style/Widget.Vector.TextView.Subtitle"
@@ -67,8 +66,8 @@
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/groupChildrenCollapse"
-        app:layout_constraintStart_toEndOf="@+id/groupAvatarImageView"
+        app:layout_constraintEnd_toStartOf="@id/groupChildrenCollapse"
+        app:layout_constraintStart_toEndOf="@id/groupAvatarImageView"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed"
         tools:text="@tools:sample/lorem/random" />
@@ -84,7 +83,7 @@
         android:src="@drawable/ic_expand_less"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/groupTmpLeave"
+        app:layout_constraintEnd_toStartOf="@id/groupTmpLeave"
         app:layout_constraintTop_toTopOf="parent"
         app:tint="?vctr_content_primary"
         tools:ignore="MissingPrefix"
@@ -113,7 +112,7 @@
         android:importantForAccessibility="no"
         android:src="@drawable/ic_arrow_right"
         android:visibility="gone"
-        app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
+        app:layout_constraintBottom_toTopOf="@id/groupBottomSeparator"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:tint="?vctr_content_primary"
diff --git a/vector/src/main/res/layout/item_suggested_room.xml b/vector/src/main/res/layout/item_suggested_room.xml
index e791f63079..c1f55f0217 100644
--- a/vector/src/main/res/layout/item_suggested_room.xml
+++ b/vector/src/main/res/layout/item_suggested_room.xml
@@ -26,7 +26,6 @@
 
     </FrameLayout>
 
-
     <!-- Margin bottom does not work, so I use space -->
     <Space
         android:id="@+id/roomAvatarBottomSpace"
@@ -50,7 +49,7 @@
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
         app:layout_constrainedWidth="true"
-        app:layout_constraintEnd_toStartOf="@+id/joinSuggestedRoomButton"
+        app:layout_constraintEnd_toStartOf="@id/joinSuggestedRoomButton"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintStart_toEndOf="@id/roomAvatarContainer"
@@ -68,8 +67,8 @@
         android:maxLines="1"
         android:textColor="?vctr_content_secondary"
         app:layout_constraintEnd_toStartOf="@id/joinSuggestedRoomButton"
-        app:layout_constraintStart_toStartOf="@+id/roomNameView"
-        app:layout_constraintTop_toBottomOf="@+id/roomNameView"
+        app:layout_constraintStart_toStartOf="@id/roomNameView"
+        app:layout_constraintTop_toBottomOf="@id/roomNameView"
         tools:text="@sample/rooms.json/data/topic" />
 
     <Button
@@ -111,7 +110,7 @@
         android:padding="8dp"
         android:textColor="?colorError"
         app:drawableStartCompat="@drawable/ic_warning_badge"
-        app:layout_constraintTop_toBottomOf="@+id/roomBottomBarrier"
+        app:layout_constraintTop_toBottomOf="@id/roomBottomBarrier"
         tools:text="An error occured while joining" />
 
     <!-- We use vctr_list_separator_system here for a better rendering -->
@@ -123,6 +122,6 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/inlineErrorText" />
+        app:layout_constraintTop_toBottomOf="@id/inlineErrorText" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_timeline_event_base.xml b/vector/src/main/res/layout/item_timeline_event_base.xml
index cb6f701bb4..ed6e501d49 100644
--- a/vector/src/main/res/layout/item_timeline_event_base.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base.xml
@@ -11,7 +11,7 @@
         android:id="@+id/messageSelectedBackground"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_alignBottom="@+id/informationBottom"
+        android:layout_alignBottom="@id/informationBottom"
         android:layout_alignParentTop="true"
         android:background="@drawable/highlighted_message_background" />
 
@@ -33,8 +33,8 @@
         android:layout_marginStart="8dp"
         android:layout_marginTop="4dp"
         android:layout_marginEnd="4dp"
-        android:layout_toStartOf="@+id/messageTimeView"
-        android:layout_toEndOf="@+id/messageStartGuideline"
+        android:layout_toStartOf="@id/messageTimeView"
+        android:layout_toEndOf="@id/messageStartGuideline"
         android:ellipsize="end"
         android:maxLines="1"
         android:textColor="?vctr_content_primary"
@@ -46,7 +46,7 @@
         style="@style/Widget.Vector.TextView.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignBaseline="@+id/messageMemberNameView"
+        android:layout_alignBaseline="@id/messageMemberNameView"
         android:layout_alignParentEnd="true"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
@@ -145,7 +145,7 @@
         android:id="@+id/messageSendStateImageView"
         android:layout_width="@dimen/item_event_message_state_size"
         android:layout_height="@dimen/item_event_message_state_size"
-        android:layout_alignBottom="@+id/viewStubContainer"
+        android:layout_alignBottom="@id/viewStubContainer"
         android:layout_alignParentEnd="true"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
@@ -160,7 +160,7 @@
         android:id="@+id/eventSendingIndicator"
         android:layout_width="@dimen/item_event_message_state_size"
         android:layout_height="@dimen/item_event_message_state_size"
-        android:layout_alignBottom="@+id/viewStubContainer"
+        android:layout_alignBottom="@id/viewStubContainer"
         android:layout_alignParentEnd="true"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
@@ -175,8 +175,8 @@
         android:id="@+id/informationBottom"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/viewStubContainer"
-        android:layout_toEndOf="@+id/messageStartGuideline"
+        android:layout_below="@id/viewStubContainer"
+        android:layout_toEndOf="@id/messageStartGuideline"
         android:addStatesFromChildren="true"
         android:orientation="vertical">
 
diff --git a/vector/src/main/res/layout/item_timeline_event_base_state.xml b/vector/src/main/res/layout/item_timeline_event_base_state.xml
index 98cea901da..2aa7012d88 100644
--- a/vector/src/main/res/layout/item_timeline_event_base_state.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base_state.xml
@@ -11,7 +11,7 @@
         android:id="@+id/messageSelectedBackground"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_alignBottom="@+id/informationBottom"
+        android:layout_alignBottom="@id/informationBottom"
         android:layout_alignParentTop="true"
         android:background="@drawable/highlighted_message_background" />
 
@@ -69,7 +69,6 @@
 
     </FrameLayout>
 
-
     <im.vector.app.core.ui.views.ShieldImageView
         android:id="@+id/messageE2EDecoration"
         android:layout_width="16dp"
@@ -84,15 +83,14 @@
         android:id="@+id/messageFailToSendIndicator"
         android:layout_width="14dp"
         android:layout_height="14dp"
-        android:layout_alignTop="@+id/viewStubContainer"
+        android:layout_alignTop="@id/viewStubContainer"
         android:layout_marginStart="2dp"
-        android:layout_toEndOf="@+id/viewStubContainer"
+        android:layout_toEndOf="@id/viewStubContainer"
         android:contentDescription="@string/a11y_error_message_not_sent"
         android:src="@drawable/ic_warning_badge"
         android:visibility="gone"
         tools:visibility="visible" />
 
-
     <LinearLayout
         android:id="@+id/informationBottom"
         android:layout_width="match_parent"
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 95f9e6661a..a1187537ae 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
@@ -44,7 +44,6 @@
         tools:drawableLeft="@drawable/ic_missed_video_call"
         tools:text="@string/call_tile_video_incoming" />
 
-
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/itemCallAcceptRejectViewGroup"
         android:layout_width="match_parent"
@@ -59,7 +58,7 @@
             android:minWidth="120dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_chainStyle="packed"
-            app:layout_constraintStart_toEndOf="@+id/itemCallRejectView"
+            app:layout_constraintStart_toEndOf="@id/itemCallRejectView"
             app:layout_constraintTop_toTopOf="@id/itemCallRejectView"
             tools:text="@string/join" />
 
@@ -70,13 +69,12 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="4dp"
             android:minWidth="120dp"
-            app:layout_constraintEnd_toStartOf="@+id/itemCallAcceptView"
+            app:layout_constraintEnd_toStartOf="@id/itemCallAcceptView"
             app:layout_constraintHorizontal_chainStyle="packed"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             tools:text="@string/ignore" />
 
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </LinearLayout>
diff --git a/vector/src/main/res/layout/item_timeline_event_file_stub.xml b/vector/src/main/res/layout/item_timeline_event_file_stub.xml
index bf6a5b7479..ae3b732b5a 100644
--- a/vector/src/main/res/layout/item_timeline_event_file_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_file_stub.xml
@@ -23,7 +23,7 @@
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:layout_marginStart="4dp"
-        app:layout_constraintStart_toEndOf="@+id/messageFilee2eIcon"
+        app:layout_constraintStart_toEndOf="@id/messageFilee2eIcon"
         app:layout_constraintTop_toTopOf="parent">
 
         <include layout="@layout/view_file_icon" />
@@ -34,7 +34,7 @@
     <!--        android:layout_width="@dimen/chat_avatar_size"-->
     <!--        android:layout_height="@dimen/chat_avatar_size"-->
     <!--        android:layout_marginStart="4dp"-->
-    <!--        app:layout_constraintStart_toEndOf="@+id/messageFilee2eIcon"-->
+    <!--        app:layout_constraintStart_toEndOf="@id/messageFilee2eIcon"-->
     <!--        app:layout_constraintTop_toTopOf="parent"-->
     <!--        tools:src="@drawable/filetype_attachment" />-->
 
@@ -52,11 +52,10 @@
         app:layout_constrainedWidth="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0"
-        app:layout_constraintStart_toEndOf="@+id/messageFileImageView"
+        app:layout_constraintStart_toEndOf="@id/messageFileImageView"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="A filename here" />
 
-
     <androidx.constraintlayout.widget.Barrier
         android:id="@+id/horizontalBarrier"
         android:layout_width="wrap_content"
@@ -74,7 +73,7 @@
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/horizontalBarrier"
+        app:layout_constraintTop_toBottomOf="@id/horizontalBarrier"
         tools:visibility="visible" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_timeline_event_media_message_stub.xml b/vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
index ebbb0913ff..9d24b113d8 100644
--- a/vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
@@ -31,7 +31,6 @@
         app:layout_constraintTop_toTopOf="@id/messageThumbnailView"
         tools:visibility="visible" />
 
-
     <include
         android:id="@+id/messageMediaUploadProgressLayout"
         layout="@layout/media_upload_download_progress_layout"
@@ -43,6 +42,6 @@
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/messageThumbnailView"
+        app:layout_constraintTop_toBottomOf="@id/messageThumbnailView"
         tools:visibility="visible" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_timeline_event_merged_header_stub.xml b/vector/src/main/res/layout/item_timeline_event_merged_header_stub.xml
index cfa5d1d3b9..1fa7cc7afa 100644
--- a/vector/src/main/res/layout/item_timeline_event_merged_header_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_merged_header_stub.xml
@@ -17,7 +17,7 @@
             android:layout_alignParentStart="true"
             android:layout_marginTop="8dp"
             android:layout_marginEnd="16dp"
-            android:layout_toStartOf="@+id/itemMergedExpandTextView" />
+            android:layout_toStartOf="@id/itemMergedExpandTextView" />
 
         <TextView
             android:id="@+id/itemMergedExpandTextView"
diff --git a/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml b/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
index c8d635bada..45b9de21f0 100644
--- a/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
@@ -56,7 +56,7 @@
             app:iconPadding="0dp"
             app:iconSize="20dp"
             app:iconTint="?vctr_content_primary"
-            app:layout_constraintCircle="@+id/creationTileRoomAvatarImageView"
+            app:layout_constraintCircle="@id/creationTileRoomAvatarImageView"
             app:layout_constraintCircleAngle="135"
             app:layout_constraintCircleRadius="34dp"
             tools:ignore="MissingConstraints" />
@@ -142,7 +142,7 @@
         android:id="@+id/mergedSumContainer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/creationTile"
+        android:layout_below="@id/creationTile"
         android:layout_marginTop="8dp">
 
         <ImageView
@@ -170,7 +170,6 @@
             android:textStyle="italic"
             tools:text="@string/room_created_summary_item" />
 
-
         <TextView
             android:id="@+id/itemMergedExpandTextView"
             style="@style/Widget.Vector.TextView.Body"
@@ -192,7 +191,7 @@
         android:id="@+id/itemMergedSeparatorView"
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:layout_below="@+id/mergedSumContainer"
+        android:layout_below="@id/mergedSumContainer"
         android:layout_marginTop="4dp"
         android:background="?vctr_list_separator" />
 
diff --git a/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml b/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml
index abcd679dea..00d3d58639 100644
--- a/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml
@@ -33,7 +33,6 @@
             app:drawableStartCompat="@drawable/ic_clock"
             app:drawableTint="?vctr_content_secondary" />
 
-
         <TextView
             android:id="@+id/itemVerificationDoneDetailTextView"
             style="@style/Widget.Vector.TextView.Caption"
@@ -48,7 +47,6 @@
             android:textColor="?vctr_content_secondary"
             android:textStyle="italic" />
 
-
         <TextView
             android:id="@+id/itemMergedExpandTextView"
             style="@style/Widget.Vector.TextView.Body"
@@ -72,7 +70,7 @@
         android:id="@+id/itemMergedSeparatorView"
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:layout_below="@+id/mergedUTDTile"
+        android:layout_below="@id/mergedUTDTile"
         android:layout_marginTop="4dp"
         android:background="?vctr_list_separator" />
 
diff --git a/vector/src/main/res/layout/item_timeline_event_option_buttons_stub.xml b/vector/src/main/res/layout/item_timeline_event_option_buttons_stub.xml
index e3a8bd7df4..0c907302ae 100644
--- a/vector/src/main/res/layout/item_timeline_event_option_buttons_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_option_buttons_stub.xml
@@ -30,5 +30,4 @@
 
     </LinearLayout>
 
-
 </LinearLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_timeline_event_status_tile_stub.xml b/vector/src/main/res/layout/item_timeline_event_status_tile_stub.xml
index fb2d8c2057..f1a080b8bd 100644
--- a/vector/src/main/res/layout/item_timeline_event_status_tile_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_status_tile_stub.xml
@@ -5,7 +5,6 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-
     <TextView
         android:id="@+id/itemVerificationDoneTitleTextView"
         style="@style/Widget.Vector.TextView.Subtitle"
@@ -19,7 +18,6 @@
         tools:drawableStart="@drawable/ic_shield_trusted"
         tools:text="@string/sas_verified" />
 
-
     <TextView
         android:id="@+id/itemVerificationDoneDetailTextView"
         style="@style/Widget.Vector.TextView.Caption"
diff --git a/vector/src/main/res/layout/item_timeline_event_verification_stub.xml b/vector/src/main/res/layout/item_timeline_event_verification_stub.xml
index 66d9a71e39..c6c3fe13c0 100644
--- a/vector/src/main/res/layout/item_timeline_event_verification_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_verification_stub.xml
@@ -6,7 +6,6 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-
     <TextView
         android:id="@+id/itemVerificationTitleTextView"
         style="@style/Widget.Vector.TextView.Subtitle"
@@ -20,7 +19,6 @@
         app:drawableStartCompat="@drawable/ic_shield_black"
         tools:text="@string/verification_request" />
 
-
     <TextView
         android:id="@+id/itemVerificationDetailTextView"
         style="@style/Widget.Vector.TextView.Caption"
diff --git a/vector/src/main/res/layout/item_timeline_event_voice_stub.xml b/vector/src/main/res/layout/item_timeline_event_voice_stub.xml
index 2c8ade173a..0b35836926 100644
--- a/vector/src/main/res/layout/item_timeline_event_voice_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_voice_stub.xml
@@ -59,10 +59,8 @@
             app:layout_constraintStart_toEndOf="@id/voicePlaybackTime"
             app:layout_constraintTop_toTopOf="parent" />
 
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-
     <include
         android:id="@+id/messageFileUploadProgressLayout"
         layout="@layout/media_upload_download_progress_layout"
@@ -75,7 +73,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/voicePlaybackLayout"
+        app:layout_constraintTop_toBottomOf="@id/voicePlaybackLayout"
         tools:visibility="visible" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_timeline_event_widget_stub.xml b/vector/src/main/res/layout/item_timeline_event_widget_stub.xml
index 1e73fc09a7..95c9ae3a41 100644
--- a/vector/src/main/res/layout/item_timeline_event_widget_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_widget_stub.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!-- Add a FrameLayout parent for better alignment -->
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
diff --git a/vector/src/main/res/layout/item_tos.xml b/vector/src/main/res/layout/item_tos.xml
index ad23e14029..c536b33d4a 100644
--- a/vector/src/main/res/layout/item_tos.xml
+++ b/vector/src/main/res/layout/item_tos.xml
@@ -37,8 +37,8 @@
         android:paddingEnd="8dp"
         android:textColor="?vctr_content_secondary"
         app:layout_constraintEnd_toStartOf="@id/term_policy_arrow"
-        app:layout_constraintStart_toStartOf="@+id/term_name"
-        app:layout_constraintTop_toBottomOf="@+id/term_name"
+        app:layout_constraintStart_toStartOf="@id/term_name"
+        app:layout_constraintTop_toBottomOf="@id/term_name"
         tools:text="Use bots, bridges, widget and sticker packs." />
 
     <!-- Do not use drawableEnd on the TextView because of RTL support -->
diff --git a/vector/src/main/res/layout/item_unknown_room.xml b/vector/src/main/res/layout/item_unknown_room.xml
index 95b8f36911..d51e603f41 100644
--- a/vector/src/main/res/layout/item_unknown_room.xml
+++ b/vector/src/main/res/layout/item_unknown_room.xml
@@ -1,5 +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"
@@ -18,7 +17,7 @@
         android:layout_height="56dp"
         android:layout_marginStart="8dp"
         android:importantForAccessibility="no"
-        app:layout_constraintBottom_toTopOf="@+id/itemPublicRoomBottomSeparator"
+        app:layout_constraintBottom_toTopOf="@id/itemPublicRoomBottomSeparator"
         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_uploads_file.xml b/vector/src/main/res/layout/item_uploads_file.xml
index cc4b43ea92..b4ee4f2eec 100644
--- a/vector/src/main/res/layout/item_uploads_file.xml
+++ b/vector/src/main/res/layout/item_uploads_file.xml
@@ -30,9 +30,9 @@
         android:maxLines="2"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@+id/uploadsFileSubtitle"
-        app:layout_constraintEnd_toStartOf="@+id/uploadsFileActionDownload"
-        app:layout_constraintStart_toEndOf="@+id/uploadsFileIcon"
+        app:layout_constraintBottom_toTopOf="@id/uploadsFileSubtitle"
+        app:layout_constraintEnd_toStartOf="@id/uploadsFileActionDownload"
+        app:layout_constraintStart_toEndOf="@id/uploadsFileIcon"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed"
         tools:text="Filename.file" />
@@ -46,9 +46,9 @@
         android:ellipsize="end"
         android:textColor="?vctr_content_secondary"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="@+id/uploadsFileTitle"
-        app:layout_constraintStart_toStartOf="@+id/uploadsFileTitle"
-        app:layout_constraintTop_toBottomOf="@+id/uploadsFileTitle"
+        app:layout_constraintEnd_toEndOf="@id/uploadsFileTitle"
+        app:layout_constraintStart_toStartOf="@id/uploadsFileTitle"
+        app:layout_constraintTop_toBottomOf="@id/uploadsFileTitle"
         tools:text="Username at 12:00 on 01/01/01" />
 
     <ImageView
@@ -59,7 +59,7 @@
         android:scaleType="center"
         android:src="@drawable/ic_download"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/uploadsFileActionShare"
+        app:layout_constraintEnd_toStartOf="@id/uploadsFileActionShare"
         app:layout_constraintTop_toTopOf="parent"
         app:tint="?colorSecondary"
         tools:ignore="MissingPrefix" />
diff --git a/vector/src/main/res/layout/item_user.xml b/vector/src/main/res/layout/item_user.xml
index 7f625e8308..95cea6cd4d 100644
--- a/vector/src/main/res/layout/item_user.xml
+++ b/vector/src/main/res/layout/item_user.xml
@@ -32,9 +32,9 @@
         android:maxLines="1"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@+id/itemUserName"
+        app:layout_constraintBottom_toTopOf="@id/itemUserName"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/itemUserAvatar"
+        app:layout_constraintStart_toEndOf="@id/itemUserAvatar"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed"
         tools:text="@sample/users.json/data/id" />
@@ -51,8 +51,8 @@
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/itemUserAvatar"
-        app:layout_constraintTop_toBottomOf="@+id/itemUserId"
+        app:layout_constraintStart_toEndOf="@id/itemUserAvatar"
+        app:layout_constraintTop_toBottomOf="@id/itemUserId"
         tools:text="@sample/users.json/data/displayName"
         tools:visibility="visible" />
 
diff --git a/vector/src/main/res/layout/item_verification_action.xml b/vector/src/main/res/layout/item_verification_action.xml
index 455c5ce9a4..79bf1ca76a 100644
--- a/vector/src/main/res/layout/item_verification_action.xml
+++ b/vector/src/main/res/layout/item_verification_action.xml
@@ -30,7 +30,6 @@
         tools:src="@drawable/ic_share"
         tools:visibility="visible" />
 
-
     <TextView
         android:id="@+id/itemVerificationActionTitle"
         style="@style/Widget.Vector.TextView.Subtitle"
@@ -39,9 +38,9 @@
         android:layout_marginStart="8dp"
         android:textColor="?colorPrimary"
         app:layout_constrainedWidth="true"
-        app:layout_constraintBottom_toTopOf="@+id/itemVerificationActionSubTitle"
-        app:layout_constraintEnd_toStartOf="@+id/itemVerificationActionIcon"
-        app:layout_constraintStart_toEndOf="@+id/itemVerificationLeftIcon"
+        app:layout_constraintBottom_toTopOf="@id/itemVerificationActionSubTitle"
+        app:layout_constraintEnd_toStartOf="@id/itemVerificationActionIcon"
+        app:layout_constraintStart_toEndOf="@id/itemVerificationLeftIcon"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed"
         app:layout_goneMarginStart="0dp"
@@ -57,9 +56,9 @@
         android:visibility="gone"
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/itemVerificationActionIcon"
-        app:layout_constraintStart_toStartOf="@+id/itemVerificationActionTitle"
-        app:layout_constraintTop_toBottomOf="@+id/itemVerificationActionTitle"
+        app:layout_constraintEnd_toStartOf="@id/itemVerificationActionIcon"
+        app:layout_constraintStart_toStartOf="@id/itemVerificationActionTitle"
+        app:layout_constraintTop_toBottomOf="@id/itemVerificationActionTitle"
         tools:text="For maximum security, do this in person"
         tools:visibility="visible" />
 
diff --git a/vector/src/main/res/layout/item_verification_wait.xml b/vector/src/main/res/layout/item_verification_wait.xml
index d406fed84f..2dcfa7957f 100644
--- a/vector/src/main/res/layout/item_verification_wait.xml
+++ b/vector/src/main/res/layout/item_verification_wait.xml
@@ -22,7 +22,6 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-
     <ImageView
         android:id="@+id/monitorIcon"
         android:layout_width="40dp"
@@ -33,7 +32,7 @@
         android:src="@drawable/ic_monitor"
         app:layout_constraintEnd_toStartOf="@id/smartphoneIcon"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/use_latest_riot"
+        app:layout_constraintTop_toBottomOf="@id/use_latest_riot"
         app:tint="?vctr_notice_secondary"
         tools:ignore="MissingPrefix" />
 
@@ -47,11 +46,10 @@
         android:src="@drawable/ic_smartphone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/monitorIcon"
-        app:layout_constraintTop_toBottomOf="@+id/use_latest_riot"
+        app:layout_constraintTop_toBottomOf="@id/use_latest_riot"
         app:tint="?vctr_notice_secondary"
         tools:ignore="MissingPrefix" />
 
-
     <TextView
         android:id="@+id/app_desktop_web"
         style="@style/Widget.Vector.TextView.Body"
@@ -85,7 +83,6 @@
         app:barrierDirection="bottom"
         app:constraint_referenced_ids="app_ios_android,app_desktop_web" />
 
-
     <TextView
         style="@style/Widget.Vector.TextView.Caption"
         android:layout_width="wrap_content"
diff --git a/vector/src/main/res/layout/item_verification_waiting.xml b/vector/src/main/res/layout/item_verification_waiting.xml
index 6a265f4edc..cef924c26c 100644
--- a/vector/src/main/res/layout/item_verification_waiting.xml
+++ b/vector/src/main/res/layout/item_verification_waiting.xml
@@ -18,7 +18,7 @@
         android:textColor="?vctr_content_secondary"
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/itemVerificationWaitingProgress"
+        app:layout_constraintEnd_toStartOf="@id/itemVerificationWaitingProgress"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="Waiting for..." />
diff --git a/vector/src/main/res/layout/media_upload_download_progress_layout.xml b/vector/src/main/res/layout/media_upload_download_progress_layout.xml
index f9c7609dc5..22d7ca711a 100644
--- a/vector/src/main/res/layout/media_upload_download_progress_layout.xml
+++ b/vector/src/main/res/layout/media_upload_download_progress_layout.xml
@@ -1,5 +1,4 @@
 <?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"
diff --git a/vector/src/main/res/layout/merge_image_attachment_overlay.xml b/vector/src/main/res/layout/merge_image_attachment_overlay.xml
index af8eb0090d..9020d5c266 100644
--- a/vector/src/main/res/layout/merge_image_attachment_overlay.xml
+++ b/vector/src/main/res/layout/merge_image_attachment_overlay.xml
@@ -15,7 +15,6 @@
 
     </View>
 
-
     <ImageView
         android:id="@+id/overlayBackButton"
         android:layout_width="44dp"
@@ -85,7 +84,6 @@
         app:tint="?colorOnPrimary"
         tools:ignore="MissingPrefix" />
 
-
     <androidx.constraintlayout.widget.Group
         android:id="@+id/overlayVideoControlsGroup"
         android:layout_width="wrap_content"
diff --git a/vector/src/main/res/layout/motion_notifs_fab_menu_merge.xml b/vector/src/main/res/layout/motion_notifs_fab_menu_merge.xml
index 34e48f6e32..9723b5cadf 100644
--- a/vector/src/main/res/layout/motion_notifs_fab_menu_merge.xml
+++ b/vector/src/main/res/layout/motion_notifs_fab_menu_merge.xml
@@ -24,7 +24,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
-        android:accessibilityTraversalBefore="@+id/roomListView"
+        android:accessibilityTraversalBefore="@id/roomListView"
         android:contentDescription="@string/a11y_create_room"
         android:src="@drawable/ic_fab_add_room"
         app:backgroundTint="#FFFFFF"
@@ -48,7 +48,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
-        android:accessibilityTraversalBefore="@+id/createRoomItemGroup"
+        android:accessibilityTraversalBefore="@id/createRoomItemGroup"
         android:contentDescription="@string/a11y_create_direct_message"
         android:src="@drawable/ic_fab_add_chat"
         app:backgroundTint="#FFFFFF"
@@ -71,7 +71,7 @@
         android:id="@+id/createRoomButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:accessibilityTraversalBefore="@+id/createRoomItemChat"
+        android:accessibilityTraversalBefore="@id/createRoomItemChat"
         android:contentDescription="@string/a11y_create_menu_open"
         android:src="@drawable/ic_fab_add"
         app:maxImageSize="14dp" />
diff --git a/vector/src/main/res/layout/vector_home_badge_unread_layout.xml b/vector/src/main/res/layout/vector_home_badge_unread_layout.xml
index 9ad6be6d69..1848cf812c 100644
--- a/vector/src/main/res/layout/vector_home_badge_unread_layout.xml
+++ b/vector/src/main/res/layout/vector_home_badge_unread_layout.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
diff --git a/vector/src/main/res/layout/vector_invite_view.xml b/vector/src/main/res/layout/vector_invite_view.xml
index deaaaa9902..ff0e29f82f 100644
--- a/vector/src/main/res/layout/vector_invite_view.xml
+++ b/vector/src/main/res/layout/vector_invite_view.xml
@@ -70,7 +70,7 @@
         app:bsv_use_flat_button="false"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_chainStyle="packed"
-        app:layout_constraintStart_toEndOf="@+id/inviteRejectView"
+        app:layout_constraintStart_toEndOf="@id/inviteRejectView"
         app:layout_constraintTop_toTopOf="@id/inviteRejectView" />
 
     <im.vector.app.core.platform.ButtonStateView
@@ -83,7 +83,7 @@
         app:bsv_button_text="@string/reject"
         app:bsv_loaded_image_src="@drawable/ic_tick"
         app:bsv_use_flat_button="true"
-        app:layout_constraintEnd_toStartOf="@+id/inviteAcceptView"
+        app:layout_constraintEnd_toStartOf="@id/inviteAcceptView"
         app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/inviteLabelView" />
@@ -93,5 +93,4 @@
         android:layout_height="16dp"
         app:layout_constraintTop_toBottomOf="@id/inviteAcceptView" />
 
-
 </merge>
diff --git a/vector/src/main/res/layout/view_attachment_type_selector.xml b/vector/src/main/res/layout/view_attachment_type_selector.xml
index bc747778a7..ec242118d9 100644
--- a/vector/src/main/res/layout/view_attachment_type_selector.xml
+++ b/vector/src/main/res/layout/view_attachment_type_selector.xml
@@ -44,7 +44,6 @@
 
             </LinearLayout>
 
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -66,7 +65,6 @@
 
             </LinearLayout>
 
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -119,7 +117,6 @@
 
             </LinearLayout>
 
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -141,7 +138,6 @@
 
             </LinearLayout>
 
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -164,7 +160,6 @@
             </LinearLayout>
         </LinearLayout>
 
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
diff --git a/vector/src/main/res/layout/view_bottom_sheet_action_button.xml b/vector/src/main/res/layout/view_bottom_sheet_action_button.xml
index 5e4873d5f0..f8521c7eba 100644
--- a/vector/src/main/res/layout/view_bottom_sheet_action_button.xml
+++ b/vector/src/main/res/layout/view_bottom_sheet_action_button.xml
@@ -35,7 +35,6 @@
             tools:src="@drawable/ic_share"
             tools:visibility="visible" />
 
-
         <TextView
             android:id="@+id/bottomSheetActionTitle"
             style="@style/Widget.Vector.TextView.Subtitle"
@@ -44,9 +43,9 @@
             android:layout_marginStart="8dp"
             android:textColor="?colorPrimary"
             app:layout_constrainedWidth="true"
-            app:layout_constraintBottom_toTopOf="@+id/bottomSheetActionSubTitle"
-            app:layout_constraintEnd_toStartOf="@+id/bottomSheetActionBeta"
-            app:layout_constraintStart_toEndOf="@+id/bottomSheetActionLeftIcon"
+            app:layout_constraintBottom_toTopOf="@id/bottomSheetActionSubTitle"
+            app:layout_constraintEnd_toStartOf="@id/bottomSheetActionBeta"
+            app:layout_constraintStart_toEndOf="@id/bottomSheetActionLeftIcon"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintVertical_chainStyle="packed"
             app:layout_goneMarginStart="0dp"
@@ -62,9 +61,9 @@
             android:visibility="gone"
             app:layout_constrainedWidth="true"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/bottomSheetActionBeta"
-            app:layout_constraintStart_toStartOf="@+id/bottomSheetActionTitle"
-            app:layout_constraintTop_toBottomOf="@+id/bottomSheetActionTitle"
+            app:layout_constraintEnd_toStartOf="@id/bottomSheetActionBeta"
+            app:layout_constraintStart_toStartOf="@id/bottomSheetActionTitle"
+            app:layout_constraintTop_toBottomOf="@id/bottomSheetActionTitle"
             tools:text="For maximum security, do this in person"
             tools:visibility="visible" />
 
@@ -74,8 +73,8 @@
             android:layout_height="wrap_content"
             android:importantForAccessibility="no"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/bottomSheetActionIcon"
-            app:layout_constraintStart_toEndOf="@+id/bottomSheetActionTitle"
+            app:layout_constraintEnd_toStartOf="@id/bottomSheetActionIcon"
+            app:layout_constraintStart_toEndOf="@id/bottomSheetActionTitle"
             app:layout_constraintTop_toTopOf="parent"
             android:src="@drawable/ic_beta_pill" />
 
diff --git a/vector/src/main/res/layout/view_call_controls.xml b/vector/src/main/res/layout/view_call_controls.xml
index 6b12c42f5b..0ce894dab1 100644
--- a/vector/src/main/res/layout/view_call_controls.xml
+++ b/vector/src/main/res/layout/view_call_controls.xml
@@ -52,7 +52,6 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/connectedControls"
         android:layout_width="match_parent"
@@ -93,7 +92,6 @@
             app:tint="?vctr_content_primary"
             tools:ignore="MissingConstraints,MissingPrefix" />
 
-
         <ImageView
             android:id="@+id/videoToggleIcon"
             android:layout_width="56dp"
diff --git a/vector/src/main/res/layout/view_failed_messages_warning.xml b/vector/src/main/res/layout/view_failed_messages_warning.xml
index 3e0e307dc3..549e384fcd 100644
--- a/vector/src/main/res/layout/view_failed_messages_warning.xml
+++ b/vector/src/main/res/layout/view_failed_messages_warning.xml
@@ -31,7 +31,7 @@
         android:textColor="?vctr_content_primary"
         app:drawableStartCompat="@drawable/ic_sending_message_failed"
         app:layout_constraintBottom_toBottomOf="@id/failedMessagesRetryButton"
-        app:layout_constraintEnd_toStartOf="@+id/failedMessagesDeleteAllButton"
+        app:layout_constraintEnd_toStartOf="@id/failedMessagesDeleteAllButton"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@id/failedMessagesRetryButton" />
 
diff --git a/vector/src/main/res/layout/view_keys_backup_banner.xml b/vector/src/main/res/layout/view_keys_backup_banner.xml
index 7dcb3d223a..79690273e3 100644
--- a/vector/src/main/res/layout/view_keys_backup_banner.xml
+++ b/vector/src/main/res/layout/view_keys_backup_banner.xml
@@ -25,7 +25,7 @@
         android:id="@+id/view_keys_backup_banner_space1"
         android:layout_width="wrap_content"
         android:layout_height="8dp"
-        app:layout_constraintBottom_toTopOf="@+id/view_keys_backup_banner_text_1"
+        app:layout_constraintBottom_toTopOf="@id/view_keys_backup_banner_text_1"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed" />
 
@@ -40,7 +40,7 @@
         app:layout_constraintBottom_toTopOf="@id/view_keys_backup_banner_text_2"
         app:layout_constraintEnd_toStartOf="@id/view_keys_backup_banner_barrier"
         app:layout_constraintStart_toEndOf="@id/view_keys_backup_banner_picto"
-        app:layout_constraintTop_toBottomOf="@+id/view_keys_backup_banner_space1" />
+        app:layout_constraintTop_toBottomOf="@id/view_keys_backup_banner_space1" />
 
     <TextView
         android:id="@+id/view_keys_backup_banner_text_2"
@@ -51,7 +51,7 @@
         android:text="@string/secure_backup_banner_setup_line2"
         android:textColor="?vctr_content_secondary"
         android:visibility="gone"
-        app:layout_constraintBottom_toTopOf="@+id/view_keys_backup_banner_space2"
+        app:layout_constraintBottom_toTopOf="@id/view_keys_backup_banner_space2"
         app:layout_constraintEnd_toStartOf="@id/view_keys_backup_banner_barrier"
         app:layout_constraintStart_toEndOf="@id/view_keys_backup_banner_picto"
         app:layout_constraintTop_toBottomOf="@id/view_keys_backup_banner_text_1"
@@ -62,7 +62,7 @@
         android:layout_width="wrap_content"
         android:layout_height="8dp"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/view_keys_backup_banner_text_2" />
+        app:layout_constraintTop_toBottomOf="@id/view_keys_backup_banner_text_2" />
 
     <androidx.constraintlayout.widget.Barrier
         android:id="@+id/view_keys_backup_banner_barrier"
diff --git a/vector/src/main/res/layout/view_poll_result_line.xml b/vector/src/main/res/layout/view_poll_result_line.xml
index 6238aa1b05..bf115a3c43 100644
--- a/vector/src/main/res/layout/view_poll_result_line.xml
+++ b/vector/src/main/res/layout/view_poll_result_line.xml
@@ -29,7 +29,6 @@
         android:textColor="?vctr_content_primary"
         tools:text="Open a Github Issue" />
 
-
     <TextView
         android:id="@+id/pollResultItemPercent"
         style="@style/Widget.Vector.TextView.Body"
diff --git a/vector/src/main/res/layout/view_read_receipts.xml b/vector/src/main/res/layout/view_read_receipts.xml
index 06f73c0db4..907f1ec0e3 100644
--- a/vector/src/main/res/layout/view_read_receipts.xml
+++ b/vector/src/main/res/layout/view_read_receipts.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
diff --git a/vector/src/main/res/layout/view_remove_jitsi_widget.xml b/vector/src/main/res/layout/view_remove_jitsi_widget.xml
index 0bfdfe60d1..a3aac5be5a 100644
--- a/vector/src/main/res/layout/view_remove_jitsi_widget.xml
+++ b/vector/src/main/res/layout/view_remove_jitsi_widget.xml
@@ -36,7 +36,6 @@
 
     </LinearLayout>
 
-
     <LinearLayout
         android:id="@+id/removeJitsiSlidingContainer"
         android:layout_width="wrap_content"
@@ -50,7 +49,6 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-
         <TextView
             android:id="@+id/removeJitsiSlidingTextView"
             style="@style/Widget.Vector.TextView.Body"
@@ -123,5 +121,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
-
 </merge>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/view_state.xml b/vector/src/main/res/layout/view_state.xml
index 782bba6588..a7bb585066 100644
--- a/vector/src/main/res/layout/view_state.xml
+++ b/vector/src/main/res/layout/view_state.xml
@@ -13,7 +13,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center" />
 
-
     <LinearLayout
         android:id="@+id/errorView"
         android:layout_width="wrap_content"
@@ -101,7 +100,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/emptyTitleView"
+            app:layout_constraintTop_toBottomOf="@id/emptyTitleView"
             app:layout_constraintVertical_chainStyle="packed"
             tools:text="@string/room_list_people_empty_body" />
 
diff --git a/vector/src/main/res/layout/view_stub_room_member_profile_header.xml b/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
index 0b3e21a348..6df1010196 100644
--- a/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
+++ b/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
@@ -14,8 +14,8 @@
         android:layout_height="wrap_content"
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
-        app:layout_constraintBottom_toTopOf="@+id/memberProfileNameView"
-        app:layout_constraintTop_toTopOf="@+id/memberProfileNameView">
+        app:layout_constraintBottom_toTopOf="@id/memberProfileNameView"
+        app:layout_constraintTop_toTopOf="@id/memberProfileNameView">
 
         <ImageView
             android:id="@+id/memberProfileAvatarView"
@@ -23,14 +23,13 @@
             android:layout_height="128dp"
             android:layout_marginBottom="16dp"
             android:contentDescription="@string/avatar"
-            app:layout_constraintBottom_toTopOf="@+id/memberProfileNameView"
+            app:layout_constraintBottom_toTopOf="@id/memberProfileNameView"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintVertical_chainStyle="spread_inside"
             tools:src="@sample/user_round_avatars" />
 
-
         <im.vector.app.core.ui.views.PresenceStateImageView
             android:id="@+id/memberProfilePresenceImageView"
             android:layout_width="26dp"
@@ -39,7 +38,7 @@
             android:importantForAccessibility="no"
             android:padding="3dp"
             android:visibility="gone"
-            app:layout_constraintCircle="@+id/memberProfileAvatarView"
+            app:layout_constraintCircle="@id/memberProfileAvatarView"
             app:layout_constraintCircleAngle="135"
             app:layout_constraintCircleRadius="64dp"
             tools:ignore="MissingConstraints"
@@ -52,11 +51,11 @@
             android:layout_height="30dp"
             android:layout_marginTop="2dp"
             android:layout_marginEnd="8dp"
-            app:layout_constraintBottom_toBottomOf="@+id/memberProfileNameView"
-            app:layout_constraintEnd_toStartOf="@+id/memberProfileNameView"
+            app:layout_constraintBottom_toBottomOf="@id/memberProfileNameView"
+            app:layout_constraintEnd_toStartOf="@id/memberProfileNameView"
             app:layout_constraintHorizontal_chainStyle="packed"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/memberProfileNameView" />
+            app:layout_constraintTop_toTopOf="@id/memberProfileNameView" />
 
         <TextView
             android:id="@+id/memberProfileNameView"
@@ -65,10 +64,10 @@
             android:layout_height="wrap_content"
             android:gravity="center"
             android:textStyle="bold"
-            app:layout_constraintBottom_toTopOf="@+id/memberProfileIdView"
+            app:layout_constraintBottom_toTopOf="@id/memberProfileIdView"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/memberProfileDecorationImageView"
-            app:layout_constraintTop_toBottomOf="@+id/memberProfileAvatarView"
+            app:layout_constraintStart_toEndOf="@id/memberProfileDecorationImageView"
+            app:layout_constraintTop_toBottomOf="@id/memberProfileAvatarView"
             tools:text="@sample/users.json/data/displayName" />
 
         <TextView
@@ -80,10 +79,10 @@
             android:layout_marginBottom="16dp"
             android:gravity="center"
             android:textStyle="bold"
-            app:layout_constraintBottom_toTopOf="@+id/memberProfilePowerLevelView"
+            app:layout_constraintBottom_toTopOf="@id/memberProfilePowerLevelView"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/memberProfileNameView"
+            app:layout_constraintTop_toBottomOf="@id/memberProfileNameView"
             tools:text="@sample/users.json/data/id" />
 
         <TextView
@@ -94,10 +93,10 @@
             android:layout_marginBottom="16dp"
             android:gravity="center"
             android:textColor="?vctr_content_primary"
-            app:layout_constraintBottom_toTopOf="@+id/memberProfileStatusView"
+            app:layout_constraintBottom_toTopOf="@id/memberProfileStatusView"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/memberProfileIdView"
+            app:layout_constraintTop_toBottomOf="@id/memberProfileIdView"
             tools:text="Admin in Matrix" />
 
         <TextView
@@ -110,7 +109,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/memberProfilePowerLevelView"
+            app:layout_constraintTop_toBottomOf="@id/memberProfilePowerLevelView"
             tools:text="Here is a profile status"
             tools:visibility="visible" />
 
diff --git a/vector/src/main/res/layout/view_stub_room_profile_header.xml b/vector/src/main/res/layout/view_stub_room_profile_header.xml
index b6fc16e606..0684b2b8ae 100644
--- a/vector/src/main/res/layout/view_stub_room_profile_header.xml
+++ b/vector/src/main/res/layout/view_stub_room_profile_header.xml
@@ -14,7 +14,7 @@
         android:layout_marginBottom="16dp"
         android:contentDescription="@string/avatar"
         android:transitionName="roomProfileAvatarView"
-        app:layout_constraintBottom_toTopOf="@+id/roomProfileNameView"
+        app:layout_constraintBottom_toTopOf="@id/roomProfileNameView"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -28,7 +28,7 @@
         android:importantForAccessibility="no"
         android:padding="3dp"
         android:visibility="gone"
-        app:layout_constraintCircle="@+id/roomProfileAvatarView"
+        app:layout_constraintCircle="@id/roomProfileAvatarView"
         app:layout_constraintCircleAngle="135"
         app:layout_constraintCircleRadius="64dp"
         tools:ignore="MissingConstraints"
@@ -44,7 +44,7 @@
         android:padding="2dp"
         android:src="@drawable/ic_public_room"
         android:visibility="gone"
-        app:layout_constraintCircle="@+id/roomProfileAvatarView"
+        app:layout_constraintCircle="@id/roomProfileAvatarView"
         app:layout_constraintCircleAngle="135"
         app:layout_constraintCircleRadius="64dp"
         tools:ignore="MissingConstraints"
@@ -56,11 +56,11 @@
         android:layout_height="30dp"
         android:layout_marginTop="2dp"
         android:layout_marginEnd="8dp"
-        app:layout_constraintBottom_toBottomOf="@+id/roomProfileNameView"
-        app:layout_constraintEnd_toStartOf="@+id/roomProfileNameView"
+        app:layout_constraintBottom_toBottomOf="@id/roomProfileNameView"
+        app:layout_constraintEnd_toStartOf="@id/roomProfileNameView"
         app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/roomProfileNameView"/>
+        app:layout_constraintTop_toTopOf="@id/roomProfileNameView"/>
 
     <TextView
         android:id="@+id/roomProfileNameView"
@@ -69,10 +69,10 @@
         android:layout_height="wrap_content"
         android:gravity="center"
         android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@+id/roomProfileAliasView"
+        app:layout_constraintBottom_toTopOf="@id/roomProfileAliasView"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/roomProfileDecorationImageView"
-        app:layout_constraintTop_toBottomOf="@+id/roomProfileAvatarView"
+        app:layout_constraintStart_toEndOf="@id/roomProfileDecorationImageView"
+        app:layout_constraintTop_toBottomOf="@id/roomProfileAvatarView"
         tools:text="@sample/rooms.json/data/name" />
 
     <TextView
@@ -87,7 +87,7 @@
         android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/roomProfileNameView"
+        app:layout_constraintTop_toBottomOf="@id/roomProfileNameView"
         tools:text="@sample/rooms.json/data/alias" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/view_url_preview.xml b/vector/src/main/res/layout/view_url_preview.xml
index 72030384f6..45c35279c8 100644
--- a/vector/src/main/res/layout/view_url_preview.xml
+++ b/vector/src/main/res/layout/view_url_preview.xml
@@ -26,8 +26,8 @@
         android:maxLines="2"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
-        app:layout_constraintEnd_toStartOf="@+id/url_preview_close"
-        app:layout_constraintStart_toStartOf="@+id/url_preview_left_border"
+        app:layout_constraintEnd_toStartOf="@id/url_preview_close"
+        app:layout_constraintStart_toStartOf="@id/url_preview_left_border"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="Jo Malone denounces her former brand's John Boyega decision" />
 
@@ -39,8 +39,8 @@
         android:importantForAccessibility="no"
         android:scaleType="fitStart"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="@+id/url_preview_title"
-        app:layout_constraintTop_toBottomOf="@+id/url_preview_title"
+        app:layout_constraintStart_toStartOf="@id/url_preview_title"
+        app:layout_constraintTop_toBottomOf="@id/url_preview_title"
         tools:src="@tools:sample/backgrounds/scenic" />
 
     <TextView
@@ -54,8 +54,8 @@
         android:maxLines="4"
         android:textColor="?vctr_content_secondary"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="@+id/url_preview_left_border"
-        app:layout_constraintTop_toBottomOf="@+id/url_preview_image"
+        app:layout_constraintStart_toStartOf="@id/url_preview_left_border"
+        app:layout_constraintTop_toBottomOf="@id/url_preview_image"
         tools:text="The British perfumer says removing actor John Boyega from his own advert was “utterly despicable”." />
 
     <TextView
@@ -70,8 +70,8 @@
         android:singleLine="true"
         android:textColor="?vctr_content_tertiary"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="@+id/url_preview_left_border"
-        app:layout_constraintTop_toBottomOf="@+id/url_preview_description"
+        app:layout_constraintStart_toStartOf="@id/url_preview_left_border"
+        app:layout_constraintTop_toBottomOf="@id/url_preview_description"
         tools:text="BBC News" />
 
     <ImageView
diff --git a/vector/src/main/res/xml/motion_scene_notifs_fab_menu.xml b/vector/src/main/res/xml/motion_scene_notifs_fab_menu.xml
index 0506bb6229..18afa79f1a 100644
--- a/vector/src/main/res/xml/motion_scene_notifs_fab_menu.xml
+++ b/vector/src/main/res/xml/motion_scene_notifs_fab_menu.xml
@@ -4,14 +4,14 @@
 
     <!-- Click on main FAB: toggle -->
     <Transition
-        motion:constraintSetEnd="@+id/constraint_set_fab_menu_open"
-        motion:constraintSetStart="@+id/constraint_set_fab_menu_close"
+        motion:constraintSetEnd="@id/constraint_set_fab_menu_open"
+        motion:constraintSetStart="@id/constraint_set_fab_menu_close"
         motion:duration="300"
         motion:motionInterpolator="easeInOut">
 
         <OnClick
             motion:clickAction="toggle"
-            motion:targetId="@+id/createRoomButton" />
+            motion:targetId="@id/createRoomButton" />
 
         <KeyFrameSet>
 
@@ -61,10 +61,10 @@
             android:visibility="invisible"
             motion:backgroundTint="#FFFFFF"
             motion:fabCustomSize="48dp"
-            motion:layout_constraintBottom_toBottomOf="@+id/createRoomButton"
-            motion:layout_constraintEnd_toEndOf="@+id/createRoomButton"
-            motion:layout_constraintStart_toStartOf="@+id/createRoomButton"
-            motion:layout_constraintTop_toTopOf="@+id/createRoomButton"
+            motion:layout_constraintBottom_toBottomOf="@id/createRoomButton"
+            motion:layout_constraintEnd_toEndOf="@id/createRoomButton"
+            motion:layout_constraintStart_toStartOf="@id/createRoomButton"
+            motion:layout_constraintTop_toTopOf="@id/createRoomButton"
             motion:maxImageSize="26dp"
             motion:tint="@android:color/black" />
 
@@ -75,9 +75,9 @@
             android:layout_marginEnd="8dp"
             android:text="@string/fab_menu_create_room"
             android:visibility="invisible"
-            motion:layout_constraintBottom_toBottomOf="@+id/createRoomItemGroup"
-            motion:layout_constraintEnd_toEndOf="@+id/createRoomItemGroup"
-            motion:layout_constraintTop_toTopOf="@+id/createRoomItemGroup" />
+            motion:layout_constraintBottom_toBottomOf="@id/createRoomItemGroup"
+            motion:layout_constraintEnd_toEndOf="@id/createRoomItemGroup"
+            motion:layout_constraintTop_toTopOf="@id/createRoomItemGroup" />
 
         <!-- Sub menu item 1 -->
         <Constraint
@@ -89,10 +89,10 @@
             android:visibility="invisible"
             motion:backgroundTint="#FFFFFF"
             motion:fabCustomSize="48dp"
-            motion:layout_constraintBottom_toBottomOf="@+id/createRoomButton"
-            motion:layout_constraintEnd_toEndOf="@+id/createRoomButton"
-            motion:layout_constraintStart_toStartOf="@+id/createRoomButton"
-            motion:layout_constraintTop_toTopOf="@+id/createRoomButton"
+            motion:layout_constraintBottom_toBottomOf="@id/createRoomButton"
+            motion:layout_constraintEnd_toEndOf="@id/createRoomButton"
+            motion:layout_constraintStart_toStartOf="@id/createRoomButton"
+            motion:layout_constraintTop_toTopOf="@id/createRoomButton"
             motion:maxImageSize="29dp"
             motion:tint="@android:color/black" />
 
@@ -103,9 +103,9 @@
             android:layout_marginEnd="8dp"
             android:text="@string/fab_menu_create_chat"
             android:visibility="invisible"
-            motion:layout_constraintBottom_toBottomOf="@+id/createRoomItemChat"
-            motion:layout_constraintEnd_toEndOf="@+id/createRoomItemChat"
-            motion:layout_constraintTop_toTopOf="@+id/createRoomItemChat" />
+            motion:layout_constraintBottom_toBottomOf="@id/createRoomItemChat"
+            motion:layout_constraintEnd_toEndOf="@id/createRoomItemChat"
+            motion:layout_constraintTop_toTopOf="@id/createRoomItemChat" />
 
         <!-- Menu -->
         <Constraint
@@ -139,9 +139,9 @@
             android:src="@drawable/ic_fab_add_room"
             motion:backgroundTint="#FFFFFF"
             motion:fabCustomSize="48dp"
-            motion:layout_constraintBottom_toTopOf="@+id/createRoomItemChat"
-            motion:layout_constraintEnd_toEndOf="@+id/createRoomButton"
-            motion:layout_constraintStart_toStartOf="@+id/createRoomButton"
+            motion:layout_constraintBottom_toTopOf="@id/createRoomItemChat"
+            motion:layout_constraintEnd_toEndOf="@id/createRoomButton"
+            motion:layout_constraintStart_toStartOf="@id/createRoomButton"
             motion:maxImageSize="26dp"
             motion:tint="@android:color/black" />
 
@@ -151,9 +151,9 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="8dp"
             android:text="@string/fab_menu_create_room"
-            motion:layout_constraintBottom_toBottomOf="@+id/createRoomItemGroup"
-            motion:layout_constraintEnd_toStartOf="@+id/createRoomItemGroup"
-            motion:layout_constraintTop_toTopOf="@+id/createRoomItemGroup" />
+            motion:layout_constraintBottom_toBottomOf="@id/createRoomItemGroup"
+            motion:layout_constraintEnd_toStartOf="@id/createRoomItemGroup"
+            motion:layout_constraintTop_toTopOf="@id/createRoomItemGroup" />
 
         <!-- Sub menu item 1 -->
         <Constraint
@@ -165,9 +165,9 @@
             android:src="@drawable/ic_fab_add_chat"
             motion:backgroundTint="#FFFFFF"
             motion:fabCustomSize="48dp"
-            motion:layout_constraintBottom_toTopOf="@+id/createRoomButton"
-            motion:layout_constraintEnd_toEndOf="@+id/createRoomButton"
-            motion:layout_constraintStart_toStartOf="@+id/createRoomButton"
+            motion:layout_constraintBottom_toTopOf="@id/createRoomButton"
+            motion:layout_constraintEnd_toEndOf="@id/createRoomButton"
+            motion:layout_constraintStart_toStartOf="@id/createRoomButton"
             motion:maxImageSize="29dp"
             motion:tint="@android:color/black" />
 
@@ -177,9 +177,9 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="8dp"
             android:text="@string/fab_menu_create_chat"
-            motion:layout_constraintBottom_toBottomOf="@+id/createRoomItemChat"
-            motion:layout_constraintEnd_toStartOf="@+id/createRoomItemChat"
-            motion:layout_constraintTop_toTopOf="@+id/createRoomItemChat" />
+            motion:layout_constraintBottom_toBottomOf="@id/createRoomItemChat"
+            motion:layout_constraintEnd_toStartOf="@id/createRoomItemChat"
+            motion:layout_constraintTop_toTopOf="@id/createRoomItemChat" />
 
         <!-- Menu -->
         <Constraint
diff --git a/vector/src/main/res/xml/vector_settings_labs.xml b/vector/src/main/res/xml/vector_settings_labs.xml
index 6260f65fd9..a605846985 100644
--- a/vector/src/main/res/xml/vector_settings_labs.xml
+++ b/vector/src/main/res/xml/vector_settings_labs.xml
@@ -44,7 +44,6 @@
         android:key="SETTINGS_LABS_UNREAD_NOTIFICATIONS_AS_TAB"
         android:title="@string/labs_show_unread_notifications_as_tab" />
 
-
     <im.vector.app.core.preference.VectorSwitchPreference
         android:defaultValue="false"
         android:key="SETTINGS_LABS_USE_RESTRICTED_JOIN_RULE"
@@ -52,5 +51,4 @@
         android:summary="@string/labs_use_restricted_join_rule_desc"/>
     <!--</im.vector.app.core.preference.VectorPreferenceCategory>-->
 
-
 </androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/vector/src/main/res/xml/vector_settings_security_privacy.xml b/vector/src/main/res/xml/vector_settings_security_privacy.xml
index 5dfde2d1df..7a301348ea 100644
--- a/vector/src/main/res/xml/vector_settings_security_privacy.xml
+++ b/vector/src/main/res/xml/vector_settings_security_privacy.xml
@@ -80,7 +80,6 @@
             android:summary="@string/settings_secure_backup_section_info" />
     </im.vector.app.core.preference.VectorPreferenceCategory>
 
-
     <im.vector.app.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_CRYPTOGRAPHY_MANAGE_PREFERENCE_KEY"
         android:title="@string/settings_cryptography_manage_keys">