diff --git a/app/src/main/res/layout/chat_info_fragment.xml b/app/src/main/res/layout/chat_info_fragment.xml
index d7790676e..474f1201f 100644
--- a/app/src/main/res/layout/chat_info_fragment.xml
+++ b/app/src/main/res/layout/chat_info_fragment.xml
@@ -210,17 +210,17 @@
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/mute_label"/>
 
-                <ImageView
+                <View
                     android:id="@+id/participants_background"
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="0dp"
                     android:layout_marginStart="16dp"
                     android:layout_marginEnd="16dp"
-                    android:visibility="@{viewModel.isGroup ? View.VISIBLE : View.GONE}"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
+                    android:layout_marginBottom="-16dp"
+                    android:background="@drawable/shape_squircle_white_background"
+                    android:visibility="@{!viewModel.expandParticipants || !viewModel.isMyselfAdmin || !viewModel.isGroup || viewModel.isReadOnly ? View.GONE : View.VISIBLE, default=gone}"
                     app:layout_constraintTop_toTopOf="@id/participants"
-                    app:layout_constraintBottom_toBottomOf="@id/participants_anchor" />
+                    app:layout_constraintBottom_toBottomOf="@id/add_participants" />
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/participants"
@@ -231,9 +231,10 @@
                     android:layout_marginEnd="16dp"
                     android:layout_marginTop="8dp"
                     android:layout_marginBottom="16dp"
+                    android:background="@drawable/shape_squircle_white_background"
                     android:nestedScrollingEnabled="true"
-                    app:layout_constraintHeight_max="@dimen/chat_room_participants_list_max_height"
-                    app:layout_constrainedHeight="true"
+                    app:layout_constraintVertical_weight="1"
+                    app:layout_constraintHeight_min="@dimen/recycler_view_min_height"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/participants_label"
@@ -261,16 +262,8 @@
                     app:drawableTint="@color/orange_main_500"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/participants"/>
-
-                <View
-                    android:id="@+id/participants_anchor"
-                    android:layout_width="wrap_content"
-                    android:layout_height="16dp"
-                    android:visibility="@{!viewModel.expandParticipants || !viewModel.isMyselfAdmin || !viewModel.isGroup || viewModel.isReadOnly ? View.GONE : View.VISIBLE}"
-                    app:layout_constraintTop_toBottomOf="@id/add_participants"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"/>
+                    app:layout_constraintTop_toBottomOf="@id/participants"
+                    app:layout_constraintBottom_toTopOf="@id/actions"/>
 
                 <androidx.appcompat.widget.AppCompatTextView
                     style="@style/section_header_style"
@@ -286,7 +279,7 @@
                     app:layout_constraintVertical_bias="0"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/participants_anchor"
+                    app:layout_constraintTop_toBottomOf="@id/add_participants"
                     app:layout_constraintBottom_toTopOf="@id/actions_background"/>
 
                 <ImageView
diff --git a/app/src/main/res/layout/chat_list_cell.xml b/app/src/main/res/layout/chat_list_cell.xml
index 21393ad1b..ccc35c3a4 100644
--- a/app/src/main/res/layout/chat_list_cell.xml
+++ b/app/src/main/res/layout/chat_list_cell.xml
@@ -187,8 +187,8 @@
             android:layout_width="0dp"
             android:layout_height="1dp"
             android:layout_marginEnd="10dp"
-            android:visibility="gone"
             android:background="@color/gray_main2_200"
+            android:visibility="gone"
             app:layout_constraintStart_toStartOf="@id/name"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"/>
diff --git a/app/src/main/res/layout/chat_participant_admin_popup_menu.xml b/app/src/main/res/layout/chat_participant_admin_popup_menu.xml
index 0266c369c..7e2c92958 100644
--- a/app/src/main/res/layout/chat_participant_admin_popup_menu.xml
+++ b/app/src/main/res/layout/chat_participant_admin_popup_menu.xml
@@ -73,6 +73,7 @@
             android:layout_marginEnd="20dp"
             android:layout_marginTop="16dp"
             android:background="@color/gray_main2_400"
