diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml
index 5f6d3be6c..2b2db0110 100644
--- a/src/main/res/layout/account_row.xml
+++ b/src/main/res/layout/account_row.xml
@@ -18,7 +18,7 @@
             android:layout_alignParentStart="true"
             android:layout_alignParentLeft="true"
             android:contentDescription="@string/account_image_description"
-            app:riv_corner_radius="2dp" />
+            app:riv_corner_radius="30dp" />
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
index 6c3bb0d4a..1c262cca5 100644
--- a/src/main/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:card_view="http://schemas.android.com/apk/res-auto">
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/tools"
+    app:ignore="NamespaceTypo">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -64,7 +66,7 @@
                                         android:layout_height="wrap_content"
                                         android:orientation="horizontal">
 
-                                        <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"
@@ -73,6 +75,7 @@
                                             android:adjustViewBounds="true"
                                             android:background="?attr/color_border"
                                             android:padding="1dp"
+                                            app:riv_corner_radius="30dp"
                                             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 73d5ad54a..a9dbc7153 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -302,7 +302,7 @@
                                 android:maxWidth="@dimen/avatar_on_details_screen_size"
                                 android:maxHeight="@dimen/avatar_on_details_screen_size"
                                 android:visibility="gone"
-                                app:riv_corner_radius="@dimen/rounded_image_border" />
+                                app:riv_corner_radius="90dp" />
                         </RelativeLayout>
 
                         <CheckBox
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index 947f56586..e48e9e7f2 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -74,7 +74,7 @@
                                             android:layout_marginRight="@dimen/avatar_item_distance"
                                             android:padding="1dp"
                                             android:scaleType="centerCrop"
-                                            app:riv_corner_radius="@dimen/rounded_image_border" />
+                                            app:riv_corner_radius="30dp" />
 
                                         <LinearLayout
                                             android:layout_width="match_parent"
@@ -355,7 +355,7 @@
                                     android:layout_alignParentEnd="false"
                                     android:layout_alignParentRight="false"
                                     android:padding="1dp"
-                                    app:riv_corner_radius="@dimen/rounded_image_border" />
+                                    app:riv_corner_radius="30dp" />
 
                                 <LinearLayout
                                     android:layout_width="wrap_content"
diff --git a/src/main/res/layout/contact.xml b/src/main/res/layout/contact.xml
index ed68014e1..97f6755e6 100644
--- a/src/main/res/layout/contact.xml
+++ b/src/main/res/layout/contact.xml
@@ -15,7 +15,7 @@
             android:layout_alignParentStart="true"
             android:layout_alignParentLeft="true"
             android:scaleType="centerCrop"
-            app:riv_corner_radius="@dimen/rounded_avatar_border" />
+            app:riv_corner_radius="30dp" />
 
         <ImageView
             android:id="@+id/user_active_indicator"
diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index ce5696d30..0d7e16c44 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -28,7 +28,7 @@
                     android:layout_alignParentStart="true"
                     android:layout_alignParentLeft="true"
                     android:scaleType="centerCrop"
-                    app:riv_corner_radius="@dimen/rounded_avatar_border" />
+                    app:riv_corner_radius="30dp" />
 
                 <ImageView
                     android:id="@+id/user_active_indicator"
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index bf926ae96..dc18f05cb 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -20,7 +20,7 @@
         android:layout_alignParentLeft="true"
         android:layout_alignParentBottom="true"
         android:scaleType="fitXY"
-        app:riv_corner_radius="@dimen/rounded_avatar_border" />
+        app:riv_corner_radius="30dp" />
 
     <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 d28bb14c5..8ad221b56 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -26,7 +26,7 @@
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:scaleType="fitXY"
-            app:riv_corner_radius="@dimen/rounded_avatar_border" />
+            app:riv_corner_radius="30dp" />
 
         <View
             android:id="@+id/placeholder"
diff --git a/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml
index a0f2181f2..f6f5f5ca2 100644
--- a/src/main/res/layout/message_status.xml
+++ b/src/main/res/layout/message_status.xml
@@ -33,7 +33,7 @@
         android:padding="0dp"
         android:scaleType="fitXY"
         android:visibility="gone"
-        app:riv_corner_radius="@dimen/rounded_image_border" />
+        app:riv_corner_radius="30dp" />
 
     <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 1edefa1f8..28019b719 100644
--- a/src/main/res/layout/search_result_item.xml
+++ b/src/main/res/layout/search_result_item.xml
@@ -16,7 +16,7 @@
             android:layout_alignParentStart="true"
             android:layout_alignParentLeft="true"
             android:scaleType="centerCrop"
-            app:riv_corner_radius="2dp" />
+            app:riv_corner_radius="30dp" />
 
         <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 9b8fffa0c..7d386c536 100644
--- a/src/main/res/layout/user_preview.xml
+++ b/src/main/res/layout/user_preview.xml
@@ -1,17 +1,18 @@
 <?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:background="?selectableItemBackground"
         android:padding="2dp">
 
-        <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="30dp"
             android:scaleType="centerInside" />
     </eu.siacs.conversations.ui.widget.SquareFrameLayout>
 </layout>
\ No newline at end of file