diff --git a/app/build.gradle b/app/build.gradle
index 4665fa25..e5d98e64 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -111,6 +111,7 @@ android {
         error 'ButtonOrder'
 
         // Layout
+        error 'UnknownIdInLayout'
         error 'StringFormatCount'
         error 'HardcodedText'
         error 'SpUsage'
diff --git a/app/src/main/java/im/vector/riotredesign/features/home/HomeActivity.kt b/app/src/main/java/im/vector/riotredesign/features/home/HomeActivity.kt
index db37dfc0..c29396f2 100644
--- a/app/src/main/java/im/vector/riotredesign/features/home/HomeActivity.kt
+++ b/app/src/main/java/im/vector/riotredesign/features/home/HomeActivity.kt
@@ -19,7 +19,6 @@ package im.vector.riotredesign.features.home
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.view.Gravity
 import android.view.MenuItem
 import androidx.appcompat.app.ActionBarDrawerToggle
 import androidx.appcompat.widget.Toolbar
@@ -96,8 +95,8 @@ class HomeActivity : RiotActivity(), ToolbarConfigurable {
     }
 
     override fun onBackPressed() {
-        if (drawerLayout.isDrawerOpen(Gravity.LEFT)) {
-            drawerLayout.closeDrawer(Gravity.LEFT)
+        if (drawerLayout.isDrawerOpen(GravityCompat.START)) {
+            drawerLayout.closeDrawer(GravityCompat.START)
         } else {
             val handled = recursivelyDispatchOnBackPressed(supportFragmentManager)
             if (!handled) {
diff --git a/app/src/main/java/im/vector/riotredesign/features/home/HomeNavigator.kt b/app/src/main/java/im/vector/riotredesign/features/home/HomeNavigator.kt
index f6583b97..7e82c031 100644
--- a/app/src/main/java/im/vector/riotredesign/features/home/HomeNavigator.kt
+++ b/app/src/main/java/im/vector/riotredesign/features/home/HomeNavigator.kt
@@ -16,7 +16,7 @@
 
 package im.vector.riotredesign.features.home
 
-import android.view.Gravity
+import androidx.core.view.GravityCompat
 import androidx.fragment.app.FragmentManager
 import im.vector.riotredesign.R
 import im.vector.riotredesign.core.extensions.addFragmentToBackstack
@@ -39,7 +39,7 @@ class HomeNavigator {
         activity?.let {
             val args = RoomDetailArgs(roomId, eventId)
             val roomDetailFragment = RoomDetailFragment.newInstance(args)
-            it.drawerLayout?.closeDrawer(Gravity.LEFT)
+            it.drawerLayout?.closeDrawer(GravityCompat.START)
             if (addToBackstack) {
                 it.addFragmentToBackstack(roomDetailFragment, R.id.homeDetailFragmentContainer, roomId)
             } else {
diff --git a/app/src/main/res/layout/fragment_home_drawer.xml b/app/src/main/res/layout/fragment_home_drawer.xml
index 0cde98ac..c9921089 100644
--- a/app/src/main/res/layout/fragment_home_drawer.xml
+++ b/app/src/main/res/layout/fragment_home_drawer.xml
@@ -8,7 +8,8 @@
     <FrameLayout
         android:id="@+id/groupListFragmentContainer"
         android:layout_width="64dp"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        app:layout_constraintStart_toStartOf="parent" />
 
     <FrameLayout
         android:id="@+id/roomListFragmentContainer"
diff --git a/app/src/main/res/layout/fragment_room_detail.xml b/app/src/main/res/layout/fragment_room_detail.xml
index 4d06b34e..452a9da8 100644
--- a/app/src/main/res/layout/fragment_room_detail.xml
+++ b/app/src/main/res/layout/fragment_room_detail.xml
@@ -25,8 +25,8 @@
                 android:id="@+id/toolbarAvatarImageView"
                 android:layout_width="40dp"
                 android:layout_height="40dp"
-                android:layout_marginBottom="8dp"
                 android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
@@ -36,8 +36,8 @@
                 android:id="@+id/toolbarTitleView"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="8dp"
                 android:layout_marginStart="8dp"
+                android:layout_marginEnd="8dp"
                 android:ellipsize="end"
                 android:maxLines="1"
                 android:textSize="18sp"
@@ -52,9 +52,9 @@
                 android:id="@+id/toolbarSubtitleView"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="8dp"
-                android:layout_marginEnd="8dp"
                 android:layout_marginStart="8dp"
+                android:layout_marginEnd="8dp"
+                android:layout_marginBottom="8dp"
                 android:ellipsize="end"
                 android:maxLines="1"
                 app:layout_constraintBottom_toBottomOf="parent"
@@ -98,18 +98,20 @@
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
             android:background="?android:attr/selectableItemBackground"
             android:src="@drawable/ic_send_white"
-            android:tint="?attr/colorAccent"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true" />
+            android:tint="?attr/colorAccent" />
 
         <EditText
             android:id="@+id/composerEditText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_alignParentStart="true"
             android:layout_alignParentLeft="true"
             android:layout_centerVertical="true"
+            android:layout_toStartOf="@id/sendButton"
             android:layout_toLeftOf="@id/sendButton"
             android:background="@android:color/transparent"
             android:gravity="center_vertical"
diff --git a/app/src/main/res/layout/fragment_room_list.xml b/app/src/main/res/layout/fragment_room_list.xml
index a2be1c9a..6355db77 100644
--- a/app/src/main/res/layout/fragment_room_list.xml
+++ b/app/src/main/res/layout/fragment_room_list.xml
@@ -12,16 +12,20 @@
         android:layout_width="0dp"
         android:layout_height="32dp"
         android:layout_marginStart="8dp"
+        android:layout_marginLeft="8dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
         android:layout_marginBottom="8dp"
         android:background="@drawable/bg_search_edit_text"
+        android:drawableStart="@drawable/ic_search_white"
         android:drawableLeft="@drawable/ic_search_white"
         android:drawablePadding="8dp"
         android:drawableTint="#9fa9ba"
         android:hint="@string/home_filter_placeholder_rooms"
         android:lines="1"
         android:paddingLeft="8dp"
+        android:paddingRight="8dp"
         app:layout_constraintBottom_toTopOf="@+id/stateView"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -32,6 +36,7 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_marginEnd="0dp"
+        android:layout_marginRight="0dp"
         android:layout_marginBottom="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/item_room.xml b/app/src/main/res/layout/item_room.xml
index c07164d1..0bbe7825 100644
--- a/app/src/main/res/layout/item_room.xml
+++ b/app/src/main/res/layout/item_room.xml
@@ -10,7 +10,9 @@
     android:clickable="true"
     android:focusable="true"
     android:foreground="?attr/selectableItemBackground"
+    android:paddingStart="8dp"
     android:paddingLeft="8dp"
+    android:paddingEnd="16dp"
     android:paddingRight="16dp">
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -24,6 +26,7 @@
             android:layout_width="32dp"
             android:layout_height="32dp"
             android:layout_marginStart="16dp"
+            android:layout_marginLeft="16dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/item_room_category.xml b/app/src/main/res/layout/item_room_category.xml
index eba3e80a..ecb6141f 100644
--- a/app/src/main/res/layout/item_room_category.xml
+++ b/app/src/main/res/layout/item_room_category.xml
@@ -9,8 +9,10 @@
     android:clickable="true"
     android:focusable="true"
     android:gravity="center_vertical"
+    android:paddingStart="16dp"
     android:paddingLeft="16dp"
     android:paddingTop="8dp"
+    android:paddingEnd="8dp"
     android:paddingRight="8dp"
     android:paddingBottom="8dp"
     tools:background="@color/pale_grey">
@@ -20,6 +22,8 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_marginEnd="8dp"
+        android:layout_marginRight="8dp"
+        android:drawableStart="@drawable/ic_expand_more_white"
         android:drawableLeft="@drawable/ic_expand_more_white"
         android:drawableTint="@color/bluey_grey_two"
         android:gravity="center_vertical"
diff --git a/app/src/main/res/layout/item_timeline_event_day_separator.xml b/app/src/main/res/layout/item_timeline_event_day_separator.xml
index db64ffb4..c05bd80b 100644
--- a/app/src/main/res/layout/item_timeline_event_day_separator.xml
+++ b/app/src/main/res/layout/item_timeline_event_day_separator.xml
@@ -10,10 +10,12 @@
         android:id="@+id/itemDayLineViewLeft"
         android:layout_width="0dp"
         android:layout_height="1dp"
-        android:layout_marginBottom="8dp"
-        android:layout_marginEnd="32dp"
         android:layout_marginStart="8dp"
+        android:layout_marginLeft="8dp"
         android:layout_marginTop="8dp"
+        android:layout_marginEnd="32dp"
+        android:layout_marginRight="32dp"
+        android:layout_marginBottom="8dp"
         android:background="@color/pale_grey_two"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/itemDayTextView"
@@ -38,10 +40,12 @@
         android:id="@+id/itemDayLineViewRight"
         android:layout_width="0dp"
         android:layout_height="1dp"
-        android:layout_marginBottom="8dp"
-        android:layout_marginEnd="8dp"
         android:layout_marginStart="32dp"
+        android:layout_marginLeft="32dp"
         android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginRight="8dp"
+        android:layout_marginBottom="8dp"
         android:background="@color/pale_grey_two"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/item_timeline_event_default.xml b/app/src/main/res/layout/item_timeline_event_default.xml
index 45bb1064..98fe706c 100644
--- a/app/src/main/res/layout/item_timeline_event_default.xml
+++ b/app/src/main/res/layout/item_timeline_event_default.xml
@@ -4,6 +4,7 @@
     android:id="@+id/stateMessageView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_marginStart="64dp"
     android:layout_marginLeft="64dp"
     android:gravity="center_vertical"
     android:padding="16dp"
diff --git a/app/src/main/res/layout/item_timeline_event_image_message.xml b/app/src/main/res/layout/item_timeline_event_image_message.xml
index a8cca347..29d5106a 100644
--- a/app/src/main/res/layout/item_timeline_event_image_message.xml
+++ b/app/src/main/res/layout/item_timeline_event_image_message.xml
@@ -23,12 +23,13 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="64dp"
+        android:layout_marginLeft="64dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="8dp"
+        android:layout_marginRight="8dp"
         android:ellipsize="end"
         android:maxLines="1"
         android:textSize="15sp"
-        app:layout_constraintBottom_toTopOf="@+id/toolbarSubtitleView"
         app:layout_constraintEnd_toStartOf="@+id/messageTimeView"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
@@ -41,6 +42,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
+        android:layout_marginLeft="8dp"
         android:textColor="@color/brown_grey"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
@@ -52,8 +54,10 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_marginStart="64dp"
+        android:layout_marginLeft="64dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="32dp"
+        android:layout_marginRight="32dp"
         android:layout_marginBottom="8dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/item_timeline_event_notice.xml b/app/src/main/res/layout/item_timeline_event_notice.xml
index 8644ac82..db4162ad 100644
--- a/app/src/main/res/layout/item_timeline_event_notice.xml
+++ b/app/src/main/res/layout/item_timeline_event_notice.xml
@@ -13,6 +13,7 @@
         android:layout_width="24dp"
         android:layout_height="24dp"
         android:layout_marginStart="64dp"
+        android:layout_marginLeft="64dp"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="8dp"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/item_timeline_event_text_message.xml b/app/src/main/res/layout/item_timeline_event_text_message.xml
index 016356f0..5d300442 100644
--- a/app/src/main/res/layout/item_timeline_event_text_message.xml
+++ b/app/src/main/res/layout/item_timeline_event_text_message.xml
@@ -23,12 +23,13 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="64dp"
+        android:layout_marginLeft="64dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="8dp"
+        android:layout_marginRight="8dp"
         android:ellipsize="end"
         android:maxLines="1"
         android:textSize="15sp"
-        app:layout_constraintBottom_toTopOf="@+id/toolbarSubtitleView"
         app:layout_constraintEnd_toStartOf="@+id/messageTimeView"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
@@ -41,6 +42,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
+        android:layout_marginLeft="8dp"
         android:textColor="@color/brown_grey"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
@@ -52,6 +54,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="64dp"
+        android:layout_marginLeft="64dp"
         android:layout_marginBottom="8dp"
         android:textColor="@color/dark_grey"
         android:textSize="14sp"