diff --git a/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java
index 168e63d42..15acf7a91 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java
@@ -187,6 +187,8 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
 
     private int mSavingPage = -1;
 
+    private static int defaultNightMode = DayNightDelegate.MODE_NIGHT_UNSPECIFIED;
+
     ActivityResultLauncher<String> requestStoragePermissionLauncher = registerForActivityResult(
             new ActivityResultContracts.RequestPermission(),
             result -> {
@@ -303,9 +305,10 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
 
     @Override
     protected void attachBaseContext(@NonNull Context newBase) {
+        if (defaultNightMode == DayNightDelegate.MODE_NIGHT_UNSPECIFIED) defaultNightMode = DayNightDelegate.getDefaultNightMode();
         switch (Settings.getReadTheme()) {
             case 0:
-                DayNightDelegate.setDefaultNightMode(Settings.getTheme());
+                DayNightDelegate.setDefaultNightMode(defaultNightMode);
                 break;
             case 1:
                 DayNightDelegate.setDefaultNightMode(DayNightDelegate.MODE_NIGHT_YES);
@@ -319,7 +322,8 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
 
     @Override
     public void finish() {
-        DayNightDelegate.setDefaultNightMode(Settings.getTheme());
+        DayNightDelegate.setDefaultNightMode(defaultNightMode);
+        defaultNightMode = DayNightDelegate.MODE_NIGHT_UNSPECIFIED;
         super.finish();
     }
 
@@ -393,23 +397,15 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
             mShowSystemUi = false;
         } else {
             Window window = getWindow();
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                View decorView = window.getDecorView();
-                int flags = decorView.getSystemUiVisibility();
-                if ((getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_YES) <= 0) {
-                    flags |= View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR;
-                } else {
-                    flags &= ~View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR;
-                }
-                decorView.setSystemUiVisibility(flags);
-                window.setStatusBarColor(AttrResources.getAttrColor(this, android.R.attr.colorBackground));
+            View decorView = window.getDecorView();
+            int flags = decorView.getSystemUiVisibility();
+            if ((getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_YES) <= 0) {
+                flags |= View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR;
             } else {
-                if ((getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_YES) <= 0) {
-                    window.setStatusBarColor(AttrResources.getAttrColor(this, R.attr.colorPrimaryDark));
-                } else {
-                    window.setStatusBarColor(AttrResources.getAttrColor(this, android.R.attr.colorBackground));
-                }
+                flags &= ~View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR;
             }
+            decorView.setSystemUiVisibility(flags);
+            window.setStatusBarColor(AttrResources.getAttrColor(this, android.R.attr.colorBackground));
         }
 
         mMaskView = (ColorView) ViewUtils.$$(this, R.id.mask);
diff --git a/app/src/main/res/layout/dialog_add_filter.xml b/app/src/main/res/layout/dialog_add_filter.xml
index cdc022a05..792400a09 100644
--- a/app/src/main/res/layout/dialog_add_filter.xml
+++ b/app/src/main/res/layout/dialog_add_filter.xml
@@ -18,9 +18,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingLeft="?attr/dialogPreferredPadding"
     android:paddingTop="@dimen/abc_dialog_padding_top_material"
-    android:paddingRight="?attr/dialogPreferredPadding">
+    android:paddingHorizontal="?attr/dialogPreferredPadding">
 
     <com.hippo.widget.CuteSpinner
         android:id="@+id/spinner"
diff --git a/app/src/main/res/layout/dialog_gallery_menu.xml b/app/src/main/res/layout/dialog_gallery_menu.xml
index d30ab3c2a..83ea31f44 100644
--- a/app/src/main/res/layout/dialog_gallery_menu.xml
+++ b/app/src/main/res/layout/dialog_gallery_menu.xml
@@ -14,208 +14,195 @@
   ~ limitations under the License.
   -->
 
-<com.hippo.widget.IndicatingScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/Indicating"
+<rikka.widget.borderview.BorderNestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:paddingTop="@dimen/abc_dialog_padding_top_material"
+        android:paddingHorizontal="?dialogPreferredPadding"
+        android:divider="@drawable/spacer_keyline"
         android:orientation="vertical"
-        android:padding="@dimen/keyline_margin">
+        android:showDividers="middle">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:divider="@drawable/spacer_keyline"
-            android:orientation="vertical"
-            android:showDividers="middle">
+            android:orientation="horizontal">
 
-            <LinearLayout
-                android:layout_width="match_parent"
+            <TextView
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal">
+                android:layout_gravity="center_vertical"
+                android:layout_weight="1"
+                android:text="@string/settings_read_screen_rotation"
+                android:textColor="?android:attr/textColorPrimary" />
 
-                <TextView
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_weight="1"
-                    android:text="@string/settings_read_screen_rotation"
-                    android:textColor="?android:attr/textColorPrimary" />
-
-                <com.hippo.widget.CuteSpinner
-                    android:id="@+id/screen_rotation"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_weight="2"
-                    android:entries="@array/screen_rotation_entries" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
+            <com.hippo.widget.CuteSpinner
+                android:id="@+id/screen_rotation"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal">
+                android:layout_gravity="center_vertical"
+                android:layout_weight="2"
+                android:entries="@array/screen_rotation_entries" />
 
-                <TextView
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_weight="1"
-                    android:text="@string/settings_read_reading_direction"
-                    android:textColor="?android:attr/textColorPrimary" />
-
-                <com.hippo.widget.CuteSpinner
-                    android:id="@+id/reading_direction"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_weight="2"
-                    android:entries="@array/reading_direction_entries" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_weight="1"
-                    android:text="@string/settings_read_page_scaling"
-                    android:textColor="?android:attr/textColorPrimary" />
-
-                <com.hippo.widget.CuteSpinner
-                    android:id="@+id/page_scaling"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_weight="2"
-                    android:entries="@array/page_scaling_entries" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_weight="1"
-                    android:text="@string/settings_read_start_position"
-                    android:textColor="?android:attr/textColorPrimary" />
-
-                <com.hippo.widget.CuteSpinner
-                    android:id="@+id/start_position"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_weight="2"
-                    android:entries="@array/start_position_entries" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_weight="1"
-                    android:text="@string/read_theme"
-                    android:textColor="?android:attr/textColorPrimary" />
-
-                <com.hippo.widget.CuteSpinner
-                    android:id="@+id/read_theme"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_weight="2"
-                    android:entries="@array/read_theme_entries" />
-
-            </LinearLayout>
         </LinearLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingTop="@dimen/keyline_margin"
-            android:orientation="vertical">
+            android:orientation="horizontal">
 
-            <Switch
-                android:id="@+id/keep_screen_on"
-                android:layout_width="match_parent"
+            <TextView
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:text="@string/settings_read_keep_screen_on"
+                android:layout_gravity="center_vertical"
+                android:layout_weight="1"
+                android:text="@string/settings_read_reading_direction"
                 android:textColor="?android:attr/textColorPrimary" />
 
-            <Switch
-                android:id="@+id/show_clock"
-                android:layout_width="match_parent"
+            <com.hippo.widget.CuteSpinner
+                android:id="@+id/reading_direction"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:text="@string/settings_read_show_clock"
-                android:textColor="?android:attr/textColorPrimary" />
-
-            <Switch
-                android:id="@+id/show_progress"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/settings_read_show_progress"
-                android:textColor="?android:attr/textColorPrimary" />
-
-            <Switch
-                android:id="@+id/show_battery"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/settings_read_show_battery"
-                android:textColor="?android:attr/textColorPrimary" />
-
-            <Switch
-                android:id="@+id/show_page_interval"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/settings_read_show_page_interval"
-                android:textColor="?android:attr/textColorPrimary" />
-
-            <Switch
-                android:id="@+id/volume_page"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/settings_read_volume_page"
-                android:textColor="?android:attr/textColorPrimary" />
-
-            <Switch
-                android:id="@+id/reading_fullscreen"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/settings_read_reading_fullscreen"
-                android:textColor="?android:attr/textColorPrimary" />
-
-            <Switch
-                android:id="@+id/custom_screen_lightness"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/settings_read_custom_screen_lightness"
-                android:textColor="?android:attr/textColorPrimary" />
-
-            <SeekBar
-                android:id="@+id/screen_lightness"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:max="200" />
+                android:layout_gravity="center_vertical"
+                android:layout_weight="2"
+                android:entries="@array/reading_direction_entries" />
 
         </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_weight="1"
+                android:text="@string/settings_read_page_scaling"
+                android:textColor="?android:attr/textColorPrimary" />
+
+            <com.hippo.widget.CuteSpinner
+                android:id="@+id/page_scaling"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_weight="2"
+                android:entries="@array/page_scaling_entries" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_weight="1"
+                android:text="@string/settings_read_start_position"
+                android:textColor="?android:attr/textColorPrimary" />
+
+            <com.hippo.widget.CuteSpinner
+                android:id="@+id/start_position"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_weight="2"
+                android:entries="@array/start_position_entries" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_weight="1"
+                android:text="@string/read_theme"
+                android:textColor="?android:attr/textColorPrimary" />
+
+            <com.hippo.widget.CuteSpinner
+                android:id="@+id/read_theme"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_weight="2"
+                android:entries="@array/read_theme_entries" />
+
+        </LinearLayout>
+
+        <Switch
+            android:id="@+id/keep_screen_on"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/settings_read_keep_screen_on"
+            android:textColor="?android:attr/textColorPrimary" />
+
+        <Switch
+            android:id="@+id/show_clock"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/settings_read_show_clock"
+            android:textColor="?android:attr/textColorPrimary" />
+
+        <Switch
+            android:id="@+id/show_progress"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/settings_read_show_progress"
+            android:textColor="?android:attr/textColorPrimary" />
+
+        <Switch
+            android:id="@+id/show_battery"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/settings_read_show_battery"
+            android:textColor="?android:attr/textColorPrimary" />
+
+        <Switch
+            android:id="@+id/show_page_interval"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/settings_read_show_page_interval"
+            android:textColor="?android:attr/textColorPrimary" />
+
+        <Switch
+            android:id="@+id/volume_page"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/settings_read_volume_page"
+            android:textColor="?android:attr/textColorPrimary" />
+
+        <Switch
+            android:id="@+id/reading_fullscreen"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/settings_read_reading_fullscreen"
+            android:textColor="?android:attr/textColorPrimary" />
+
+        <Switch
+            android:id="@+id/custom_screen_lightness"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/settings_read_custom_screen_lightness"
+            android:textColor="?android:attr/textColorPrimary" />
+
+        <SeekBar
+            android:id="@+id/screen_lightness"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:max="200" />
+
     </LinearLayout>
-</com.hippo.widget.IndicatingScrollView>
+</rikka.widget.borderview.BorderNestedScrollView>
diff --git a/app/src/main/res/layout/dialog_go_to.xml b/app/src/main/res/layout/dialog_go_to.xml
index f135375fb..263e7b597 100644
--- a/app/src/main/res/layout/dialog_go_to.xml
+++ b/app/src/main/res/layout/dialog_go_to.xml
@@ -18,9 +18,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="horizontal"
-    android:paddingLeft="16dp"
-    android:paddingTop="16dp"
-    android:paddingRight="16dp">
+    android:paddingTop="@dimen/abc_dialog_padding_top_material"
+    android:paddingHorizontal="?attr/dialogPreferredPadding">
 
     <TextView
         android:id="@+id/start"
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 9e0b94bcf..139c3d6ea 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -65,9 +65,7 @@
         <item name="colorAccent">@color/colorPrimary</item>
         <item name="colorControlActivated">@color/colorPrimary</item>
 
-        <item name="android:windowBackground">@color/grey_850</item>
         <item name="android:colorBackground">@color/grey_850</item>
-        <item name="colorBackgroundFloating">@color/grey_850</item>
 
         <item name="colorEdgeEffect">@color/grey_500</item>
         <item name="dividerColor">@color/divider</item>
@@ -112,12 +110,10 @@
     <style name="ThemeOverlay.Black">
         <item name="colorPrimaryDark">@android:color/black</item>
 
-        <item name="android:windowBackground">@android:color/black</item>
         <item name="android:colorBackground">@android:color/black</item>
 
         <item name="android:textColorPrimary">@color/primary_text_material_black</item>
 
-        <item name="colorEdgeEffect">@color/grey_500</item>
         <item name="dividerColor">@color/divider_black</item>
         <item name="toolbarColor">@android:color/black</item>
         <item name="colorControlNormal">@color/primary_drawable_black</item>