diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/preference/ThemesPreferenceAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/preference/ThemesPreferenceAdapter.kt
index 20a4fdc0db..34f669cc9c 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/widget/preference/ThemesPreferenceAdapter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/widget/preference/ThemesPreferenceAdapter.kt
@@ -54,6 +54,9 @@ class ThemesPreferenceAdapter(private val clickListener: OnItemClickListener) :
         fun bind(appTheme: PreferenceValues.AppTheme) {
             binding.name.text = view.context.getString(appTheme.titleResId!!)
 
+            // For rounded corners
+            binding.badges.clipToOutline = true
+
             val isSelected = preferences.appTheme().get() == appTheme
             binding.themeCard.isChecked = isSelected
             binding.themeCard.strokeColor = if (isSelected) selectedColor else unselectedColor
diff --git a/app/src/main/res/layout/pref_theme_item.xml b/app/src/main/res/layout/pref_theme_item.xml
index d7ba95a71a..f66384e239 100644
--- a/app/src/main/res/layout/pref_theme_item.xml
+++ b/app/src/main/res/layout/pref_theme_item.xml
@@ -59,16 +59,27 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:tint="?android:attr/divider" />
 
-            <ImageView
-                android:id="@+id/cover_badge"
-                android:layout_width="12dp"
-                android:layout_height="16dp"
+            <LinearLayout
+                android:id="@+id/badges"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:layout_marginStart="4dp"
                 android:layout_marginTop="4dp"
-                android:src="@drawable/rounded_rectangle"
-                app:tint="?attr/colorAccent"
+                android:background="@drawable/rounded_rectangle"
                 app:layout_constraintStart_toStartOf="@+id/cover_container"
-                app:layout_constraintTop_toTopOf="@+id/cover_container" />
+                app:layout_constraintTop_toTopOf="@+id/cover_container">
+
+                <View
+                    android:layout_width="12dp"
+                    android:layout_height="16dp"
+                    android:background="?attr/colorTertiary" />
+
+                <View
+                    android:layout_width="12dp"
+                    android:layout_height="16dp"
+                    android:background="?attr/colorSecondary" />
+
+            </LinearLayout>
 
             <View
                 android:id="@+id/bottom_nav"