diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d84811d26..76318e74b 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -39,7 +39,9 @@
         </item>
         <item name="android:popupWindowStyle">@style/Cyanea.PopupMenu.Light</item>
         <item name="android:windowBackground">@color/cyanea_background_light</item>
-        <item name="colorControlActivated">@color/cyanea_accent_dark_reference</item>
+
+        <item name="colorControlActivated">@color/cyanea_accent_reference</item>
+        <item name="colorSwitchThumbNormal">#E0E0E0</item>
     </style>
 
     <style name="MenuPopup" parent="AppTheme.PopupOverlay">
@@ -79,7 +81,8 @@
         </item>
         <item name="android:popupWindowStyle">@style/Cyanea.PopupMenu.Dark</item>
         <item name="android:windowBackground">@color/cyanea_background_dark</item>
-        <item name="colorControlActivated">@color/cyanea_accent_dark_reference</item>
+        <item name="colorControlActivated">@color/cyanea_accent_reference</item>
+        <item name="colorSwitchThumbNormal">#E0E0E0</item>
     </style>
 
 
@@ -99,7 +102,9 @@
         <item name="android:popupWindowStyle">@style/Cyanea.PopupMenu.Light</item>
         <item name="android:itemBackground">@drawable/menu_selector_light</item>
         <item name="android:windowBackground">@color/cyanea_background_dark</item>
-        <item name="colorControlActivated">@color/cyanea_accent_dark_reference</item>
+
+        <item name="colorControlActivated">@color/cyanea_accent_reference</item>
+        <item name="colorSwitchThumbNormal">#E0E0E0</item>
     </style>
 
     <style name="AppThemeBarDark" parent="Theme.Cyanea.Dark">
@@ -117,7 +122,9 @@
         <item name="android:popupWindowStyle">@style/Cyanea.PopupMenu.Dark</item>
         <item name="android:itemBackground">@drawable/menu_selector_dark</item>
         <item name="android:windowBackground">@color/cyanea_background_dark</item>
-        <item name="colorControlActivated">@color/cyanea_accent_dark_reference</item>
+        <item name="colorControlActivated">@color/cyanea_accent_reference</item>
+        <item name="colorSwitchThumbNormal">#E0E0E0</item>
+
     </style>
 
 
diff --git a/app/src/main/res/xml/pref_interface.xml b/app/src/main/res/xml/pref_interface.xml
index 12f13b1a2..077a94952 100644
--- a/app/src/main/res/xml/pref_interface.xml
+++ b/app/src/main/res/xml/pref_interface.xml
@@ -3,27 +3,27 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-    <androidx.preference.SwitchPreference
+    <SwitchPreferenceCompat
         app:defaultValue="true"
         app:iconSpaceReserved="false"
         app:key="@string/SET_UNFOLLOW_VALIDATION"
         app:summary="@string/set_unfollow_validation"
         app:title="@string/set_unfollow_validation_title" />
 
-    <androidx.preference.SwitchPreference
+    <SwitchPreferenceCompat
         app:defaultValue="false"
         app:iconSpaceReserved="false"
         app:key="@string/SET_CLEAR_CACHE_EXIT"
         app:summary="@string/set_clear_cache_exit_indication"
         app:title="@string/set_clear_cache_exit" />
 
-    <androidx.preference.SwitchPreference
+    <SwitchPreferenceCompat
         app:defaultValue="true"
         app:iconSpaceReserved="false"
         app:key="@string/SET_EMBEDDED_BROWSER"
         app:title="@string/embedded_browser" />
 
-    <androidx.preference.SwitchPreference
+    <SwitchPreferenceCompat
         app:defaultValue="false"
         app:iconSpaceReserved="false"
         app:key="@string/SET_SEND_CRASH_REPORTS"
diff --git a/app/src/main/res/xml/pref_notifications.xml b/app/src/main/res/xml/pref_notifications.xml
index a37cf73b9..b4d7dc3ec 100644
--- a/app/src/main/res/xml/pref_notifications.xml
+++ b/app/src/main/res/xml/pref_notifications.xml
@@ -23,32 +23,32 @@
         app:key="notifications_enabled"
         app:summary="@string/disable_notifications"
         app:title="@string/settings_category_notif_categories">
-        <SwitchPreference
+        <SwitchPreferenceCompat
             app:defaultValue="true"
             app:iconSpaceReserved="false"
             app:key="@string/SET_NOTIF_FOLLOW"
             app:title="@string/set_notif_follow" />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             app:defaultValue="true"
             app:iconSpaceReserved="false"
             app:key="@string/SET_NOTIF_MENTION"
             app:title="@string/set_notif_follow_mention" />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             app:defaultValue="true"
             app:iconSpaceReserved="false"
             app:key="@string/SET_NOTIF_FAVOURITE"
             app:title="@string/set_notif_follow_add" />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             app:defaultValue="true"
             app:iconSpaceReserved="false"
             app:key="@string/SET_NOTIF_SHARE"
             app:title="@string/set_notif_follow_share" />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             app:defaultValue="true"
             app:iconSpaceReserved="false"
             app:key="@string/SET_NOTIF_POLL"
             app:title="@string/set_notif_follow_poll" />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             app:defaultValue="true"
             app:iconSpaceReserved="false"
             app:key="@string/SET_NOTIF_STATUS"
