diff --git a/app/src/main/res/layout-v21/asp_preference_widget_switch.xml b/app/src/main/res/layout-v21/asp_preference_widget_switch.xml
new file mode 100644
index 000000000..2fcedadf4
--- /dev/null
+++ b/app/src/main/res/layout-v21/asp_preference_widget_switch.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2015 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<!-- Layout used by SwitchPreference for the switch widget style. This is inflated
+     inside android.R.layout.preference. -->
+<Switch android:id="@+id/switchWidget"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginEnd="-4dp"
+    android:layout_marginStart="-4dp"
+    android:background="@null"
+    android:clickable="false"
+    android:focusable="false"
+    android:showText="false"/>
diff --git a/app/src/main/res/xml/pref_about.xml b/app/src/main/res/xml/pref_about.xml
index 3fc01ac67..9294da454 100644
--- a/app/src/main/res/xml/pref_about.xml
+++ b/app/src/main/res/xml/pref_about.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
     <PreferenceScreen
         android:key="about_screen"
@@ -11,18 +10,13 @@
             android:defaultValue="true"
             android:key="acra.enable"
             android:summary="@string/pref_acra_summary"
-            android:textOff="@string/pref_enable_acra"
-            android:textOn="@string/pref_enable_acra"
             android:title="@string/pref_enable_acra" />
 
         <SwitchPreference
             android:defaultValue="false"
             android:key="@string/pref_enable_automatic_updates_key"
             android:summary="@string/pref_enable_automatic_updates_summary"
-            android:textOff="@string/pref_enable_automatic_updates"
-            android:textOn="@string/pref_enable_automatic_updates"
-            android:title="@string/pref_enable_automatic_updates"
-            app:showText="false"/>
+            android:title="@string/pref_enable_automatic_updates" />
 
         <Preference
             android:key="@string/pref_version"
diff --git a/app/src/main/res/xml/pref_advanced.xml b/app/src/main/res/xml/pref_advanced.xml
index 9131e8154..49b73f5e5 100644
--- a/app/src/main/res/xml/pref_advanced.xml
+++ b/app/src/main/res/xml/pref_advanced.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
     <PreferenceScreen
         android:key="advanced_screen"
diff --git a/app/src/main/res/xml/pref_downloads.xml b/app/src/main/res/xml/pref_downloads.xml
index d29807bf9..e0c7bf158 100644
--- a/app/src/main/res/xml/pref_downloads.xml
+++ b/app/src/main/res/xml/pref_downloads.xml
@@ -13,8 +13,6 @@
         <SwitchPreference
             android:defaultValue="true"
             android:key="@string/pref_download_only_over_wifi_key"
-            android:textOff="@string/pref_download_only_over_wifi"
-            android:textOn="@string/pref_download_only_over_wifi"
             android:title="@string/pref_download_only_over_wifi" />
 
         <eu.kanade.tachiyomi.widget.preference.IntListPreference
@@ -32,8 +30,6 @@
         <SwitchPreference
             android:defaultValue="false"
             android:key="@string/pref_remove_after_marked_as_read_key"
-            android:textOff="@string/pref_remove_after_marked_as_read"
-            android:textOn="@string/pref_remove_after_marked_as_read"
             android:title="@string/pref_remove_after_marked_as_read" />
 
         <eu.kanade.tachiyomi.widget.preference.IntListPreference
diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml
index 088c25e47..35a8fb60f 100644
--- a/app/src/main/res/xml/pref_general.xml
+++ b/app/src/main/res/xml/pref_general.xml
@@ -50,8 +50,6 @@
         <SwitchPreference
             android:defaultValue="false"
             android:key="@string/pref_update_only_non_completed_key"
-            android:textOff="@string/pref_update_only_non_completed"
-            android:textOn="@string/pref_update_only_non_completed"
             android:title="@string/pref_update_only_non_completed" />
 
     </PreferenceScreen>
diff --git a/app/src/main/res/xml/pref_reader.xml b/app/src/main/res/xml/pref_reader.xml
index 1b3f53edd..aefdf7335 100644
--- a/app/src/main/res/xml/pref_reader.xml
+++ b/app/src/main/res/xml/pref_reader.xml
@@ -55,29 +55,21 @@
             android:summary="%s" />
 
         <SwitchPreference
-            android:textOff="@string/pref_fullscreen"
-            android:textOn="@string/pref_fullscreen"
             android:title="@string/pref_fullscreen"
             android:key="@string/pref_fullscreen_key"
             android:defaultValue="true" />
 
         <SwitchPreference
-            android:textOff="@string/pref_enable_transitions"
-            android:textOn="@string/pref_enable_transitions"
             android:title="@string/pref_enable_transitions"
             android:key="@string/pref_enable_transitions_key"
             android:defaultValue="true" />
 
         <SwitchPreference
-            android:textOff="@string/pref_show_page_number"
-            android:textOn="@string/pref_show_page_number"
             android:title="@string/pref_show_page_number"
             android:key="@string/pref_show_page_number_key"
             android:defaultValue="true" />
 
         <SwitchPreference
-            android:textOff="@string/pref_keep_screen_on"
-            android:textOn="@string/pref_keep_screen_on"
             android:title="@string/pref_keep_screen_on"
             android:key="@string/pref_keep_screen_on_key"
             android:defaultValue="true" />
@@ -86,15 +78,11 @@
             android:title="@string/pref_reader_navigation">
 
             <SwitchPreference
-                android:textOff="@string/pref_read_with_tapping"
-                android:textOn="@string/pref_read_with_tapping"
                 android:title="@string/pref_read_with_tapping"
                 android:key="@string/pref_read_with_tapping_key"
                 android:defaultValue="true" />
 
             <SwitchPreference
-                android:textOff="@string/pref_read_with_volume_keys"
-                android:textOn="@string/pref_read_with_volume_keys"
                 android:title="@string/pref_read_with_volume_keys"
                 android:key="@string/pref_read_with_volume_keys_key"
                 android:defaultValue="false" />
diff --git a/app/src/main/res/xml/pref_sync.xml b/app/src/main/res/xml/pref_sync.xml
index 27f0b599a..885f34eb4 100644
--- a/app/src/main/res/xml/pref_sync.xml
+++ b/app/src/main/res/xml/pref_sync.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
     <PreferenceScreen
         android:key="sync_screen"
@@ -10,21 +9,18 @@
         <SwitchPreference
             android:key="@string/pref_auto_update_manga_sync_key"
             android:title="@string/pref_auto_update_manga_sync"
-            android:defaultValue="true"
-            app:showText="false"/>
+            android:defaultValue="true" />
 
         <SwitchPreference
             android:key="@string/pref_ask_update_manga_sync_key"
             android:title="@string/pref_ask_update_manga_sync"
             android:defaultValue="false"
-            android:dependency="@string/pref_auto_update_manga_sync_key"
-            app:showText="false"/>
+            android:dependency="@string/pref_auto_update_manga_sync_key" />
 
         <PreferenceCategory
             android:key="@string/pref_category_manga_sync_accounts_key"
             android:title="@string/services"
-            android:persistent="false"
-            app:showText="false"/>
+            android:persistent="false" />
 
     </PreferenceScreen>