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 2e348dfdc..4fac212f9 100644
--- a/app/src/main/res/layout-land/contacts_list_fragment.xml
+++ b/app/src/main/res/layout-land/contacts_list_fragment.xml
@@ -70,15 +70,57 @@
                     app:layout_constraintTop_toTopOf="@id/top_bar"
                     app:layout_constraintBottom_toBottomOf="@id/top_bar" />
 
-                <ImageView
-                    android:id="@+id/background"
+                <LinearLayout
+                    android:id="@+id/lists"
                     android:layout_width="0dp"
                     android:layout_height="0dp"
-                    android:src="@color/white"
+                    android:layout_marginTop="@dimen/top_bar_height"
+                    android:orientation="vertical"
+                    android:background="@color/white"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
-                    app:layout_constraintTop_toBottomOf="@id/top_bar"/>
+                    app:layout_constraintTop_toTopOf="parent">
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        style="@style/section_header_style"
+                        android:id="@+id/favourites_label"
+                        android:visibility="@{!viewModel.isListFiltered &amp;&amp; viewModel.favourites.size() > 0 ? View.VISIBLE : View.GONE}"
+                        onClickListener="@{() -> viewModel.toggleFavouritesVisibility()}"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="16dp"
+                        android:layout_marginEnd="16dp"
+                        android:layout_marginTop="20dp"
+                        android:text="@string/contacts_list_favourites_title"
+                        android:drawableEnd="@drawable/caret_up"
+                        android:drawableTint="@color/gray_main2_600"/>
+
+                    <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="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="4dp" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        style="@style/section_header_style"
+                        android:id="@+id/all_contacts_label"
+                        android:visibility="@{!viewModel.isListFiltered &amp;&amp; viewModel.favourites.size() > 0 ? View.VISIBLE : View.GONE}"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="16dp"
+                        android:layout_marginEnd="16dp"
+                        android:layout_marginTop="16dp"
+                        android:text="@string/contacts_list_all_contacts_title"/>
+
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/contactsList"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginTop="8dp" />
+
+                </LinearLayout>
 
                 <ImageView
                     android:id="@+id/no_contacts_image"
@@ -91,7 +133,7 @@
                     app:layout_constraintDimensionRatio="1:1"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
-                    app:layout_constraintTop_toBottomOf="@id/background" />
+                    app:layout_constraintTop_toBottomOf="@id/lists" />
 
                 <androidx.appcompat.widget.AppCompatTextView
                     style="@style/section_header_style"
@@ -99,62 +141,11 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/contacts_list_empty"
-                    app:layout_constraintBottom_toTopOf="@id/background"
+                    app:layout_constraintBottom_toTopOf="@id/lists"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
                     app:layout_constraintTop_toBottomOf="@id/no_contacts_image" />
 
-                <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/section_header_style"
-                    android:id="@+id/favourites_label"
-                    android:visibility="@{!viewModel.isListFiltered &amp;&amp; viewModel.favourites.size() > 0 ? View.VISIBLE : View.GONE}"
-                    onClickListener="@{() -> viewModel.toggleFavouritesVisibility()}"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="16dp"
-                    android:layout_marginEnd="16dp"
-                    android:layout_marginTop="20dp"
-                    android:text="@string/contacts_list_favourites_title"
-                    android:drawableEnd="@drawable/caret_up"
-                    android:drawableTint="@color/gray_main2_600"
-                    app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="@id/background"/>
-
-                <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_height="wrap_content"
-                    android:layout_marginTop="4dp"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
-                    app:layout_constraintTop_toBottomOf="@id/favourites_label" />
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/section_header_style"
-                    android:id="@+id/all_contacts_label"
-                    android:visibility="@{!viewModel.isListFiltered &amp;&amp; viewModel.favourites.size() > 0 ? View.VISIBLE : View.GONE}"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="16dp"
-                    android:layout_marginEnd="16dp"
-                    android:layout_marginTop="16dp"
-                    android:text="@string/contacts_list_all_contacts_title"
-                    app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/favourites_contacts_list"/>
-
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/contactsList"
-                    android:layout_width="0dp"
-                    android:layout_height="0dp"
-                    android:layout_marginTop="8dp"
-                    app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/all_contacts_label"
-                    app:layout_constraintBottom_toBottomOf="parent" />
-
                 <com.google.android.material.floatingactionbutton.FloatingActionButton
                     android:id="@+id/new_contact"
                     android:onClick="@{onNewContactClicked}"
