diff --git a/app/src/main/res/layout-land/reader_color_filter_sheet.xml b/app/src/main/res/layout-land/reader_color_filter_sheet.xml
index 4dc4bd9b0d..6df89dc7c6 100644
--- a/app/src/main/res/layout-land/reader_color_filter_sheet.xml
+++ b/app/src/main/res/layout-land/reader_color_filter_sheet.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/reader_activity.xml b/app/src/main/res/layout/reader_activity.xml
index c1b1fe1bb6..5948439b41 100644
--- a/app/src/main/res/layout/reader_activity.xml
+++ b/app/src/main/res/layout/reader_activity.xml
@@ -1,9 +1,9 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/reader_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:id="@+id/reader_layout"
     android:gravity="center">
 
     <FrameLayout
@@ -41,26 +41,27 @@
         android:background="@android:color/transparent"
         android:visibility="invisible"
         tools:visibility="visible">
+
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/appbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:theme="?attr/actionBarTheme"
             android:background="?attr/colorSecondary"
             android:stateListAnimator="@null"
+            android:theme="?attr/actionBarTheme"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="@android:color/transparent" />
+            <androidx.appcompat.widget.Toolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:background="@android:color/transparent" />
 
         </com.google.android.material.appbar.AppBarLayout>
 
-       <include layout="@layout/reader_chapters_sheet"/>
+        <include layout="@layout/reader_chapters_sheet" />
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
diff --git a/app/src/main/res/layout/reader_chapter_item.xml b/app/src/main/res/layout/reader_chapter_item.xml
index c57927aa9a..e838909501 100644
--- a/app/src/main/res/layout/reader_chapter_item.xml
+++ b/app/src/main/res/layout/reader_chapter_item.xml
@@ -4,9 +4,9 @@
     android:id="@+id/reader_chapter_layout"
     android:layout_width="match_parent"
     android:layout_height="60dp"
+    android:background="@drawable/list_item_selector"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintEnd_toEndOf="parent"
-    android:background="@drawable/list_item_selector"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toTopOf="parent">
 
@@ -59,6 +59,6 @@
             android:layout_height="30dp"
             android:layout_gravity="center"
             android:src="@drawable/ic_bookmark_border_24dp"
-            android:tint="?android:attr/textColorHint"/>
+            android:tint="?android:attr/textColorHint" />
     </FrameLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/reader_chapters_sheet.xml b/app/src/main/res/layout/reader_chapters_sheet.xml
index 128e90ecd1..f9c026643b 100644
--- a/app/src/main/res/layout/reader_chapters_sheet.xml
+++ b/app/src/main/res/layout/reader_chapters_sheet.xml
@@ -66,8 +66,8 @@
                 android:layout_width="100dp"
                 android:layout_height="match_parent"
                 android:gravity="center"
-                android:textSize="15sp"
                 android:textColor="?actionBarTintColor"
+                android:textSize="15sp"
                 tools:text="100 / 105" />
         </LinearLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/reader_color_filter.xml b/app/src/main/res/layout/reader_color_filter.xml
index cc6cd0b754..fa9248a9a0 100644
--- a/app/src/main/res/layout/reader_color_filter.xml
+++ b/app/src/main/res/layout/reader_color_filter.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/constraint_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
     android:padding="16dp">
 
     <androidx.legacy.widget.Space
@@ -20,9 +19,9 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:text="@string/use_custom_color_filter"
-        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <!-- Red filter -->
 
@@ -30,13 +29,13 @@
         android:id="@+id/seekbar_color_filter_red"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:max="255"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
+        android:max="255"
         android:padding="@dimen/material_component_text_fields_floating_label_padding_between_label_and_input_text"
-        app:layout_constraintTop_toBottomOf="@id/switch_color_filter"
+        app:layout_constraintEnd_toStartOf="@id/txt_color_filter_red_value"
         app:layout_constraintStart_toEndOf="@id/txt_color_filter_red_symbol"
-        app:layout_constraintEnd_toStartOf="@id/txt_color_filter_red_value" />
+        app:layout_constraintTop_toBottomOf="@id/switch_color_filter" />
 
     <TextView
         android:id="@+id/txt_color_filter_red_symbol"
