diff --git a/app/src/main/res/layout/item_color_scheme.xml b/app/src/main/res/layout/item_color_scheme.xml
index d6f325151..dd45495cd 100644
--- a/app/src/main/res/layout/item_color_scheme.xml
+++ b/app/src/main/res/layout/item_color_scheme.xml
@@ -91,7 +91,7 @@
 		android:ellipsize="end"
 		android:paddingTop="4dp"
 		android:singleLine="true"
-		android:textAppearance="?attr/textAppearanceBodySmall"
+		android:textAppearance="?attr/textAppearanceTitleSmall"
 		android:textColor="?android:attr/textColorPrimary"
 		tools:text="@string/theme_name_miku" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/item_download_option.xml b/app/src/main/res/layout/item_download_option.xml
index b40694d2b..d57cf723f 100644
--- a/app/src/main/res/layout/item_download_option.xml
+++ b/app/src/main/res/layout/item_download_option.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <org.koitharu.kotatsu.core.ui.widgets.TwoLinesItemView
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/layout/item_empty_card.xml b/app/src/main/res/layout/item_empty_card.xml
index 5f02f59a9..7aa7348e5 100644
--- a/app/src/main/res/layout/item_empty_card.xml
+++ b/app/src/main/res/layout/item_empty_card.xml
@@ -26,7 +26,7 @@
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
 			android:layout_marginStart="@dimen/margin_small"
-			android:textAppearance="?attr/textAppearanceTitleLarge"
+			android:textAppearance="?attr/textAppearanceTitleMedium"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toEndOf="@id/icon"
 			app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/item_empty_hint.xml b/app/src/main/res/layout/item_empty_hint.xml
index eb3fe5f7d..03e30064c 100644
--- a/app/src/main/res/layout/item_empty_hint.xml
+++ b/app/src/main/res/layout/item_empty_hint.xml
@@ -22,7 +22,7 @@
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:layout_marginStart="@dimen/margin_small"
-		android:textAppearance="?attr/textAppearanceTitleLarge"
+		android:textAppearance="?attr/textAppearanceTitleMedium"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toEndOf="@id/icon"
 		app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/item_error_footer.xml b/app/src/main/res/layout/item_error_footer.xml
index a5675f32c..80e7cc0a0 100644
--- a/app/src/main/res/layout/item_error_footer.xml
+++ b/app/src/main/res/layout/item_error_footer.xml
@@ -3,38 +3,25 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
-	android:layout_height="@dimen/list_footer_height_outer"
+	android:layout_height="wrap_content"
 	android:background="?selectableItemBackground"
 	android:gravity="center"
-	android:orientation="horizontal"
+	android:minHeight="@dimen/list_footer_height_outer"
+	android:orientation="vertical"
 	android:padding="4dp">
 
-	<ImageView
-		android:id="@+id/imageView_icon"
+	<TextView
+		android:id="@+id/textView_title"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:contentDescription="@null"
-		tools:src="@drawable/ic_alert_outline" />
+		android:textAppearance="?attr/textAppearanceTitleSmall"
+		tools:text="@string/too_many_requests_message" />
 
-	<LinearLayout
+	<TextView
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_marginStart="8dp"
-		android:orientation="vertical">
+		android:layout_marginTop="2dp"
+		android:text="@string/tap_to_try_again"
+		android:textAppearance="?attr/textAppearanceBodySmall" />
 
-		<TextView
-			android:id="@+id/textView_title"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:textAppearance="?attr/textAppearanceBodyLarge"
-			tools:text="@string/error_occurred" />
-
-		<TextView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/tap_to_try_again"
-			android:textAppearance="?attr/textAppearanceBodySmall" />
-
-	</LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/item_error_state.xml b/app/src/main/res/layout/item_error_state.xml
index 3b8b62feb..a63563f79 100644
--- a/app/src/main/res/layout/item_error_state.xml
+++ b/app/src/main/res/layout/item_error_state.xml
@@ -17,7 +17,7 @@
 		android:drawablePadding="12dp"
 		android:gravity="center_horizontal"
 		android:textAlignment="center"
