diff --git a/build.gradle b/build.gradle
index 7a0766773..a0d9d1c8b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -64,7 +64,6 @@ dependencies {
     implementation 'de.measite.minidns:minidns-hla:0.2.4'
     implementation 'me.leolin:ShortcutBadger:1.1.22@aar'
     implementation 'org.whispersystems:signal-protocol-java:2.6.2'
-    implementation 'com.makeramen:roundedimageview:2.3.0'
     implementation "com.wefika:flowlayout:0.4.1"
     //noinspection GradleDependency
     implementation('com.github.natario1:Transcoder:v0.9.1') {
diff --git a/src/main/java/eu/siacs/conversations/ui/widget/AvatarView.kt b/src/main/java/eu/siacs/conversations/ui/widget/AvatarView.kt
new file mode 100644
index 000000000..c51a1e977
--- /dev/null
+++ b/src/main/java/eu/siacs/conversations/ui/widget/AvatarView.kt
@@ -0,0 +1,71 @@
+package eu.siacs.conversations.ui.widget
+
+import android.content.Context
+import android.content.SharedPreferences
+import android.graphics.Outline
+import android.preference.PreferenceManager
+import android.util.AttributeSet
+import android.view.View
+import android.view.ViewOutlineProvider
+import androidx.appcompat.widget.AppCompatImageView
+import eu.siacs.conversations.R
+
+class AvatarView : AppCompatImageView {
+    private var currentShape: String = ""
+
+    private val preferencesListener = SharedPreferences.OnSharedPreferenceChangeListener { _, _ -> invalidateShape() }
+
+    constructor(context: Context) : super(context)
+    constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
+    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(
+        context,
+        attrs,
+        defStyleAttr
+    )
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        invalidateShape()
+        PreferenceManager.getDefaultSharedPreferences(context).registerOnSharedPreferenceChangeListener(preferencesListener)
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        PreferenceManager.getDefaultSharedPreferences(context).unregisterOnSharedPreferenceChangeListener(preferencesListener)
+    }
+
+    private fun invalidateShape() {
+        val shape = PreferenceManager.getDefaultSharedPreferences(context).getString("avatar_shape", context.getString(R.string.avatar_shape))
+
+        if (shape == currentShape) {
+            return
+        }
+
+        when {
+            shape == "oval" -> {
+                clipToOutline = true
+                outlineProvider = object : ViewOutlineProvider() {
+                    override fun getOutline(view: View, outline: Outline) {
+                        outline.setOval(0, 0, view.width, view.height)
+                    }
+                }
+            }
+            shape == "rounded_square" -> {
+                clipToOutline = true
+                outlineProvider = object : ViewOutlineProvider() {
+                    override fun getOutline(view: View, outline: Outline) {
+                        val maxRadius = minOf(view.width, view.height) / 2f
+                        val radius = minOf(context.resources.getDimension(R.dimen.avatar_corners_radius), maxRadius)
+                        outline.setRoundRect(0, 0, view.width, view.height, radius)
+                    }
+                }
+            }
+            shape == "square" -> {
+                clipToOutline = false
+                outlineProvider = ViewOutlineProvider.BACKGROUND
+            }
+        }
+
+        currentShape = shape!!
+    }
+}
\ No newline at end of file
diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml
index 92cb0801d..dfe0e1d22 100644
--- a/src/main/res/layout/account_row.xml
+++ b/src/main/res/layout/account_row.xml
@@ -10,13 +10,12 @@
         android:paddingBottom="8dp"
         android:paddingTop="8dp">
 
-        <com.makeramen.roundedimageview.RoundedImageView
+        <eu.siacs.conversations.ui.widget.AvatarView
             android:id="@+id/account_image"
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:layout_alignParentLeft="true"
-            android:contentDescription="@string/account_image_description"
-            app:riv_corner_radius="6dp" />
+            android:contentDescription="@string/account_image_description" />
 
         <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 67aff0608..e9117daf1 100644
--- a/src/main/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
@@ -35,12 +35,11 @@
                         android:layout_height="wrap_content"
                         android:padding="@dimen/card_padding_regular">
 
-                        <com.makeramen.roundedimageview.RoundedImageView
+                        <eu.siacs.conversations.ui.widget.AvatarView
                             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 7e5a92969..17189cea3 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -39,14 +39,13 @@
                         android:layout_height="wrap_content"
                         android:padding="@dimen/card_padding_regular">
 
-                        <com.makeramen.roundedimageview.RoundedImageView
+                        <eu.siacs.conversations.ui.widget.AvatarView
                             android:id="@+id/avater"
                             android:layout_width="@dimen/avatar_on_details_screen_size"
                             android:layout_height="@dimen/avatar_on_details_screen_size"
                             android:layout_alignParentTop="true"
                             android:layout_marginRight="@dimen/avatar_item_distance"
-                            android:contentDescription="@string/account_image_description"
-                            app:riv_corner_radius="8dp" />
+                            android:contentDescription="@string/account_image_description" />
 
                         <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 7f2e0bfd2..6d6c6c54b 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -40,11 +40,10 @@
                             android:gravity="center_vertical"
                             android:padding="16dp">
 
-                            <com.makeramen.roundedimageview.RoundedImageView
+                            <eu.siacs.conversations.ui.widget.AvatarView
                                 android:id="@+id/muc_pm_counterpart_avatar"
                                 android:layout_width="@dimen/avatar_on_details_screen_size"
                                 android:layout_height="@dimen/avatar_on_details_screen_size"
-                                app:riv_corner_radius="8dp"
                                 android:layout_marginEnd="@dimen/avatar_item_distance"/>
 
                             <LinearLayout
@@ -97,12 +96,11 @@
                             android:layout_height="wrap_content"
                             android:layout_marginBottom="32dp">
 
-                            <com.makeramen.roundedimageview.RoundedImageView
+                            <eu.siacs.conversations.ui.widget.AvatarView
                                 android:id="@+id/your_photo"
                                 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="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 d8fb128a7..f1d9496c7 100644
--- a/src/main/res/layout/contact.xml
+++ b/src/main/res/layout/contact.xml
@@ -8,13 +8,12 @@
         android:background="?selectableItemBackground"
         android:padding="@dimen/list_padding">
 
-        <com.makeramen.roundedimageview.RoundedImageView
+        <eu.siacs.conversations.ui.widget.AvatarView
             android:id="@+id/contact_photo"
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:layout_alignParentLeft="true"
-            android:scaleType="centerCrop"
-            app:riv_corner_radius="6dp"/>
+            android:scaleType="centerCrop"/>
 
         <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 01c118779..da0ca4990 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -19,13 +19,12 @@
                 android:orientation="horizontal"
                 android:padding="8dp">
 
-                <com.makeramen.roundedimageview.RoundedImageView
+                <eu.siacs.conversations.ui.widget.AvatarView
                     android:id="@+id/conversation_image"
                     android:layout_width="56dp"
                     android:layout_height="56dp"
                     android:layout_alignParentLeft="true"
-                    android:scaleType="centerCrop"
-                    app:riv_corner_radius="8dp" />
+                    android:scaleType="centerCrop" />
 
                 <RelativeLayout
                     android:layout_width="fill_parent"
@@ -43,6 +42,7 @@
                         android:paddingRight="4dp"
                         android:maxLines="1"
                         android:ellipsize="end"
+                        android:fontFamily="sans-serif-medium"
                         android:textAppearance="@style/TextAppearance.Conversations.Subhead" />
 
                     <RelativeLayout
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index 7028cf52e..81166bbcc 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -22,15 +22,14 @@
         android:alpha="0"
         android:visibility="invisible"/>
 
-    <com.makeramen.roundedimageview.RoundedImageView
+    <eu.siacs.conversations.ui.widget.AvatarView
         android:id="@+id/message_photo"
         android:layout_width="48dp"
         android:layout_height="48dp"
         android:layout_alignParentLeft="true"
         android:layout_alignParentBottom="true"
         android:translationY="-2dp"
-        android:scaleType="fitXY"
-        app:riv_corner_radius="6dp" />
+        android:scaleType="fitXY" />
 
     <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 1c4ccec0d..fe3c64dfb 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -22,15 +22,14 @@
         android:alpha="0"
         android:visibility="invisible"/>
 
-    <com.makeramen.roundedimageview.RoundedImageView
+    <eu.siacs.conversations.ui.widget.AvatarView
         android:id="@+id/message_photo"
         android:layout_width="48dp"
         android:layout_height="48dp"
         android:layout_alignParentBottom="true"
         android:layout_alignParentRight="true"
         android:translationY="-2dp"
-        android:scaleType="fitXY"
-        app:riv_corner_radius="6dp" />
+        android:scaleType="fitXY" />
 
     <LinearLayout
         android:id="@+id/message_box"
diff --git a/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml
index 341f5f4f7..e9bc85ac5 100644
--- a/src/main/res/layout/message_status.xml
+++ b/src/main/res/layout/message_status.xml
@@ -19,7 +19,7 @@
         android:text="@string/load_more_messages"
         android:textColor="?colorAccent"/>
 
-    <com.makeramen.roundedimageview.RoundedImageView
+    <eu.siacs.conversations.ui.widget.AvatarView
         android:id="@+id/message_photo"
         android:layout_width="32dp"
         android:layout_height="32dp"
@@ -27,8 +27,7 @@
         android:layout_alignParentTop="true"
         android:layout_marginRight="-1.5dp"
         android:padding="0dp"
-        android:scaleType="fitXY"
-        app:riv_corner_radius="4dp"/>
+        android:scaleType="fitXY" />
 
     <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 338114472..2e89739f9 100644
--- a/src/main/res/layout/search_result_item.xml
+++ b/src/main/res/layout/search_result_item.xml
@@ -9,13 +9,12 @@
         android:background="?selectableItemBackground"
         android:padding="@dimen/list_padding">
 
-        <com.makeramen.roundedimageview.RoundedImageView
+        <eu.siacs.conversations.ui.widget.AvatarView
             android:id="@+id/avatar"
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:layout_alignParentLeft="true"
-            android:scaleType="centerCrop"
-            app:riv_corner_radius="6dp" />
+            android:scaleType="centerCrop" />
 
         <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 dc665907f..cb9612849 100644
--- a/src/main/res/layout/user_preview.xml
+++ b/src/main/res/layout/user_preview.xml
@@ -6,12 +6,11 @@
         android:layout_height="match_parent"
         android:padding="2dp"
         android:background="?selectableItemBackground">
-        <com.makeramen.roundedimageview.RoundedImageView
+        <eu.siacs.conversations.ui.widget.AvatarView
             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>
diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml
index 3ddf86d9c..6a5636b01 100644
--- a/src/main/res/values/arrays.xml
+++ b/src/main/res/values/arrays.xml
@@ -89,6 +89,18 @@
 		<item>SEND_LOCATION</item>
 	</string-array>
 
+	<string-array name="avatars_shape">
+		<item>@string/avater_shape_rounded_square</item>
+		<item>@string/avater_shape_oval</item>
+		<item>@string/avater_shape_square</item>
+	</string-array>
+
+	<string-array name="avatars_shape_values">
+		<item>rounded_square</item>
+		<item>oval</item>
+		<item>square</item>
+	</string-array>
+
 	<string-array name="picture_compression_values">
 		<item>never</item>
 		<item>auto</item>
diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml
index e1a5e3b14..bbd3581ca 100644
--- a/src/main/res/values/defaults.xml
+++ b/src/main/res/values/defaults.xml
@@ -54,4 +54,5 @@
     <string name="default_push_account">none</string>
     <bool name="always_full_timestamps">false</bool>
     <bool name="skip_image_editor_screen">false</bool>
+    <string name="avatar_shape">rounded_square</string>
 </resources>
diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml
index f1e1b4ede..a6544901a 100644
--- a/src/main/res/values/dimens.xml
+++ b/src/main/res/values/dimens.xml
@@ -78,4 +78,6 @@
     <dimen name="activity_margin">16dp</dimen>
 
     <dimen name="colorpicker_hue_width">30dp</dimen>
+
+    <dimen name="avatar_corners_radius">8dp</dimen>
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 3ad0b48a6..022ee687f 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -599,6 +599,8 @@
     <string name="pref_theme_dark">Dark</string>
     <string name="pref_show_navigation_bar">Show navigation bar</string>
     <string name="pref_show_navigation_bar_summary">Use alternative navigation way via navigation bar on the bottom of the screen</string>
+    <string name="pref_avatars_shape">Avatars shape</string>
+    <string name="pref_avatar_shape_summary">Allows you to select avatars shape globally</string>
     <string name="pref_use_green_background">Green Background</string>
     <string name="pref_use_green_background_summary">Use green background for received messages</string>
     <string name="pref_always_show_full_timestamps">Show full timestamps</string>
@@ -1099,4 +1101,7 @@
     <string name="delete_background_failed">Couldn\'t remove background image</string>
     <string name="delete_background_success">Background image removed</string>
     <string name="no_background_set">No custom background set</string>
+    <string name="avater_shape_oval">Oval</string>
+    <string name="avater_shape_rounded_square">Rounded Square</string>
+    <string name="avater_shape_square">Square</string>
 </resources>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 583651446..b881c5e80 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -183,6 +183,13 @@
             android:key="show_nav_bar"
             android:summary="@string/pref_show_navigation_bar_summary"
             android:title="@string/pref_show_navigation_bar" />
+        <ListPreference
+            android:defaultValue="@string/avatar_shape"
+            android:key="avatar_shape"
+            android:entries="@array/avatars_shape"
+            android:entryValues="@array/avatars_shape_values"
+            android:summary="@string/pref_avatar_shape_summary"
+            android:title="@string/pref_avatars_shape" />
         <CheckBoxPreference
             android:defaultValue="@bool/use_green_background"
             android:key="use_green_background"