diff --git a/app/src/main/res/layout/playlist_bookmark_row.xml b/app/src/main/res/layout/playlist_bookmark_row.xml
index ae81b74d1..68b404d2d 100644
--- a/app/src/main/res/layout/playlist_bookmark_row.xml
+++ b/app/src/main/res/layout/playlist_bookmark_row.xml
@@ -9,14 +9,29 @@
     android:orientation="vertical"
     android:padding="5dp">
 
-    <com.google.android.material.imageview.ShapeableImageView
-        android:id="@+id/thumbnail"
+    <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:adjustViewBounds="true"
-        android:scaleType="fitCenter"
-        app:shapeAppearanceOverlay="@style/ShapeAppearance.Material3.Corner.Medium"
-        tools:src="@tools:sample/backgrounds/scenic" />
+        app:cardCornerRadius="8dp">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <ImageView
+                android:id="@+id/thumbnail"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                app:layout_constraintDimensionRatio="16:9"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:src="@tools:sample/backgrounds/scenic" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.cardview.widget.CardView>
 
     <TextView
         android:id="@+id/playlistName"
diff --git a/app/src/main/res/layout/trending_row.xml b/app/src/main/res/layout/trending_row.xml
index cfad78a66..82ca95fd1 100644
--- a/app/src/main/res/layout/trending_row.xml
+++ b/app/src/main/res/layout/trending_row.xml
@@ -13,7 +13,6 @@
         android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="8dp"
-        android:elevation="10dp"
         app:cardCornerRadius="8dp"
         app:layout_constraintDimensionRatio="16:9"
         app:layout_constraintEnd_toEndOf="parent"
@@ -77,7 +76,7 @@
         android:textSize="15sp"
         android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="@+id/thumbnailcard"
-        app:layout_constraintStart_toEndOf="@+id/channel_image"
+        app:layout_constraintStart_toEndOf="@+id/channel_image_container"
         app:layout_constraintTop_toBottomOf="@+id/thumbnailcard"
         tools:text="Title" />
 
@@ -94,15 +93,22 @@
         app:layout_constraintTop_toBottomOf="@+id/textView_title"
         tools:text="Channel Name" />
 
-    <com.google.android.material.imageview.ShapeableImageView
-        android:id="@+id/channel_image"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
+    <androidx.cardview.widget.CardView
+        android:id="@+id/channel_image_container"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
+        app:cardCornerRadius="20dp"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/thumbnailcard"
-        app:shapeAppearance="@style/CircleImageView"
-        tools:srcCompat="@mipmap/ic_launcher" />
+        app:layout_constraintTop_toBottomOf="@+id/thumbnailcard">
+
+        <ImageView
+            android:id="@+id/channel_image"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            tools:srcCompat="@mipmap/ic_launcher" />
+
+    </androidx.cardview.widget.CardView>
 
 </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 236b32db7..509d1d8d8 100644
--- a/app/src/main/res/layout/video_row.xml
+++ b/app/src/main/res/layout/video_row.xml
@@ -11,7 +11,7 @@
         android:orientation="vertical"
         app:layout_constraintGuide_percent=".45" />
 
-    <com.google.android.material.card.MaterialCardView
+    <androidx.cardview.widget.CardView
         android:id="@+id/thumbnail_card"
         android:layout_width="0dp"
         android:layout_height="0dp"
@@ -22,8 +22,7 @@
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.0"
-        app:strokeWidth="0dp">
+        app:layout_constraintVertical_bias="0.0">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
@@ -66,7 +65,7 @@
                 app:layout_constraintStart_toStartOf="parent" />
         </androidx.constraintlayout.widget.ConstraintLayout>
 
-    </com.google.android.material.card.MaterialCardView>
+    </androidx.cardview.widget.CardView>
 
     <TextView
         android:id="@+id/video_title"
@@ -104,11 +103,17 @@
         app:layout_constraintStart_toStartOf="@+id/guideline"
         app:layout_constraintTop_toBottomOf="@id/video_info">
 
-        <com.google.android.material.imageview.ShapeableImageView
-            android:id="@+id/channel_image"
-            android:layout_width="27dp"
-            android:layout_height="27dp"
-            app:shapeAppearance="@style/CircleImageView" />
+        <androidx.cardview.widget.CardView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:cardCornerRadius="13.5dp">
+
+            <ImageView
+                android:id="@+id/channel_image"
+                android:layout_width="27dp"
+                android:layout_height="27dp" />
+
+        </androidx.cardview.widget.CardView>
 
         <TextView
             android:id="@+id/channel_name"