diff --git a/build.gradle b/build.gradle
index 437740c02c77225f88c0e47194a6438b53b39bbe..65949f4af9367756e7c0605c8d4c5e35e3bde3d1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -75,7 +75,6 @@ dependencies {
     implementation 'de.measite.minidns:minidns-hla:0.2.4'
     implementation 'me.leolin:ShortcutBadger:1.1.22@aar'
     implementation 'org.whispersystems:signal-protocol-android:2.6.2'
-    implementation 'com.makeramen:roundedimageview:2.3.0'
     implementation "com.wefika:flowlayout:0.4.1"
     //noinspection GradleDependency
     implementation 'com.otaliastudios:transcoder:0.9.1'
diff --git a/src/cheogram/res/values/styles.xml b/src/cheogram/res/values/styles.xml
new file mode 100644
index 0000000000000000000000000000000000000000..cc798d3b6b48d5fdeec67c250c0fefc6f8e98ded
--- /dev/null
+++ b/src/cheogram/res/values/styles.xml
@@ -0,0 +1,13 @@
+<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
+
+<style name="ShapeAppearanceOverlay.Photo" parent="ShapeAppearance.MaterialComponents.SmallComponent">
+	<item name="cornerFamily">rounded</item>
+	<item name="cornerSize">2dp</item>
+</style>
+
+<style name="ShapeAppearanceOverlay.IncomingCall" parent="ShapeAppearance.MaterialComponents.SmallComponent">
+	<item name="cornerFamily">rounded</item>
+	<item name="cornerSize">@dimen/incoming_call_radius</item>
+</style>
+
+</resources>
diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml
index 3457b68bb5311044d55c9ea709666046584f4f2f..2a0a0f71958e68d0161b22444a82ba2ff0f396ff 100644
--- a/src/main/res/layout/account_row.xml
+++ b/src/main/res/layout/account_row.xml
@@ -10,13 +10,13 @@
         android:paddingBottom="8dp"
         android:paddingTop="8dp">
 
-        <com.makeramen.roundedimageview.RoundedImageView
+        <com.google.android.material.imageview.ShapeableImageView
             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="2dp" />
+            app:shapeAppearance="@style/ShapeAppearanceOverlay.Photo" />
 
         <LinearLayout
             android:layout_width="fill_parent"
@@ -55,4 +55,4 @@
             android:focusable="false" />
 
     </RelativeLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 4fd8dc3c3e06e91080680a2bce1d99498c7ea527..c973bd0c9f763d49059fc5f967f79e11130055cc 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -38,14 +38,14 @@
                         android:layout_height="wrap_content"
                         android:padding="@dimen/card_padding_regular">
 
-                        <com.makeramen.roundedimageview.RoundedImageView
+                        <com.google.android.material.imageview.ShapeableImageView
                             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="2dp"/>
+                            app:shapeAppearance="@style/ShapeAppearanceOverlay.Photo" />
 
                         <LinearLayout
                             android:layout_width="fill_parent"
diff --git a/src/main/res/layout/activity_manage_accounts.xml b/src/main/res/layout/activity_manage_accounts.xml
index 782be8c48f61755c07fdb54d06d451b5046525e8..0bf7c87e3a073a98f8438c6afaab28e10a010eb8 100644
--- a/src/main/res/layout/activity_manage_accounts.xml
+++ b/src/main/res/layout/activity_manage_accounts.xml
@@ -26,14 +26,14 @@
         android:paddingBottom="8dp"
         android:paddingTop="8dp">
 
-        <com.makeramen.roundedimageview.RoundedImageView
+        <com.google.android.material.imageview.ShapeableImageView
             android:id="@+id/phone_accounts_image"
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:layout_alignParentLeft="true"
             android:src="@drawable/ic_call_white_48dp"
             android:background="@color/yeller"
-            app:riv_corner_radius="2dp" />
+            app:shapeAppearance="@style/ShapeAppearanceOverlay.Photo" />
 
         <LinearLayout
             android:layout_width="fill_parent"
@@ -58,7 +58,7 @@
                 android:textAppearance="@style/TextAppearance.Conversations.Body2" />
         </LinearLayout>
 
-        <com.makeramen.roundedimageview.RoundedImageView
+        <com.google.android.material.imageview.ShapeableImageView
             android:id="@+id/phone_accounts_settings"
             android:layout_width="48dp"
             android:layout_height="48dp"
@@ -66,7 +66,7 @@
             android:layout_centerVertical="true"
             android:paddingRight="16dp"
             android:src="?attr/icon_settings"
-            app:riv_corner_radius="2dp" />
+            app:shapeAppearance="@style/ShapeAppearanceOverlay.Photo" />
     </RelativeLayout>
 
 </LinearLayout>
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index 418a3f23919a24028066e47414e255f4e0813e0d..3898ef049cc4b16024fe2fe8b7e17364ebe9381a 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -42,12 +42,12 @@
                             android:layout_height="wrap_content"
                             android:layout_marginBottom="32dp">
 
-                            <com.makeramen.roundedimageview.RoundedImageView
+                            <com.google.android.material.imageview.ShapeableImageView
                                 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="2dp"
+                                app:shapeAppearance="@style/ShapeAppearanceOverlay.Photo"
                                 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/activity_rtp_session.xml b/src/main/res/layout/activity_rtp_session.xml
index 3d67d6727ce6d1f8f7d98a71da594a8fc98e7972..e90fc50f7c788200226730dcbbfd04384906b605 100644
--- a/src/main/res/layout/activity_rtp_session.xml
+++ b/src/main/res/layout/activity_rtp_session.xml
@@ -99,12 +99,12 @@
                 android:layout_alignParentBottom="true"
                 android:visibility="gone" />
 
-            <com.makeramen.roundedimageview.RoundedImageView
+            <com.google.android.material.imageview.ShapeableImageView
                 android:id="@+id/contact_photo"
                 android:layout_width="@dimen/publish_avatar_size"
                 android:layout_height="@dimen/publish_avatar_size"
                 android:layout_centerInParent="true"
-                app:riv_corner_radius="@dimen/incoming_call_radius" />
+                app:shapeAppearance="@style/ShapeAppearanceOverlay.IncomingCall" />
 
         </RelativeLayout>
 
diff --git a/src/main/res/layout/contact.xml b/src/main/res/layout/contact.xml
index 088f3243df119749741766af738452c3c6f4bb3f..279dd6f944b21b3e41435a57ddff255271fae02e 100644
--- a/src/main/res/layout/contact.xml
+++ b/src/main/res/layout/contact.xml
@@ -8,13 +8,13 @@
         android:background="?selectableItemBackground"
         android:padding="@dimen/list_padding">
 
-        <com.makeramen.roundedimageview.RoundedImageView
+        <com.google.android.material.imageview.ShapeableImageView
             android:id="@+id/contact_photo"
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:layout_alignParentLeft="true"
             android:scaleType="centerCrop"
-            app:riv_corner_radius="2dp"/>
+            app:shapeAppearance="@style/ShapeAppearanceOverlay.Photo" />
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -55,4 +55,4 @@
         </LinearLayout>
 
     </RelativeLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index 892e279f14b42ca27bcd425d62978198b55cf580..d3a7d70aafaca46993dc05dde511ea9dbdd54e40 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -19,13 +19,13 @@
                 android:orientation="horizontal"
                 android:padding="8dp">
 
-                <com.makeramen.roundedimageview.RoundedImageView
+                <com.google.android.material.imageview.ShapeableImageView
                     android:id="@+id/conversation_image"
                     android:layout_width="56dp"
                     android:layout_height="56dp"
                     android:layout_alignParentLeft="true"
                     android:scaleType="centerCrop"
-                    app:riv_corner_radius="2dp" />
+                    app:shapeAppearance="@style/ShapeAppearanceOverlay.Photo" />
 
                 <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 bbec1e533ab50a8b7d4637495ca99c5241e43638..14108646b07937ee5098b3678a2ca9ff129509c9 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -10,14 +10,14 @@
     android:paddingRight="8dp"
     android:paddingTop="3dp">
 
-    <com.makeramen.roundedimageview.RoundedImageView
+    <com.google.android.material.imageview.ShapeableImageView
         android:id="@+id/message_photo"
         android:layout_width="48dp"
         android:layout_height="48dp"
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
         android:scaleType="fitXY"
-        app:riv_corner_radius="2dp" />
+        app:shapeAppearance="@style/ShapeAppearanceOverlay.Photo" />
 
     <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 f9a35fb6a036c6ea083075008209c72747985f8f..f3675a5dd19cd68c3b2ba62f5cbd512acedb95f9 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -23,12 +23,12 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <com.makeramen.roundedimageview.RoundedImageView
+            <com.google.android.material.imageview.ShapeableImageView
                 android:id="@+id/message_photo"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:scaleType="fitXY"
-                app:riv_corner_radius="2dp" />
+                app:shapeAppearance="@style/ShapeAppearanceOverlay.Photo" />
 
             <View
                 android:id="@+id/placeholder"
diff --git a/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml
index 6bffeb3823aad89d7cf879a8f84169e21eae3542..d6dff2fa530f33e2f5fef34b7f5d8a28e037f528 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
+    <com.google.android.material.imageview.ShapeableImageView
         android:id="@+id/message_photo"
         android:layout_width="32dp"
         android:layout_height="32dp"
@@ -28,7 +28,7 @@
         android:layout_marginRight="-1.5dp"
         android:padding="0dp"
         android:scaleType="fitXY"
-        app:riv_corner_radius="1dp"/>
+        app:shapeAppearance="@style/ShapeAppearanceOverlay.Photo" />
 
     <TextView
         android:id="@+id/status_message"
@@ -43,4 +43,4 @@
         android:text="@string/contact_has_read_up_to_this_point"
         android:textAppearance="@style/TextAppearance.Conversations.Status"/>
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/src/main/res/layout/search_result_item.xml b/src/main/res/layout/search_result_item.xml
index c006dabd8e049cb090d86ebe8b637259a518c7db..ee6b463a8ef2c5e19a8734d0e1eef2998ef0fad1 100644
--- a/src/main/res/layout/search_result_item.xml
+++ b/src/main/res/layout/search_result_item.xml
@@ -9,13 +9,13 @@
         android:background="?selectableItemBackground"
         android:padding="@dimen/list_padding">
 
-        <com.makeramen.roundedimageview.RoundedImageView
+        <com.google.android.material.imageview.ShapeableImageView
             android:id="@+id/avatar"
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:layout_alignParentLeft="true"
             android:scaleType="centerCrop"
-            app:riv_corner_radius="2dp" />
+            app:shapeAppearance="@style/ShapeAppearanceOverlay.Photo" />
 
         <RelativeLayout
             android:layout_width="wrap_content"
@@ -60,4 +60,4 @@
         </RelativeLayout>
 
     </RelativeLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/src/main/res/values/about.xml b/src/main/res/values/about.xml
index d6e064d579889dbfcdb8f480e88a50e7f0b69c32..2f5add4e383a3bcbb905edea471e11e684d42263 100644
--- a/src/main/res/values/about.xml
+++ b/src/main/res/values/about.xml
@@ -55,7 +55,6 @@
 			\n\nhttps://github.com/google/material-design-icons\n(CC BY 4.0)
 			\n\nhttps://github.com/leolin310148/ShortcutBadger\n(Apache License, Version 2.0)
 			\n\nhttps://github.com/WhisperSystems/libaxolotl-java\n(GPLv3)
-			\n\nhttps://github.com/vinc3m1/RoundedImageView\n(Apache License, Version 2.0)
 			\n\nhttps://github.com/jdamcd/android-crop\n(Apache License, Version 2.0)
 			\n\nhttps://github.com/zxing/zxing\n(Apache License, Version 2.0)
 			\n\nhttps://github.com/osmdroid/osmdroid\n(Apache License, Version 2.0)