diff --git a/app/src/main/res/xml/advanced_settings.xml b/app/src/main/res/xml/advanced_settings.xml
index e4368065a..e14988c68 100644
--- a/app/src/main/res/xml/advanced_settings.xml
+++ b/app/src/main/res/xml/advanced_settings.xml
@@ -17,14 +17,14 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="save_parse_error_body"
         android:summary="@string/settings_advanced_save_parse_error_body_summary"
         android:title="@string/settings_advanced_save_parse_error_body"
         app:iconSpaceReserved="false" />
 
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="save_crash_log"
         android:summary="@string/settings_advanced_save_crash_log_summary"
@@ -72,7 +72,7 @@
         android:title="@string/settings_advanced_proxy"
         app:iconSpaceReserved="false" />
 
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="built_in_hosts_2"
         android:summary="@string/settings_advanced_built_in_hosts_summary"
@@ -86,7 +86,7 @@
         android:title="@string/settings_advanced_custom_hosts_title"
         app:iconSpaceReserved="false" />
 
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="domain_fronting"
         android:summary="@string/settings_advanced_domain_fronting_summary"
diff --git a/app/src/main/res/xml/download_settings.xml b/app/src/main/res/xml/download_settings.xml
index 3b4fe3ceb..fbf413520 100644
--- a/app/src/main/res/xml/download_settings.xml
+++ b/app/src/main/res/xml/download_settings.xml
@@ -22,7 +22,7 @@
         android:title="@string/settings_download_download_location"
         app:iconSpaceReserved="false" />
 
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="media_scan"
         android:title="@string/settings_download_media_scan"
@@ -66,7 +66,7 @@
         app:entryValues="@array/image_resolution_entry_values"
         app:iconSpaceReserved="false" />
 
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="download_origin_image"
         android:summary="@string/settings_download_download_origin_image_summary"
diff --git a/app/src/main/res/xml/eh_settings.xml b/app/src/main/res/xml/eh_settings.xml
index 63523664f..26b9b0c2b 100644
--- a/app/src/main/res/xml/eh_settings.xml
+++ b/app/src/main/res/xml/eh_settings.xml
@@ -61,7 +61,7 @@
         android:title="@string/dark_theme"
         app:iconSpaceReserved="false" />
 
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:key="black_dark_theme"
         android:title="@string/black_dark_theme"
         app:iconSpaceReserved="false" />
@@ -111,27 +111,27 @@
         app:entryValues="@array/thumb_resolution_entry_values"
         app:iconSpaceReserved="false" />
 
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="fix_thumb_url"
         android:title="@string/settings_eh_fix_thumb_url"
         app:iconSpaceReserved="false" />
 
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="show_jpn_title"
         android:summary="@string/settings_eh_show_jpn_title_summary"
         android:title="@string/settings_eh_show_jpn_title"
         app:iconSpaceReserved="false" />
 
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="show_gallery_pages"
         android:summary="@string/settings_eh_show_gallery_pages_summary"
         android:title="@string/settings_eh_show_gallery_pages"
         app:iconSpaceReserved="false" />
 
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="show_tag_translations"
         android:summary="@string/settings_eh_show_tag_translations_summary"
@@ -151,13 +151,13 @@
         android:title="@string/settings_eh_filter"
         app:iconSpaceReserved="false" />
 
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="cellular_network_warning"
         android:title="@string/settings_eh_metered_network_warning"
         app:iconSpaceReserved="false" />
 
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="request_news"
         android:title="@string/settings_request_news_title"
diff --git a/app/src/main/res/xml/privacy_settings.xml b/app/src/main/res/xml/privacy_settings.xml
index c8fa10e32..b75b17bef 100644
--- a/app/src/main/res/xml/privacy_settings.xml
+++ b/app/src/main/res/xml/privacy_settings.xml
@@ -8,7 +8,7 @@
         android:title="@string/settings_privacy_pattern_protection_title"
         app:iconSpaceReserved="false" />
 
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="enable_secure"
         android:title="@string/settings_privacy_secure"
diff --git a/app/src/main/res/xml/read_settings.xml b/app/src/main/res/xml/read_settings.xml
index 9656ac9e0..bbd963eb0 100644
--- a/app/src/main/res/xml/read_settings.xml
+++ b/app/src/main/res/xml/read_settings.xml
@@ -62,56 +62,56 @@
         app:entryValues="@array/read_theme_entry_values"
         app:iconSpaceReserved="false" />
 
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="keep_screen_on"
         android:title="@string/settings_read_keep_screen_on"
         app:iconSpaceReserved="false" />
 
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="gallery_show_clock"
         android:title="@string/settings_read_show_clock"
         app:iconSpaceReserved="false" />
 
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="gallery_show_progress"
         android:title="@string/settings_read_show_progress"
         app:iconSpaceReserved="false" />
 
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="gallery_show_battery"
         android:title="@string/settings_read_show_battery"
         app:iconSpaceReserved="false" />
 
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="gallery_show_page_interval"
         android:title="@string/settings_read_show_page_interval"
         app:iconSpaceReserved="false" />
 
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="volume_page"
         android:title="@string/settings_read_volume_page"
         app:iconSpaceReserved="false" />
 
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="false"
         android:dependency="volume_page"
         android:key="reserve_volume_page"
         android:title="@string/settings_read_reverse_volume"
         app:iconSpaceReserved="false" />
 
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="reading_fullscreen"
         android:title="@string/settings_read_reading_fullscreen"
         app:iconSpaceReserved="false" />
 
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="custom_screen_lightness"
         android:title="@string/settings_read_custom_screen_lightness"