@@ -44,9 +43,9 @@
         android:layout_height="wrap_content"
         android:text="@string/red_initial"
         android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary"
-        app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_red"
         app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_red"
-        app:layout_constraintStart_toStartOf="parent"/>
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_red" />
 
     <TextView
         android:id="@+id/txt_color_filter_red_value"
@@ -54,9 +53,9 @@
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
         android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary"
-        app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_red"
         app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_red"
-        app:layout_constraintEnd_toEndOf="parent"/>
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_red" />
 
     <!-- Green filter -->
 
@@ -64,13 +63,13 @@
         android:id="@+id/seekbar_color_filter_green"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:max="255"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
+        android:max="255"
         android:padding="@dimen/material_component_text_fields_floating_label_padding_between_label_and_input_text"
-        app:layout_constraintTop_toBottomOf="@id/seekbar_color_filter_red"
+        app:layout_constraintEnd_toStartOf="@id/txt_color_filter_green_value"
         app:layout_constraintStart_toEndOf="@id/txt_color_filter_green_symbol"
-        app:layout_constraintEnd_toStartOf="@id/txt_color_filter_green_value" />
+        app:layout_constraintTop_toBottomOf="@id/seekbar_color_filter_red" />
 
     <TextView
         android:id="@+id/txt_color_filter_green_symbol"
@@ -78,9 +77,9 @@
         android:layout_height="wrap_content"
         android:text="@string/green_initial"
         android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary"
-        app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_green"
         app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_green"
-        app:layout_constraintStart_toStartOf="parent"/>
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_green" />
 
     <TextView
         android:id="@+id/txt_color_filter_green_value"
@@ -88,9 +87,9 @@
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
         android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary"
-        app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_green"
         app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_green"
-        app:layout_constraintEnd_toEndOf="parent"/>
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_green" />
 
     <!-- Blue filter -->
 
@@ -98,13 +97,13 @@
         android:id="@+id/seekbar_color_filter_blue"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:max="255"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
+        android:max="255"
         android:padding="@dimen/material_component_text_fields_floating_label_padding_between_label_and_input_text"
-        app:layout_constraintTop_toBottomOf="@id/seekbar_color_filter_green"
+        app:layout_constraintEnd_toStartOf="@id/txt_color_filter_blue_value"
         app:layout_constraintStart_toEndOf="@id/txt_color_filter_blue_symbol"
-        app:layout_constraintEnd_toStartOf="@id/txt_color_filter_blue_value" />
+        app:layout_constraintTop_toBottomOf="@id/seekbar_color_filter_green" />
 
     <TextView
         android:id="@+id/txt_color_filter_blue_symbol"
@@ -112,9 +111,9 @@
         android:layout_height="wrap_content"
         android:text="@string/blue_initial"
         android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary"
-        app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_blue"
         app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_blue"
-        app:layout_constraintStart_toStartOf="parent"/>
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_blue" />
 
     <TextView
         android:id="@+id/txt_color_filter_blue_value"
@@ -122,9 +121,9 @@
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
         android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary"
-        app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_blue"
         app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_blue"
-        app:layout_constraintEnd_toEndOf="parent"/>
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_blue" />
 
     <!-- Alpha filter -->
 
@@ -132,13 +131,13 @@
         android:id="@+id/seekbar_color_filter_alpha"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:max="255"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
+        android:max="255"
         android:padding="@dimen/material_component_text_fields_floating_label_padding_between_label_and_input_text"
-        app:layout_constraintTop_toBottomOf="@id/seekbar_color_filter_blue"
+        app:layout_constraintEnd_toStartOf="@id/txt_color_filter_alpha_value"
         app:layout_constraintStart_toEndOf="@id/txt_color_filter_alpha_symbol"
-        app:layout_constraintEnd_toStartOf="@id/txt_color_filter_alpha_value" />
+        app:layout_constraintTop_toBottomOf="@id/seekbar_color_filter_blue" />
 
     <TextView
         android:id="@+id/txt_color_filter_alpha_symbol"
