diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/NineMangaRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/NineMangaRepository.kt
index 6cd4d3823..7b4e0f7d7 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/NineMangaRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/NineMangaRepository.kt
@@ -203,7 +203,7 @@ abstract class NineMangaRepository(
 		return 0L
 	}
 
-	open class English(loaderContext: MangaLoaderContext) : NineMangaRepository(
+	class English(loaderContext: MangaLoaderContext) : NineMangaRepository(
 		loaderContext,
 		MangaSource.NINEMANGA_EN,
 		"www.ninemanga.com",
diff --git a/app/src/main/res/layout-w600dp-land/fragment_details.xml b/app/src/main/res/layout-w600dp-land/fragment_details.xml
index 4ce68a753..c7295768c 100644
--- a/app/src/main/res/layout-w600dp-land/fragment_details.xml
+++ b/app/src/main/res/layout-w600dp-land/fragment_details.xml
@@ -116,7 +116,7 @@
 					android:dividerPadding="8dp"
 					android:orientation="horizontal"
 					android:showDividers="middle"
-					app:layout_constraintTop_toBottomOf="@+id/textView_author">
+					app:layout_constraintTop_toBottomOf="@+id/textView_state">
 
 					<LinearLayout
 						android:id="@+id/rating_container"
diff --git a/app/src/main/res/layout-w600dp-port/fragment_details.xml b/app/src/main/res/layout-w600dp-port/fragment_details.xml
index 5a7eb1a1e..25b0b326d 100644
--- a/app/src/main/res/layout-w600dp-port/fragment_details.xml
+++ b/app/src/main/res/layout-w600dp-port/fragment_details.xml
@@ -117,7 +117,7 @@
 					android:dividerPadding="8dp"
 					android:orientation="horizontal"
 					android:showDividers="middle"
-					app:layout_constraintTop_toBottomOf="@+id/textView_author">
+					app:layout_constraintTop_toBottomOf="@+id/textView_state">
 
 					<LinearLayout
 						android:id="@+id/rating_container"
diff --git a/app/src/main/res/layout/fragment_details.xml b/app/src/main/res/layout/fragment_details.xml
index 88c3d4950..341e70b33 100644
--- a/app/src/main/res/layout/fragment_details.xml
+++ b/app/src/main/res/layout/fragment_details.xml
@@ -287,6 +287,7 @@
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@id/desc_header"
+			app:layout_constraintBottom_toBottomOf="parent"
 			tools:ignore="UnusedAttribute"
 			tools:text="@tools:sample/lorem/random[25]" />
 
diff --git a/app/src/main/res/layout/item_empty_state.xml b/app/src/main/res/layout/item_empty_state.xml
index 12407626e..a71d5796d 100644
--- a/app/src/main/res/layout/item_empty_state.xml
+++ b/app/src/main/res/layout/item_empty_state.xml
@@ -4,9 +4,9 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:orientation="vertical"
+	android:layout_marginHorizontal="32dp"
 	android:gravity="center"
-	android:layout_marginHorizontal="32dp">
+	android:orientation="vertical">
 
 	<ImageView
 		android:id="@+id/icon"
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index fdb266936..ff8094f6b 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -8,7 +8,6 @@
 	</declare-styleable>
 
 	<!--CoverImageView attrs-->
-
 	<declare-styleable name="CoverImageView">
 		<attr name="android:orientation" />
 	</declare-styleable>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 49c6cab54..b36f51bb0 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -4,6 +4,7 @@
 	<color name="color_primary">#1976D2</color>
 	<color name="color_primary_variant">#1565C0</color>
 	<color name="color_on_secondary">@android:color/white</color>
+	<color name="color_primary_alpha">#1F1976D2</color>
 
 	<color name="color_control_light">#39000000</color>
 	<color name="color_surface">#FFFFFF</color>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index d97a88bd7..6e4900beb 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -18,7 +18,7 @@
 	<dimen name="grid_spacing_outer">2dp</dimen>
 	<dimen name="manga_list_item_height">86dp</dimen>
 	<dimen name="manga_list_details_item_height">120dp</dimen>
-	<dimen name="chapter_list_item_height">46dp</dimen>
+	<dimen name="chapter_list_item_height">56dp</dimen>
 	<dimen name="preferred_grid_width">120dp</dimen>
 	<dimen name="header_height">48dp</dimen>
 	<dimen name="elevation_large">16dp</dimen>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 399534df8..fd9c5ba8b 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -28,6 +28,7 @@
 		<item name="tabTextColor">@color/tab_text</item>
 		<item name="tabTextAppearance">@style/TextAppearance.Kotatsu.Tab</item>
 		<item name="tabIndicatorAnimationMode">elastic</item>
+		<item name="tabRippleColor">@color/color_primary_alpha</item>
 	</style>
 
 	<style name="Widget.Kotatsu.NavigationView" parent="@style/Widget.MaterialComponents.NavigationView">
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 669a8c4f2..5dab148fd 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -10,6 +10,10 @@
 		<item name="colorOnSecondary">@color/color_on_secondary</item>
 		<item name="colorControlLight">@color/color_control_light</item>
 
+		<!-- Handles RTL text -->
+		<item name="android:textAlignment">gravity</item>
+		<item name="android:textDirection">locale</item>
+
 		<!-- Window decor -->
 		<item name="android:windowLightStatusBar" tools:targetApi="m">@bool/use_light_status</item>
 		<item name="android:statusBarColor">@color/status_bar_scrim</item>