diff --git a/CHANGES.md b/CHANGES.md
index 2111d369e9..54a0194a6d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -23,7 +23,7 @@ SDK API changes ⚠️:
  - Rename package `im.vector.matrix.rx` to `org.matrix.android.sdk.rx`
 
 Build 🧱:
- -
+ - Fix RtlHardcoded issues (use `Start` and `End` instead of `Left` and `Right` layout attributes)
 
 Other changes:
  - Use `Context#getSystemService` extension function provided by `core-ktx` (#1702)
diff --git a/vector/lint.xml b/vector/lint.xml
index 8acd8af9b6..86fc15f937 100644
--- a/vector/lint.xml
+++ b/vector/lint.xml
@@ -30,8 +30,7 @@
 
     <!-- RTL -->
     <issue id="RtlEnabled" severity="error" />
-    <!-- Now with min API set to 19, we do not need Left and Right attribute, Start and End is enougth. For the moment, just reduce the severity -->
-    <issue id="RtlHardcoded" severity="warning" />
+    <issue id="RtlHardcoded" severity="error" />
     <issue id="RtlSymmetry" severity="error" />
 
     <!-- Code -->
diff --git a/vector/src/main/res/layout/activity_bug_report.xml b/vector/src/main/res/layout/activity_bug_report.xml
index 7156f91314..3bfb1f5429 100644
--- a/vector/src/main/res/layout/activity_bug_report.xml
+++ b/vector/src/main/res/layout/activity_bug_report.xml
@@ -25,10 +25,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
             android:layout_marginTop="10dp"
             android:layout_marginEnd="10dp"
-            android:layout_marginRight="10dp"
             android:text="@string/send_bug_report_progress"
             android:textColor="?riotx_text_primary"
             android:visibility="gone"
@@ -41,9 +39,7 @@
             android:layout_height="20dp"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
             android:layout_marginEnd="10dp"
-            android:layout_marginRight="10dp"
             android:max="100"
             android:visibility="gone"
             tools:progress="70"
@@ -66,9 +62,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
-                    android:layout_marginLeft="10dp"
                     android:layout_marginEnd="10dp"
-                    android:layout_marginRight="10dp"
                     android:text="@string/send_bug_report_description"
                     android:textColor="?riotx_text_primary" />
 
@@ -78,10 +72,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
-                    android:layout_marginLeft="10dp"
                     android:layout_marginTop="10dp"
                     android:layout_marginEnd="10dp"
-                    android:layout_marginRight="10dp"
                     android:hint="@string/send_bug_report_placeholder"
                     android:textColorHint="?attr/vctr_default_text_hint_color"
                     app:counterEnabled="true"
@@ -100,9 +92,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
-                    android:layout_marginLeft="10dp"
                     android:layout_marginEnd="10dp"
-                    android:layout_marginRight="10dp"
                     android:text="@string/send_bug_report_description_in_english"
                     android:textColor="?riotx_text_secondary"
                     android:textSize="12sp" />
@@ -112,10 +102,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
-                    android:layout_marginLeft="10dp"
                     android:layout_marginTop="10dp"
                     android:layout_marginEnd="10dp"
-                    android:layout_marginRight="10dp"
                     android:text="@string/send_bug_report_logs_description"
                     android:textColor="?riotx_text_primary" />
 
@@ -124,9 +112,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
-                    android:layout_marginLeft="10dp"
                     android:layout_marginEnd="10dp"
-                    android:layout_marginRight="10dp"
                     android:checked="true"
                     android:text="@string/send_bug_report_include_logs" />
 
@@ -135,9 +121,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
-                    android:layout_marginLeft="10dp"
                     android:layout_marginEnd="10dp"
-                    android:layout_marginRight="10dp"
                     android:checked="true"
                     android:text="@string/send_bug_report_include_crash_logs" />
 
@@ -146,9 +130,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
-                    android:layout_marginLeft="10dp"
                     android:layout_marginEnd="10dp"
-                    android:layout_marginRight="10dp"
                     android:checked="true"
                     android:text="@string/send_bug_report_include_screenshot" />
 
diff --git a/vector/src/main/res/layout/alerter_verification_layout.xml b/vector/src/main/res/layout/alerter_verification_layout.xml
index 7098c3152d..7a2e81a6ce 100644
--- a/vector/src/main/res/layout/alerter_verification_layout.xml
+++ b/vector/src/main/res/layout/alerter_verification_layout.xml
@@ -23,11 +23,11 @@
         android:id="@+id/ivIcon"
         android:layout_width="24dp"
         android:layout_height="24dp"
+        android:src="@drawable/ic_shield_warning"
         app:layout_constraintCircle="@+id/ivUserAvatar"
         app:layout_constraintCircleAngle="135"
         app:layout_constraintCircleRadius="20dp"
         tools:ignore="MissingConstraints"
-        android:src="@drawable/ic_shield_warning"
         tools:visibility="visible" />
 
     <LinearLayout
@@ -47,7 +47,6 @@
             android:layout_marginStart="@dimen/alerter_padding_half"
             android:layout_marginEnd="@dimen/alerter_padding_half"
             android:paddingStart="@dimen/alerter_padding_small"
-            android:paddingLeft="@dimen/alerter_padding_small"
             android:paddingEnd="@dimen/alerter_padding_small"
             android:textAppearance="@style/AlertTextAppearance.Title"
             android:visibility="gone"
@@ -60,15 +59,14 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/alerter_padding_half"
             android:layout_marginEnd="@dimen/alerter_padding_half"
+            android:maxLines="3"
             android:paddingStart="@dimen/alerter_padding_small"
-            android:paddingLeft="@dimen/alerter_padding_small"
             android:paddingTop="@dimen/alerter_padding_small"
             android:paddingEnd="@dimen/alerter_padding_small"
             android:paddingBottom="@dimen/alerter_padding_small"
             android:textAppearance="@style/AlertTextAppearance.Text"
             android:visibility="gone"
             tools:text="Text"
-            android:maxLines="3"
             tools:visibility="visible" />
 
     </LinearLayout>
diff --git a/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml b/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml
index 28262cf5de..c109e821cb 100644
--- a/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml
+++ b/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml
@@ -64,7 +64,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
-            android:layout_marginLeft="8dp"
             android:textColor="?riotx_text_secondary"
             tools:text="@string/keys_backup_info_keys_all_backup_up" />
 
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 e4df4b5c9a..56459e90d6 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
@@ -51,7 +51,6 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
-            android:layout_marginLeft="8dp"
             android:layout_weight="1"
             android:orientation="vertical">
 
@@ -99,7 +98,6 @@
             android:id="@+id/widgetPermissionDecline"
             style="@style/VectorButtonStyleDestructive"
             android:layout_marginEnd="@dimen/layout_vertical_margin"
-            android:layout_marginRight="@dimen/layout_vertical_margin"
             android:text="@string/decline"
             android:textAllCaps="true" />
 
@@ -107,7 +105,6 @@
             android:id="@+id/widgetPermissionContinue"
             style="@style/VectorButtonStylePositive"
             android:layout_marginEnd="@dimen/layout_vertical_margin"
-            android:layout_marginRight="@dimen/layout_vertical_margin"
             android:minWidth="160dp"
             android:text="@string/_continue"
             android:textAllCaps="true" />
diff --git a/vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml b/vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml
index b6fb49178d..4f528e6ef4 100644
--- a/vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml
+++ b/vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml
@@ -35,9 +35,9 @@
         android:foreground="?attr/selectableItemBackground"
         android:minHeight="50dp"
         android:orientation="horizontal"
-        android:paddingLeft="@dimen/layout_horizontal_margin"
+        android:paddingStart="@dimen/layout_horizontal_margin"
         android:paddingTop="8dp"
-        android:paddingRight="@dimen/layout_horizontal_margin"
+        android:paddingEnd="@dimen/layout_horizontal_margin"
         android:paddingBottom="8dp">
 
         <ImageView
@@ -45,7 +45,6 @@
             android:layout_height="24dp"
             android:layout_gravity="center_vertical"
             android:layout_marginEnd="16dp"
-            android:layout_marginRight="16dp"
             android:src="@drawable/ic_material_share"
             android:tint="?colorAccent" />
 
@@ -66,9 +65,9 @@
         android:foreground="?attr/selectableItemBackground"
         android:minHeight="50dp"
         android:orientation="horizontal"
-        android:paddingLeft="@dimen/layout_horizontal_margin"
+        android:paddingStart="@dimen/layout_horizontal_margin"
         android:paddingTop="8dp"
-        android:paddingRight="@dimen/layout_horizontal_margin"
+        android:paddingEnd="@dimen/layout_horizontal_margin"
         android:paddingBottom="8dp">
 
         <ImageView
@@ -76,7 +75,6 @@
             android:layout_height="24dp"
             android:layout_gravity="center_vertical"
             android:layout_marginEnd="16dp"
-            android:layout_marginRight="16dp"
             android:src="@drawable/ic_material_save"
             android:tint="?colorAccent" />
 
diff --git a/vector/src/main/res/layout/constraint_set_composer_layout_expanded.xml b/vector/src/main/res/layout/constraint_set_composer_layout_expanded.xml
index bd59a14dd9..00f1830b1d 100644
--- a/vector/src/main/res/layout/constraint_set_composer_layout_expanded.xml
+++ b/vector/src/main/res/layout/constraint_set_composer_layout_expanded.xml
@@ -40,7 +40,6 @@
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="8dp"
         app:layout_constraintBottom_toTopOf="@id/composer_related_message_action_image"
@@ -105,11 +104,9 @@
         android:layout_width="32dp"
         android:layout_height="32dp"
         android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="4dp"
         app:layout_goneMarginEnd="8dp"
-        android:layout_marginRight="8dp"
         android:layout_marginBottom="8dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/composer_shield"
diff --git a/vector/src/main/res/layout/dialog_base_edit_text.xml b/vector/src/main/res/layout/dialog_base_edit_text.xml
index 98dc398042..1c4695a815 100644
--- a/vector/src/main/res/layout/dialog_base_edit_text.xml
+++ b/vector/src/main/res/layout/dialog_base_edit_text.xml
@@ -5,10 +5,8 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:paddingStart="?dialogPreferredPadding"
-    android:paddingLeft="?dialogPreferredPadding"
     android:paddingTop="12dp"
-    android:paddingEnd="?dialogPreferredPadding"
-    android:paddingRight="?dialogPreferredPadding">
+    android:paddingEnd="?dialogPreferredPadding">
 
     <EditText
         android:id="@+id/editText"
diff --git a/vector/src/main/res/layout/dialog_change_password.xml b/vector/src/main/res/layout/dialog_change_password.xml
index 840f67c715..c1213aacfd 100644
--- a/vector/src/main/res/layout/dialog_change_password.xml
+++ b/vector/src/main/res/layout/dialog_change_password.xml
@@ -6,10 +6,8 @@
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:paddingStart="?dialogPreferredPadding"
-    android:paddingLeft="?dialogPreferredPadding"
     android:paddingTop="12dp"
-    android:paddingEnd="?dialogPreferredPadding"
-    android:paddingRight="?dialogPreferredPadding">
+    android:paddingEnd="?dialogPreferredPadding">
 
     <LinearLayout
         android:layout_width="match_parent"
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 859eda2010..5a4e90be16 100644
--- a/vector/src/main/res/layout/dialog_confirmation_with_reason.xml
+++ b/vector/src/main/res/layout/dialog_confirmation_with_reason.xml
@@ -6,18 +6,16 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingStart="?dialogPreferredPadding"
-    android:paddingLeft="?dialogPreferredPadding"
     android:paddingTop="12dp"
     android:paddingEnd="?dialogPreferredPadding"
-    android:paddingRight="?dialogPreferredPadding"
     android:paddingBottom="12dp">
 
     <TextView
         android:id="@+id/dialogConfirmationText"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        tools:text="@string/delete_event_dialog_content"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="@string/delete_event_dialog_content" />
 
     <com.google.android.material.checkbox.MaterialCheckBox
         android:id="@+id/dialogReasonCheck"
@@ -34,12 +32,12 @@
         style="@style/VectorTextInputLayout"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        tools:hint="@string/delete_event_dialog_reason_hint"
         app:counterEnabled="true"
         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
             android:id="@+id/dialogReasonInput"
diff --git a/vector/src/main/res/layout/dialog_device_verify.xml b/vector/src/main/res/layout/dialog_device_verify.xml
index a91a6a23f9..75255c05d8 100644
--- a/vector/src/main/res/layout/dialog_device_verify.xml
+++ b/vector/src/main/res/layout/dialog_device_verify.xml
@@ -9,10 +9,8 @@
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:paddingStart="?dialogPreferredPadding"
-        android:paddingLeft="?dialogPreferredPadding"
         android:paddingTop="12dp"
-        android:paddingEnd="?dialogPreferredPadding"
-        android:paddingRight="?dialogPreferredPadding">
+        android:paddingEnd="?dialogPreferredPadding">
 
         <TextView
             android:layout_width="match_parent"
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 264563746d..e4cdbd9f08 100644
--- a/vector/src/main/res/layout/dialog_edit_power_level.xml
+++ b/vector/src/main/res/layout/dialog_edit_power_level.xml
@@ -1,15 +1,12 @@
 <?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"
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:paddingStart="?dialogPreferredPadding"
-    android:paddingLeft="?dialogPreferredPadding"
     android:paddingTop="12dp"
-    android:paddingEnd="?dialogPreferredPadding"
-    android:paddingRight="?dialogPreferredPadding">
+    android:paddingEnd="?dialogPreferredPadding">
 
     <RadioGroup
         android:id="@+id/powerLevelRadioGroup"
@@ -50,9 +47,9 @@
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/powerLevelCustomEditLayout"
         style="@style/VectorTextInputLayout"
-        android:hint="@string/power_level_custom_no_value"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:hint="@string/power_level_custom_no_value">
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/powerLevelCustomEdit"
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 f0c9438f1a..67ccd89b11 100644
--- a/vector/src/main/res/layout/dialog_export_e2e_keys.xml
+++ b/vector/src/main/res/layout/dialog_export_e2e_keys.xml
@@ -6,10 +6,8 @@
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:paddingStart="?dialogPreferredPadding"
-    android:paddingLeft="?dialogPreferredPadding"
     android:paddingTop="12dp"
     android:paddingEnd="?dialogPreferredPadding"
-    android:paddingRight="?dialogPreferredPadding"
     android:paddingBottom="12dp">
 
     <TextView
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 c42d63719d..56d276f3f0 100644
--- a/vector/src/main/res/layout/dialog_import_e2e_keys.xml
+++ b/vector/src/main/res/layout/dialog_import_e2e_keys.xml
@@ -6,10 +6,8 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:paddingStart="?dialogPreferredPadding"
-    android:paddingLeft="?dialogPreferredPadding"
     android:paddingTop="12dp"
     android:paddingEnd="?dialogPreferredPadding"
-    android:paddingRight="?dialogPreferredPadding"
     android:paddingBottom="12dp">
 
     <TextView
diff --git a/vector/src/main/res/layout/dialog_prompt_password.xml b/vector/src/main/res/layout/dialog_prompt_password.xml
index 3fa5f4a867..081ce9cdae 100644
--- a/vector/src/main/res/layout/dialog_prompt_password.xml
+++ b/vector/src/main/res/layout/dialog_prompt_password.xml
@@ -10,10 +10,8 @@
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:paddingStart="?dialogPreferredPadding"
-        android:paddingLeft="?dialogPreferredPadding"
         android:paddingTop="12dp"
-        android:paddingEnd="?dialogPreferredPadding"
-        android:paddingRight="?dialogPreferredPadding">
+        android:paddingEnd="?dialogPreferredPadding">
 
         <TextView
             android:layout_width="match_parent"
@@ -44,7 +42,6 @@
                     android:inputType="textPassword"
                     android:maxLines="1"
                     android:paddingEnd="48dp"
-                    android:paddingRight="48dp"
                     tools:ignore="RtlSymmetry"
                     tools:text="abc" />
 
diff --git a/vector/src/main/res/layout/dialog_recovery_key_saved_info.xml b/vector/src/main/res/layout/dialog_recovery_key_saved_info.xml
index 31a0255848..36c9a68077 100644
--- a/vector/src/main/res/layout/dialog_recovery_key_saved_info.xml
+++ b/vector/src/main/res/layout/dialog_recovery_key_saved_info.xml
@@ -5,10 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingStart="?dialogPreferredPadding"
-    android:paddingLeft="?dialogPreferredPadding"
     android:paddingTop="12dp"
     android:paddingEnd="?dialogPreferredPadding"
-    android:paddingRight="?dialogPreferredPadding"
     android:paddingBottom="12dp">
 
     <LinearLayout
diff --git a/vector/src/main/res/layout/dialog_report_content.xml b/vector/src/main/res/layout/dialog_report_content.xml
index dda84fe02d..c92394e8b5 100644
--- a/vector/src/main/res/layout/dialog_report_content.xml
+++ b/vector/src/main/res/layout/dialog_report_content.xml
@@ -6,10 +6,8 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:paddingStart="?dialogPreferredPadding"
-    android:paddingLeft="?dialogPreferredPadding"
     android:paddingTop="12dp"
-    android:paddingEnd="?dialogPreferredPadding"
-    android:paddingRight="?dialogPreferredPadding">
+    android:paddingEnd="?dialogPreferredPadding">
 
     <com.google.android.material.textfield.TextInputLayout
         style="@style/VectorTextInputLayout"
diff --git a/vector/src/main/res/layout/dialog_select_text_size.xml b/vector/src/main/res/layout/dialog_select_text_size.xml
index 9ab63ca543..1a3bd91485 100644
--- a/vector/src/main/res/layout/dialog_select_text_size.xml
+++ b/vector/src/main/res/layout/dialog_select_text_size.xml
@@ -6,10 +6,8 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:paddingStart="?dialogPreferredPadding"
-    android:paddingLeft="?dialogPreferredPadding"
     android:paddingTop="12dp"
     android:paddingEnd="?dialogPreferredPadding"
-    android:paddingRight="?dialogPreferredPadding"
     tools:ignore="SpUsage">
 
     <!-- keep the sizes in dp -->
diff --git a/vector/src/main/res/layout/dialog_ssl_fingerprint.xml b/vector/src/main/res/layout/dialog_ssl_fingerprint.xml
index 3c1abc11a2..0c6fad871e 100644
--- a/vector/src/main/res/layout/dialog_ssl_fingerprint.xml
+++ b/vector/src/main/res/layout/dialog_ssl_fingerprint.xml
@@ -9,10 +9,8 @@
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:paddingStart="?dialogPreferredPadding"
-        android:paddingLeft="?dialogPreferredPadding"
         android:paddingTop="12dp"
-        android:paddingEnd="?dialogPreferredPadding"
-        android:paddingRight="?dialogPreferredPadding">
+        android:paddingEnd="?dialogPreferredPadding">
 
         <TextView
             android:layout_width="match_parent"
diff --git a/vector/src/main/res/layout/fragment_deactivate_account.xml b/vector/src/main/res/layout/fragment_deactivate_account.xml
index 978921ecc9..a03f4dba00 100644
--- a/vector/src/main/res/layout/fragment_deactivate_account.xml
+++ b/vector/src/main/res/layout/fragment_deactivate_account.xml
@@ -73,7 +73,6 @@
                     android:inputType="textPassword"
                     android:maxLines="1"
                     android:paddingEnd="48dp"
-                    android:paddingRight="48dp"
                     tools:ignore="RtlSymmetry" />
 
             </com.google.android.material.textfield.TextInputLayout>
diff --git a/vector/src/main/res/layout/fragment_home_drawer.xml b/vector/src/main/res/layout/fragment_home_drawer.xml
index 377c3ed17c..e09e26c575 100644
--- a/vector/src/main/res/layout/fragment_home_drawer.xml
+++ b/vector/src/main/res/layout/fragment_home_drawer.xml
@@ -32,7 +32,6 @@
             android:layout_width="64dp"
             android:layout_height="64dp"
             android:layout_marginStart="@dimen/layout_horizontal_margin"
-            android:layout_marginLeft="@dimen/layout_horizontal_margin"
             android:layout_marginTop="24dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
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 3592ff074d..cdbc6d11de 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
@@ -42,7 +42,6 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
-            android:layout_marginLeft="16dp"
             android:layout_marginTop="16dp"
             app:errorEnabled="true"
             app:layout_constraintEnd_toStartOf="@+id/keys_backup_import"
@@ -91,7 +90,6 @@
             style="@style/VectorButtonStyle"
             android:layout_marginTop="@dimen/layout_vertical_margin_big"
             android:layout_marginEnd="@dimen/layout_horizontal_margin"
-            android:layout_marginRight="@dimen/layout_horizontal_margin"
             android:minWidth="200dp"
             android:text="@string/keys_backup_unlock_button"
             app:layout_constraintEnd_toEndOf="parent"
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 fe1e6efe78..4a963c590e 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
@@ -42,7 +42,6 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
-            android:layout_marginLeft="16dp"
             android:layout_marginTop="16dp"
             app:errorEnabled="true"
             app:layout_constraintEnd_toStartOf="@id/keys_backup_view_show_password"
@@ -91,7 +90,6 @@
             style="@style/VectorButtonStyle"
             android:layout_marginTop="@dimen/layout_vertical_margin_big"
             android:layout_marginEnd="@dimen/layout_horizontal_margin"
-            android:layout_marginRight="@dimen/layout_horizontal_margin"
             android:layout_marginBottom="@dimen/layout_vertical_margin_big"
             android:minWidth="200dp"
             android:text="@string/keys_backup_unlock_button"
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 d690aa777d..d9b6275e61 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
@@ -66,7 +66,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
-        android:layout_marginLeft="16dp"
         android:layout_marginTop="20dp"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
         android:text="@string/keys_backup_setup_step1_advanced"
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 5c306eef48..fe8db20f4e 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
@@ -52,7 +52,6 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
-            android:layout_marginLeft="16dp"
             android:layout_marginTop="16dp"
             app:errorEnabled="true"
             app:layout_constraintEnd_toStartOf="@id/keys_backup_view_show_password"
@@ -97,7 +96,6 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
-            android:layout_marginLeft="16dp"
             android:layout_marginTop="16dp"
             android:layout_weight="1"
             app:errorEnabled="true"
@@ -120,7 +118,6 @@
             style="@style/VectorButtonStyle"
             android:layout_marginTop="16dp"
             android:layout_marginEnd="16dp"
-            android:layout_marginRight="16dp"
             android:text="@string/keys_backup_setup_step2_button_title"
             android:textColor="@android:color/white"
             app:layout_constraintEnd_toEndOf="parent"
@@ -132,10 +129,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
-            android:layout_marginLeft="16dp"
             android:layout_marginTop="20dp"
             android:layout_marginEnd="16dp"
-            android:layout_marginRight="16dp"
             android:text="@string/keys_backup_setup_step1_recovery_key_alternative"
             android:textAlignment="center"
             android:textColor="?riotx_text_primary"
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 bc92335ce0..7d3d821daf 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
@@ -26,9 +26,9 @@
             android:id="@+id/keys_backup_setup_step3_success_title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/layout_horizontal_margin"
+            android:layout_marginStart="@dimen/layout_horizontal_margin"
             android:layout_marginTop="20dp"
-            android:layout_marginRight="@dimen/layout_horizontal_margin"
+            android:layout_marginEnd="@dimen/layout_horizontal_margin"
             android:text="@string/keys_backup_setup_step3_success_title"
             android:textAlignment="center"
             android:textColor="?riotx_text_primary"
@@ -42,9 +42,9 @@
             android:id="@+id/keys_backup_setup_step3_line1_text"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/layout_horizontal_margin"
+            android:layout_marginStart="@dimen/layout_horizontal_margin"
             android:layout_marginTop="20dp"
-            android:layout_marginRight="@dimen/layout_horizontal_margin"
+            android:layout_marginEnd="@dimen/layout_horizontal_margin"
             android:text="@string/keys_backup_setup_step3_text_line1"
             android:textAlignment="center"
             android:textColor="?riotx_text_primary"
@@ -54,9 +54,9 @@
             android:id="@+id/keys_backup_setup_step3_line2_text"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/layout_horizontal_margin"
+            android:layout_marginStart="@dimen/layout_horizontal_margin"
             android:layout_marginTop="20dp"
-            android:layout_marginRight="@dimen/layout_horizontal_margin"
+            android:layout_marginEnd="@dimen/layout_horizontal_margin"
             android:textAlignment="center"
             android:textColor="?riotx_text_secondary"
             android:textSize="15sp"
diff --git a/vector/src/main/res/layout/fragment_login.xml b/vector/src/main/res/layout/fragment_login.xml
index 794048f3b3..608041ec03 100644
--- a/vector/src/main/res/layout/fragment_login.xml
+++ b/vector/src/main/res/layout/fragment_login.xml
@@ -82,7 +82,6 @@
                         android:inputType="textPassword"
                         android:maxLines="1"
                         android:paddingEnd="48dp"
-                        android:paddingRight="48dp"
                         tools:ignore="RtlSymmetry" />
 
                 </com.google.android.material.textfield.TextInputLayout>
diff --git a/vector/src/main/res/layout/fragment_login_reset_password.xml b/vector/src/main/res/layout/fragment_login_reset_password.xml
index e2e908cf29..098bd047a9 100644
--- a/vector/src/main/res/layout/fragment_login_reset_password.xml
+++ b/vector/src/main/res/layout/fragment_login_reset_password.xml
@@ -72,7 +72,6 @@
                         android:inputType="textPassword"
                         android:maxLines="1"
                         android:paddingEnd="48dp"
-                        android:paddingRight="48dp"
                         tools:ignore="RtlSymmetry" />
 
                 </com.google.android.material.textfield.TextInputLayout>
diff --git a/vector/src/main/res/layout/fragment_public_rooms.xml b/vector/src/main/res/layout/fragment_public_rooms.xml
index de448f3b8b..933bcf86aa 100644
--- a/vector/src/main/res/layout/fragment_public_rooms.xml
+++ b/vector/src/main/res/layout/fragment_public_rooms.xml
@@ -48,7 +48,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
-            android:layout_marginLeft="16dp"
             android:layout_marginTop="8dp"
             android:layout_marginBottom="8dp"
             android:minHeight="@dimen/layout_touch_size"
diff --git a/vector/src/main/res/layout/fragment_room_list.xml b/vector/src/main/res/layout/fragment_room_list.xml
index aa2eaacaaf..413d3957c1 100644
--- a/vector/src/main/res/layout/fragment_room_list.xml
+++ b/vector/src/main/res/layout/fragment_room_list.xml
@@ -28,7 +28,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
         android:layout_marginBottom="16dp"
         android:accessibilityTraversalBefore="@+id/roomListView"
         android:contentDescription="@string/a11y_create_direct_message"
@@ -45,7 +44,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
         android:layout_marginBottom="16dp"
         android:accessibilityTraversalBefore="@+id/roomListView"
         android:contentDescription="@string/a11y_create_room"
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 dce0b27358..2f4db6f116 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
@@ -64,8 +64,8 @@
                 android:layout_height="wrap_content"
                 android:gravity="center_horizontal"
                 android:orientation="vertical"
-                android:paddingLeft="@dimen/layout_horizontal_margin"
-                android:paddingRight="@dimen/layout_horizontal_margin">
+                android:paddingStart="@dimen/layout_horizontal_margin"
+                android:paddingEnd="@dimen/layout_horizontal_margin">
 
                 <ImageView
                     android:id="@+id/roomPreviewNoPreviewAvatar"
diff --git a/vector/src/main/res/layout/fragment_settings_notifications_troubleshoot.xml b/vector/src/main/res/layout/fragment_settings_notifications_troubleshoot.xml
index 69ffcb41fc..6e3749b0eb 100644
--- a/vector/src/main/res/layout/fragment_settings_notifications_troubleshoot.xml
+++ b/vector/src/main/res/layout/fragment_settings_notifications_troubleshoot.xml
@@ -33,10 +33,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
-            android:layout_marginLeft="16dp"
             android:layout_marginTop="4dp"
             android:layout_marginEnd="8dp"
-            android:layout_marginRight="8dp"
             android:text="@string/settings_troubleshoot_diagnostic"
             android:textColor="?riotx_text_primary"
             android:textStyle="bold" />
@@ -46,10 +44,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
-            android:layout_marginLeft="16dp"
             android:layout_marginTop="4dp"
             android:layout_marginEnd="8dp"
-            android:layout_marginRight="8dp"
             android:textColor="?riotx_text_secondary"
             tools:text="@string/settings_troubleshoot_diagnostic_running_status" />
 
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 005de93cf6..e5482f0ec7 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
@@ -15,11 +15,11 @@
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:layout_marginStart="16dp"
+            android:src="@drawable/ic_security_phrase_24dp"
             android:tint="?riotx_text_primary"
             app:layout_constraintBottom_toBottomOf="@+id/ssss_restore_with_passphrase"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/ssss_restore_with_passphrase"
-            android:src="@drawable/ic_security_phrase_24dp" />
+            app:layout_constraintTop_toTopOf="@+id/ssss_restore_with_passphrase" />
 
         <TextView
             android:id="@+id/ssss_restore_with_passphrase"
@@ -56,7 +56,6 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
-            android:layout_marginLeft="16dp"
             android:layout_marginTop="16dp"
             app:errorEnabled="true"
             app:layout_constraintEnd_toStartOf="@id/ssss_view_show_password"
diff --git a/vector/src/main/res/layout/grid_section_header.xml b/vector/src/main/res/layout/grid_section_header.xml
index 4cd6499a87..65aa68dab6 100644
--- a/vector/src/main/res/layout/grid_section_header.xml
+++ b/vector/src/main/res/layout/grid_section_header.xml
@@ -10,8 +10,7 @@
         android:layout_height="wrap_content"
         android:layout_margin="8dp"
         android:paddingStart="8dp"
-        android:paddingLeft="8dp"
-        android:paddingRight="8dp"
+        android:paddingEnd="8dp"
         android:textStyle="bold"
         tools:text="Smiley &amp; Peolple" />
 
diff --git a/vector/src/main/res/layout/item_autocomplete_command.xml b/vector/src/main/res/layout/item_autocomplete_command.xml
index ce2cd6c731..3e73da00ae 100644
--- a/vector/src/main/res/layout/item_autocomplete_command.xml
+++ b/vector/src/main/res/layout/item_autocomplete_command.xml
@@ -27,9 +27,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_marginStart="5dp"
-        android:layout_marginLeft="5dp"
         android:layout_toEndOf="@+id/commandName"
-        android:layout_toRightOf="@+id/commandName"
         android:maxLines="1"
         android:textColor="?riotx_text_secondary"
         android:textSize="12sp"
@@ -42,7 +40,6 @@
         android:layout_height="wrap_content"
         android:layout_below="@+id/commandName"
         android:layout_alignParentStart="true"
-        android:layout_alignParentLeft="true"
         android:layout_gravity="center_vertical"
         android:maxLines="2"
         android:textColor="?riotx_text_secondary"
diff --git a/vector/src/main/res/layout/item_autocomplete_emoji.xml b/vector/src/main/res/layout/item_autocomplete_emoji.xml
index c34ab0d452..fa628c0d24 100644
--- a/vector/src/main/res/layout/item_autocomplete_emoji.xml
+++ b/vector/src/main/res/layout/item_autocomplete_emoji.xml
@@ -23,7 +23,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
         android:orientation="vertical">
 
         <TextView
diff --git a/vector/src/main/res/layout/item_autocomplete_matrix_item.xml b/vector/src/main/res/layout/item_autocomplete_matrix_item.xml
index 84a85d0102..81eb084eb6 100644
--- a/vector/src/main/res/layout/item_autocomplete_matrix_item.xml
+++ b/vector/src/main/res/layout/item_autocomplete_matrix_item.xml
@@ -20,7 +20,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
         android:orientation="vertical">
 
         <TextView
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 66a096799d..2d10d513ab 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_action.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_action.xml
@@ -8,9 +8,9 @@
     android:focusable="true"
     android:foreground="?attr/selectableItemBackground"
     android:minHeight="50dp"
-    android:paddingLeft="@dimen/layout_horizontal_margin"
+    android:paddingStart="@dimen/layout_horizontal_margin"
     android:paddingTop="8dp"
-    android:paddingRight="@dimen/layout_horizontal_margin"
+    android:paddingEnd="@dimen/layout_horizontal_margin"
     android:paddingBottom="8dp">
 
     <Space
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 a688f38d0f..0e4a613662 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
@@ -27,9 +27,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="start"
         android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
-        android:layout_marginRight="@dimen/layout_horizontal_margin"
         android:ellipsize="end"
         android:fontFamily="sans-serif-bold"
         android:singleLine="true"
@@ -47,9 +45,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="start"
         android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
-        android:layout_marginRight="@dimen/layout_horizontal_margin"
         android:layout_marginBottom="4dp"
         android:ellipsize="end"
         android:maxLines="3"
@@ -67,7 +63,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
-        android:layout_marginRight="@dimen/layout_horizontal_margin"
         android:layout_marginBottom="8dp"
         android:textColor="?riotx_text_secondary"
         android:textSize="12sp"
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 e3fa8944ee..bed1d5eb2f 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
@@ -31,7 +31,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="start"
         android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
         android:ellipsize="end"
         android:fontFamily="sans-serif-bold"
         android:singleLine="true"
diff --git a/vector/src/main/res/layout/item_create_direct_room_letter_header.xml b/vector/src/main/res/layout/item_create_direct_room_letter_header.xml
index 80a0fc4ce1..61e4231fa8 100644
--- a/vector/src/main/res/layout/item_create_direct_room_letter_header.xml
+++ b/vector/src/main/res/layout/item_create_direct_room_letter_header.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/createDirectRoomLetterView"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/createDirectRoomLetterView"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_marginLeft="8dp"
+    android:layout_marginStart="8dp"
     android:fontFamily="sans-serif-medium"
     android:padding="8dp"
     android:textColor="?attr/riotx_text_primary"
diff --git a/vector/src/main/res/layout/item_form_switch.xml b/vector/src/main/res/layout/item_form_switch.xml
index 146c8c70ce..24425a5eb4 100644
--- a/vector/src/main/res/layout/item_form_switch.xml
+++ b/vector/src/main/res/layout/item_form_switch.xml
@@ -13,9 +13,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
-        android:layout_marginLeft="@dimen/layout_horizontal_margin"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
-        android:layout_marginRight="@dimen/layout_horizontal_margin"
         android:duplicateParentState="true"
         android:ellipsize="end"
         android:maxLines="1"
diff --git a/vector/src/main/res/layout/item_generic_header.xml b/vector/src/main/res/layout/item_generic_header.xml
index 0d2cf8ebc5..6dbf68cd11 100644
--- a/vector/src/main/res/layout/item_generic_header.xml
+++ b/vector/src/main/res/layout/item_generic_header.xml
@@ -4,9 +4,9 @@
     android:id="@+id/itemGenericHeaderText"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingLeft="16dp"
+    android:paddingStart="16dp"
     android:paddingTop="4dp"
-    android:paddingRight="16dp"
+    android:paddingEnd="16dp"
     android:paddingBottom="4dp"
     android:textColor="?vctr_notice_text_color"
     android:textSize="15sp"
diff --git a/vector/src/main/res/layout/item_generic_list.xml b/vector/src/main/res/layout/item_generic_list.xml
index 7331c31dfd..dee6e06693 100644
--- a/vector/src/main/res/layout/item_generic_list.xml
+++ b/vector/src/main/res/layout/item_generic_list.xml
@@ -9,36 +9,36 @@
     android:minHeight="50dp">
 
     <ImageView
+        android:id="@+id/item_generic_title_image"
         android:layout_width="20dp"
         android:layout_height="20dp"
-        android:id="@+id/item_generic_title_image"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/item_generic_title_text"
-        app:layout_constraintBottom_toBottomOf="@id/item_generic_title_text"
         android:layout_marginStart="16dp"
         android:scaleType="centerInside"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@id/item_generic_title_text"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/item_generic_title_text"
         tools:src="@drawable/ic_shield_trusted"
-        tools:visibility="visible"
-        android:visibility="gone"/>
+        tools:visibility="visible" />
 
     <TextView
         android:id="@+id/item_generic_title_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
         android:layout_marginTop="4dp"
         android:layout_marginEnd="16dp"
-        android:layout_marginStart="8dp"
         android:layout_marginBottom="4dp"
         android:textColor="?riotx_text_primary"
         android:textStyle="bold"
         android:visibility="gone"
         app:layout_constrainedWidth="true"
-        app:layout_goneMarginStart="16dp"
         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"
+        app:layout_goneMarginStart="16dp"
         tools:text="Item Title"
         tools:textSize="14sp"
         tools:visibility="visible" />
@@ -48,10 +48,8 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
-        android:layout_marginLeft="16dp"
         android:layout_marginTop="4dp"
         android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
         android:layout_marginBottom="4dp"
         android:textColor="?riotx_text_secondary"
         android:visibility="gone"
@@ -102,7 +100,6 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
         android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
         android:layout_marginBottom="16dp"
         android:maxWidth="@dimen/button_max_width"
         android:visibility="gone"
diff --git a/vector/src/main/res/layout/item_group.xml b/vector/src/main/res/layout/item_group.xml
index 94d5041147..c42d1e26e9 100644
--- a/vector/src/main/res/layout/item_group.xml
+++ b/vector/src/main/res/layout/item_group.xml
@@ -16,7 +16,6 @@
         android:layout_height="42dp"
         android:layout_gravity="center"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
-        android:layout_marginLeft="@dimen/layout_horizontal_margin"
         android:duplicateParentState="true"
         app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
         app:layout_constraintStart_toStartOf="parent"
@@ -45,7 +44,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="21dp"
-        android:layout_marginRight="21dp"
         android:src="@drawable/ic_arrow_right"
         android:tint="?riotx_text_primary"
         app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
diff --git a/vector/src/main/res/layout/item_login_password_form.xml b/vector/src/main/res/layout/item_login_password_form.xml
index 759da76a0d..19b0c5452b 100644
--- a/vector/src/main/res/layout/item_login_password_form.xml
+++ b/vector/src/main/res/layout/item_login_password_form.xml
@@ -30,7 +30,6 @@
                 android:inputType="textPassword"
                 android:maxLines="1"
                 android:paddingEnd="48dp"
-                android:paddingRight="48dp"
                 tools:ignore="RtlSymmetry" />
 
         </com.google.android.material.textfield.TextInputLayout>
diff --git a/vector/src/main/res/layout/item_notification_troubleshoot.xml b/vector/src/main/res/layout/item_notification_troubleshoot.xml
index 7944e1969f..507b936d20 100644
--- a/vector/src/main/res/layout/item_notification_troubleshoot.xml
+++ b/vector/src/main/res/layout/item_notification_troubleshoot.xml
@@ -23,9 +23,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
-        android:layout_marginLeft="16dp"
         android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
         android:paddingTop="4dp"
         android:paddingBottom="4dp"
         android:textColor="?riotx_text_primary"
@@ -45,9 +43,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
-        android:layout_marginLeft="16dp"
         android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
         android:paddingTop="4dp"
         android:paddingBottom="4dp"
         android:textColor="?riotx_text_secondary"
@@ -66,9 +62,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
-        android:layout_marginLeft="16dp"
         android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
         android:layout_marginBottom="16dp"
         android:background="?attr/colorAccent"
         android:padding="8dp"
diff --git a/vector/src/main/res/layout/item_profile_action.xml b/vector/src/main/res/layout/item_profile_action.xml
index b23ea5c084..6d3ba36d06 100644
--- a/vector/src/main/res/layout/item_profile_action.xml
+++ b/vector/src/main/res/layout/item_profile_action.xml
@@ -9,9 +9,9 @@
     android:focusable="true"
     android:foreground="?attr/selectableItemBackground"
     android:minHeight="64dp"
-    android:paddingLeft="@dimen/layout_horizontal_margin"
+    android:paddingStart="@dimen/layout_horizontal_margin"
     android:paddingTop="8dp"
-    android:paddingRight="@dimen/layout_horizontal_margin"
+    android:paddingEnd="@dimen/layout_horizontal_margin"
     android:paddingBottom="8dp">
 
     <ImageView
@@ -71,7 +71,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         tools:src="@drawable/ic_shield_warning"
-        android:layout_marginRight="8dp"
+        android:layout_marginEnd="8dp"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/actionEditable"
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 87f2f8de27..1c84a65691 100644
--- a/vector/src/main/res/layout/item_profile_matrix_item.xml
+++ b/vector/src/main/res/layout/item_profile_matrix_item.xml
@@ -9,9 +9,9 @@
     android:focusable="true"
     android:foreground="?attr/selectableItemBackground"
     android:minHeight="64dp"
-    android:paddingLeft="@dimen/layout_horizontal_margin"
+    android:paddingStart="@dimen/layout_horizontal_margin"
     android:paddingTop="8dp"
-    android:paddingRight="@dimen/layout_horizontal_margin"
+    android:paddingEnd="@dimen/layout_horizontal_margin"
     android:paddingBottom="8dp">
 
     <ImageView
@@ -46,12 +46,12 @@
         android:maxLines="1"
         android:textColor="?riotx_text_primary"
         android:textSize="16sp"
+        app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toTopOf="@+id/matrixItemSubtitle"
         app:layout_constraintEnd_toStartOf="@+id/matrixItemEditable"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toEndOf="@id/matrixItemAvatar"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constrainedWidth="true"
         app:layout_goneMarginStart="0dp"
         tools:text="@sample/matrix.json/data/displayName" />
 
@@ -66,12 +66,12 @@
         android:maxLines="1"
         android:textColor="?riotx_text_secondary"
         android:textSize="12sp"
+        app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/matrixItemEditable"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toEndOf="@id/matrixItemAvatar"
         app:layout_constraintTop_toBottomOf="@id/matrixItemTitle"
-        app:layout_constrainedWidth="true"
         app:layout_goneMarginStart="0dp"
         tools:text="@sample/matrix.json/data/mxid" />
 
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 ccc6f66518..66cff4840e 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
@@ -9,9 +9,9 @@
     android:focusable="true"
     android:foreground="?attr/selectableItemBackground"
     android:minHeight="64dp"
-    android:paddingLeft="@dimen/layout_horizontal_margin"
+    android:paddingStart="@dimen/layout_horizontal_margin"
     android:paddingTop="8dp"
-    android:paddingRight="@dimen/layout_horizontal_margin"
+    android:paddingEnd="@dimen/layout_horizontal_margin"
     android:paddingBottom="8dp">
 
     <ImageView
diff --git a/vector/src/main/res/layout/item_public_room.xml b/vector/src/main/res/layout/item_public_room.xml
index 4a16ed6dec..ae8287fdc4 100644
--- a/vector/src/main/res/layout/item_public_room.xml
+++ b/vector/src/main/res/layout/item_public_room.xml
@@ -17,7 +17,6 @@
         android:layout_width="56dp"
         android:layout_height="56dp"
         android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
         app:layout_constraintBottom_toTopOf="@+id/itemPublicRoomBottomSeparator"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -28,9 +27,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="17dp"
-        android:layout_marginLeft="17dp"
         android:layout_marginEnd="8dp"
-        android:layout_marginRight="16dp"
         android:ellipsize="end"
         android:maxLines="2"
         android:textColor="?riotx_text_primary"
@@ -49,7 +46,6 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
         android:layout_marginEnd="22dp"
-        android:layout_marginRight="22dp"
         android:gravity="center_vertical"
         android:maxLines="1"
         android:singleLine="true"
@@ -69,9 +65,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
         android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
         android:drawableStart="@drawable/ic_user"
-        android:drawableLeft="@drawable/ic_user"
         android:drawablePadding="8dp"
         android:drawableTint="?riotx_text_secondary"
         android:gravity="center_vertical"
@@ -88,9 +82,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
         android:layout_marginEnd="22dp"
-        android:layout_marginRight="22dp"
         android:gravity="center_vertical"
         android:maxLines="1"
         android:minWidth="40dp"
@@ -108,7 +100,6 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
         android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
         app:bsv_button_text="@string/join"
         app:bsv_loaded_image_src="@drawable/ic_tick"
         app:bsv_use_flat_button="true"
diff --git a/vector/src/main/res/layout/item_pushrule_raw.xml b/vector/src/main/res/layout/item_pushrule_raw.xml
index 0d2ba360bd..7a29415f2e 100644
--- a/vector/src/main/res/layout/item_pushrule_raw.xml
+++ b/vector/src/main/res/layout/item_pushrule_raw.xml
@@ -11,7 +11,6 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
         android:layout_weight="1"
         android:orientation="vertical">
 
@@ -20,8 +19,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="4dp"
-            tools:text=".m.rule.contains_user_name"
-            android:textStyle="bold" />
+            android:textStyle="bold"
+            tools:text=".m.rule.contains_user_name" />
 
 
         <TextView
diff --git a/vector/src/main/res/layout/item_room.xml b/vector/src/main/res/layout/item_room.xml
index 62e98fd062..c844f10ed2 100644
--- a/vector/src/main/res/layout/item_room.xml
+++ b/vector/src/main/res/layout/item_room.xml
@@ -51,12 +51,11 @@
         android:id="@+id/roomAvatarFailSendingImageView"
         android:layout_width="16dp"
         android:layout_height="16dp"
+        android:src="@drawable/ic_warning_badge"
         app:layout_constraintCircle="@id/roomAvatarContainer"
         app:layout_constraintCircleAngle="45"
         app:layout_constraintCircleRadius="30dp"
-        tools:ignore="MissingConstraints"
-        android:src="@drawable/ic_warning_badge"
-        />
+        tools:ignore="MissingConstraints" />
 
     <ImageView
         android:id="@+id/roomAvatarDecorationImageView"
@@ -82,10 +81,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
-        android:layout_marginLeft="@dimen/layout_horizontal_margin"
         android:layout_marginTop="12dp"
         android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
         android:duplicateParentState="true"
         android:ellipsize="end"
         android:maxLines="1"
@@ -104,8 +101,8 @@
         android:id="@+id/roomDraftBadge"
         android:layout_width="16dp"
         android:layout_height="16dp"
-        android:layout_marginLeft="4dp"
-        android:layout_marginRight="4dp"
+        android:layout_marginStart="4dp"
+        android:layout_marginEnd="4dp"
         android:src="@drawable/ic_edit"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@+id/roomNameView"
@@ -119,12 +116,11 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
         android:gravity="center"
         android:minWidth="16dp"
         android:minHeight="16dp"
-        android:paddingLeft="4dp"
-        android:paddingRight="4dp"
+        android:paddingStart="4dp"
+        android:paddingEnd="4dp"
         android:textColor="@android:color/white"
         android:textSize="10sp"
         android:visibility="gone"
@@ -141,7 +137,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
         android:textColor="?riotx_text_secondary"
         android:textSize="15sp"
         app:layout_constraintBottom_toBottomOf="@+id/roomNameView"
@@ -155,7 +150,6 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="3dp"
         android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
         android:ellipsize="end"
         android:maxLines="2"
         android:textColor="?riotx_text_secondary"
@@ -171,7 +165,6 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="3dp"
         android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
         android:ellipsize="end"
         android:maxLines="2"
         android:textColor="@color/riotx_accent"
diff --git a/vector/src/main/res/layout/item_room_category.xml b/vector/src/main/res/layout/item_room_category.xml
index ed8126aa36..d27aea5bcf 100644
--- a/vector/src/main/res/layout/item_room_category.xml
+++ b/vector/src/main/res/layout/item_room_category.xml
@@ -11,10 +11,8 @@
     android:gravity="center_vertical"
     android:orientation="horizontal"
     android:paddingStart="8dp"
-    android:paddingLeft="8dp"
     android:paddingTop="12dp"
     android:paddingEnd="@dimen/layout_horizontal_margin"
-    android:paddingRight="@dimen/layout_horizontal_margin"
     android:paddingBottom="4dp">
 
     <TextView
@@ -39,8 +37,8 @@
         android:gravity="center"
         android:minWidth="16dp"
         android:minHeight="16dp"
-        android:paddingLeft="4dp"
-        android:paddingRight="4dp"
+        android:paddingStart="4dp"
+        android:paddingEnd="4dp"
         android:textColor="@android:color/white"
         android:textSize="10sp"
         tools:background="@drawable/bg_unread_highlight"
diff --git a/vector/src/main/res/layout/item_room_directory.xml b/vector/src/main/res/layout/item_room_directory.xml
index 8869a22bea..4add2d566d 100644
--- a/vector/src/main/res/layout/item_room_directory.xml
+++ b/vector/src/main/res/layout/item_room_directory.xml
@@ -16,7 +16,6 @@
         android:layout_width="48dp"
         android:layout_height="48dp"
         android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
         android:layout_marginTop="4dp"
         android:layout_marginBottom="4dp"
         android:background="@drawable/circle"
diff --git a/vector/src/main/res/layout/item_room_invitation.xml b/vector/src/main/res/layout/item_room_invitation.xml
index 873705fd7c..92660634e0 100644
--- a/vector/src/main/res/layout/item_room_invitation.xml
+++ b/vector/src/main/res/layout/item_room_invitation.xml
@@ -15,7 +15,6 @@
         android:layout_width="56dp"
         android:layout_height="56dp"
         android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
         android:layout_marginTop="12dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -35,10 +34,8 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
-        android:layout_marginLeft="@dimen/layout_horizontal_margin"
         android:layout_marginTop="12dp"
         android:layout_marginEnd="20dp"
-        android:layout_marginRight="20dp"
         android:drawableEnd="@drawable/ic_arrow_right"
         android:drawablePadding="8dp"
         android:duplicateParentState="true"
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 93b5ac9b2d..592eb6dd96 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
@@ -23,7 +23,6 @@
         app:layout_constraintEnd_toStartOf="@+id/settings_item_button"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:drawableLeft="@drawable/ic_notification_privacy_warning"
         tools:drawableStart="@drawable/ic_notification_privacy_warning"
         tools:drawableTint="@color/vector_error_color"
         tools:text="foo@bar.test" />
diff --git a/vector/src/main/res/layout/item_signout_action.xml b/vector/src/main/res/layout/item_signout_action.xml
index c5acc09e56..16d10a3ff0 100644
--- a/vector/src/main/res/layout/item_signout_action.xml
+++ b/vector/src/main/res/layout/item_signout_action.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/signedOutActionClickable"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -7,11 +7,10 @@
     android:foreground="?attr/selectableItemBackground"
     android:minHeight="50dp"
     android:orientation="horizontal"
-    android:paddingLeft="@dimen/layout_horizontal_margin"
+    android:paddingStart="@dimen/layout_horizontal_margin"
     android:paddingTop="8dp"
-    android:paddingRight="@dimen/layout_horizontal_margin"
-    android:paddingBottom="8dp"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+    android:paddingEnd="@dimen/layout_horizontal_margin"
+    android:paddingBottom="8dp">
 
     <ImageView
         android:id="@+id/actionIconImageView"
@@ -19,7 +18,6 @@
         android:layout_height="24dp"
         android:layout_gravity="center_vertical"
         android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
         android:scaleType="fitCenter"
         android:src="@drawable/ic_secure_backup"
         android:tint="?riotx_text_primary" />
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 919e5b0a3e..73b0750cbd 100644
--- a/vector/src/main/res/layout/item_simple_reaction_info.xml
+++ b/vector/src/main/res/layout/item_simple_reaction_info.xml
@@ -15,7 +15,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
         android:gravity="center"
         android:lines="1"
         android:textColor="@color/black"
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 853ece47e1..15016e0abe 100644
--- a/vector/src/main/res/layout/item_timeline_event_base.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base.xml
@@ -29,10 +29,8 @@
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
         android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
         android:layout_marginTop="4dp"
         android:layout_marginEnd="4dp"
-        android:layout_marginRight="8dp"
         android:layout_toStartOf="@+id/messageTimeView"
         android:layout_toEndOf="@+id/messageStartGuideline"
         android:ellipsize="end"
@@ -49,9 +47,7 @@
         android:layout_alignBaseline="@+id/messageMemberNameView"
         android:layout_alignParentEnd="true"
         android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
         android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
         android:textColor="?riotx_text_secondary"
         android:textSize="12sp"
         tools:text="@tools:sample/date/hhmm" />
diff --git a/vector/src/main/res/layout/item_timeline_event_create.xml b/vector/src/main/res/layout/item_timeline_event_create.xml
index d6fc5e4b5d..0fd63515d9 100644
--- a/vector/src/main/res/layout/item_timeline_event_create.xml
+++ b/vector/src/main/res/layout/item_timeline_event_create.xml
@@ -9,7 +9,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
-        android:layout_marginLeft="16dp"
         android:layout_marginTop="16dp"
         android:layout_marginBottom="16dp"
         android:background="?attr/riotx_keys_backup_banner_accent_color"
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 a15de8bd34..a67d14168b 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
@@ -35,7 +35,6 @@
     <!--        android:layout_width="@dimen/chat_avatar_size"-->
     <!--        android:layout_height="@dimen/chat_avatar_size"-->
     <!--        android:layout_marginStart="4dp"-->
-    <!--        android:layout_marginLeft="4dp"-->
     <!--        app:layout_constraintStart_toEndOf="@+id/messageFilee2eIcon"-->
     <!--        app:layout_constraintTop_toTopOf="parent"-->
     <!--        tools:src="@drawable/filetype_attachment" />-->
@@ -46,7 +45,6 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
-        android:layout_marginLeft="4dp"
         android:layout_marginEnd="32dp"
         android:autoLink="none"
         android:gravity="center_vertical"
@@ -70,7 +68,6 @@
         android:layout_height="46dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="32dp"
-        android:layout_marginRight="32dp"
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
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 5df455b1c1..ad3b036a4d 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
@@ -10,7 +10,6 @@
         android:layout_width="375dp"
         android:layout_height="0dp"
         android:layout_marginEnd="32dp"
-        android:layout_marginRight="32dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0"
         app:layout_constraintStart_toStartOf="parent"
@@ -49,7 +48,6 @@
         android:layout_height="46dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="32dp"
-        android:layout_marginRight="32dp"
         android:layout_marginBottom="8dp"
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
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 7f16b51abd..a0cfb6491f 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
@@ -14,21 +14,21 @@
             layout="@layout/vector_message_merge_avatar_list"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
             android:layout_alignParentStart="true"
-            android:layout_toLeftOf="@+id/itemMergedExpandTextView"
-            android:layout_marginEnd="16dp" />
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="16dp"
+            android:layout_toStartOf="@+id/itemMergedExpandTextView" />
 
         <TextView
             android:id="@+id/itemMergedExpandTextView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="2dp"
-            android:paddingLeft="8dp"
-            android:paddingTop="4dp"
-            android:paddingRight="8dp"
-            android:paddingBottom="4dp"
             android:layout_alignParentEnd="true"
+            android:layout_marginTop="2dp"
+            android:paddingStart="8dp"
+            android:paddingTop="4dp"
+            android:paddingEnd="8dp"
+            android:paddingBottom="4dp"
             android:text="@string/merged_events_expand"
             android:textColor="?attr/colorAccent"
             android:textSize="14sp"
@@ -41,7 +41,7 @@
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:layout_marginTop="4dp"
-        android:background="?attr/riotx_header_panel_background"/>
+        android:background="?attr/riotx_header_panel_background" />
 
 
     <TextView
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 3ed840954f..eefa387254 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
@@ -58,9 +58,9 @@
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
             android:layout_marginTop="2dp"
-            android:paddingLeft="8dp"
+            android:paddingStart="8dp"
             android:paddingTop="4dp"
-            android:paddingRight="8dp"
+            android:paddingEnd="8dp"
             android:paddingBottom="4dp"
             android:text="@string/merged_events_expand"
             android:textColor="?attr/colorAccent"
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 847324884c..3f0c269e90 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
@@ -55,9 +55,9 @@
             android:layout_height="wrap_content"
             android:layout_gravity="end"
             android:layout_marginTop="2dp"
-            android:paddingLeft="8dp"
+            android:paddingStart="8dp"
             android:paddingTop="4dp"
-            android:paddingRight="8dp"
+            android:paddingEnd="8dp"
             android:paddingBottom="4dp"
             android:text="@string/merged_events_expand"
             android:textColor="?attr/colorAccent"
diff --git a/vector/src/main/res/layout/item_user_directory_letter_header.xml b/vector/src/main/res/layout/item_user_directory_letter_header.xml
index 0cb2faf9bc..4e4b1fdfea 100644
--- a/vector/src/main/res/layout/item_user_directory_letter_header.xml
+++ b/vector/src/main/res/layout/item_user_directory_letter_header.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/userDirectoryLetterView"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/userDirectoryLetterView"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_marginLeft="8dp"
+    android:layout_marginStart="8dp"
     android:fontFamily="sans-serif-medium"
     android:padding="8dp"
     android:textColor="?attr/riotx_text_primary"
diff --git a/vector/src/main/res/layout/item_verification_action.xml b/vector/src/main/res/layout/item_verification_action.xml
index c6f1152afe..f5d060b267 100644
--- a/vector/src/main/res/layout/item_verification_action.xml
+++ b/vector/src/main/res/layout/item_verification_action.xml
@@ -9,9 +9,9 @@
     android:focusable="true"
     android:foreground="?attr/selectableItemBackground"
     android:minHeight="64dp"
-    android:paddingLeft="@dimen/layout_horizontal_margin"
+    android:paddingStart="@dimen/layout_horizontal_margin"
     android:paddingTop="8dp"
-    android:paddingRight="@dimen/layout_horizontal_margin"
+    android:paddingEnd="@dimen/layout_horizontal_margin"
     android:paddingBottom="8dp">
 
     <ImageView
diff --git a/vector/src/main/res/layout/item_verification_notice.xml b/vector/src/main/res/layout/item_verification_notice.xml
index bb495f88b1..2669fba03c 100644
--- a/vector/src/main/res/layout/item_verification_notice.xml
+++ b/vector/src/main/res/layout/item_verification_notice.xml
@@ -4,9 +4,9 @@
     android:id="@+id/itemVerificationNoticeText"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingLeft="@dimen/layout_horizontal_margin"
+    android:paddingStart="@dimen/layout_horizontal_margin"
     android:paddingTop="8dp"
-    android:paddingRight="@dimen/layout_horizontal_margin"
+    android:paddingEnd="@dimen/layout_horizontal_margin"
     android:paddingBottom="8dp"
     android:textColor="?riotx_text_primary"
     android:textSize="14sp"
diff --git a/vector/src/main/res/layout/item_verification_waiting.xml b/vector/src/main/res/layout/item_verification_waiting.xml
index bcf99e6894..8c32e57f9b 100644
--- a/vector/src/main/res/layout/item_verification_waiting.xml
+++ b/vector/src/main/res/layout/item_verification_waiting.xml
@@ -5,9 +5,9 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minHeight="72dp"
-    android:paddingLeft="@dimen/layout_horizontal_margin"
+    android:paddingStart="@dimen/layout_horizontal_margin"
     android:paddingTop="8dp"
-    android:paddingRight="@dimen/layout_horizontal_margin"
+    android:paddingEnd="@dimen/layout_horizontal_margin"
     android:paddingBottom="8dp">
 
     <TextView
diff --git a/vector/src/main/res/layout/merge_overlay_waiting_view.xml b/vector/src/main/res/layout/merge_overlay_waiting_view.xml
index 10ae1a7ae2..c13d5e5df2 100644
--- a/vector/src/main/res/layout/merge_overlay_waiting_view.xml
+++ b/vector/src/main/res/layout/merge_overlay_waiting_view.xml
@@ -39,8 +39,7 @@
                     android:layout_width="40dp"
                     android:layout_height="40dp"
                     android:layout_gravity="center_vertical"
-                    android:layout_marginEnd="6dp"
-                    android:layout_marginRight="6dp" />
+                    android:layout_marginEnd="6dp" />
 
                 <TextView
                     android:id="@+id/waiting_view_status_text"
diff --git a/vector/src/main/res/layout/motion_fab_menu_merge.xml b/vector/src/main/res/layout/motion_fab_menu_merge.xml
index 104db206cd..e564d16aaf 100644
--- a/vector/src/main/res/layout/motion_fab_menu_merge.xml
+++ b/vector/src/main/res/layout/motion_fab_menu_merge.xml
@@ -38,7 +38,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
         android:ellipsize="end"
         android:importantForAccessibility="no"
         android:text="@string/fab_menu_create_room" />
@@ -63,7 +62,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
         android:ellipsize="end"
         android:importantForAccessibility="no"
         android:text="@string/fab_menu_create_chat" />
diff --git a/vector/src/main/res/layout/reaction_button.xml b/vector/src/main/res/layout/reaction_button.xml
index c23dd154e6..4f11bf1fcd 100644
--- a/vector/src/main/res/layout/reaction_button.xml
+++ b/vector/src/main/res/layout/reaction_button.xml
@@ -4,17 +4,17 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/reactionSelector"
     android:layout_width="wrap_content"
-    android:minWidth="44dp"
     android:layout_height="26dp"
     android:background="@drawable/rounded_rect_shape"
-    android:clipChildren="false">
+    android:clipChildren="false"
+    android:minWidth="44dp">
 
 
     <!--<View-->
-        <!--android:id="@+id/reactionSelector"-->
-        <!--android:layout_width="match_parent"-->
-        <!--android:layout_height="match_parent"-->
-        <!--android:background="@drawable/rounded_rect_shape" />-->
+    <!--android:id="@+id/reactionSelector"-->
+    <!--android:layout_width="match_parent"-->
+    <!--android:layout_height="match_parent"-->
+    <!--android:background="@drawable/rounded_rect_shape" />-->
 
     <im.vector.app.features.reactions.widget.DotsView
         android:id="@+id/dots"
@@ -39,32 +39,27 @@
         android:id="@+id/reactionText"
         android:layout_width="wrap_content"
         android:layout_height="20dp"
-        android:minWidth="20dp"
         android:layout_marginStart="6dp"
-        android:layout_marginLeft="6dp"
+        android:ellipsize="middle"
         android:gravity="center"
+        android:maxEms="10"
+        android:minWidth="20dp"
+        android:singleLine="true"
         android:textColor="@color/black"
         android:textSize="13sp"
-        android:maxEms="10"
-        android:ellipsize="middle"
-        android:singleLine="true"
-        app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/reactionCount"
+        app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/reactionCount"
         tools:text="* Party Parrot Again * 👀" />
 
     <TextView
         android:id="@+id/reactionCount"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintHorizontal_chainStyle="packed"
-        app:layout_constraintBaseline_toBaselineOf="@id/reactionText"
         android:layout_marginStart="2dp"
-        android:layout_marginLeft="2dp"
         android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
         android:gravity="center"
         android:maxLines="1"
         android:textColor="?riotx_text_secondary"
@@ -73,8 +68,10 @@
         app:autoSizeMaxTextSize="14sp"
         app:autoSizeMinTextSize="8sp"
         app:autoSizeTextType="uniform"
-        app:layout_constraintStart_toEndOf="@id/reactionText"
+        app:layout_constraintBaseline_toBaselineOf="@id/reactionText"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintStart_toEndOf="@id/reactionText"
         tools:text="13450" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
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 d4260bd472..051e7850df 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
@@ -11,13 +11,12 @@
         android:layout_height="wrap_content"
         android:layout_gravity="top|center_horizontal"
         android:layout_marginStart="10dp"
-        android:layout_marginLeft="10dp"
         android:layout_marginTop="10dp"
         android:gravity="center"
         android:minWidth="8dp"
         android:minHeight="8dp"
-        android:paddingLeft="4dp"
-        android:paddingRight="4dp"
+        android:paddingStart="4dp"
+        android:paddingEnd="4dp"
         android:textColor="@android:color/white"
         android:textSize="10sp"
         tools:background="@drawable/bg_unread_highlight"
diff --git a/vector/src/main/res/layout/vector_invite_view.xml b/vector/src/main/res/layout/vector_invite_view.xml
index ed3f559ed2..159e394426 100644
--- a/vector/src/main/res/layout/vector_invite_view.xml
+++ b/vector/src/main/res/layout/vector_invite_view.xml
@@ -11,10 +11,8 @@
         android:layout_width="96dp"
         android:layout_height="96dp"
         android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
         android:layout_marginTop="86dp"
         android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -84,7 +82,7 @@
         app:layout_constraintEnd_toStartOf="@+id/inviteAcceptView"
         app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/inviteLabelView"/>
+        app:layout_constraintTop_toBottomOf="@id/inviteLabelView" />
 
     <Space
         android:layout_width="match_parent"
diff --git a/vector/src/main/res/layout/vector_message_merge_avatar_list.xml b/vector/src/main/res/layout/vector_message_merge_avatar_list.xml
index 58f38ada0e..7e4588f4cc 100644
--- a/vector/src/main/res/layout/vector_message_merge_avatar_list.xml
+++ b/vector/src/main/res/layout/vector_message_merge_avatar_list.xml
@@ -18,7 +18,6 @@
         android:layout_width="20dp"
         android:layout_height="20dp"
         android:layout_marginStart="-5dp"
-        android:layout_marginLeft="-5dp"
         android:adjustViewBounds="true"
         android:scaleType="centerCrop"
         tools:ignore="NegativeMargin"
@@ -29,7 +28,6 @@
         android:layout_width="20dp"
         android:layout_height="20dp"
         android:layout_marginStart="-5dp"
-        android:layout_marginLeft="-5dp"
         android:adjustViewBounds="true"
         android:scaleType="centerCrop"
         tools:ignore="NegativeMargin"
@@ -40,7 +38,6 @@
         android:layout_width="20dp"
         android:layout_height="20dp"
         android:layout_marginStart="-5dp"
-        android:layout_marginLeft="-5dp"
         android:adjustViewBounds="true"
         android:scaleType="centerCrop"
         tools:ignore="NegativeMargin"
@@ -51,7 +48,6 @@
         android:layout_width="20dp"
         android:layout_height="20dp"
         android:layout_marginStart="-5dp"
-        android:layout_marginLeft="-5dp"
         android:adjustViewBounds="true"
         android:scaleType="centerCrop"
         tools:ignore="NegativeMargin"
diff --git a/vector/src/main/res/layout/vector_preference_push_rule.xml b/vector/src/main/res/layout/vector_preference_push_rule.xml
index b5d111aed9..2c753a5c5e 100644
--- a/vector/src/main/res/layout/vector_preference_push_rule.xml
+++ b/vector/src/main/res/layout/vector_preference_push_rule.xml
@@ -10,9 +10,7 @@
     android:minHeight="?android:attr/listPreferredItemHeightSmall"
     android:orientation="vertical"
     android:paddingStart="?android:attr/listPreferredItemPaddingLeft"
-    android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingRight"
-    android:paddingRight="?android:attr/listPreferredItemPaddingRight">
+    android:paddingEnd="?android:attr/listPreferredItemPaddingRight">
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -35,7 +33,6 @@
             android:layout_height="wrap_content"
             android:layout_below="@android:id/title"
             android:layout_alignStart="@android:id/title"
-            android:layout_alignLeft="@android:id/title"
             android:maxLines="2"
             android:paddingTop="6dp"
             android:textAppearance="?android:attr/textAppearanceSmall"
diff --git a/vector/src/main/res/layout/vector_settings_round_group_avatar.xml b/vector/src/main/res/layout/vector_settings_round_group_avatar.xml
index 57beeb48a7..8f0781dd4e 100644
--- a/vector/src/main/res/layout/vector_settings_round_group_avatar.xml
+++ b/vector/src/main/res/layout/vector_settings_round_group_avatar.xml
@@ -10,7 +10,6 @@
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:layout_marginEnd="10dp"
-        android:layout_marginRight="10dp"
         android:adjustViewBounds="true"
         android:scaleType="centerCrop"
         tools:src="@tools:sample/avatars" />
diff --git a/vector/src/main/res/layout/view_jump_to_read_marker.xml b/vector/src/main/res/layout/view_jump_to_read_marker.xml
index 48f7bd1d80..019480e6fe 100644
--- a/vector/src/main/res/layout/view_jump_to_read_marker.xml
+++ b/vector/src/main/res/layout/view_jump_to_read_marker.xml
@@ -29,13 +29,10 @@
         android:layout_alignTop="@+id/jumpToReadMarkerLabelView"
         android:layout_alignBottom="@+id/jumpToReadMarkerLabelView"
         android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
         android:background="?attr/selectableItemBackground"
         android:contentDescription="@string/action_close"
         android:paddingStart="16dp"
-        android:paddingLeft="16dp"
         android:paddingEnd="16dp"
-        android:paddingRight="16dp"
         android:src="@drawable/ic_clear_white" />
 
 </merge>
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 d9b66b9213..7e54823fae 100644
--- a/vector/src/main/res/layout/view_keys_backup_banner.xml
+++ b/vector/src/main/res/layout/view_keys_backup_banner.xml
@@ -13,7 +13,6 @@
         android:layout_width="32dp"
         android:layout_height="32dp"
         android:layout_marginStart="19dp"
-        android:layout_marginLeft="19dp"
         android:src="@drawable/ic_secure_backup"
         android:tint="?riotx_text_primary"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -33,7 +32,6 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="27dp"
-        android:layout_marginLeft="27dp"
         android:text="@string/secure_backup_banner_setup_line1"
         android:textColor="?riotx_text_primary"
         android:textSize="18sp"
@@ -47,7 +45,6 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="27dp"
-        android:layout_marginLeft="27dp"
         android:text="@string/secure_backup_banner_setup_line2"
         android:textColor="?riotx_text_secondary"
         android:textSize="14sp"
diff --git a/vector/src/main/res/layout/view_password_strength_bar.xml b/vector/src/main/res/layout/view_password_strength_bar.xml
index b359cd140b..0b4361c7cb 100644
--- a/vector/src/main/res/layout/view_password_strength_bar.xml
+++ b/vector/src/main/res/layout/view_password_strength_bar.xml
@@ -11,7 +11,6 @@
         android:layout_width="0dp"
         android:layout_height="4dp"
         android:layout_marginEnd="5dp"
-        android:layout_marginRight="5dp"
         android:layout_weight="1"
         tools:background="@color/password_strength_bar_weak" />
 
@@ -20,7 +19,6 @@
         android:layout_width="0dp"
         android:layout_height="4dp"
         android:layout_marginEnd="5dp"
-        android:layout_marginRight="5dp"
         android:layout_weight="1"
         tools:background="@color/password_strength_bar_low" />
 
@@ -29,7 +27,6 @@
         android:layout_width="0dp"
         android:layout_height="4dp"
         android:layout_marginEnd="5dp"
-        android:layout_marginRight="5dp"
         android:layout_weight="1"
         tools:background="@color/password_strength_bar_ok" />
 
diff --git a/vector/src/main/res/xml/motion_scene_fab_menu.xml b/vector/src/main/res/xml/motion_scene_fab_menu.xml
index 646cfc34c5..0be402649a 100644
--- a/vector/src/main/res/xml/motion_scene_fab_menu.xml
+++ b/vector/src/main/res/xml/motion_scene_fab_menu.xml
@@ -73,7 +73,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="8dp"
-            android:layout_marginRight="8dp"
             android:text="@string/fab_menu_create_room"
             android:visibility="invisible"
             motion:layout_constraintBottom_toBottomOf="@+id/createRoomItemGroup"
@@ -102,7 +101,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="8dp"
-            android:layout_marginRight="8dp"
             android:text="@string/fab_menu_create_chat"
             android:visibility="invisible"
             motion:layout_constraintBottom_toBottomOf="@+id/createRoomItemChat"
@@ -115,7 +113,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="16dp"
-            android:layout_marginRight="16dp"
             android:layout_marginBottom="16dp"
             android:src="@drawable/ic_fab_add"
             motion:layout_constraintBottom_toBottomOf="parent"
@@ -153,7 +150,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="8dp"
-            android:layout_marginRight="8dp"
             android:text="@string/fab_menu_create_room"
             motion:layout_constraintBottom_toBottomOf="@+id/createRoomItemGroup"
             motion:layout_constraintEnd_toStartOf="@+id/createRoomItemGroup"
@@ -180,7 +176,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="8dp"
-            android:layout_marginRight="8dp"
             android:text="@string/fab_menu_create_chat"
             motion:layout_constraintBottom_toBottomOf="@+id/createRoomItemChat"
             motion:layout_constraintEnd_toStartOf="@+id/createRoomItemChat"
@@ -192,7 +187,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="16dp"
-            android:layout_marginRight="16dp"
             android:layout_marginBottom="16dp"
             android:rotation="135"
             android:src="@drawable/ic_fab_add"