diff --git a/app/src/main/res/drawable/bg_badge_accent.xml b/app/src/main/res/drawable/bg_badge_accent.xml
index 143b10f71..aafa2c127 100644
--- a/app/src/main/res/drawable/bg_badge_accent.xml
+++ b/app/src/main/res/drawable/bg_badge_accent.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape
 	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:shape="rectangle">
-	<corners android:radius="5dp" />
+	android:shape="oval">
 	<solid android:color="?colorAccent" />
 	<padding
 		android:bottom="2dp"
 		android:left="2dp"
 		android:right="2dp"
 		android:top="2dp" />
-</shape>
\ No newline at end of file
+</shape>
diff --git a/app/src/main/res/drawable/bg_badge_default.xml b/app/src/main/res/drawable/bg_badge_default.xml
index 46fd21923..f010f44f6 100644
--- a/app/src/main/res/drawable/bg_badge_default.xml
+++ b/app/src/main/res/drawable/bg_badge_default.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape
 	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:shape="rectangle">
-	<corners android:radius="5dp" />
+	android:shape="oval">
 	<solid android:color="?attr/colorTertiary" />
 	<padding
 		android:bottom="2dp"
 		android:left="2dp"
 		android:right="2dp"
 		android:top="2dp" />
-</shape>
\ No newline at end of file
+</shape>
diff --git a/app/src/main/res/drawable/bg_badge_empty.xml b/app/src/main/res/drawable/bg_badge_empty.xml
index 55ad85bd1..01437c12e 100644
--- a/app/src/main/res/drawable/bg_badge_empty.xml
+++ b/app/src/main/res/drawable/bg_badge_empty.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape
 	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:shape="rectangle">
-	<corners android:radius="5dp" />
+	android:shape="oval">
 	<solid android:color="?colorBackgroundFloating" />
 	<stroke
 		android:width="1dp"
@@ -12,4 +11,4 @@
 		android:left="2dp"
 		android:right="2dp"
 		android:top="2dp" />
-</shape>
\ No newline at end of file
+</shape>
diff --git a/app/src/main/res/drawable/bg_badge_outline.xml b/app/src/main/res/drawable/bg_badge_outline.xml
index 938b47983..c4ce0d8b2 100644
--- a/app/src/main/res/drawable/bg_badge_outline.xml
+++ b/app/src/main/res/drawable/bg_badge_outline.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape
 	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:shape="rectangle">
-	<corners android:radius="5dp" />
+	android:shape="oval">
 	<stroke
 		android:width="2dp"
 		android:color="?android:textColorTertiary" />
@@ -11,4 +10,4 @@
 		android:left="2dp"
 		android:right="2dp"
 		android:top="2dp" />
-</shape>
\ No newline at end of file
+</shape>
diff --git a/app/src/main/res/layout/item_chapter.xml b/app/src/main/res/layout/item_chapter.xml
index 6fe72009e..0a44ea419 100644
--- a/app/src/main/res/layout/item_chapter.xml
+++ b/app/src/main/res/layout/item_chapter.xml
@@ -13,13 +13,15 @@
 
 	<TextView
 		android:id="@+id/textView_number"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
+		android:layout_width="32dp"
+		android:layout_height="32dp"
 		android:layout_marginStart="?android:listPreferredItemPaddingStart"
 		android:background="@drawable/bg_badge_default"
+		android:ellipsize="none"
 		android:gravity="center"
-		android:minWidth="26dp"
+		android:singleLine="true"
 		android:textAlignment="center"
+		android:textSize="14sp"
 		tools:text="13"
 		tools:textColor="?attr/colorOnPrimary" />
 
@@ -67,4 +69,4 @@
 		android:layout_marginEnd="?android:listPreferredItemPaddingEnd"
 		android:src="@drawable/ic_save_ok" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/item_page_thumb.xml b/app/src/main/res/layout/item_page_thumb.xml
index 2ed3ec94c..c19c532d5 100644
--- a/app/src/main/res/layout/item_page_thumb.xml
+++ b/app/src/main/res/layout/item_page_thumb.xml
@@ -1,11 +1,11 @@
 <?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"
 	xmlns:tools="http://schemas.android.com/tools"
+	style="@style/Widget.Material3.CardView.Outlined"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
-	style="@style/Widget.Material3.CardView.Outlined"
 	app:cardBackgroundColor="?scrimBackground">
 
 	<org.koitharu.kotatsu.base.ui.widgets.CoverImageView
@@ -17,17 +17,17 @@
 
 	<TextView
 		android:id="@+id/textView_number"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
+		android:layout_width="32dp"
+		android:layout_height="32dp"
 		android:layout_gravity="bottom|end"
-		android:layout_margin="4dp"
+		android:layout_margin="8dp"
 		android:ellipsize="none"
 		android:gravity="center"
-		android:minWidth="26dp"
 		android:singleLine="true"
 		android:textAlignment="center"
 		android:textColor="?attr/colorOnTertiary"
+		android:textSize="14sp"
 		tools:background="@drawable/bg_badge_default"
 		tools:text="2" />
 
-</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
+</com.google.android.material.card.MaterialCardView>