+            android:visibility="gone"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/unset_admin"
diff --git a/app/src/main/res/layout/chat_participant_list_cell.xml b/app/src/main/res/layout/chat_participant_list_cell.xml
index 8b1c86121..3437a2e47 100644
--- a/app/src/main/res/layout/chat_participant_list_cell.xml
+++ b/app/src/main/res/layout/chat_participant_list_cell.xml
@@ -94,10 +94,12 @@
             app:layout_constraintBottom_toBottomOf="parent" />
 
         <View
+            android:id="@+id/separator"
             android:layout_width="0dp"
             android:layout_height="1dp"
             android:layout_marginEnd="10dp"
             android:background="@color/gray_main2_200"
+            android:visibility="gone"
             app:layout_constraintStart_toStartOf="@id/name"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"/>
diff --git a/app/src/main/res/layout/contact_fragment.xml b/app/src/main/res/layout/contact_fragment.xml
index 8b4c75623..321282480 100644
--- a/app/src/main/res/layout/contact_fragment.xml
+++ b/app/src/main/res/layout/contact_fragment.xml
@@ -74,6 +74,7 @@
                 android:layout_width="0dp"
                 android:layout_height="0dp"
                 android:background="@color/gray_100"
+                android:fillViewport="true"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/invisible_title"
@@ -555,22 +556,15 @@
                         android:layout_height="wrap_content"
                         android:layout_marginStart="16dp"
                         android:layout_marginEnd="16dp"
+                        android:layout_marginBottom="@dimen/screen_bottom_margin"
                         android:background="@drawable/action_background"
                         android:text="@string/contact_details_delete"
                         android:drawableStart="@drawable/trash_simple"
+                        app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintTop_toBottomOf="@id/action_share"
                         app:layout_constraintStart_toStartOf="@id/actions_background"
                         app:layout_constraintEnd_toEndOf="@id/actions_background"/>
 
-                    <View
-                        android:id="@+id/anchor"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/screen_bottom_margin"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintTop_toBottomOf="@id/action_delete"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"/>
-
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
             </ScrollView>
diff --git a/app/src/main/res/layout/contact_number_address_list_cell.xml b/app/src/main/res/layout/contact_number_address_list_cell.xml
index 585d8951b..e966d5ba9 100644
--- a/app/src/main/res/layout/contact_number_address_list_cell.xml
+++ b/app/src/main/res/layout/contact_number_address_list_cell.xml
@@ -17,6 +17,8 @@
         android:selected="@{model.selected}"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:paddingTop="10dp"
+        android:paddingBottom="10dp"
         android:background="@drawable/secondary_cell_background">
 
         <androidx.appcompat.widget.AppCompatTextView
@@ -24,7 +26,6 @@
             android:id="@+id/header"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
             android:layout_marginStart="10dp"
             android:text="@{model.sip ? @string/sip_address : model.label.length() > 0 ? @string/phone_number + ` (` + model.label + `)` : @string/phone_number, default=`Phone number (Home)`}"
             android:maxLines="1"
@@ -58,11 +59,13 @@
             app:layout_constraintEnd_toEndOf="parent" />
 
         <View
+            android:id="@+id/separator"
             android:layout_width="0dp"
             android:layout_height="1dp"
             android:layout_marginEnd="10dp"
             android:layout_marginTop="10dp"
             android:background="@color/gray_main2_200"
+            android:visibility="gone"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/number_or_address"
diff --git a/app/src/main/res/layout/dialog_number_address_list_cell.xml b/app/src/main/res/layout/dialog_number_address_list_cell.xml
index 1db2b42a7..a2f9f15c7 100644
--- a/app/src/main/res/layout/dialog_number_address_list_cell.xml
+++ b/app/src/main/res/layout/dialog_number_address_list_cell.xml
@@ -16,6 +16,8 @@
         android:selected="@{model.selected}"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:paddingTop="10dp"
