diff --git a/commons/src/main/res/layout/item_contact_with_number.xml b/commons/src/main/res/layout/item_contact_with_number.xml
index 892082d37..a239d59a2 100644
--- a/commons/src/main/res/layout/item_contact_with_number.xml
+++ b/commons/src/main/res/layout/item_contact_with_number.xml
@@ -4,11 +4,12 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/item_contact_frame"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/two_line_list_item_min_height"
+    android:layout_height="wrap_content"
     android:layout_marginBottom="@dimen/tiny_margin"
     android:background="@drawable/selector_clickable"
     android:clickable="true"
     android:focusable="true"
+    android:minHeight="@dimen/two_line_list_item_min_height"
     android:paddingHorizontal="@dimen/list_item_padding_horizontal"
     android:paddingVertical="@dimen/list_item_padding_vertical">
 
@@ -36,8 +37,6 @@
         app:layout_constraintEnd_toStartOf="@+id/drag_handle_icon"
         app:layout_constraintStart_toEndOf="@+id/item_contact_image"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.5"
-        app:layout_constraintVertical_chainStyle="packed"
         tools:text="John Doe" />
 
     <TextView
@@ -52,7 +51,6 @@
         app:layout_constraintEnd_toStartOf="@+id/drag_handle_icon"
         app:layout_constraintStart_toEndOf="@+id/item_contact_image"
         app:layout_constraintTop_toBottomOf="@+id/item_contact_name"
-        app:layout_constraintVertical_bias="0.5"
         tools:text="0123 456 789" />
 
     <ImageView
diff --git a/commons/src/main/res/layout/item_contact_without_number.xml b/commons/src/main/res/layout/item_contact_without_number.xml
index 8e8037261..b5d935772 100644
--- a/commons/src/main/res/layout/item_contact_without_number.xml
+++ b/commons/src/main/res/layout/item_contact_without_number.xml
@@ -4,11 +4,12 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/item_contact_frame"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/one_line_list_item_min_height"
+    android:layout_height="wrap_content"
     android:layout_marginBottom="@dimen/tiny_margin"
     android:background="@drawable/selector_clickable"
     android:clickable="true"
     android:focusable="true"
+    android:minHeight="@dimen/one_line_list_item_min_height"
     android:paddingHorizontal="@dimen/list_item_padding_horizontal"
     android:paddingVertical="@dimen/list_item_padding_vertical">