diff --git a/src/main/res/layout/fragment_installed_x.xml b/src/main/res/layout/fragment_installed_x.xml
index fcdea5d6..657234e7 100644
--- a/src/main/res/layout/fragment_installed_x.xml
+++ b/src/main/res/layout/fragment_installed_x.xml
@@ -31,8 +31,9 @@
             android:id="@+id/updatedBar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginHorizontal="@dimen/shape_margin_medium"
-            android:layout_marginTop="@dimen/shape_margin_medium"
+            android:layout_marginHorizontal="@dimen/shape_margin_large"
+            android:layout_marginVertical="@dimen/shape_margin_small"
+            android:paddingTop="2dp"
             app:layout_constraintBottom_toTopOf="@id/modeBar"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -43,7 +44,6 @@
                 style="@style/Widget.Material3.Button.ElevatedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/shape_margin_medium"
                 android:drawableEnd="@drawable/ic_arrow_up"
                 android:drawableTint="?attr/colorPrimary"
                 android:paddingHorizontal="@dimen/shape_margin_medium"
@@ -60,7 +60,7 @@
                 style="@style/Widget.Material3.Chip.Assist.Elevated"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="4dp"
+                android:layout_marginStart="@dimen/shape_margin_medium"
                 android:text="@string/update_all"
                 app:chipIcon="@drawable/ic_download"
                 app:layout_constraintBottom_toBottomOf="parent"
@@ -78,17 +78,16 @@
             android:id="@+id/modeBar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginHorizontal="@dimen/shape_margin_medium"
+            android:layout_marginHorizontal="@dimen/shape_margin_large"
             android:clipChildren="false"
             android:clipToPadding="false"
-            android:orientation="horizontal"
-            android:paddingHorizontal="4dp">
+            android:orientation="horizontal">
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/buttonBlocklist"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
+                android:paddingHorizontal="@dimen/shape_margin_small"
                 android:text="@string/installed_applications"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@id/buttonSortFilter"
@@ -101,6 +100,7 @@
                 style="@style/Widget.Material3.Chip.Assist.Elevated"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/shape_margin_medium"
                 android:text="@string/sort_filter"
                 app:chipIcon="@drawable/ic_sort"
                 app:layout_constraintBottom_toBottomOf="parent"
diff --git a/src/main/res/layout/fragment_latest_x.xml b/src/main/res/layout/fragment_latest_x.xml
index d5d38a11..de016ed1 100644
--- a/src/main/res/layout/fragment_latest_x.xml
+++ b/src/main/res/layout/fragment_latest_x.xml
@@ -31,8 +31,9 @@
             android:id="@+id/textNew"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginHorizontal="12dp"
-            android:layout_marginVertical="14dp"
+            android:layout_marginHorizontal="@dimen/shape_margin_large"
+            android:layout_marginVertical="@dimen/shape_margin_large"
+            android:padding="@dimen/shape_margin_small"
             android:text="@string/new_applications" />
 
         <androidx.compose.ui.platform.ComposeView
@@ -44,7 +45,7 @@
             android:id="@+id/modeBar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginHorizontal="@dimen/shape_margin_medium"
+            android:layout_marginHorizontal="@dimen/shape_margin_large"
             android:clipChildren="false"
             android:clipToPadding="false"
             android:orientation="horizontal">
@@ -53,7 +54,7 @@
                 android:id="@+id/textLatest"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
+                android:paddingHorizontal="@dimen/shape_margin_small"
                 android:text="@string/recently_updated"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@id/buttonSortFilter"
@@ -66,6 +67,7 @@
                 style="@style/Widget.Material3.Chip.Assist.Elevated"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/shape_margin_medium"
                 android:text="@string/sort_filter"
                 app:chipIcon="@drawable/ic_sort"
                 app:layout_constraintBottom_toBottomOf="parent"
diff --git a/src/main/res/values/dimen.xml b/src/main/res/values/dimen.xml
index 64007a55..94de3933 100644
--- a/src/main/res/values/dimen.xml
+++ b/src/main/res/values/dimen.xml
@@ -3,6 +3,7 @@
     <dimen name="text_margin">16dp</dimen>
     <dimen name="shape_margin_small">4dp</dimen>
     <dimen name="shape_margin_medium">8dp</dimen>
+    <dimen name="shape_margin_large">16dp</dimen>
     <dimen name="shape_small_corner">4dp</dimen>
     <dimen name="shape_medium_corner">8dp</dimen>
     <dimen name="shape_large_corner">16dp</dimen>