diff --git a/app/build.gradle b/app/build.gradle
index 2491ff778..19f6f23dd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -102,7 +102,6 @@ dependencies {
 
     /* Design */
     implementation libs.material
-    implementation libs.circleimageview
 
     /* ExoPlayer */
     implementation libs.exoplayer
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index d2e672cd9..e06e93f56 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -23,7 +23,7 @@
             android:layout_gravity="center"
             android:layout_marginTop="30dp"
             android:src="@mipmap/ic_launcher_round"
-            app:shapeAppearanceOverlay="@style/CircleImageView" />
+            app:shapeAppearance="@style/CircleImageView" />
 
         <TextView
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_community.xml b/app/src/main/res/layout/activity_community.xml
index 8eabde815..754d07546 100644
--- a/app/src/main/res/layout/activity_community.xml
+++ b/app/src/main/res/layout/activity_community.xml
@@ -23,7 +23,7 @@
             android:layout_marginTop="30dp"
             android:layout_marginBottom="40dp"
             android:src="@mipmap/ic_launcher_round"
-            app:shapeAppearanceOverlay="@style/CircleImageView" />
+            app:shapeAppearance="@style/CircleImageView" />
 
         <com.google.android.material.card.MaterialCardView
             android:id="@+id/telegram"
diff --git a/app/src/main/res/layout/app_icon_item.xml b/app/src/main/res/layout/app_icon_item.xml
index 14eb9abcd..ab4641c37 100644
--- a/app/src/main/res/layout/app_icon_item.xml
+++ b/app/src/main/res/layout/app_icon_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -8,12 +9,13 @@
     android:orientation="vertical"
     android:paddingVertical="10dp">
 
-    <de.hdodenhof.circleimageview.CircleImageView
+    <com.google.android.material.imageview.ShapeableImageView
         android:id="@+id/iconIV"
         android:layout_width="75dp"
         android:layout_height="75dp"
         android:layout_gravity="center"
         android:padding="10dp"
+        app:shapeAppearance="@style/CircleImageView"
         tools:src="@mipmap/ic_gradient" />
 
     <TextView
diff --git a/app/src/main/res/layout/channel_row.xml b/app/src/main/res/layout/channel_row.xml
index 6e4d00831..e6e47ac57 100644
--- a/app/src/main/res/layout/channel_row.xml
+++ b/app/src/main/res/layout/channel_row.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     style="@style/ItemRow">
 
-    <de.hdodenhof.circleimageview.CircleImageView
+    <com.google.android.material.imageview.ShapeableImageView
         android:id="@+id/search_channel_image"
         android:layout_width="70dp"
         android:layout_height="70dp"
@@ -11,7 +11,8 @@
         android:layout_marginStart="50dp"
         android:layout_marginEnd="55dp"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:shapeAppearance="@style/CircleImageView"/>
 
     <LinearLayout
         android:id="@+id/search_channel_info"
diff --git a/app/src/main/res/layout/channel_subscription_row.xml b/app/src/main/res/layout/channel_subscription_row.xml
index b82b9a477..093a8df37 100644
--- a/app/src/main/res/layout/channel_subscription_row.xml
+++ b/app/src/main/res/layout/channel_subscription_row.xml
@@ -8,12 +8,13 @@
     android:paddingHorizontal="8dp"
     android:paddingVertical="4dp">
 
-    <de.hdodenhof.circleimageview.CircleImageView
+    <com.google.android.material.imageview.ShapeableImageView
         android:id="@+id/subscription_channel_image"
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:layout_gravity="center"
-        android:layout_marginStart="8dp" />
+        android:layout_marginStart="8dp"
+        app:shapeAppearance="@style/CircleImageView"/>
 
     <TextView
         android:id="@+id/subscription_channel_name"
diff --git a/app/src/main/res/layout/comments_row.xml b/app/src/main/res/layout/comments_row.xml
index d83070b09..84c67e0f1 100644
--- a/app/src/main/res/layout/comments_row.xml
+++ b/app/src/main/res/layout/comments_row.xml
@@ -23,12 +23,13 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
-            <de.hdodenhof.circleimageview.CircleImageView
+            <com.google.android.material.imageview.ShapeableImageView
                 android:id="@+id/commentor_image"
                 android:layout_width="36dp"
                 android:layout_height="36dp"
                 android:layout_marginEnd="16dp"
-                app:srcCompat="@mipmap/ic_launcher" />
+                app:srcCompat="@mipmap/ic_launcher"
+                app:shapeAppearance="@style/CircleImageView"/>
 
             <LinearLayout
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_channel.xml b/app/src/main/res/layout/fragment_channel.xml
index 2f77da5df..78cb80adf 100644
--- a/app/src/main/res/layout/fragment_channel.xml
+++ b/app/src/main/res/layout/fragment_channel.xml
@@ -31,11 +31,12 @@
                 android:layout_margin="10dp"
                 android:orientation="horizontal">
 
-                <de.hdodenhof.circleimageview.CircleImageView
+                <com.google.android.material.imageview.ShapeableImageView
                     android:id="@+id/channel_image"
                     android:layout_width="45dp"
                     android:layout_height="45dp"
-                    android:layout_gravity="center" />
+                    android:layout_gravity="center"
+                    app:shapeAppearance="@style/CircleImageView"/>
 
                 <LinearLayout
                     android:layout_width="0dp"
diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml
index 3811b453d..6c0229f50 100644
--- a/app/src/main/res/layout/fragment_player.xml
+++ b/app/src/main/res/layout/fragment_player.xml
@@ -192,12 +192,13 @@
                 android:paddingLeft="8dp"
                 android:paddingRight="8dp">
 
-                <de.hdodenhof.circleimageview.CircleImageView
+                <com.google.android.material.imageview.ShapeableImageView
                     android:id="@+id/player_channelImage"
                     android:layout_width="40dp"
                     android:layout_height="40dp"
                     android:layout_gravity="center"
-                    android:layout_marginEnd="4dp" />
+                    android:layout_marginEnd="4dp"
+                    app:shapeAppearance="@style/CircleImageView"/>
 
                 <LinearLayout
                     android:layout_width="0dp"
diff --git a/app/src/main/res/layout/legacy_subscription_channel.xml b/app/src/main/res/layout/legacy_subscription_channel.xml
index 074fe8b15..c94963eef 100644
--- a/app/src/main/res/layout/legacy_subscription_channel.xml
+++ b/app/src/main/res/layout/legacy_subscription_channel.xml
@@ -2,16 +2,18 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="?attr/selectableItemBackground"
     android:orientation="vertical"
     android:paddingHorizontal="4dp"
     android:paddingVertical="8dp">
 
-    <de.hdodenhof.circleimageview.CircleImageView
+    <com.google.android.material.imageview.ShapeableImageView
         android:id="@+id/channel_avatar"
         android:layout_width="match_parent"
         android:layout_height="50dp"
-        android:layout_gravity="center" />
+        android:layout_gravity="center"
+        app:shapeAppearance="@style/CircleImageView"/>
 
     <TextView
         android:id="@+id/channel_name"
diff --git a/app/src/main/res/layout/trending_row.xml b/app/src/main/res/layout/trending_row.xml
index 59e8acf8f..2fec76aa7 100644
--- a/app/src/main/res/layout/trending_row.xml
+++ b/app/src/main/res/layout/trending_row.xml
@@ -90,7 +90,7 @@
         app:layout_constraintTop_toBottomOf="@+id/textView_title"
         tools:text="Channel Name" />
 
-    <de.hdodenhof.circleimageview.CircleImageView
+    <com.google.android.material.imageview.ShapeableImageView
         android:id="@+id/channel_image"
         android:layout_width="40dp"
         android:layout_height="40dp"
@@ -98,6 +98,7 @@
         android:layout_marginTop="8dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/thumbnailcard"
-        app:srcCompat="@mipmap/ic_launcher" />
+        app:srcCompat="@mipmap/ic_launcher"
+        app:shapeAppearance="@style/CircleImageView"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/video_row.xml b/app/src/main/res/layout/video_row.xml
index ee8c71d39..695d2f63e 100644
--- a/app/src/main/res/layout/video_row.xml
+++ b/app/src/main/res/layout/video_row.xml
@@ -99,10 +99,11 @@
         app:layout_constraintStart_toStartOf="@+id/guideline"
         app:layout_constraintTop_toBottomOf="@id/video_info">
 
-        <de.hdodenhof.circleimageview.CircleImageView
+        <com.google.android.material.imageview.ShapeableImageView
             android:id="@+id/channel_image"
             android:layout_width="27dp"
-            android:layout_height="27dp" />
+            android:layout_height="27dp"
+            app:shapeAppearance="@style/CircleImageView"/>
 
         <TextView
             android:id="@+id/channel_name"
diff --git a/app/src/main/res/layout/watch_history_row.xml b/app/src/main/res/layout/watch_history_row.xml
index 370d13595..c738923aa 100644
--- a/app/src/main/res/layout/watch_history_row.xml
+++ b/app/src/main/res/layout/watch_history_row.xml
@@ -87,14 +87,15 @@
         app:layout_constraintStart_toEndOf="@id/thumbnail_card"
         app:layout_constraintTop_toBottomOf="@id/video_title" />
 
-    <de.hdodenhof.circleimageview.CircleImageView
+    <com.google.android.material.imageview.ShapeableImageView
         android:id="@+id/channel_image"
         android:layout_width="30dp"
         android:layout_height="30dp"
         android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
         app:layout_constraintStart_toStartOf="@+id/guideline"
-        app:layout_constraintTop_toBottomOf="@id/video_info" />
+        app:layout_constraintTop_toBottomOf="@id/video_info"
+        app:shapeAppearance="@style/CircleImageView"/>
 
     <TextView
         android:id="@+id/channel_name"
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index bd9dddb2f..3d3d8ca18 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -9,7 +9,6 @@ preference = "1.2.0"
 extJunit = "1.1.4"
 espresso = "3.5.0"
 workRuntime = "2.7.1"
-circleimageview = "3.1.0"
 exoplayer = "2.18.2"
 multidex = "2.0.1"
 retrofit = "2.9.0"
@@ -32,7 +31,6 @@ androidx-preference = { group = "androidx.preference", name = "preference-ktx",
 androidx-test-junit = { group = "androidx.test.ext", name = "junit", version.ref = "extJunit" }
 androidx-test-espressoCore = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso" }
 androidx-work-runtime = { group = "androidx.work", name="work-runtime-ktx", version.ref="workRuntime" }
-circleimageview = { group = "de.hdodenhof", name = "circleimageview", version.ref = "circleimageview" }
 exoplayer = { group = "com.google.android.exoplayer", name = "exoplayer", version.ref = "exoplayer" }
 exoplayer-extension-mediasession = { group = "com.google.android.exoplayer", name = "extension-mediasession", version.ref = "exoplayer" }
 androidx-multidex = { group = "androidx.multidex", name = "multidex", version.ref = "multidex" }