diff --git a/app/src/main/res/layout-w600dp/activity_settings.xml b/app/src/main/res/layout-w600dp/activity_settings.xml
index 2a11422ce..3b6db9d0b 100644
--- a/app/src/main/res/layout-w600dp/activity_settings.xml
+++ b/app/src/main/res/layout-w600dp/activity_settings.xml
@@ -8,33 +8,33 @@
 
 	<com.google.android.material.appbar.AppBarLayout
 		android:id="@+id/appbar"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintTop_toTopOf="parent"
+		style="@style/Widget.Kotatsu.AppBar"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		app:elevation="0dp"
-		style="@style/Widget.Kotatsu.AppBar">
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent">
 
 		<com.google.android.material.appbar.MaterialToolbar
 			android:id="@id/toolbar"
+			style="@style/Widget.Kotatsu.Toolbar"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			app:layout_scrollFlags="scroll|enterAlways"
-			style="@style/Widget.Kotatsu.Toolbar" />
+			app:layout_scrollFlags="scroll|enterAlways" />
 
 	</com.google.android.material.appbar.AppBarLayout>
 
 	<com.google.android.material.card.MaterialCardView
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintBottom_toBottomOf="parent"
-		app:layout_constraintTop_toBottomOf="@id/appbar"
-		app:layout_constraintWidth_percent="0.6"
+		android:layout_width="0dp"
+		android:layout_height="0dp"
 		android:layout_marginTop="12dp"
 		android:layout_marginBottom="12dp"
-		android:layout_width="0dp"
-		android:layout_height="0dp">
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@id/appbar"
+		app:layout_constraintWidth_percent="0.6">
 
 		<androidx.fragment.app.FragmentContainerView
 			android:id="@id/container"
diff --git a/app/src/main/res/layout/activity_protect.xml b/app/src/main/res/layout/activity_protect.xml
index b17229948..28cc9060b 100644
--- a/app/src/main/res/layout/activity_protect.xml
+++ b/app/src/main/res/layout/activity_protect.xml
@@ -36,6 +36,7 @@
 
 	<com.google.android.material.textfield.TextInputLayout
 		android:id="@+id/layout_password"
+		style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:layout_marginTop="30dp"
diff --git a/app/src/main/res/layout/activity_setup_protect.xml b/app/src/main/res/layout/activity_setup_protect.xml
index 7f3aae3c8..e061e7139 100644
--- a/app/src/main/res/layout/activity_setup_protect.xml
+++ b/app/src/main/res/layout/activity_setup_protect.xml
@@ -36,6 +36,7 @@
 
 	<com.google.android.material.textfield.TextInputLayout
 		android:id="@+id/layout_password"
+		style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:layout_marginTop="30dp"
diff --git a/app/src/main/res/layout/dialog_favorite_categories.xml b/app/src/main/res/layout/dialog_favorite_categories.xml
index 064a9a733..469cd6f7f 100644
--- a/app/src/main/res/layout/dialog_favorite_categories.xml
+++ b/app/src/main/res/layout/dialog_favorite_categories.xml
@@ -9,9 +9,9 @@
 
 	<TextView
 		style="@style/MaterialAlertDialog.MaterialComponents.Title.Text"
-		android:padding="16dp"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
+		android:padding="16dp"
 		android:text="@string/add_to_favourites" />
 
 	<View
@@ -24,8 +24,8 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:orientation="vertical"
-		android:scrollbars="vertical"
 		android:overScrollMode="never"
+		android:scrollbars="vertical"
 		app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
 		tools:listitem="@layout/item_category_checkable" />
 
diff --git a/app/src/main/res/layout/item_page.xml b/app/src/main/res/layout/item_page.xml
index cf4798de0..281625e76 100644
--- a/app/src/main/res/layout/item_page.xml
+++ b/app/src/main/res/layout/item_page.xml
@@ -3,9 +3,9 @@
 	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:background="?android:windowBackground"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent"
+	android:background="?android:windowBackground">
 
 	<com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
 		android:id="@+id/ssiv"
@@ -37,8 +37,8 @@
 			android:drawablePadding="12dp"
 			android:gravity="center_horizontal"
 			android:textAppearance="@style/TextAppearance.AppCompat.Small"
-			tools:text="@tools:sample/lorem[6]"
-			app:drawableTopCompat="@drawable/ic_error_large" />
+			app:drawableTopCompat="@drawable/ic_error_large"
+			tools:text="@tools:sample/lorem[6]" />
 
 		<com.google.android.material.button.MaterialButton
 			android:id="@+id/button_retry"
diff --git a/app/src/main/res/layout/item_source_config.xml b/app/src/main/res/layout/item_source_config.xml
index 69e2815f3..21a2bb0d9 100644
--- a/app/src/main/res/layout/item_source_config.xml
+++ b/app/src/main/res/layout/item_source_config.xml
@@ -4,7 +4,6 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="?android:listPreferredItemHeightSmall"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:background="?android:windowBackground"
 	android:gravity="center_vertical"
 	android:orientation="horizontal">
@@ -32,7 +31,7 @@
 	<com.google.android.material.switchmaterial.SwitchMaterial
 		android:id="@+id/switch_toggle"
 		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"/>
+		android:layout_height="wrap_content" />
 
 	<ImageView
 		android:id="@+id/imageView_config"
diff --git a/app/src/main/res/layout/sheet_pages.xml b/app/src/main/res/layout/sheet_pages.xml
index 74573b6c2..2552723d5 100644
--- a/app/src/main/res/layout/sheet_pages.xml
+++ b/app/src/main/res/layout/sheet_pages.xml
@@ -43,6 +43,7 @@
 		android:id="@+id/recyclerView"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
+		android:clipToPadding="false"
 		android:padding="@dimen/grid_spacing"
 		android:scrollbars="vertical"
 		app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"