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 b50da60ef..65f06cd4b 100644
--- a/app/src/main/res/layout-land/contacts_list_fragment.xml
+++ b/app/src/main/res/layout-land/contacts_list_fragment.xml
@@ -93,7 +93,7 @@
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style_800"
             android:id="@+id/favourites_label"
-            android:visibility="@{viewModel.searchFilter.length() == 0 ? View.VISIBLE : View.GONE}"
+            android:visibility="@{viewModel.searchFilter.length() == 0 &amp;&amp; viewModel.favourites.size() > 0 ? View.VISIBLE : View.GONE}"
             onClickListener="@{() -> viewModel.toggleFavouritesVisibility()}"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -110,7 +110,7 @@
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/favourites_contacts_list"
-            android:visibility="@{viewModel.showFavourites &amp;&amp; viewModel.searchFilter.length() == 0 ? View.VISIBLE : View.GONE}"
+            android:visibility="@{viewModel.showFavourites &amp;&amp; viewModel.searchFilter.length() == 0 &amp;&amp; viewModel.favourites.size() > 0 ? View.VISIBLE : View.GONE}"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="4dp"
@@ -123,7 +123,7 @@
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style_800"
             android:id="@+id/all_contacts_label"
-            android:visibility="@{viewModel.searchFilter.length() == 0 ? View.VISIBLE : View.GONE}"
+            android:visibility="@{viewModel.searchFilter.length() == 0 &amp;&amp; viewModel.favourites.size() > 0 ? View.VISIBLE : View.GONE}"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
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 41f15a654..c0d2e9f76 100644
--- a/app/src/main/res/layout/contact_favourite_list_cell.xml
+++ b/app/src/main/res/layout/contact_favourite_list_cell.xml
@@ -19,15 +19,16 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:onClick="@{onClickListener}"
         android:onLongClick="@{onLongClickListener}"
-        android:layout_width="wrap_content"
+        android:layout_width="65dp"
         android:layout_height="wrap_content"
-        android:padding="4dp"
+        android:layout_marginStart="4dp"
+        android:layout_marginEnd="4dp"
         android:background="@drawable/cell_background">
 
         <io.getstream.avatarview.AvatarView
             android:id="@+id/avatar"
-            android:layout_width="72dp"
-            android:layout_height="72dp"
+            android:layout_width="@dimen/avatar_favorite_list_cell_size"
+            android:layout_height="@dimen/avatar_favorite_list_cell_size"
             android:adjustViewBounds="true"
             contactAvatar="@{model}"
             app:avatarViewPlaceholder="@drawable/contact_avatar"
@@ -57,8 +58,8 @@
             android:textSize="14sp"
             android:maxLines="1"
             android:ellipsize="end"
-            app:layout_constraintStart_toStartOf="@id/avatar"
-            app:layout_constraintEnd_toEndOf="@id/avatar"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/avatar"/>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/contact_fragment.xml b/app/src/main/res/layout/contact_fragment.xml
index e413ce968..fa950bd72 100644
--- a/app/src/main/res/layout/contact_fragment.xml
+++ b/app/src/main/res/layout/contact_fragment.xml
@@ -75,8 +75,8 @@
 
                 <io.getstream.avatarview.AvatarView
                     android:id="@+id/avatar"
-                    android:layout_width="72dp"
-                    android:layout_height="72dp"
+                    android:layout_width="@dimen/avatar_big_size"
+                    android:layout_height="@dimen/avatar_big_size"
                     android:layout_marginTop="32dp"
                     android:adjustViewBounds="true"
                     contactAvatar="@{viewModel.contact}"
diff --git a/app/src/main/res/layout/contact_list_cell.xml b/app/src/main/res/layout/contact_list_cell.xml
index 4ef422dd7..26de41ec0 100644
--- a/app/src/main/res/layout/contact_list_cell.xml
+++ b/app/src/main/res/layout/contact_list_cell.xml
@@ -41,8 +41,8 @@
 
         <io.getstream.avatarview.AvatarView
             android:id="@+id/avatar"
-            android:layout_width="36dp"
-            android:layout_height="36dp"
+            android:layout_width="@dimen/avatar_list_cell_size"
+            android:layout_height="@dimen/avatar_list_cell_size"
             android:layout_marginStart="12dp"
             android:layout_marginTop="5dp"
             android:layout_marginBottom="5dp"
diff --git a/app/src/main/res/layout/contacts_list_fragment.xml b/app/src/main/res/layout/contacts_list_fragment.xml
index 46f685d75..ae1142520 100644
--- a/app/src/main/res/layout/contacts_list_fragment.xml
+++ b/app/src/main/res/layout/contacts_list_fragment.xml
@@ -77,7 +77,7 @@
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style_800"
             android:id="@+id/favourites_label"
-            android:visibility="@{viewModel.searchFilter.length() == 0 ? View.VISIBLE : View.GONE}"
+            android:visibility="@{viewModel.searchFilter.length() == 0 &amp;&amp; viewModel.favourites.size() > 0 ? View.VISIBLE : View.GONE}"
             onClickListener="@{() -> viewModel.toggleFavouritesVisibility()}"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -95,7 +95,7 @@
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/favourites_contacts_list"
-            android:visibility="@{viewModel.showFavourites &amp;&amp; viewModel.searchFilter.length() == 0 ? View.VISIBLE : View.GONE}"
+            android:visibility="@{viewModel.showFavourites &amp;&amp; viewModel.searchFilter.length() == 0 &amp;&amp; viewModel.favourites.size() > 0 ? View.VISIBLE : View.GONE}"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="4dp"
@@ -108,7 +108,7 @@
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style_800"
             android:id="@+id/all_contacts_label"
-            android:visibility="@{viewModel.searchFilter.length() == 0 ? View.VISIBLE : View.GONE}"
+            android:visibility="@{viewModel.searchFilter.length() == 0 &amp;&amp; viewModel.favourites.size() > 0 ? View.VISIBLE : View.GONE}"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:padding="5dp"
diff --git a/app/src/main/res/layout/voip_outgoing_call_fragment.xml b/app/src/main/res/layout/voip_outgoing_call_fragment.xml
index bea8fc4d0..c73ccd7eb 100644
--- a/app/src/main/res/layout/voip_outgoing_call_fragment.xml
+++ b/app/src/main/res/layout/voip_outgoing_call_fragment.xml
@@ -66,8 +66,8 @@
 
         <io.getstream.avatarview.AvatarView
             android:id="@+id/avatar"
-            android:layout_width="120dp"
-            android:layout_height="120dp"
+            android:layout_width="@dimen/avatar_in_call_size"
+            android:layout_height="@dimen/avatar_in_call_size"
             app:avatarViewBorderWidth="0dp"
             app:avatarViewInitials="SB"
             app:avatarViewInitialsBackgroundColor="@color/blue_outgoing_message"
diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml
index bc999d4d1..80c3dbc43 100644
--- a/app/src/main/res/values/dimen.xml
+++ b/app/src/main/res/values/dimen.xml
@@ -5,4 +5,9 @@
     <!-- This value is the result of the above two added together -->
     <dimen name="sliding_pane_left_fragment_with_nav_width">355dp</dimen>
     <dimen name="sliding_pane_right_fragment_width">300dp</dimen>
+
+    <dimen name="avatar_list_cell_size">45dp</dimen>
+    <dimen name="avatar_favorite_list_cell_size">50dp</dimen>
+    <dimen name="avatar_big_size">72dp</dimen>
+    <dimen name="avatar_in_call_size">120dp</dimen>
 </resources>
\ No newline at end of file