diff --git a/app/src/main/res/layout/picker_subscription_item.xml b/app/src/main/res/layout/picker_subscription_item.xml
index 84c6a9130..6bc68cab8 100644
--- a/app/src/main/res/layout/picker_subscription_item.xml
+++ b/app/src/main/res/layout/picker_subscription_item.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="2dp"
-    android:background="?attr/focused_selector"
+    android:background="?attr/selectableItemBackground"
     android:clickable="true"
     android:focusable="true">
 
@@ -42,7 +42,7 @@
         android:id="@+id/selected_highlight"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="#9A000000"
+        android:background="?attr/colorControlHighlight"
         android:visibility="gone"
         tools:visibility="visible">
 
@@ -52,6 +52,7 @@
             android:layout_gravity="top|center_horizontal"
             android:layout_marginTop="4dp"
             android:scaleType="centerInside"
+            android:tint="@color/white"
             app:srcCompat="@drawable/ic_done"
             tools:ignore="ContentDescription" />
     </FrameLayout>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index ce56d5a30..cbbfcad48 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -13,7 +13,9 @@
     </style>
 
     <!-- Base themes -->
-    <style name="Base.V7" parent="Theme.AppCompat.DayNight.NoActionBar"/>
+    <style name="Base.V7" parent="Theme.AppCompat.DayNight.NoActionBar">
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
+    </style>
 
     <style name="Base" parent="Base.V7"/>
 
@@ -40,8 +42,6 @@
         <item name="card_item_contrast_color">@color/light_card_item_contrast_color</item>
         <item name="border_color">@color/light_border_color</item>
         <item name="dashed_border">@drawable/dashed_border_light</item>
-
-        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
     </style>
 
     <style name="Base.V7.DarkTheme" parent="Base" />
@@ -67,8 +67,6 @@
         <item name="card_item_contrast_color">@color/dark_card_item_contrast_color</item>
         <item name="border_color">@color/dark_border_color</item>
         <item name="dashed_border">@drawable/dashed_border_dark</item>
-
-        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
     </style>
 
     <style name="Base.V7.BlackTheme" parent="DarkTheme" />