diff --git a/app/src/main/res/layout-land/contact_master_fragment.xml b/app/src/main/res/layout-land/contact_master_fragment.xml
index de40c5218..bcddbf525 100644
--- a/app/src/main/res/layout-land/contact_master_fragment.xml
+++ b/app/src/main/res/layout-land/contact_master_fragment.xml
@@ -141,9 +141,16 @@
             android:queryBackground="@color/transparent_color"
             android:queryHint="@string/contact_filter_hint"/>
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_below="@id/searchBar"
+            android:background="?attr/dividerColor" />
+
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/contactsList"
             android:layout_toRightOf="@id/tabs_fragment"
+            android:layout_marginTop="5dp"
             android:layout_below="@id/searchBar"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
diff --git a/app/src/main/res/layout-land/history_master_fragment.xml b/app/src/main/res/layout-land/history_master_fragment.xml
index 1a642e684..80ebf91c0 100644
--- a/app/src/main/res/layout-land/history_master_fragment.xml
+++ b/app/src/main/res/layout-land/history_master_fragment.xml
@@ -94,7 +94,7 @@
 
             <ImageView
                 android:onClick="@{editClickListener}"
-                android:enabled="@{!viewModel.callLogs.empty}"
+                android:enabled="@{viewModel.missedCallLogsSelected ? !viewModel.missedCallLogs.empty : !viewModel.callLogs.empty}"
                 android:contentDescription="@string/content_description_enter_edition_mode"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
diff --git a/app/src/main/res/layout-sw533dp-land/contact_master_fragment.xml b/app/src/main/res/layout-sw533dp-land/contact_master_fragment.xml
index 286054d6a..7bfbda6b3 100644
--- a/app/src/main/res/layout-sw533dp-land/contact_master_fragment.xml
+++ b/app/src/main/res/layout-sw533dp-land/contact_master_fragment.xml
@@ -150,8 +150,15 @@
                     android:queryBackground="@color/transparent_color"
                     android:queryHint="@string/contact_filter_hint"/>
 
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_below="@id/searchBar"
+                    android:background="?attr/dividerColor" />
+
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/contactsList"
+                    android:layout_marginTop="5dp"
                     android:layout_below="@id/searchBar"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent" />
diff --git a/app/src/main/res/layout-sw533dp-land/history_master_fragment.xml b/app/src/main/res/layout-sw533dp-land/history_master_fragment.xml
index 3d6902543..b541dfc6f 100644
--- a/app/src/main/res/layout-sw533dp-land/history_master_fragment.xml
+++ b/app/src/main/res/layout-sw533dp-land/history_master_fragment.xml
@@ -104,7 +104,7 @@
 
                     <ImageView
                         android:onClick="@{editClickListener}"
-                        android:enabled="@{!viewModel.callLogs.empty}"
+                        android:enabled="@{viewModel.missedCallLogsSelected ? !viewModel.missedCallLogs.empty : !viewModel.callLogs.empty}"
                         android:contentDescription="@string/content_description_enter_edition_mode"
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/chat_room_detail_fragment.xml b/app/src/main/res/layout/chat_room_detail_fragment.xml
index 15fdb58f5..52431704d 100644
--- a/app/src/main/res/layout/chat_room_detail_fragment.xml
+++ b/app/src/main/res/layout/chat_room_detail_fragment.xml
@@ -210,7 +210,7 @@
                         android:src="@drawable/chat_send_message" />
 
                     <ImageView
-                        android:visibility="@{viewModel.chatRoom.ephemeralEnabled() ? View.VISIBLE : View.GONE}"
+                        android:visibility="@{viewModel.chatRoom.ephemeralEnabled() ? View.VISIBLE : View.GONE, default=gone}"
                         android:enabled="@{chatSendingViewModel.sendMessageEnabled &amp;&amp; !chatSendingViewModel.isReadOnly}"
                         android:contentDescription="@string/content_description_ephemeral_message"
                         android:clickable="false"
diff --git a/app/src/main/res/layout/chat_room_list_cell.xml b/app/src/main/res/layout/chat_room_list_cell.xml
index f05b8016c..65da43e0a 100644
--- a/app/src/main/res/layout/chat_room_list_cell.xml
+++ b/app/src/main/res/layout/chat_room_list_cell.xml
@@ -39,6 +39,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 tools:layout="@layout/contact_avatar"
+                android:layout_centerHorizontal="true"
                 app:showSecurityLevel="@{viewModel.encryptedChatRoom}"
                 app:viewModel="@{viewModel}"/>
 