@@ -146,9 +145,9 @@
         android:layout_height="wrap_content"
         android:text="@string/alpha_initial"
         android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary"
-        app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_alpha"
         app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_alpha"
-        app:layout_constraintStart_toStartOf="parent"/>
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_alpha" />
 
     <TextView
         android:id="@+id/txt_color_filter_alpha_value"
@@ -156,9 +155,9 @@
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
         android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary"
-        app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_alpha"
         app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_alpha"
-        app:layout_constraintEnd_toEndOf="parent"/>
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_alpha" />
 
     <!-- Filter mode -->
 
@@ -167,9 +166,9 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:text="@string/color_filter_blend_mode"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBaseline_toBaselineOf="@id/color_filter_mode"
         app:layout_constraintEnd_toStartOf="@id/color_filter_mode"
-        app:layout_constraintBaseline_toBaselineOf="@id/color_filter_mode"/>
+        app:layout_constraintStart_toStartOf="parent" />
 
     <androidx.appcompat.widget.AppCompatSpinner
         android:id="@+id/color_filter_mode"
@@ -177,9 +176,9 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
         android:entries="@array/color_filter_modes"
-        app:layout_constraintTop_toBottomOf="@id/seekbar_color_filter_alpha"
+        app:layout_constraintEnd_toEndOf="@id/spinner_end"
         app:layout_constraintStart_toEndOf="@id/bottom_line"
-        app:layout_constraintEnd_toEndOf="@id/spinner_end" />
+        app:layout_constraintTop_toBottomOf="@id/seekbar_color_filter_alpha" />
 
     <!-- Brightness -->
 
@@ -189,7 +188,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
         android:text="@string/use_custom_brightness"
-        app:layout_constraintTop_toBottomOf="@id/color_filter_mode_text"/>
+        app:layout_constraintTop_toBottomOf="@id/color_filter_mode_text" />
 
     <!-- Brightness value -->
 
@@ -200,10 +199,10 @@
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
         android:padding="@dimen/material_component_text_fields_floating_label_padding_between_label_and_input_text"
-        app:layout_constraintTop_toBottomOf="@id/custom_brightness"
-        app:layout_constraintStart_toEndOf="@id/txt_brightness_seekbar_icon"
-        app:layout_constraintEnd_toStartOf="@id/txt_brightness_seekbar_value"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/txt_brightness_seekbar_value"
+        app:layout_constraintStart_toEndOf="@id/txt_brightness_seekbar_icon"
+        app:layout_constraintTop_toBottomOf="@id/custom_brightness"
         app:max_seek="100"
         app:min_seek="-75" />
 
@@ -213,19 +212,19 @@
         android:layout_height="wrap_content"
         android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary"
         android:tint="?android:attr/textColorSecondary"
-        app:srcCompat="@drawable/ic_brightness_5_black_24dp"
-        app:layout_constraintTop_toTopOf="@id/brightness_seekbar"
         app:layout_constraintBottom_toBottomOf="@id/brightness_seekbar"
-        app:layout_constraintStart_toStartOf="parent"/>
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/brightness_seekbar"
+        app:srcCompat="@drawable/ic_brightness_5_black_24dp" />
 
     <TextView
         android:id="@+id/txt_brightness_seekbar_value"
         android:layout_width="30dp"
         android:layout_height="wrap_content"
         android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary"
-        app:layout_constraintTop_toTopOf="@id/brightness_seekbar"
         app:layout_constraintBottom_toBottomOf="@id/brightness_seekbar"
-        app:layout_constraintEnd_toEndOf="parent"/>
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@id/brightness_seekbar" />
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/bottom_line"
diff --git a/app/src/main/res/layout/reader_page_sheet.xml b/app/src/main/res/layout/reader_page_sheet.xml
index 6d58ef28b3..420d7bea6f 100644
--- a/app/src/main/res/layout/reader_page_sheet.xml
+++ b/app/src/main/res/layout/reader_page_sheet.xml
@@ -1,35 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     style="@style/BottomSheetDialogTheme"
-    android:background="@drawable/bottom_sheet_rounded_background"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="@drawable/bottom_sheet_rounded_background"
     android:orientation="vertical">
 
     <LinearLayout
         android:id="@+id/set_as_cover_layout"
         android:layout_width="match_parent"
         android:layout_height="56dp"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
