diff --git a/app/src/main/res/drawable/shape_conversation_cell_background.xml b/app/src/main/res/drawable/shape_conversation_cell_background.xml
index 139f19f5d..95a658bb5 100644
--- a/app/src/main/res/drawable/shape_conversation_cell_background.xml
+++ b/app/src/main/res/drawable/shape_conversation_cell_background.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners android:radius="10dp" />
     <solid android:color="@color/white"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_conversation_selected_cell_background.xml b/app/src/main/res/drawable/shape_conversation_selected_cell_background.xml
index 63497fa7c..c7bbd34bb 100644
--- a/app/src/main/res/drawable/shape_conversation_selected_cell_background.xml
+++ b/app/src/main/res/drawable/shape_conversation_selected_cell_background.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners android:radius="10dp" />
     <solid android:color="@color/gray_3"/>
 </shape>
\ No newline at end of file
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 00d6f4466..8a481255f 100644
--- a/app/src/main/res/layout-land/contacts_list_fragment.xml
+++ b/app/src/main/res/layout-land/contacts_list_fragment.xml
@@ -118,8 +118,8 @@
             android:visibility="@{viewModel.showFavourites &amp;&amp; viewModel.searchFilter.length() == 0 ? View.VISIBLE : View.GONE}"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="8dp"
+            android:layout_marginStart="4dp"
+            android:layout_marginEnd="4dp"
             android:layout_marginTop="16dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
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 0313838c6..b62f7069c 100644
--- a/app/src/main/res/layout/contact_favourite_list_cell.xml
+++ b/app/src/main/res/layout/contact_favourite_list_cell.xml
@@ -21,7 +21,7 @@
         android:onLongClick="@{onLongClickListener}"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
+        android:padding="4dp"
         android:background="@drawable/cell_background">
 
         <io.getstream.avatarview.AvatarView
diff --git a/app/src/main/res/layout/contacts_list_fragment.xml b/app/src/main/res/layout/contacts_list_fragment.xml
index 547495eb7..afc1e3365 100644
--- a/app/src/main/res/layout/contacts_list_fragment.xml
+++ b/app/src/main/res/layout/contacts_list_fragment.xml
@@ -101,8 +101,8 @@
             android:visibility="@{viewModel.showFavourites &amp;&amp; viewModel.searchFilter.length() == 0 ? View.VISIBLE : View.GONE}"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="8dp"
+            android:layout_marginStart="4dp"
+            android:layout_marginEnd="4dp"
             android:layout_marginTop="5dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/gradle.properties b/gradle.properties
index 059a5b41d..1686bc25b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -23,4 +23,5 @@ kotlin.code.style=official
 android.nonTransitiveRClass=true
 android.defaults.buildfeatures.buildconfig=true
 android.nonFinalResIds=true
+kotlin.experimental.tryK2=true
 LinphoneSdkBuildDir=
\ No newline at end of file