diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml
index 914ee1950..5bf98a8bc 100644
--- a/src/main/res/layout/account_row.xml
+++ b/src/main/res/layout/account_row.xml
@@ -16,7 +16,7 @@
             android:layout_height="48dp"
             android:layout_alignParentLeft="true"
             android:contentDescription="@string/account_image_description"
-            app:riv_corner_radius="2dp" />
+            app:riv_corner_radius="6dp" />
 
         <LinearLayout
             android:layout_width="fill_parent"
diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
index 1c2ce4359..a7d569a4a 100644
--- a/src/main/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
@@ -36,11 +36,12 @@
                         android:layout_height="wrap_content"
                         android:padding="@dimen/card_padding_regular">
 
-                        <QuickContactBadge
+                        <com.makeramen.roundedimageview.RoundedImageView
                             android:id="@+id/details_contact_badge"
                             android:layout_width="@dimen/avatar_on_details_screen_size"
                             android:layout_height="@dimen/avatar_on_details_screen_size"
                             android:layout_alignParentTop="true"
+                            app:riv_corner_radius="8dp"
                             android:scaleType="centerCrop" />
 
                         <LinearLayout
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 4fd8dc3c3..4b2f49359 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -45,7 +45,7 @@
                             android:layout_alignParentTop="true"
                             android:layout_marginRight="@dimen/avatar_item_distance"
                             android:contentDescription="@string/account_image_description"
-                            app:riv_corner_radius="2dp"/>
+                            app:riv_corner_radius="8dp"/>
 
                         <LinearLayout
                             android:layout_width="fill_parent"
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index f2b4b00d7..eb3898319 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -47,7 +47,7 @@
                                 android:layout_width="@dimen/avatar_on_details_screen_size"
                                 android:layout_height="@dimen/avatar_on_details_screen_size"
                                 android:layout_alignParentStart="true"
-                                app:riv_corner_radius="2dp"
+                                app:riv_corner_radius="8dp"
                                 android:layout_marginEnd="@dimen/avatar_item_distance"
                                 android:layout_alignParentLeft="true"
                                 android:layout_marginRight="@dimen/avatar_item_distance" />
diff --git a/src/main/res/layout/contact.xml b/src/main/res/layout/contact.xml
index 088f3243d..d8fb128a7 100644
--- a/src/main/res/layout/contact.xml
+++ b/src/main/res/layout/contact.xml
@@ -14,7 +14,7 @@
             android:layout_height="48dp"
             android:layout_alignParentLeft="true"
             android:scaleType="centerCrop"
-            app:riv_corner_radius="2dp"/>
+            app:riv_corner_radius="6dp"/>
 
         <LinearLayout
             android:layout_width="wrap_content"
diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index 892e279f1..01c118779 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -25,7 +25,7 @@
                     android:layout_height="56dp"
                     android:layout_alignParentLeft="true"
                     android:scaleType="centerCrop"
-                    app:riv_corner_radius="2dp" />
+                    app:riv_corner_radius="8dp" />
 
                 <RelativeLayout
                     android:layout_width="fill_parent"
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index 75b1eb340..a2bb5e496 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -16,7 +16,7 @@
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
         android:scaleType="fitXY"
-        app:riv_corner_radius="2dp" />
+        app:riv_corner_radius="6dp" />
 
     <LinearLayout
         android:id="@+id/message_box"
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index f84d07e34..6c2e8943f 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -24,7 +24,7 @@
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:scaleType="fitXY"
-            app:riv_corner_radius="2dp" />
+            app:riv_corner_radius="6dp" />
 
         <View
             android:id="@+id/placeholder"
diff --git a/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml
index 6bffeb382..f0ba01f24 100644
--- a/src/main/res/layout/message_status.xml
+++ b/src/main/res/layout/message_status.xml
@@ -28,7 +28,7 @@
         android:layout_marginRight="-1.5dp"
         android:padding="0dp"
         android:scaleType="fitXY"
-        app:riv_corner_radius="1dp"/>
+        app:riv_corner_radius="4dp"/>
 
     <TextView
         android:id="@+id/status_message"
diff --git a/src/main/res/layout/search_result_item.xml b/src/main/res/layout/search_result_item.xml
index c006dabd8..338114472 100644
--- a/src/main/res/layout/search_result_item.xml
+++ b/src/main/res/layout/search_result_item.xml
@@ -15,7 +15,7 @@
             android:layout_height="48dp"
             android:layout_alignParentLeft="true"
             android:scaleType="centerCrop"
-            app:riv_corner_radius="2dp" />
+            app:riv_corner_radius="6dp" />
 
         <RelativeLayout
             android:layout_width="wrap_content"
diff --git a/src/main/res/layout/user_preview.xml b/src/main/res/layout/user_preview.xml
index 2601ece8f..dc665907f 100644
--- a/src/main/res/layout/user_preview.xml
+++ b/src/main/res/layout/user_preview.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <eu.siacs.conversations.ui.widget.SquareFrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:padding="2dp"
         android:background="?selectableItemBackground">
-        <ImageView
+        <com.makeramen.roundedimageview.RoundedImageView
             android:id="@+id/avatar"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="@color/black54"
+            app:riv_corner_radius="6dp"
             android:scaleType="centerInside"/>
     </eu.siacs.conversations.ui.widget.SquareFrameLayout>
 </layout>