diff --git a/app/src/main/res/layout-television/dialog_theme_selection.xml b/app/src/main/res/layout-television/dialog_theme_selection.xml
index b557100..72de36a 100644
--- a/app/src/main/res/layout-television/dialog_theme_selection.xml
+++ b/app/src/main/res/layout-television/dialog_theme_selection.xml
@@ -27,9 +27,6 @@
             android:text="@string/pref_theme_selection_mode_device_default"
             android:textSize="20sp"
             android:padding="12dp"
-            android:button="@null"
-            android:drawableEnd="?android:attr/listChoiceIndicatorSingle"
-            android:drawablePadding="16dp"
             android:focusable="true"
             android:clickable="true" />
 
@@ -40,9 +37,6 @@
             android:text="@string/pref_theme_selection_mode_light"
             android:textSize="20sp"
             android:padding="12dp"
-            android:button="@null"
-            android:drawableEnd="?android:attr/listChoiceIndicatorSingle"
-            android:drawablePadding="16dp"
             android:focusable="true"
             android:clickable="true" />
 
@@ -53,9 +47,6 @@
             android:text="@string/pref_theme_selection_mode_dark"
             android:textSize="20sp"
             android:padding="12dp"
-            android:button="@null"
-            android:drawableEnd="?android:attr/listChoiceIndicatorSingle"
-            android:drawablePadding="16dp"
             android:focusable="true"
             android:clickable="true" />
 
diff --git a/app/src/main/res/layout/dialog_theme_selection.xml b/app/src/main/res/layout/dialog_theme_selection.xml
index 5357248..16f3d40 100644
--- a/app/src/main/res/layout/dialog_theme_selection.xml
+++ b/app/src/main/res/layout/dialog_theme_selection.xml
@@ -26,12 +26,7 @@
             android:layout_height="wrap_content"
             android:text="@string/pref_theme_selection_mode_device_default"
             android:textSize="16sp"
-            android:padding="8dp"
-            android:button="@null"
-            android:drawableStart="?android:attr/listChoiceIndicatorSingle"
-            android:drawablePadding="12dp"
-            android:focusable="true"
-            android:clickable="true" />
+            android:padding="8dp"/>
 
         <RadioButton
             android:id="@+id/radio_theme_light"
@@ -39,12 +34,7 @@
             android:layout_height="wrap_content"
             android:text="@string/pref_theme_selection_mode_light"
             android:textSize="16sp"
-            android:padding="8dp"
-            android:button="@null"
-            android:drawableStart="?android:attr/listChoiceIndicatorSingle"
-            android:drawablePadding="12dp"
-            android:focusable="true"
-            android:clickable="true" />
+            android:padding="8dp"/>
 
         <RadioButton
             android:id="@+id/radio_theme_dark"
@@ -52,12 +42,7 @@
             android:layout_height="wrap_content"
             android:text="@string/pref_theme_selection_mode_dark"
             android:textSize="16sp"
-            android:padding="8dp"
-            android:button="@null"
-            android:drawableStart="?android:attr/listChoiceIndicatorSingle"
-            android:drawablePadding="12dp"
-            android:focusable="true"
-            android:clickable="true" />
+            android:padding="8dp"/>
 
     </RadioGroup>