diff --git a/app/src/main/res/layout/item_download.xml b/app/src/main/res/layout/item_download.xml
index b70971dc2..ac91be7ce 100644
--- a/app/src/main/res/layout/item_download.xml
+++ b/app/src/main/res/layout/item_download.xml
@@ -6,17 +6,16 @@
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:background="?attr/selectableItemBackground"
-	android:paddingStart="16dp"
+	android:paddingStart="8dp"
 	android:paddingTop="4dp"
-	android:paddingEnd="16dp"
+	android:paddingEnd="8dp"
 	android:paddingBottom="6dp">
 
 	<com.google.android.material.card.MaterialCardView
 		android:id="@+id/card_cover"
 		android:layout_width="48dp"
 		android:layout_height="48dp"
-		android:layout_marginTop="8dp"
-		android:layout_marginBottom="8dp"
+		android:layout_margin="8dp"
 		app:cardCornerRadius="4dp"
 		app:cardElevation="4dp"
 		app:layout_constraintDimensionRatio="h,1:1"
@@ -39,6 +38,7 @@
 		android:layout_height="wrap_content"
 		android:layout_marginStart="16dp"
 		android:layout_marginTop="4dp"
+		android:layout_marginEnd="8dp"
 		android:ellipsize="end"
 		android:singleLine="true"
 		android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
@@ -53,6 +53,7 @@
 		android:layout_height="wrap_content"
 		android:layout_marginStart="16dp"
 		android:layout_marginTop="4dp"
+		android:layout_marginEnd="8dp"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toEndOf="@id/card_cover"
 		app:layout_constraintTop_toBottomOf="@id/textView_title" />
@@ -63,10 +64,11 @@
 		android:layout_height="wrap_content"
 		android:layout_marginStart="16dp"
 		android:layout_marginTop="4dp"
+		android:layout_marginEnd="8dp"
 		android:ellipsize="end"
 		android:singleLine="true"
 		android:textAppearance="@style/TextAppearance.AppCompat.Small"
-		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintEnd_toStartOf="@id/textView_percent"
 		app:layout_constraintStart_toEndOf="@id/card_cover"
 		app:layout_constraintTop_toBottomOf="@id/progressBar"
 		tools:text="@string/manga_downloading_" />
@@ -78,6 +80,7 @@
 		android:textAppearance="@style/TextAppearance.AppCompat.Body2"
 		app:layout_constraintBaseline_toBaselineOf="@id/textView_status"
 		app:layout_constraintEnd_toEndOf="parent"
+		android:layout_marginEnd="8dp"
 		tools:text="25%" />
 
 	<TextView
@@ -86,6 +89,7 @@
 		android:layout_height="wrap_content"
 		android:layout_marginStart="16dp"
 		android:layout_marginTop="4dp"
+		android:layout_marginEnd="8dp"
 		android:ellipsize="end"
 		android:maxLines="4"
 		android:textAppearance="@style/TextAppearance.AppCompat.Small"
diff --git a/app/src/main/res/layout/item_header.xml b/app/src/main/res/layout/item_header.xml
index 27b1c2c37..416e0ec12 100644
--- a/app/src/main/res/layout/item_header.xml
+++ b/app/src/main/res/layout/item_header.xml
@@ -5,8 +5,8 @@
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:gravity="center_vertical|start"
-	android:paddingStart="4dp"
-	android:paddingEnd="4dp"
+	android:paddingStart="8dp"
+	android:paddingEnd="8dp"
 	android:singleLine="true"
 	android:textAllCaps="true"
 	android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"
diff --git a/app/src/main/res/layout/item_manga_grid.xml b/app/src/main/res/layout/item_manga_grid.xml
index 439dd081e..801ab2d7b 100644
--- a/app/src/main/res/layout/item_manga_grid.xml
+++ b/app/src/main/res/layout/item_manga_grid.xml
@@ -12,7 +12,9 @@
 		android:id="@+id/card"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_margin="4dp"
+		android:layout_marginTop="8dp"
+		android:layout_marginBottom="4dp"
+		android:layout_marginHorizontal="8dp"
 		app:cardCornerRadius="4dp"
 		app:cardElevation="4dp">
 
