diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceItem.kt
index e3f89c896..414523716 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceItem.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceItem.kt
@@ -34,6 +34,9 @@ class SourceItem(val manga: Manga, private val catalogueAsList: Preference<Boole
         val parent = adapter.recyclerView
         return if (parent is AutofitRecyclerView) {
             view.apply {
+                // Setting this via XML doesn't work
+                card.clipToOutline = true
+
                 card.layoutParams = FrameLayout.LayoutParams(
                     MATCH_PARENT, parent.itemWidth / 3 * 4
                 )
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt
index cd3a5bbd8..5a8e42629 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt
@@ -38,6 +38,9 @@ class LibraryItem(val manga: LibraryManga, private val libraryAsList: Preference
         val parent = adapter.recyclerView
         return if (parent is AutofitRecyclerView) {
             view.apply {
+                // Setting this via XML doesn't work
+                card.clipToOutline = true
+
                 val coverHeight = parent.itemWidth / 3 * 4
                 card.layoutParams = FrameLayout.LayoutParams(MATCH_PARENT, coverHeight)
                 gradient.layoutParams = FrameLayout.LayoutParams(
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt
index 184373aac..eddfdca73 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt
@@ -85,6 +85,9 @@ class MangaInfoController(private val fromSource: Boolean = false) :
     override fun onViewCreated(view: View) {
         super.onViewCreated(view)
 
+        // Setting this via XML doesn't work
+        binding.mangaCover.clipToOutline = true
+
         binding.btnFavorite.clicks()
             .onEach { onFavoriteClick() }
             .launchIn(scope)
diff --git a/app/src/main/res/drawable/rounded_rectangle.xml b/app/src/main/res/drawable/rounded_rectangle.xml
new file mode 100644
index 000000000..6af8dc293
--- /dev/null
+++ b/app/src/main/res/drawable/rounded_rectangle.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="@dimen/card_radius" />
+    <solid android:color="?attr/colorSurface" />
+</shape>
diff --git a/app/src/main/res/layout-land/manga_info_controller.xml b/app/src/main/res/layout-land/manga_info_controller.xml
index 59633d064..ca1b1a321 100644
--- a/app/src/main/res/layout-land/manga_info_controller.xml
+++ b/app/src/main/res/layout-land/manga_info_controller.xml
@@ -11,45 +11,32 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <androidx.cardview.widget.CardView
-            android:id="@+id/manga_cover_card"
+        <ImageView
+            android:id="@+id/manga_cover"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginBottom="16dp"
-            app:cardCornerRadius="@dimen/card_radius"
+            android:layout_margin="16dp"
+            android:background="@drawable/rounded_rectangle"
+            android:contentDescription="@string/description_cover"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintDimensionRatio="h,3:2"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_bias="0.0">
-
-            <ImageView
-                android:id="@+id/manga_cover"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:contentDescription="@string/description_cover"
-                tools:background="@color/material_grey_700" />
-
-        </androidx.cardview.widget.CardView>
+            app:layout_constraintVertical_bias="0.0" />
 
         <androidx.core.widget.NestedScrollView
             android:id="@+id/info_scrollview"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginBottom="16dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/manga_cover_card"
+            app:layout_constraintStart_toEndOf="@+id/manga_cover"
             app:layout_constraintTop_toTopOf="parent">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent">
+                android:layout_height="match_parent"
+                android:padding="16dp">
 
                 <TextView
                     android:id="@+id/manga_full_title"
diff --git a/app/src/main/res/layout/manga_info_controller.xml b/app/src/main/res/layout/manga_info_controller.xml
index b024dc9b0..0cfce0f10 100644
--- a/app/src/main/res/layout/manga_info_controller.xml
+++ b/app/src/main/res/layout/manga_info_controller.xml
@@ -38,29 +38,18 @@
                     app:layout_constraintTop_toTopOf="parent"
                     tools:background="@color/material_grey_700" />
 
-                <androidx.cardview.widget.CardView
-                    android:id="@+id/manga_cover_card"
+                <ImageView
+                    android:id="@+id/manga_cover"
                     android:layout_width="0dp"
                     android:layout_height="0dp"
-                    android:layout_marginStart="16dp"
-                    android:layout_marginTop="16dp"
-                    android:layout_marginEnd="16dp"
-                    android:layout_marginBottom="16dp"
-                    app:cardCornerRadius="@dimen/card_radius"
-                    app:layout_constraintDimensionRatio="h,2:3"
+                    android:layout_margin="16dp"
+                    android:background="@drawable/rounded_rectangle"
+                    android:contentDescription="@string/description_cover"
                     app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintDimensionRatio="h,2:3"
                     app:layout_constraintEnd_toStartOf="@+id/guideline2"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent">
-
-                    <ImageView
-                        android:id="@+id/manga_cover"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:contentDescription="@string/description_cover"
-                        tools:background="@color/material_grey_700" />
-
-                </androidx.cardview.widget.CardView>
+                    app:layout_constraintTop_toTopOf="parent" />
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/manga_info_section"
diff --git a/app/src/main/res/layout/source_grid_item.xml b/app/src/main/res/layout/source_grid_item.xml
index 03d2045be..8eb9ec2ba 100644
--- a/app/src/main/res/layout/source_grid_item.xml
+++ b/app/src/main/res/layout/source_grid_item.xml
@@ -7,18 +7,17 @@
     android:background="@drawable/library_item_selector"
     android:padding="4dp">
 
-    <androidx.cardview.widget.CardView
+    <FrameLayout
         android:id="@+id/card"
         android:layout_width="wrap_content"
         android:layout_height="220dp"
-        app:cardCornerRadius="@dimen/card_radius">
+        android:background="@drawable/rounded_rectangle">
 
         <ImageView
             android:id="@+id/thumbnail"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/colorSurface"
-            tools:background="?attr/colorSurface"
             tools:ignore="ContentDescription"
             tools:src="@mipmap/ic_launcher" />
 
@@ -120,6 +119,6 @@
             android:layout_gravity="center"
             android:visibility="gone" />
 
-    </androidx.cardview.widget.CardView>
+    </FrameLayout>
 
 </FrameLayout>