diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/lang/RxCoroutineBridge.kt b/app/src/main/java/eu/kanade/tachiyomi/util/lang/RxCoroutineBridge.kt
index 19cb1886e..ba35b24e5 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/util/lang/RxCoroutineBridge.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/util/lang/RxCoroutineBridge.kt
@@ -41,7 +41,7 @@ private suspend fun <T> Observable<T>.awaitOne(): T = suspendCancellableCoroutin
                 }
 
                 override fun onError(e: Throwable) {
-                /*
+/*
                        * Rx1 observable throws NoSuchElementException if cancellation happened before
                        * element emission. To mitigate this we try to atomically resume continuation with exception:
                        * if resume failed, then we know that continuation successfully cancelled itself
diff --git a/app/src/main/res/layout/reader_general_settings.xml b/app/src/main/res/layout/reader_general_settings.xml
index 4886aebb8..a5690708c 100644
--- a/app/src/main/res/layout/reader_general_settings.xml
+++ b/app/src/main/res/layout/reader_general_settings.xml
@@ -3,11 +3,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="wrap_content">
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:orientation="vertical">
 
         <eu.kanade.tachiyomi.ui.reader.setting.SpinnerPreference
diff --git a/app/src/main/res/layout/reader_pager_settings.xml b/app/src/main/res/layout/reader_pager_settings.xml
index 2223caeb3..e323e47fc 100644
--- a/app/src/main/res/layout/reader_pager_settings.xml
+++ b/app/src/main/res/layout/reader_pager_settings.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:orientation="vertical">
 
     <TextView
diff --git a/app/src/main/res/layout/reader_reading_mode_settings.xml b/app/src/main/res/layout/reader_reading_mode_settings.xml
index 6d634a546..6b68a18ae 100644
--- a/app/src/main/res/layout/reader_reading_mode_settings.xml
+++ b/app/src/main/res/layout/reader_reading_mode_settings.xml
@@ -3,11 +3,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="wrap_content">
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:orientation="vertical">
 
         <eu.kanade.tachiyomi.ui.reader.setting.SpinnerPreference
diff --git a/app/src/main/res/layout/reader_webtoon_settings.xml b/app/src/main/res/layout/reader_webtoon_settings.xml
index 9875f812b..e50355d48 100644
--- a/app/src/main/res/layout/reader_webtoon_settings.xml
+++ b/app/src/main/res/layout/reader_webtoon_settings.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:orientation="vertical">
 
     <TextView