diff --git a/app/src/main/java/com/hippo/preference/FixedSwitchPreference.java b/app/src/main/java/com/hippo/preference/SwitchPreference.java
similarity index 84%
rename from app/src/main/java/com/hippo/preference/FixedSwitchPreference.java
rename to app/src/main/java/com/hippo/preference/SwitchPreference.java
index e1a6cc951..b3ae7578a 100644
--- a/app/src/main/java/com/hippo/preference/FixedSwitchPreference.java
+++ b/app/src/main/java/com/hippo/preference/SwitchPreference.java
@@ -33,7 +33,7 @@ import com.hippo.ehviewer.R;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
-public class FixedSwitchPreference extends TwoStatePreference {
+public class SwitchPreference extends TwoStatePreference {
 
     private static Method sSyncSummaryViewMethod;
 
@@ -63,38 +63,39 @@ public class FixedSwitchPreference extends TwoStatePreference {
                 return;
             }
 
-            FixedSwitchPreference.this.setChecked(isChecked);
+            SwitchPreference.this.setChecked(isChecked);
         }
     }
 
-    public FixedSwitchPreference(Context context) {
+    public SwitchPreference(Context context) {
         super(context);
         init(context, null, 0, 0);
     }
 
-    public FixedSwitchPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
+    public SwitchPreference(Context context, AttributeSet attrs) {
+        super(context, attrs, android.R.attr.preferenceStyle);
         init(context, attrs, 0, 0);
     }
 
-    public FixedSwitchPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+    public SwitchPreference(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
         init(context, attrs, defStyleAttr, 0);
     }
 
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
-    public FixedSwitchPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+    public SwitchPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
         init(context, attrs, defStyleAttr, defStyleRes);
     }
 
     public void init(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.FixedSwitchPreference, defStyleAttr, defStyleRes);
-        setSummaryOn(a.getString(R.styleable.FixedSwitchPreference_summaryOn));
-        setSummaryOff(a.getString(R.styleable.FixedSwitchPreference_summaryOff));
-        setSwitchTextOn(a.getString(R.styleable.FixedSwitchPreference_switchTextOn));
-        setSwitchTextOff(a.getString(R.styleable.FixedSwitchPreference_switchTextOff));
-        setDisableDependentsState(a.getBoolean(R.styleable.FixedSwitchPreference_disableDependentsState, false));
+        setWidgetLayoutResource(R.layout.preference_widget_fixed_switch);
+        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.SwitchPreference, defStyleAttr, defStyleRes);
+        setSummaryOn(a.getString(R.styleable.SwitchPreference_summaryOn));
+        setSummaryOff(a.getString(R.styleable.SwitchPreference_summaryOff));
+        setSwitchTextOn(a.getString(R.styleable.SwitchPreference_switchTextOn));
+        setSwitchTextOff(a.getString(R.styleable.SwitchPreference_switchTextOff));
+        setDisableDependentsState(a.getBoolean(R.styleable.SwitchPreference_disableDependentsState, false));
         a.recycle();
     }
 
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 719381c07..b056cede2 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -88,7 +88,7 @@
         <attr name="dark" format="boolean"/>
     </declare-styleable>
 
-    <declare-styleable name="FixedSwitchPreference">
+    <declare-styleable name="SwitchPreference">
         <!-- The summary for the Preference in a PreferenceActivity screen when the
              SwitchPreference is checked. If separate on/off summaries are not
              needed, the summary attribute can be used instead. -->
diff --git a/app/src/main/res/xml/about_settings.xml b/app/src/main/res/xml/about_settings.xml
index f2024c9f5..7e6e4ae5b 100644
--- a/app/src/main/res/xml/about_settings.xml
+++ b/app/src/main/res/xml/about_settings.xml
@@ -46,9 +46,7 @@
         android:key="donate"
         android:title="@string/settings_about_donate"/>
 