+        android:paddingBottom="10dp"
         android:background="@drawable/primary_cell_background">
 
         <androidx.appcompat.widget.AppCompatTextView
@@ -23,7 +25,6 @@
             android:id="@+id/header"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
             android:layout_marginStart="10dp"
             android:text="@{model.sip ? @string/sip_address : model.label.length() > 0 ? @string/phone_number + ` (` + model.label + `)` : @string/phone_number, default=`Phone number (Home)`}"
             android:maxLines="1"
@@ -45,11 +46,13 @@
             app:layout_constraintTop_toBottomOf="@id/header"/>
 
         <View
+            android:id="@+id/separator"
             android:layout_width="0dp"
             android:layout_height="1dp"
             android:layout_marginEnd="10dp"
             android:layout_marginTop="10dp"
             android:background="@color/gray_main2_200"
+            android:visibility="gone"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/number_or_address"
diff --git a/app/src/main/res/layout/history_contact_fragment.xml b/app/src/main/res/layout/history_contact_fragment.xml
index 5096a36b3..8cc2eaac2 100644
--- a/app/src/main/res/layout/history_contact_fragment.xml
+++ b/app/src/main/res/layout/history_contact_fragment.xml
@@ -71,6 +71,7 @@
                 android:layout_width="0dp"
                 android:layout_height="0dp"
                 android:background="@color/gray_100"
+                android:fillViewport="true"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/title"
@@ -246,7 +247,7 @@
                     <androidx.recyclerview.widget.RecyclerView
                         android:id="@+id/call_history"
                         android:layout_width="0dp"
-                        android:layout_height="wrap_content"
+                        android:layout_height="0dp"
                         android:layout_marginTop="28dp"
                         android:layout_marginStart="16dp"
                         android:layout_marginEnd="16dp"
@@ -255,9 +256,11 @@
                         android:paddingBottom="5dp"
                         android:background="@drawable/shape_squircle_white_background"
                         android:nestedScrollingEnabled="true"
+                        app:layout_constraintHeight_min="@dimen/recycler_view_min_height"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toBottomOf="@id/call_label" />
+                        app:layout_constraintTop_toBottomOf="@id/call_label"
+                        app:layout_constraintBottom_toBottomOf="parent"/>
 
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/history_contact_list_cell.xml b/app/src/main/res/layout/history_contact_list_cell.xml
index c0615d4b9..f9d089504 100644
--- a/app/src/main/res/layout/history_contact_list_cell.xml
+++ b/app/src/main/res/layout/history_contact_list_cell.xml
@@ -15,13 +15,14 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp">
+        android:layout_marginEnd="16dp"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp">
 
         <ImageView
             android:id="@+id/call_status"
             android:layout_width="12dp"
             android:layout_height="12dp"
-            android:layout_marginTop="11dp"
             android:layout_marginStart="2dp"
             android:src="@{model.iconResId, default=@drawable/outgoing_call}"
             app:layout_constraintStart_toStartOf="parent"
@@ -45,7 +46,6 @@
             android:id="@+id/date_time"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
             android:layout_marginStart="5dp"
             android:gravity="center"
             android:text="@{model.dateTime, default=`August 13th 2023 | 07:47 PM`}"
@@ -75,6 +75,7 @@
             android:layout_marginEnd="10dp"
             android:layout_marginBottom="11dp"
             android:background="@color/gray_main2_200"
+            android:visibility="gone"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"/>
diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml
index a24b853ce..01f81727f 100644
--- a/app/src/main/res/values/dimen.xml
+++ b/app/src/main/res/values/dimen.xml
@@ -80,4 +80,6 @@
     <dimen name="chat_room_emoji_picker_height">300dp</dimen>
     <dimen name="chat_room_participants_list_max_height">300dp</dimen>
     <dimen name="chat_bubble_emoji_picker_height">425dp</dimen>
+
+    <dimen name="recycler_view_min_height">200dp</dimen>
 </resources>
\ No newline at end of file