diff --git a/app/src/main/res/layout-land/chat_list_fragment.xml b/app/src/main/res/layout-land/chat_list_fragment.xml
index 836b4b999..1f9861d41 100644
--- a/app/src/main/res/layout-land/chat_list_fragment.xml
+++ b/app/src/main/res/layout-land/chat_list_fragment.xml
@@ -93,14 +93,10 @@
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/conversations_list"
-                    android:layout_width="0dp"
-                    android:layout_height="0dp"
-                    android:layout_marginStart="16dp"
-                    android:layout_marginEnd="16dp"
-                    app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="@id/background"
-                    app:layout_constraintBottom_toBottomOf="parent" />
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="@dimen/top_bar_height"
+                    android:layout_marginStart="@dimen/landscape_nav_bar_width" />
 
                 <com.google.android.material.floatingactionbutton.FloatingActionButton
                     android:id="@+id/new_conversation"
diff --git a/app/src/main/res/layout-land/contacts_list_fragment.xml b/app/src/main/res/layout-land/contacts_list_fragment.xml
index 3c937ae29..e0a4e98b7 100644
--- a/app/src/main/res/layout-land/contacts_list_fragment.xml
+++ b/app/src/main/res/layout-land/contacts_list_fragment.xml
@@ -126,8 +126,6 @@
                     android:visibility="@{viewModel.showFavourites &amp;&amp; !viewModel.isListFiltered &amp;&amp; viewModel.favourites.size() > 0 ? View.VISIBLE : View.GONE}"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="10dp"
-                    android:layout_marginEnd="10dp"
                     android:layout_marginTop="4dp"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
diff --git a/app/src/main/res/layout-land/history_list_fragment.xml b/app/src/main/res/layout-land/history_list_fragment.xml
index c102bbbf9..410e0cbb9 100644
--- a/app/src/main/res/layout-land/history_list_fragment.xml
+++ b/app/src/main/res/layout-land/history_list_fragment.xml
@@ -112,14 +112,10 @@
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/history_list"
-                    android:layout_width="0dp"
-                    android:layout_height="0dp"
-                    android:layout_marginStart="16dp"
-                    android:layout_marginEnd="16dp"
-                    app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/top_bar"
-                    app:layout_constraintBottom_toBottomOf="parent" />
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="@dimen/top_bar_height"
+                    android:layout_marginStart="@dimen/landscape_nav_bar_width" />
 
                 <com.google.android.material.floatingactionbutton.FloatingActionButton
                     android:onClick="@{startCallClickListener}"
diff --git a/app/src/main/res/layout-land/meetings_list_fragment.xml b/app/src/main/res/layout-land/meetings_list_fragment.xml
index 2246b7bb7..985569c2c 100644
--- a/app/src/main/res/layout-land/meetings_list_fragment.xml
+++ b/app/src/main/res/layout-land/meetings_list_fragment.xml
@@ -109,14 +109,10 @@
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/meetings_list"
-                    android:layout_width="0dp"
-                    android:layout_height="0dp"
-                    android:layout_marginStart="16dp"
-                    android:layout_marginEnd="16dp"
-                    app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="@id/background"
-                    app:layout_constraintBottom_toBottomOf="parent" />
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="@dimen/top_bar_height"
+                    android:layout_marginStart="@dimen/landscape_nav_bar_width" />
 
                 <com.google.android.material.floatingactionbutton.FloatingActionButton
                     android:id="@+id/new_meeting"
diff --git a/app/src/main/res/layout/chat_list_cell.xml b/app/src/main/res/layout/chat_list_cell.xml
index f603be9ca..21393ad1b 100644
--- a/app/src/main/res/layout/chat_list_cell.xml
+++ b/app/src/main/res/layout/chat_list_cell.xml
@@ -24,10 +24,10 @@
         android:onLongClickListener="@{onLongClickListener}"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
-        android:layout_marginBottom="4dp"
         android:paddingTop="4dp"
         android:paddingBottom="4dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
         android:background="@drawable/primary_cell_background">
 
         <com.google.android.material.imageview.ShapeableImageView
diff --git a/app/src/main/res/layout/chat_list_fragment.xml b/app/src/main/res/layout/chat_list_fragment.xml
index b9feb9b2e..7cf159e8f 100644
--- a/app/src/main/res/layout/chat_list_fragment.xml
+++ b/app/src/main/res/layout/chat_list_fragment.xml
@@ -83,13 +83,10 @@
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/conversations_list"
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="0dp"
-                    android:layout_marginStart="16dp"
-                    android:layout_marginEnd="16dp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="@id/background"
+                    android:layout_marginTop="@dimen/top_bar_height"
+                    app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar" />
 
                 <include
