diff --git a/atox/src/main/res/layout/contact_list_view_item.xml b/atox/src/main/res/layout/contact_list_view_item.xml
index 1c20046d5..655fc097e 100644
--- a/atox/src/main/res/layout/contact_list_view_item.xml
+++ b/atox/src/main/res/layout/contact_list_view_item.xml
@@ -6,67 +6,84 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="?android:attr/selectableItemBackground"
-        android:padding="10dp">
+        android:paddingHorizontal="16dp"
+        android:paddingVertical="12dp">
 
     <ltd.evilcorp.atox.ui.AvatarImageView
             android:id="@+id/avatarImageView"
-            android:layout_height="38dp"
-            android:layout_width="38dp"
+            android:layout_height="@dimen/default_avatar_size"
+            android:layout_width="@dimen/default_avatar_size"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
             app:shapeAppearanceOverlay="@style/CircleImageView"
             app:strokeColor="@null" />
 
-    <TextView android:id="@+id/name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:textStyle="bold"
-            app:layout_constraintLeft_toRightOf="@id/avatarImageView"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:text="name goes here"/>
-    <TextView android:id="@+id/lastMessage"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintRight_toRightOf="parent"
+    <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_marginStart="16dp"
+            app:layout_constraintStart_toEndOf="@+id/avatarImageView"
             app:layout_constraintTop_toTopOf="parent"
-            tools:text="28 May 2019 11:49"/>
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent">
 
-    <TextView android:id="@+id/statusMessage"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:ellipsize="end"
-            android:singleLine="true"
-            app:layout_constraintHorizontal_weight="3"
-            app:layout_constraintLeft_toRightOf="@id/avatarImageView"
-            app:layout_constraintRight_toLeftOf="@id/publicKey"
-            app:layout_constraintTop_toBottomOf="@id/name"
-            tools:text="Really long and interesting status message"/>
-    <TextView android:id="@+id/publicKey"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:gravity="end"
-            android:singleLine="true"
-            app:layout_constraintHorizontal_bias="1"
-            app:layout_constraintHorizontal_weight="1"
-            app:layout_constraintLeft_toRightOf="@id/statusMessage"
-            app:layout_constraintRight_toLeftOf="@id/unreadIndicator"
-            app:layout_constraintTop_toBottomOf="@id/lastMessage"
-            tools:text="AAAA AAAA"/>
-    <ImageView android:id="@+id/unreadIndicator"
-            android:layout_width="12dp"
-            android:layout_height="12dp"
-            android:layout_marginStart="10dp"
-            android:layout_marginVertical="4dp"
-            android:contentDescription="@null"
-            android:src="@drawable/circle"
-            android:translationZ="9dp"
-            app:layout_constraintLeft_toRightOf="@id/publicKey"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/lastMessage"
-            app:tint="@color/colorPrimary"
-            tools:targetApi="LOLLIPOP"/>
+        <TextView
+                android:id="@+id/name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textStyle="bold"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:text="name goes here" />
+
+        <TextView
+                android:id="@+id/lastMessage"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:text="28 May 2019 11:49" />
+
+        <TextView
+                android:id="@+id/statusMessage"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:ellipsize="end"
+                android:singleLine="true"
+                app:layout_constraintHorizontal_weight="3"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/publicKey"
+                app:layout_constraintTop_toBottomOf="@id/name"
+                tools:text="Really long and interesting status message" />
+
+        <TextView
+                android:id="@+id/publicKey"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10dp"
+                android:gravity="end"
+                android:singleLine="true"
+                app:layout_constraintHorizontal_bias="1"
+                app:layout_constraintHorizontal_weight="1"
+                app:layout_constraintStart_toEndOf="@id/statusMessage"
+                app:layout_constraintEnd_toStartOf="@id/unreadIndicator"
+                app:layout_constraintTop_toBottomOf="@id/lastMessage"
+                tools:text="AAAA AAAA" />
+
+        <ImageView
+                android:id="@+id/unreadIndicator"
+                android:layout_width="12dp"
+                android:layout_height="12dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginVertical="4dp"
+                android:contentDescription="@null"
+                android:src="@drawable/circle"
+                android:translationZ="9dp"
+                app:layout_constraintStart_toEndOf="@id/publicKey"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/lastMessage"
+                app:tint="@color/colorPrimary"
+                tools:targetApi="LOLLIPOP" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/atox/src/main/res/layout/fragment_call.xml b/atox/src/main/res/layout/fragment_call.xml
index 2fc54c936..02b520d7d 100644
--- a/atox/src/main/res/layout/fragment_call.xml
+++ b/atox/src/main/res/layout/fragment_call.xml
@@ -5,21 +5,51 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-    <RelativeLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentTop="true"
             android:layout_alignParentStart="true"
             android:layout_alignParentEnd="true"
             android:layout_above="@id/control_container">