-        android:gravity="center"
         android:clickable="true"
         android:focusable="true"
-        android:foreground="?attr/selectableItemBackground">
+        android:foreground="?attr/selectableItemBackground"
+        android:gravity="center"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp">
 
         <ImageView
             android:layout_width="24dp"
             android:layout_height="24dp"
-            app:srcCompat="@drawable/ic_image_black_24dp"
-            android:tint="@color/md_white_1000_54"/>
+            android:tint="@color/md_white_1000_54"
+            app:srcCompat="@drawable/ic_image_black_24dp" />
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="32dp"
-            android:text="@string/set_as_cover"/>
+            android:text="@string/set_as_cover" />
 
     </LinearLayout>
 
@@ -37,23 +36,23 @@
         android:id="@+id/share_layout"
         android:layout_width="match_parent"
         android:layout_height="56dp"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
-        android:gravity="center"
         android:clickable="true"
         android:focusable="true"
-        android:foreground="?attr/selectableItemBackground">
+        android:foreground="?attr/selectableItemBackground"
+        android:gravity="center"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp">
 
         <ImageView
             android:layout_width="24dp"
             android:layout_height="24dp"
-            app:srcCompat="@drawable/ic_share_grey_24dp"/>
+            app:srcCompat="@drawable/ic_share_grey_24dp" />
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="32dp"
-            android:text="@string/share"/>
+            android:text="@string/share" />
 
     </LinearLayout>
 
@@ -61,24 +60,24 @@
         android:id="@+id/save_layout"
         android:layout_width="match_parent"
         android:layout_height="56dp"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
-        android:gravity="center"
         android:clickable="true"
         android:focusable="true"
-        android:foreground="?attr/selectableItemBackground">
+        android:foreground="?attr/selectableItemBackground"
+        android:gravity="center"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp">
 
         <ImageView
             android:layout_width="24dp"
             android:layout_height="24dp"
-            app:srcCompat="@drawable/ic_file_download_black_24dp"
-            android:tint="@color/md_white_1000_54"/>
+            android:tint="@color/md_white_1000_54"
+            app:srcCompat="@drawable/ic_file_download_black_24dp" />
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="32dp"
-            android:text="@string/save"/>
+            android:text="@string/save" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/reader_settings_sheet.xml b/app/src/main/res/layout/reader_settings_sheet.xml
index 00e85d8d8e..39865f0441 100644
--- a/app/src/main/res/layout/reader_settings_sheet.xml
+++ b/app/src/main/res/layout/reader_settings_sheet.xml
@@ -247,9 +247,9 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:text="@string/pref_webtoon_side_padding"
+                app:layout_constraintBaseline_toBaselineOf="@id/webtoon_side_padding"
                 app:layout_constraintEnd_toStartOf="@id/bottom_line"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintBaseline_toBaselineOf="@id/webtoon_side_padding"/>
+                app:layout_constraintStart_toStartOf="parent" />
 
             <androidx.appcompat.widget.AppCompatSpinner
                 android:id="@+id/webtoon_side_padding"
@@ -257,12 +257,12 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
                 android:layout_marginBottom="8dp"
-                app:layout_constraintEnd_toEndOf="@id/spinner_end"
-                app:layout_constraintStart_toEndOf="@id/bottom_line"
-                app:layout_constraintBottom_toBottomOf="parent"
                 android:entries="@array/webtoon_side_padding"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="@id/spinner_end"
                 app:layout_constraintRight_toRightOf="@id/spinner_end"
-                app:layout_constraintTop_toBottomOf="@id/crop_borders_webtoon"/>
+                app:layout_constraintStart_toEndOf="@id/bottom_line"
+                app:layout_constraintTop_toBottomOf="@id/crop_borders_webtoon" />
 
             <!-- Groups of preferences -->