diff --git a/app/src/main/res/xml/pref_privacy.xml b/app/src/main/res/xml/pref_privacy.xml
index f43663471..209a7d096 100644
--- a/app/src/main/res/xml/pref_privacy.xml
+++ b/app/src/main/res/xml/pref_privacy.xml
@@ -5,7 +5,7 @@
         app:summary="Rewrite links to use alternative frontends"
         app:title="Alternative frontends">
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             app:iconSpaceReserved="false"
             app:key="@string/SET_INVIDIOUS"
             app:summary="@string/replace_youtube_description"
@@ -20,7 +20,7 @@
             app:title="@string/replace_youtube_host"
             app:useSimpleSummaryProvider="true" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             app:iconSpaceReserved="false"
             app:key="@string/SET_NITTER"
             app:summary="@string/replace_twitter_description"
@@ -35,7 +35,7 @@
             app:title="@string/replace_twitter_host"
             app:useSimpleSummaryProvider="true" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             app:iconSpaceReserved="false"
             app:key="@string/SET_BIBLIOGRAM"
             app:summary="@string/replace_instagram_description"
@@ -50,7 +50,7 @@
             app:title="@string/replace_instagram_host"
             app:useSimpleSummaryProvider="true" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             app:iconSpaceReserved="false"
             app:key="@string/SET_LIBREDDIT"
             app:summary="@string/replace_reddit_description"
@@ -64,7 +64,7 @@
             app:title="@string/replace_reddit_host"
             app:useSimpleSummaryProvider="true" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             app:iconSpaceReserved="false"
             app:key="@string/REPLACE_MEDIUM"
             app:summary="@string/replace_medium_description"
@@ -84,7 +84,7 @@
         app:iconSpaceReserved="false"
         app:title="@string/other">
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             app:iconSpaceReserved="false"
             app:key="@string/SET_FILTER_UTM"
             app:summary="@string/set_utm_parameters_indication"
diff --git a/app/src/main/res/xml/pref_theming.xml b/app/src/main/res/xml/pref_theming.xml
index de51c5010..596ef8f76 100644
--- a/app/src/main/res/xml/pref_theming.xml
+++ b/app/src/main/res/xml/pref_theming.xml
@@ -11,7 +11,7 @@
         app:summary="@string/pref_theme_base_summary"
         app:title="@string/pref_theme_base" />
 
-    <androidx.preference.SwitchPreference
+    <SwitchPreferenceCompat
         app:defaultValue="false"
         app:iconSpaceReserved="false"
         app:key="use_custom_theme"
diff --git a/app/src/main/res/xml/pref_timelines.xml b/app/src/main/res/xml/pref_timelines.xml
index 9ca436f9a..2f12f9ba0 100644
--- a/app/src/main/res/xml/pref_timelines.xml
+++ b/app/src/main/res/xml/pref_timelines.xml
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:android="http://schemas.android.com/apk/res/android">
-    <androidx.preference.SwitchPreference
+    <SwitchPreferenceCompat
         app:iconSpaceReserved="false"
         android:defaultValue="false"
         app:key="@string/SET_EXPAND_CW"
         app:title="@string/expand_cw" />
-    <androidx.preference.SwitchPreference
+    <SwitchPreferenceCompat
         app:iconSpaceReserved="false"
         android:defaultValue="false"
         app:key="@string/SET_EXPAND_MEDIA"
         app:title="@string/expand_image" />
-    <androidx.preference.SwitchPreference
+    <SwitchPreferenceCompat
         app:iconSpaceReserved="false"
         android:defaultValue="true"
         app:key="@string/SET_NOTIF_VALIDATION"
         app:title="@string/set_share_validation" />
-    <androidx.preference.SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="false"
         app:iconSpaceReserved="false"
         app:key="@string/SET_DISPLAY_BOOKMARK"
         app:title="@string/set_display_bookmark_indication" />
-    <androidx.preference.SwitchPreference
+    <SwitchPreferenceCompat
         app:iconSpaceReserved="false"
         android:defaultValue="false"
         app:key="@string/SET_NOTIF_VALIDATION_FAV"
@@ -34,29 +34,29 @@
         android:max="20"
         app:key="@string/SET_TRUNCATE_TOOTS_SIZE"
         app:title="@string/truncate_long_toots" />
-    <androidx.preference.SwitchPreference
+    <SwitchPreferenceCompat
         app:iconSpaceReserved="false"
         android:defaultValue="false"
         app:key="@string/SET_LONG_PRESS_MEDIA"
         app:title="@string/set_long_press_media" />
-    <androidx.preference.SwitchPreference
+    <SwitchPreferenceCompat
         app:iconSpaceReserved="false"
         android:defaultValue="false"
         app:key="@string/SET_FULL_PREVIEW"
         android:summary="@string/set_fit_preview_indication"
         app:title="@string/set_fit_preview" />
-    <androidx.preference.SwitchPreference
+    <SwitchPreferenceCompat
         app:iconSpaceReserved="false"
         android:defaultValue="false"
         app:key="@string/SET_DISABLE_GIF"
         app:title="@string/set_disable_gif" />
-    <androidx.preference.SwitchPreference
+    <SwitchPreferenceCompat
         app:iconSpaceReserved="false"
         android:defaultValue="false"
         app:key="@string/SET_DISABLE_ANIMATED_EMOJI"
         app:title="@string/set_disable_animated_emoji" />
 
-    <androidx.preference.SwitchPreference
+    <SwitchPreferenceCompat
         app:iconSpaceReserved="false"
         android:defaultValue="false"
         app:key="@string/SET_DISPLAY_CARD"