diff --git a/app/src/main/java/org/oxycblt/auxio/widgets/WidgetProvider.kt b/app/src/main/java/org/oxycblt/auxio/widgets/WidgetProvider.kt
index 3f14578f6..388dbdc28 100644
--- a/app/src/main/java/org/oxycblt/auxio/widgets/WidgetProvider.kt
+++ b/app/src/main/java/org/oxycblt/auxio/widgets/WidgetProvider.kt
@@ -158,6 +158,7 @@ class WidgetProvider : AppWidgetProvider() {
                 uiSettings,
             )
             .setupCover(context, state.takeIf { canDisplayWaferCover(uiSettings) })
+            .setupFillingCover(uiSettings)
             .setupTimelineControls(context, state)
 
     private fun newWideWaferLayout(
@@ -170,6 +171,7 @@ class WidgetProvider : AppWidgetProvider() {
                 uiSettings,
             )
             .setupCover(context, state.takeIf { canDisplayWaferCover(uiSettings) })
+            .setupFillingCover(uiSettings)
             .setupFullControls(context, state)
 
     private fun newThinDockedLayout(
@@ -231,9 +233,9 @@ class WidgetProvider : AppWidgetProvider() {
         // On API 31+, the bar should always be round in order to fit in with other widgets.
         val background =
             if (useRoundedRemoteViews(uiSettings)) {
-                R.drawable.ui_widget_bar_round
+                R.drawable.ui_widget_bg_round
             } else {
-                R.drawable.ui_widget_bar_system
+                R.drawable.ui_widget_bg_sharp
             }
         setBackgroundResource(R.id.widget_controls, background)
         return this
@@ -253,7 +255,7 @@ class WidgetProvider : AppWidgetProvider() {
             if (useRoundedRemoteViews(uiSettings)) {
                 R.drawable.ui_widget_bg_round
             } else {
-                R.drawable.ui_widget_bg_system
+                R.drawable.ui_widget_bg_sharp
             }
         setBackgroundResource(android.R.id.background, background)
         return this
@@ -292,6 +294,20 @@ class WidgetProvider : AppWidgetProvider() {
         return this
     }
 
+    private fun RemoteViews.setupFillingCover(uiSettings: UISettings): RemoteViews {
+        // Below API 31, enable a rounded background only if round mode is enabled.
+        // On API 31+, the background should always be round in order to fit in with other
+        // widgets.
+        val background =
+            if (useRoundedRemoteViews(uiSettings)) {
+                R.drawable.ui_widget_bg_round
+            } else {
+                R.drawable.ui_widget_bg_sharp
+            }
+        setBackgroundResource(R.id.widget_cover, background)
+        return this
+    }
+
     /**
      * Set up the album cover, song title, and artist name in a [RemoteViews] layout that contains
      * them.
diff --git a/app/src/main/res/drawable-v31/ui_widget_bar_system.xml b/app/src/main/res/drawable-v31/ui_widget_bg_round.xml
similarity index 100%
rename from app/src/main/res/drawable-v31/ui_widget_bar_system.xml
rename to app/src/main/res/drawable-v31/ui_widget_bg_round.xml
index b6144dd5f..893bae085 100644
--- a/app/src/main/res/drawable-v31/ui_widget_bar_system.xml
+++ b/app/src/main/res/drawable-v31/ui_widget_bg_round.xml
@@ -1,6 +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="@android:dimen/system_app_widget_background_radius" />
     <solid android:color="@android:color/white" />
+    <corners android:radius="@android:dimen/system_app_widget_background_radius" />
 </shape>
diff --git a/app/src/main/res/drawable/ui_widget_bar_round.xml b/app/src/main/res/drawable/ui_widget_bar_round.xml
deleted file mode 100644
index 9fcd8308b..000000000
--- a/app/src/main/res/drawable/ui_widget_bar_round.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="@dimen/size_corners_mid_large" />
-    <solid android:color="@android:color/white" />
-</shape>
diff --git a/app/src/main/res/drawable/ui_widget_bar_system.xml b/app/src/main/res/drawable/ui_widget_bg_sharp.xml
similarity index 100%
rename from app/src/main/res/drawable/ui_widget_bar_system.xml
rename to app/src/main/res/drawable/ui_widget_bg_sharp.xml
diff --git a/app/src/main/res/drawable/ui_widget_bg_system.xml b/app/src/main/res/drawable/ui_widget_bg_system.xml
deleted file mode 100644
index 9d33d5912..000000000
--- a/app/src/main/res/drawable/ui_widget_bg_system.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@android:color/white" />
-</shape>
diff --git a/app/src/main/res/layout/widget_docked_thin.xml b/app/src/main/res/layout/widget_docked_thin.xml
index 2b2566812..086013dcc 100644
--- a/app/src/main/res/layout/widget_docked_thin.xml
+++ b/app/src/main/res/layout/widget_docked_thin.xml
@@ -61,7 +61,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_gravity="center"
-        android:background="@drawable/ui_widget_bar_system"
+        android:background="@drawable/ui_widget_bg_round"
         android:backgroundTint="?attr/colorSurface"
         android:orientation="horizontal"
         android:padding="@dimen/spacing_mid_medium">
diff --git a/app/src/main/res/layout/widget_docked_wide.xml b/app/src/main/res/layout/widget_docked_wide.xml
index f0b129ae5..d344799f4 100644
--- a/app/src/main/res/layout/widget_docked_wide.xml
+++ b/app/src/main/res/layout/widget_docked_wide.xml
@@ -48,7 +48,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_gravity="center"
-        android:background="@drawable/ui_widget_bar_system"
+        android:background="@drawable/ui_widget_bg_round"
         android:backgroundTint="?attr/colorSurface"
         android:orientation="horizontal"
         android:padding="@dimen/spacing_mid_medium">
diff --git a/app/src/main/res/layout/widget_pane_thin.xml b/app/src/main/res/layout/widget_pane_thin.xml
index 4dc4c394c..2b2361971 100644
--- a/app/src/main/res/layout/widget_pane_thin.xml
+++ b/app/src/main/res/layout/widget_pane_thin.xml
@@ -4,7 +4,7 @@
     android:id="@android:id/background"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/ui_widget_bg_system"
+    android:background="@drawable/ui_widget_bg_sharp"
     android:backgroundTint="?attr/colorSurface"
     android:theme="@style/Theme.Auxio.Widget">
 
diff --git a/app/src/main/res/layout/widget_pane_wide.xml b/app/src/main/res/layout/widget_pane_wide.xml
index 2ef525fa3..07c693564 100644
--- a/app/src/main/res/layout/widget_pane_wide.xml
+++ b/app/src/main/res/layout/widget_pane_wide.xml
@@ -4,7 +4,7 @@
     android:id="@android:id/background"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/ui_widget_bg_system"
+    android:background="@drawable/ui_widget_bg_sharp"
     android:backgroundTint="?attr/colorSurface"
     android:theme="@style/Theme.Auxio.Widget">
 
diff --git a/app/src/main/res/layout/widget_wafer_thin.xml b/app/src/main/res/layout/widget_wafer_thin.xml
index fe7ec01dc..db12288cf 100644
--- a/app/src/main/res/layout/widget_wafer_thin.xml
+++ b/app/src/main/res/layout/widget_wafer_thin.xml
@@ -4,7 +4,7 @@
     android:id="@android:id/background"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/ui_widget_bg_system"
+    android:background="@drawable/ui_widget_bg_sharp"
     android:backgroundTint="?attr/colorSurface"
     android:baselineAligned="false"
     android:orientation="horizontal"
@@ -20,6 +20,8 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scaleType="centerCrop"
+        android:background="@drawable/ui_widget_bg_round"
+        android:clipToOutline="true"
         tools:ignore="ContentDescription" />
 
     <android.widget.LinearLayout
diff --git a/app/src/main/res/layout/widget_wafer_wide.xml b/app/src/main/res/layout/widget_wafer_wide.xml
index f32d97b4b..d773fc5f0 100644
--- a/app/src/main/res/layout/widget_wafer_wide.xml
+++ b/app/src/main/res/layout/widget_wafer_wide.xml
@@ -4,22 +4,23 @@
     android:id="@android:id/background"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/ui_widget_bg_system"
+    android:background="@drawable/ui_widget_bg_sharp"
     android:backgroundTint="?attr/colorSurface"
     android:baselineAligned="false"
     android:orientation="horizontal"
     android:theme="@style/Theme.Auxio.Widget">
 
     <!--
-    Wrapping the 1:1 ImageView hack in a LinearLayout allows the view to measure greedily
-    without squishing the controls.
+    clipToOutline won't actually do anything before Android 12, but that's fine since we won't
+    show a cover then anyway.
     -->
-
     <android.widget.ImageView
         android:id="@+id/widget_cover"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scaleType="centerCrop"
+        android:background="@drawable/ui_widget_bg_round"
+        android:clipToOutline="true"
         tools:ignore="ContentDescription" />
 
     <android.widget.LinearLayout