diff --git a/app/src/main/res/layout/chat_list_fragment.xml b/app/src/main/res/layout/chat_list_fragment.xml
index ca9901314..b59c17bbc 100644
--- a/app/src/main/res/layout/chat_list_fragment.xml
+++ b/app/src/main/res/layout/chat_list_fragment.xml
@@ -58,10 +58,9 @@
                     android:id="@+id/conversations_list"
                     android:background="@drawable/shape_squircle_white_r20_top_background"
                     android:layout_width="match_parent"
-                    android:layout_height="0dp"
+                    android:layout_height="match_parent"
                     android:layout_marginTop="@dimen/top_bar_height"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar" />
+                    android:layout_marginBottom="@dimen/portrait_nav_bar_height" />
 
                 <ImageView
                     android:id="@+id/no_conversation_image"
diff --git a/app/src/main/res/layout/contacts_list_fragment.xml b/app/src/main/res/layout/contacts_list_fragment.xml
index b5e307440..c231772b8 100644
--- a/app/src/main/res/layout/contacts_list_fragment.xml
+++ b/app/src/main/res/layout/contacts_list_fragment.xml
@@ -61,14 +61,13 @@
                 <LinearLayout
                     android:id="@+id/lists"
                     android:layout_width="match_parent"
-                    android:layout_height="0dp"
+                    android:layout_height="match_parent"
                     android:layout_marginTop="@dimen/top_bar_height"
+                    android:layout_marginBottom="@dimen/portrait_nav_bar_height"
                     android:orientation="vertical"
                     android:background="@drawable/shape_squircle_white_r20_top_background"
-                    app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent">
+                    app:layout_constraintStart_toStartOf="parent">
 
                     <androidx.appcompat.widget.AppCompatTextView
                         style="@style/section_header_style"
diff --git a/app/src/main/res/layout/history_list_fragment.xml b/app/src/main/res/layout/history_list_fragment.xml
index 17f21ccaf..73e341306 100644
--- a/app/src/main/res/layout/history_list_fragment.xml
+++ b/app/src/main/res/layout/history_list_fragment.xml
@@ -68,10 +68,9 @@
                     android:id="@+id/history_list"
                     android:background="@drawable/shape_squircle_white_r20_top_background"
                     android:layout_width="match_parent"
-                    android:layout_height="0dp"
+                    android:layout_height="match_parent"
                     android:layout_marginTop="@dimen/top_bar_height"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar" />
+                    android:layout_marginBottom="@dimen/portrait_nav_bar_height" />
 
                 <ImageView
                     android:id="@+id/no_calls_image"
diff --git a/app/src/main/res/layout/meetings_list_fragment.xml b/app/src/main/res/layout/meetings_list_fragment.xml
index ad654234f..edc093bdd 100644
--- a/app/src/main/res/layout/meetings_list_fragment.xml
+++ b/app/src/main/res/layout/meetings_list_fragment.xml
@@ -59,10 +59,9 @@
                     android:id="@+id/meetings_list"
                     android:layout_width="match_parent"
                     android:background="@drawable/shape_squircle_white_r20_top_background"
-                    android:layout_height="0dp"
+                    android:layout_height="match_parent"
                     android:layout_marginTop="@dimen/top_bar_height"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar" />
+                    android:layout_marginBottom="@dimen/portrait_nav_bar_height" />
 
                 <com.google.android.material.progressindicator.CircularProgressIndicator
                     android:id="@+id/fetch_in_progress"