diff --git a/app/src/main/res/layout/contact_favourite_list_cell.xml b/app/src/main/res/layout/contact_favourite_list_cell.xml
index deb8dde70..c26180b21 100644
--- a/app/src/main/res/layout/contact_favourite_list_cell.xml
+++ b/app/src/main/res/layout/contact_favourite_list_cell.xml
@@ -23,6 +23,7 @@
         android:onLongClick="@{onLongClickListener}"
         android:layout_width="75dp"
         android:layout_height="wrap_content"
+        android:layout_marginStart="5dp"
         android:padding="5dp"
         android:background="@drawable/primary_cell_background">
 
diff --git a/app/src/main/res/layout/contacts_list_fragment.xml b/app/src/main/res/layout/contacts_list_fragment.xml
index 658962b07..2a3bde1fa 100644
--- a/app/src/main/res/layout/contacts_list_fragment.xml
+++ b/app/src/main/res/layout/contacts_list_fragment.xml
@@ -115,13 +115,9 @@
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/favourites_contacts_list"
                     android:visibility="@{viewModel.showFavourites &amp;&amp; !viewModel.isListFiltered &amp;&amp; viewModel.favourites.size() > 0 ? View.VISIBLE : View.GONE}"
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="10dp"
-                    android:layout_marginEnd="10dp"
                     android:layout_marginTop="4dp"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/favourites_label" />
 
                 <androidx.appcompat.widget.AppCompatTextView
@@ -141,11 +137,9 @@
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/contactsList"
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="0dp"
                     android:layout_marginTop="8dp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/all_contacts_label"
                     app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar" />
 
diff --git a/app/src/main/res/layout/history_list_cell.xml b/app/src/main/res/layout/history_list_cell.xml
index e7041d8d1..b9da75845 100644
--- a/app/src/main/res/layout/history_list_cell.xml
+++ b/app/src/main/res/layout/history_list_cell.xml
@@ -27,6 +27,8 @@
         android:onLongClickListener="@{onLongClickListener}"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
         android:background="@drawable/primary_cell_background">
 
         <com.google.android.material.imageview.ShapeableImageView
diff --git a/app/src/main/res/layout/history_list_fragment.xml b/app/src/main/res/layout/history_list_fragment.xml
index ff9a8f058..dc990e7dd 100644
--- a/app/src/main/res/layout/history_list_fragment.xml
+++ b/app/src/main/res/layout/history_list_fragment.xml
@@ -102,13 +102,10 @@
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/history_list"
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="0dp"
-                    android:layout_marginStart="16dp"
-                    android:layout_marginEnd="16dp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/top_bar"
+                    android:layout_marginTop="@dimen/top_bar_height"
+                    app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar" />
 
                 <include
diff --git a/app/src/main/res/layout/meeting_list_cell.xml b/app/src/main/res/layout/meeting_list_cell.xml
index 64e5d67e0..4756ea582 100644
--- a/app/src/main/res/layout/meeting_list_cell.xml
+++ b/app/src/main/res/layout/meeting_list_cell.xml
@@ -18,7 +18,9 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp">
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style_300"
diff --git a/app/src/main/res/layout/meetings_list_decoration.xml b/app/src/main/res/layout/meetings_list_decoration.xml
index 90eced8a6..d290c00f3 100644
--- a/app/src/main/res/layout/meetings_list_decoration.xml
+++ b/app/src/main/res/layout/meetings_list_decoration.xml
@@ -14,6 +14,7 @@
         android:layout_height="wrap_content"
         android:paddingTop="16dp"
         android:paddingBottom="16dp"
+        android:paddingStart="16dp"
         android:text="October"
         android:textSize="20sp"
         android:textColor="@color/gray_main2_600"
diff --git a/app/src/main/res/layout/meetings_list_fragment.xml b/app/src/main/res/layout/meetings_list_fragment.xml
index fce34f8eb..699639e01 100644
--- a/app/src/main/res/layout/meetings_list_fragment.xml
+++ b/app/src/main/res/layout/meetings_list_fragment.xml
@@ -99,13 +99,10 @@
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/meetings_list"
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="0dp"
-                    android:layout_marginStart="16dp"
-                    android:layout_marginEnd="16dp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="@id/background"
+                    android:layout_marginTop="@dimen/top_bar_height"
+                    app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar" />
 
                 <include