-    <com.hippo.preference.FixedSwitchPreference
-        style="?android:attr/preferenceStyle"
-        android:widgetLayout="@layout/preference_widget_fixed_switch"
+    <com.hippo.preference.SwitchPreference
         android:key="enable_analytics"
         android:title="@string/settings_about_enable_analytics"
         android:defaultValue="true"/>
@@ -65,9 +63,7 @@
         android:key="check_for_updates"
         android:title="@string/settings_about_check_for_updates"/>
 
-    <com.hippo.preference.FixedSwitchPreference
-        style="?android:attr/preferenceStyle"
-        android:widgetLayout="@layout/preference_widget_fixed_switch"
+    <com.hippo.preference.SwitchPreference
         android:key="beta_update_channel"
         android:title="@string/settings_about_beta_update_channel"
         android:defaultValue="@bool/beta"/>
diff --git a/app/src/main/res/xml/advanced_settings.xml b/app/src/main/res/xml/advanced_settings.xml
index 3b71b3709..2f169f97d 100644
--- a/app/src/main/res/xml/advanced_settings.xml
+++ b/app/src/main/res/xml/advanced_settings.xml
@@ -18,9 +18,7 @@
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <com.hippo.preference.FixedSwitchPreference
-        style="?android:attr/preferenceStyle"
-        android:widgetLayout="@layout/preference_widget_fixed_switch"
+    <com.hippo.preference.SwitchPreference
         android:key="save_parse_error_body"
         android:title="@string/settings_about_save_parse_error_body"
         android:summary="@string/settings_about_save_parse_error_body_summary"
diff --git a/app/src/main/res/xml/eh_settings.xml b/app/src/main/res/xml/eh_settings.xml
index 075c8af53..dcf1b16a6 100644
--- a/app/src/main/res/xml/eh_settings.xml
+++ b/app/src/main/res/xml/eh_settings.xml
@@ -19,9 +19,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <com.hippo.preference.FixedSwitchPreference
-        style="?android:attr/preferenceStyle"
-        android:widgetLayout="@layout/preference_widget_fixed_switch"
+    <com.hippo.preference.SwitchPreference
         android:key="show_jpn_title"
         android:title="@string/settings_eh_show_jpn_title"
         app:summaryOn="@string/settings_eh_show_jpn_title_summary_on"
diff --git a/app/src/main/res/xml/read_settings.xml b/app/src/main/res/xml/read_settings.xml
index dc118f15b..e0ae245c1 100644
--- a/app/src/main/res/xml/read_settings.xml
+++ b/app/src/main/res/xml/read_settings.xml
@@ -42,30 +42,22 @@
         android:entryValues="@array/start_position_values"
         android:defaultValue="1"/>
 
-    <com.hippo.preference.FixedSwitchPreference
-        style="?android:attr/preferenceStyle"
-        android:widgetLayout="@layout/preference_widget_fixed_switch"
+    <com.hippo.preference.SwitchPreference
         android:key="keep_screen_on"
         android:title="@string/settings_read_keep_screen_on"
         android:defaultValue="false" />
 
-    <com.hippo.preference.FixedSwitchPreference
-        style="?android:attr/preferenceStyle"
-        android:widgetLayout="@layout/preference_widget_fixed_switch"
+    <com.hippo.preference.SwitchPreference
         android:key="gallery_show_clock"
         android:title="@string/settings_read_show_clock"
         android:defaultValue="true"/>
 
-    <com.hippo.preference.FixedSwitchPreference
-        style="?android:attr/preferenceStyle"
-        android:widgetLayout="@layout/preference_widget_fixed_switch"
+    <com.hippo.preference.SwitchPreference
         android:key="gallery_show_battery"
         android:title="@string/settings_read_show_battery"
         android:defaultValue="true"/>
 
-    <com.hippo.preference.FixedSwitchPreference
-        style="?android:attr/preferenceStyle"
-        android:widgetLayout="@layout/preference_widget_fixed_switch"
+    <com.hippo.preference.SwitchPreference
         android:key="volume_page"
         android:title="@string/settings_read_volume_page"
         android:defaultValue="false"/>