diff --git a/app/src/main/res/layout/generic_address_picker_contact_list_cell.xml b/app/src/main/res/layout/generic_address_picker_contact_list_cell.xml
index 9933983bc..7204cf116 100644
--- a/app/src/main/res/layout/generic_address_picker_contact_list_cell.xml
+++ b/app/src/main/res/layout/generic_address_picker_contact_list_cell.xml
@@ -21,7 +21,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
-        android:layout_marginEnd="16dp"
+        android:layout_marginEnd="4dp"
         android:paddingTop="5dp"
         android:paddingBottom="5dp"
         android:background="@drawable/primary_cell_background">
@@ -60,6 +60,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
+            android:layout_marginEnd="12dp"
             android:text="@{model.name, default=`John Doe`}"
             android:textSize="14sp"
             android:maxLines="1"
@@ -74,6 +75,7 @@
             android:id="@+id/selected"
             android:layout_width="@dimen/icon_size"
             android:layout_height="@dimen/icon_size"
+            android:layout_marginEnd="12dp"
             android:contentDescription="@null"
             android:src="@drawable/check"
             android:visibility="@{model.selected ? View.VISIBLE : View.GONE, default=gone}"
diff --git a/app/src/main/res/layout/generic_address_picker_conversation_list_cell.xml b/app/src/main/res/layout/generic_address_picker_conversation_list_cell.xml
index 33ad5ff4d..232b65ff5 100644
--- a/app/src/main/res/layout/generic_address_picker_conversation_list_cell.xml
+++ b/app/src/main/res/layout/generic_address_picker_conversation_list_cell.xml
@@ -18,7 +18,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
-        android:layout_marginEnd="16dp"
+        android:layout_marginEnd="4dp"
         android:paddingTop="5dp"
         android:paddingBottom="5dp"
         android:background="@drawable/primary_cell_background">
@@ -42,6 +42,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
+            android:layout_marginEnd="12dp"
             android:text="@{model.name, default=`Friends group`}"
             android:textSize="14sp"
             android:maxLines="1"
@@ -56,6 +57,7 @@
             android:id="@+id/selected"
             android:layout_width="@dimen/icon_size"
             android:layout_height="@dimen/icon_size"
+            android:layout_marginEnd="12dp"
             android:contentDescription="@null"
             android:src="@drawable/check"
             android:visibility="@{model.selected ? View.VISIBLE : View.GONE, default=gone}"
diff --git a/app/src/main/res/layout/generic_address_picker_suggestion_list_cell.xml b/app/src/main/res/layout/generic_address_picker_suggestion_list_cell.xml
index 134c12a91..74fb0e2c9 100644
--- a/app/src/main/res/layout/generic_address_picker_suggestion_list_cell.xml
+++ b/app/src/main/res/layout/generic_address_picker_suggestion_list_cell.xml
@@ -17,8 +17,8 @@
         android:onClick="@{onClickListener}"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
+        android:layout_marginStart="4dp"
+        android:layout_marginEnd="4dp"
         android:paddingTop="5dp"
         android:paddingBottom="5dp"
         android:background="@drawable/primary_cell_background">
@@ -27,6 +27,7 @@
             android:id="@+id/avatar"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginStart="12dp"
             android:layout_marginTop="5dp"
             android:layout_marginBottom="5dp"
             layout="@layout/contact_avatar"
@@ -41,6 +42,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
+            android:layout_marginEnd="12dp"
             android:text="@{model.sipUri, default=`john.doe@sip.linphone.org`}"
             android:textSize="14sp"
             android:maxLines="1"
@@ -55,6 +57,7 @@
             android:id="@+id/selected"
             android:layout_width="@dimen/icon_size"
             android:layout_height="@dimen/icon_size"
+            android:layout_marginEnd="12dp"
             android:contentDescription="@null"
             android:src="@drawable/check"
             android:visibility="@{model.selected ? View.VISIBLE : View.GONE, default=gone}"