@@ -34,7 +36,8 @@
 		android:ellipsize="end"
 		android:lineSpacingExtra="-2dp"
 		android:maxLines="2"
-		android:padding="4dp"
+		android:paddingHorizontal="8dp"
+		android:paddingBottom="4dp"
 		android:elegantTextHeight="false"
 		tools:text="Sample name" />
 
diff --git a/app/src/main/res/layout/item_manga_list.xml b/app/src/main/res/layout/item_manga_list.xml
index ed12b43af..333115285 100644
--- a/app/src/main/res/layout/item_manga_list.xml
+++ b/app/src/main/res/layout/item_manga_list.xml
@@ -12,7 +12,7 @@
 	<com.google.android.material.card.MaterialCardView
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_margin="4dp"
+		android:layout_margin="8dp"
 		app:cardCornerRadius="4dp"
 		app:cardElevation="4dp">
 
diff --git a/app/src/main/res/layout/item_manga_list_details.xml b/app/src/main/res/layout/item_manga_list_details.xml
index 2c8e07b0e..63d959bf8 100644
--- a/app/src/main/res/layout/item_manga_list_details.xml
+++ b/app/src/main/res/layout/item_manga_list_details.xml
@@ -11,7 +11,7 @@
 	<com.google.android.material.card.MaterialCardView
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_margin="4dp"
+		android:layout_margin="8dp"
 		app:cardElevation="4dp">
 
 		<org.koitharu.kotatsu.base.ui.widgets.CoverImageView
@@ -27,10 +27,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_gravity="center_vertical"
-		android:layout_marginStart="16dp"
-		android:layout_marginTop="8dp"
-		android:layout_marginEnd="8dp"
-		android:layout_marginBottom="8dp"
+		android:layout_margin="8dp"
 		android:orientation="vertical">
 
 		<TextView
diff --git a/app/src/main/res/layout/item_tracklog.xml b/app/src/main/res/layout/item_tracklog.xml
index 3621a779c..e55c1ff7d 100644
--- a/app/src/main/res/layout/item_tracklog.xml
+++ b/app/src/main/res/layout/item_tracklog.xml
@@ -6,15 +6,14 @@
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:background="?attr/selectableItemBackground"
-	android:paddingStart="16dp"
-	android:paddingEnd="16dp">
+	android:paddingStart="8dp"
+	android:paddingEnd="8dp">
 
 	<com.google.android.material.card.MaterialCardView
 		android:id="@+id/card_cover"
 		android:layout_width="48dp"
 		android:layout_height="48dp"
-		android:layout_marginTop="8dp"
-		android:layout_marginBottom="8dp"
+		android:layout_margin="8dp"
 		app:cardCornerRadius="4dp"
 		app:cardElevation="4dp"
 		app:layout_constraintBottom_toBottomOf="parent"
@@ -38,6 +37,7 @@
 		android:layout_height="wrap_content"
 		android:layout_marginStart="16dp"
 		android:layout_marginTop="4dp"
+		android:layout_marginEnd="8dp"
 		android:orientation="horizontal"
 		app:layout_constraintBottom_toTopOf="@id/textView_chapters"
 		app:layout_constraintEnd_toEndOf="parent"
@@ -75,6 +75,7 @@
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:layout_marginStart="16dp"
+		android:layout_marginEnd="8dp"
 		android:layout_marginBottom="4dp"
 		android:ellipsize="none"
 		app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index c308cb1f7..da8545884 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -13,10 +13,10 @@
 	<dimen name="nav_item_background_inset_left">0dp</dimen>
 	<dimen name="nav_item_background_inset_right">8dp</dimen>>
 
-	<dimen name="grid_spacing">6dp</dimen>
-	<dimen name="list_spacing">6dp</dimen>
+	<dimen name="grid_spacing">4dp</dimen>
+	<dimen name="list_spacing">4dp</dimen>
 	<dimen name="grid_spacing_outer">2dp</dimen>
-	<dimen name="manga_list_item_height">78dp</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="preferred_grid_width">120dp</dimen>