@@ -50,7 +51,9 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/avatar"
+                android:paddingRight="10dp"
                 android:layout_marginTop="5dp"
+                android:layout_centerHorizontal="true"
                 android:singleLine="true" />
 
         </RelativeLayout>
@@ -88,11 +91,11 @@
                     android:singleLine="true"
                     android:ellipsize="end"
                     android:text="@{String.valueOf(viewModel.unreadMessagesCount)}"
-                    android:visibility="@{viewModel.unreadMessagesCount == 0 ? View.GONE : View.VISIBLE}"/>
+                    android:visibility="@{viewModel.unreadMessagesCount == 0 ? View.GONE : View.VISIBLE, default=gone}"/>
 
                 <CheckBox
                     android:onClick="@{() -> selectionListViewModel.onToggleSelect(position)}"
-                    android:visibility="@{selectionListViewModel.isEditionEnabled ? View.VISIBLE : View.GONE}"
+                    android:visibility="@{selectionListViewModel.isEditionEnabled ? View.VISIBLE : View.GONE, default=gone}"
                     android:checked="@{selectionListViewModel.selectedItems.contains(position)}"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent" />
@@ -111,7 +114,7 @@
                 android:maxLines="2" />
 
             <ImageView
-                android:visibility="@{viewModel.chatRoom.ephemeralEnabled() ? View.VISIBLE : View.GONE}"
+                android:visibility="@{viewModel.chatRoom.ephemeralEnabled() ? View.VISIBLE : View.GONE, default=gone}"
                 android:id="@+id/ephemeral"
                 android:contentDescription="@string/content_description_ephemeral_chat_room"
                 android:layout_width="20dp"
diff --git a/app/src/main/res/layout/contact_list_cell.xml b/app/src/main/res/layout/contact_list_cell.xml
index 1de16a5f9..f0de8c324 100644
--- a/app/src/main/res/layout/contact_list_cell.xml
+++ b/app/src/main/res/layout/contact_list_cell.xml
@@ -70,7 +70,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:layout_marginLeft="5dp"
             android:layout_toLeftOf="@id/right"
             android:layout_toRightOf="@id/avatar">
 
diff --git a/app/src/main/res/layout/contact_master_fragment.xml b/app/src/main/res/layout/contact_master_fragment.xml
index a6d79c8b2..eb52cec7b 100644
--- a/app/src/main/res/layout/contact_master_fragment.xml
+++ b/app/src/main/res/layout/contact_master_fragment.xml
@@ -139,10 +139,17 @@
             android:queryBackground="@color/transparent_color"
             android:queryHint="@string/contact_filter_hint"/>
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_below="@id/searchBar"
+            android:background="?attr/dividerColor" />
+
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/contactsList"
             android:layout_above="@id/tabs_fragment"
             android:layout_below="@id/searchBar"
+            android:layout_marginTop="5dp"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
 
diff --git a/app/src/main/res/layout/history_list_cell.xml b/app/src/main/res/layout/history_list_cell.xml
index aa74c302a..460fb68c6 100644
--- a/app/src/main/res/layout/history_list_cell.xml
+++ b/app/src/main/res/layout/history_list_cell.xml
@@ -77,10 +77,12 @@
                 android:contentDescription="@{viewModel.iconContentDescription}"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:layout_marginLeft="5dp"
                 android:layout_alignParentLeft="true"
                 android:adjustViewBounds="true"
-                android:padding="7dp"/>
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
+                android:paddingTop="7dp"
+                android:paddingBottom="7dp"/>
 
             <org.linphone.contact.ContactAvatarView
                 android:id="@+id/avatar"
@@ -97,7 +99,6 @@
                 style="@style/contact_name_list_cell_font"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:layout_marginLeft="5dp"
                 android:layout_toRightOf="@id/avatar"
                 android:gravity="center_vertical"
                 android:singleLine="true" />
diff --git a/app/src/main/res/layout/history_master_fragment.xml b/app/src/main/res/layout/history_master_fragment.xml
index a17a0327f..8240d69bf 100644
--- a/app/src/main/res/layout/history_master_fragment.xml
+++ b/app/src/main/res/layout/history_master_fragment.xml
@@ -94,7 +94,7 @@
 
             <ImageView
                 android:onClick="@{editClickListener}"
-                android:enabled="@{!viewModel.callLogs.empty}"
+                android:enabled="@{viewModel.missedCallLogsSelected ? !viewModel.missedCallLogs.empty : !viewModel.callLogs.empty}"
                 android:contentDescription="@string/content_description_enter_edition_mode"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"