diff --git a/app/src/main/res/layout/contacts_list_fragment.xml b/app/src/main/res/layout/contacts_list_fragment.xml
index fb6472c58..f03d63f0a 100644
--- a/app/src/main/res/layout/contacts_list_fragment.xml
+++ b/app/src/main/res/layout/contacts_list_fragment.xml
@@ -60,15 +60,59 @@
                     app:layout_constraintTop_toTopOf="@id/top_bar"
                     app:layout_constraintBottom_toBottomOf="@id/top_bar" />
 
-                <ImageView
-                    android:id="@+id/background"
-                    android:layout_width="0dp"
+                <LinearLayout
+                    android:id="@+id/lists"
+                    android:layout_width="match_parent"
                     android:layout_height="0dp"
-                    android:src="@color/white"
+                    android:layout_marginTop="@dimen/top_bar_height"
+                    android:orientation="vertical"
+                    android:background="@color/white"
                     app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/top_bar" />
+                    app:layout_constraintTop_toTopOf="parent">
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        style="@style/section_header_style"
+                        android:id="@+id/favourites_label"
+                        android:visibility="@{!viewModel.isListFiltered &amp;&amp; viewModel.favourites.size() > 0 ? View.VISIBLE : View.GONE}"
+                        onClickListener="@{() -> viewModel.toggleFavouritesVisibility()}"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:padding="5dp"
+                        android:layout_marginStart="16dp"
+                        android:layout_marginEnd="16dp"
+                        android:layout_marginTop="16dp"
+                        android:text="@string/contacts_list_favourites_title"
+                        android:drawableEnd="@{viewModel.showFavourites ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}"
+                        android:drawableTint="@color/gray_main2_600" />
+
+                    <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="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="4dp" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        style="@style/section_header_style"
+                        android:id="@+id/all_contacts_label"
+                        android:visibility="@{!viewModel.isListFiltered &amp;&amp; viewModel.favourites.size() > 0 ? View.VISIBLE : View.GONE}"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:padding="5dp"
+                        android:layout_marginStart="16dp"
+                        android:layout_marginEnd="16dp"
+                        android:layout_marginTop="16dp"
+                        android:text="@string/contacts_list_all_contacts_title" />
+
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/contactsList"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginTop="8dp" />
+
+                </LinearLayout>
 
                 <ImageView
                     android:id="@+id/no_contacts_image"
@@ -81,7 +125,7 @@
                     app:layout_constraintDimensionRatio="1:1"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/background" />
+                    app:layout_constraintTop_toBottomOf="@id/lists" />
 
                 <androidx.appcompat.widget.AppCompatTextView
                     style="@style/section_header_style"
@@ -89,60 +133,11 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/contacts_list_empty"
-                    app:layout_constraintBottom_toTopOf="@id/background"
+                    app:layout_constraintBottom_toTopOf="@id/lists"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/no_contacts_image" />
 
-                <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/section_header_style"
-                    android:id="@+id/favourites_label"
-                    android:visibility="@{!viewModel.isListFiltered &amp;&amp; viewModel.favourites.size() > 0 ? View.VISIBLE : View.GONE}"
-                    onClickListener="@{() -> viewModel.toggleFavouritesVisibility()}"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:padding="5dp"
-                    android:layout_marginStart="16dp"
-                    android:layout_marginEnd="16dp"
-                    android:layout_marginTop="16dp"
-                    android:text="@string/contacts_list_favourites_title"
-                    android:drawableEnd="@{viewModel.showFavourites ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}"
-                    android:drawableTint="@color/gray_main2_600"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="@id/background"/>
-
-                <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="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="4dp"
-                    app:layout_constraintTop_toBottomOf="@id/favourites_label" />
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/section_header_style"
-                    android:id="@+id/all_contacts_label"
-                    android:visibility="@{!viewModel.isListFiltered &amp;&amp; viewModel.favourites.size() > 0 ? View.VISIBLE : View.GONE}"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:padding="5dp"
-                    android:layout_marginStart="16dp"
-                    android:layout_marginEnd="16dp"
-                    android:layout_marginTop="16dp"
-                    android:text="@string/contacts_list_all_contacts_title"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/favourites_contacts_list"/>
-
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/contactsList"
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_marginTop="8dp"
-                    app:layout_constraintTop_toBottomOf="@id/all_contacts_label"
-                    app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar" />
-
                 <include
                     android:id="@+id/bottom_nav_bar"
                     android:layout_width="0dp"