+        <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/guideline_start"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                app:layout_constraintGuide_percent="0.15 "/>
+        <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/guideline_top"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                app:layout_constraintGuide_percent="0.15 "/>
+
         <ltd.evilcorp.atox.ui.AvatarImageView
                 android:id="@+id/avatarImageView"
-                android:layout_height="match_parent"
-                android:layout_width="match_parent"
-                android:layout_centerInParent="true"
+                android:layout_height="0dp"
+                android:layout_width="0dp"
+                app:layout_constraintStart_toEndOf="@id/guideline_start"
+                app:layout_constraintEnd_toStartOf="@id/guideline_end"
+                app:layout_constraintTop_toBottomOf="@id/guideline_top"
+                app:layout_constraintBottom_toTopOf="@id/guideline_bottom"
+                app:layout_constraintDimensionRatio="1:1"
                 app:statusIndicatorVisible="false"
                 app:strokeColor="@null" />
-    </RelativeLayout>
+
+        <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/guideline_end"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                app:layout_constraintGuide_percent="0.85 "/>
+        <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/guideline_bottom"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                app:layout_constraintGuide_percent="0.85 "/>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <RelativeLayout android:id="@+id/control_container"
             android:layout_width="match_parent"
diff --git a/atox/src/main/res/layout/fragment_chat.xml b/atox/src/main/res/layout/fragment_chat.xml
index f99ecb967..86cbaf327 100644
--- a/atox/src/main/res/layout/fragment_chat.xml
+++ b/atox/src/main/res/layout/fragment_chat.xml
@@ -37,7 +37,7 @@
                         android:layout_height="38dp"
                         android:layout_width="38dp"
                         android:layout_centerVertical="true"
-                        android:layout_marginEnd="10dp"
+                        android:layout_marginEnd="16dp"
                         app:shapeAppearanceOverlay="@style/CircleImageView"
                         app:strokeColor="@null" />
 
diff --git a/atox/src/main/res/layout/fragment_contact_profile.xml b/atox/src/main/res/layout/fragment_contact_profile.xml
index 9ca6cc4b4..22bf1546e 100644
--- a/atox/src/main/res/layout/fragment_contact_profile.xml
+++ b/atox/src/main/res/layout/fragment_contact_profile.xml
@@ -8,20 +8,20 @@
         tools:context=".ui.contactprofile.ContactProfileFragment">
     <com.google.android.material.appbar.AppBarLayout android:id="@+id/appBar"
             android:layout_width="match_parent"
-            android:layout_height="128dp"
+            android:layout_height="wrap_content"
             android:fitsSystemWindows="true">
         <androidx.appcompat.widget.Toolbar android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"/>
 
-        <LinearLayout android:layout_width="wrap_content"
+        <RelativeLayout android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="16dp">
+                android:layout_margin="16dp">
 
             <ltd.evilcorp.atox.ui.AvatarImageView
                     android:id="@+id/avatarImageView"
-                    android:layout_height="38dp"
-                    android:layout_width="38dp"
+                    android:layout_height="@dimen/default_avatar_size"
+                    android:layout_width="@dimen/default_avatar_size"
                     app:shapeAppearanceOverlay="@style/CircleImageView"
                     app:strokeColor="@null" />
 
@@ -29,10 +29,12 @@
                     style="@style/TextAppearance.AppCompat.Widget.ActionBar.Title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_margin="6dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_centerVertical="true"
+                    android:layout_toEndOf="@id/avatarImageView"
                     android:textColor="@android:color/white"
                     tools:text="Contact name or something here"/>
-        </LinearLayout>
+        </RelativeLayout>
     </com.google.android.material.appbar.AppBarLayout>
 
     <LinearLayout android:id="@+id/content"
diff --git a/atox/src/main/res/values/dimens.xml b/atox/src/main/res/values/dimens.xml
index 4db023d15..36df434cb 100644
--- a/atox/src/main/res/values/dimens.xml
+++ b/atox/src/main/res/values/dimens.xml
@@ -7,7 +7,7 @@
     <dimen name="message_corner_radius_large">15dp</dimen>
     <dimen name="message_margin">50dp</dimen>
 
-    <dimen name="contact_avatar_placeholder_text">28dp</dimen>
+    <dimen name="contact_avatar_placeholder_text">25.2dp</dimen>
 
-    <dimen name="default_avatar_size">50dp</dimen>
+    <dimen name="default_avatar_size">45dp</dimen>
 </resources>