diff --git a/app/src/main/res/layout/item_recent_chapter_section.xml b/app/src/main/res/layout/item_recent_chapter_section.xml
index 81a654fac..0bf14dd38 100644
--- a/app/src/main/res/layout/item_recent_chapter_section.xml
+++ b/app/src/main/res/layout/item_recent_chapter_section.xml
@@ -18,7 +18,6 @@
         android:textColor="@color/white"
         android:textSize="16sp"
         android:id="@+id/section_text"
-        android:text="asd"
         android:layout_gravity="center_vertical"
         android:textStyle="bold" />
 
diff --git a/app/src/main/res/xml/pref_about.xml b/app/src/main/res/xml/pref_about.xml
index a5a4574f6..e6c2d00c2 100644
--- a/app/src/main/res/xml/pref_about.xml
+++ b/app/src/main/res/xml/pref_about.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <CheckBoxPreference
+    <SwitchPreference
         android:key="acra.enable"
         android:title="@string/pref_enable_acra"
         android:summary="@string/pref_acra_summary"
diff --git a/app/src/main/res/xml/pref_downloads.xml b/app/src/main/res/xml/pref_downloads.xml
index 38d211a8b..ee85035d2 100644
--- a/app/src/main/res/xml/pref_downloads.xml
+++ b/app/src/main/res/xml/pref_downloads.xml
@@ -5,7 +5,7 @@
         android:title="@string/pref_download_directory"
         android:key="@string/pref_download_directory_key"/>
 
-    <CheckBoxPreference
+    <SwitchPreference
         android:title="@string/pref_download_only_over_wifi"
         android:key="@string/pref_download_only_over_wifi_key"
         android:defaultValue="true"/>
diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml
index e5d2b10ab..ca40329ac 100644
--- a/app/src/main/res/xml/pref_general.xml
+++ b/app/src/main/res/xml/pref_general.xml
@@ -14,17 +14,17 @@
         android:defaultValue="0"
         android:summary="%s"/>
 
-    <CheckBoxPreference
+    <SwitchPreference
         android:key="@string/pref_update_only_non_completed_key"
         android:title="@string/pref_update_only_non_completed"
         android:defaultValue="false"/>
 
-    <CheckBoxPreference
+    <SwitchPreference
         android:key="@string/pref_auto_update_manga_sync_key"
         android:title="@string/pref_auto_update_manga_sync"
         android:defaultValue="true"/>
 
-    <CheckBoxPreference
+    <SwitchPreference
         android:key="@string/pref_ask_update_manga_sync_key"
         android:title="@string/pref_ask_update_manga_sync"
         android:defaultValue="false"
diff --git a/app/src/main/res/xml/pref_reader.xml b/app/src/main/res/xml/pref_reader.xml
index ac2c27945..cd5789f77 100644
--- a/app/src/main/res/xml/pref_reader.xml
+++ b/app/src/main/res/xml/pref_reader.xml
@@ -1,26 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <CheckBoxPreference android:title="@string/pref_hide_status_bar"
+    <SwitchPreference android:title="@string/pref_hide_status_bar"
         android:key="@string/pref_hide_status_bar_key"
         android:defaultValue="true" />
 
-    <CheckBoxPreference android:title="@string/pref_lock_orientation"
+    <SwitchPreference android:title="@string/pref_lock_orientation"
         android:key="@string/pref_lock_orientation_key"
         android:defaultValue="true" />
 
-    <CheckBoxPreference android:title="@string/pref_enable_transitions"
+    <SwitchPreference android:title="@string/pref_enable_transitions"
         android:key="@string/pref_enable_transitions_key"
         android:defaultValue="true" />
 
-    <CheckBoxPreference android:title="@string/pref_show_page_number"
+    <SwitchPreference android:title="@string/pref_show_page_number"
         android:key="@string/pref_show_page_number_key"
         android:defaultValue="true" />
 
-    <CheckBoxPreference android:title="@string/pref_custom_brightness"
-        android:key="@string/pref_custom_brightness_key"
-        android:defaultValue="false" />
-
     <eu.kanade.tachiyomi.widget.preference.IntListPreference
         android:title="@string/pref_viewer_type"
         android:key="@string/pref_default_viewer_key"