-		android:textAppearance="?attr/textAppearanceBodySmall"
+		android:textAppearance="?attr/textAppearanceBodyMedium"
 		app:drawableTopCompat="@drawable/ic_error_large"
 		tools:text="@tools:sample/lorem[6]" />
 
@@ -29,4 +29,4 @@
 		android:layout_marginTop="16dp"
 		android:text="@string/try_again" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/item_loading_footer.xml b/app/src/main/res/layout/item_loading_footer.xml
index f1237f529..3c971e277 100644
--- a/app/src/main/res/layout/item_loading_footer.xml
+++ b/app/src/main/res/layout/item_loading_footer.xml
@@ -3,7 +3,8 @@
 	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="@dimen/list_footer_height_outer">
+	android:layout_height="wrap_content"
+	android:minHeight="@dimen/list_footer_height_outer">
 
 	<com.google.android.material.progressindicator.CircularProgressIndicator
 		android:id="@+id/progressBar"
diff --git a/app/src/main/res/layout/item_shelf_section_draggable.xml b/app/src/main/res/layout/item_shelf_section_draggable.xml
deleted file mode 100644
index dbf7b22b8..000000000
--- a/app/src/main/res/layout/item_shelf_section_draggable.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:tools="http://schemas.android.com/tools"
-	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
-	android:background="?android:windowBackground"
-	android:gravity="center_vertical"
-	android:minHeight="58dp"
-	android:orientation="horizontal">
-
-	<ImageView
-		android:id="@+id/imageView_handle"
-		android:layout_width="wrap_content"
-		android:layout_height="match_parent"
-		android:paddingHorizontal="?listPreferredItemPaddingStart"
-		android:scaleType="center"
-		android:src="@drawable/ic_reorder_handle" />
-
-	<TextView
-		android:id="@+id/textView_title"
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		android:layout_weight="1"
-		android:ellipsize="end"
-		android:singleLine="true"
-		android:textAppearance="?attr/textAppearanceBodyLarge"
-		tools:text="@tools:sample/lorem[15]" />
-
-	<com.google.android.material.materialswitch.MaterialSwitch
-		android:id="@+id/switch_toggle"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:paddingHorizontal="?listPreferredItemPaddingEnd" />
-
-</LinearLayout>
diff --git a/app/src/main/res/layout/layout_app_update.xml b/app/src/main/res/layout/layout_app_update.xml
deleted file mode 100644
index d9b7525e7..000000000
--- a/app/src/main/res/layout/layout_app_update.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
-	android:id="@+id/card_update"
-	app:cardCornerRadius="21dp"
-	app:cardBackgroundColor="?attr/colorSurfaceContainerLow"
-	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
-	app:contentPadding="@dimen/margin_normal">
-
-	<androidx.constraintlayout.widget.ConstraintLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content">
-
-		<TextView
-			android:id="@+id/textPrimary"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:text="@string/app_update_available"
-			android:textAppearance="?attr/textAppearanceTitleLarge"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toTopOf="parent" />
-
-		<TextView
-			android:id="@+id/textSecondary"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="@dimen/margin_small"
-			android:text="@string/new_version_s"
-			android:textAppearance="?attr/textAppearanceBodyMedium"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@id/textPrimary" />
-
-		<Button
-			android:id="@+id/button_changelog"
-			style="@style/Widget.Material3.Button.TextButton"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="12dp"
-			android:layout_marginEnd="12dp"
-			android:text="@string/details"
-			app:layout_constraintEnd_toStartOf="@id/button_download"
-			app:layout_constraintTop_toBottomOf="@id/textSecondary" />
-
-		<Button
-			android:id="@+id/button_download"
-			style="@style/Widget.Material3.Button"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="12dp"
-			android:text="@string/download"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintTop_toBottomOf="@id/textSecondary" />
-
-	</androidx.constraintlayout.widget.ConstraintLayout>
-
-</com.google.android.material.card.MaterialCardView>