diff --git a/res/values/styles-dark.xml b/res/values/styles-dark.xml
index 12f5950b..c7d7e6f7 100644
--- a/res/values/styles-dark.xml
+++ b/res/values/styles-dark.xml
@@ -5,7 +5,7 @@
     <color name="darkStatusBarBackground">#333333</color>
 
     <!-- KdeConnectThemeBase styles must only be defined in the main res/values/ folder -->
-    <style name="KdeConnectThemeBase.Dark" parent="Theme.AppCompat">
+    <style name="KdeConnectThemeBase.Dark" parent="Theme.MaterialComponents">
         <item name="colorPrimary">@color/darkGrey</item>
         <item name="colorPrimaryDark">@color/darkStatusBarBackground</item>
         <item name="colorAccent">@color/accent</item>
@@ -16,6 +16,7 @@
         <item name="colorHighContrast">@android:color/white</item>
         <item name="android:textColorPrimary">@android:color/white</item>
         <item name="android:textColor">@android:color/white</item>
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
     </style>
 
     <style name="KdeConnectThemeBase.Dark.NoActionBar" parent="KdeConnectThemeBase.Dark">
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 9c068ac7..e08efdd4 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -5,7 +5,7 @@
     <color name="disabled_grey">#eee</color>
 
     <!-- NoActionBar because we use a Toolbar widget as ActionBar -->
-    <style name="KdeConnectThemeBase" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="KdeConnectThemeBase" parent="Theme.MaterialComponents.Light.DarkActionBar">
         <!-- The three colors used by system widgets, according to https://chris.banes.me/2014/10/17/appcompat-v21/ -->
         <item name="colorPrimary">@color/primary</item>
         <item name="colorPrimaryDark">@color/primaryDark</item>
@@ -16,6 +16,7 @@
         <item name="colorHighContrast">@android:color/black</item>
         <item name="android:textColorPrimary">@android:color/black</item>
         <item name="android:textColor">@android:color/black</item>
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
     </style>
 
     <style name="KdeConnectThemeBase.NoActionBar" parent="KdeConnectThemeBase">
@@ -40,5 +41,4 @@
     <style name="DisableableButton" parent="ThemeOverlay.AppCompat">
         <item name="colorButtonNormal">@drawable/disableable_button</item>
     </style>
-
 </resources>