diff --git a/app/src/main/res/layout/drawer_menu.xml b/app/src/main/res/layout/drawer_menu.xml
index efa4817d9..667dba8e0 100644
--- a/app/src/main/res/layout/drawer_menu.xml
+++ b/app/src/main/res/layout/drawer_menu.xml
@@ -150,8 +150,8 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginBottom="10dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:orientation="vertical"
             android:visibility="@{viewModel.shortcuts.empty ? View.GONE : View.VISIBLE, default=gone}"
             app:entries="@{viewModel.shortcuts}"
@@ -166,9 +166,10 @@
             android:id="@+id/settings"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="20dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
+            android:padding="5dp"
             android:text="@string/settings_title"
             android:drawableStart="@drawable/gear"
             android:drawableEnd="@drawable/caret_right"
@@ -186,9 +187,10 @@
             android:id="@+id/recordings"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="20dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
+            android:padding="5dp"
             android:text="@string/recordings_title"
             android:drawableStart="@drawable/record_fill"
             android:drawableEnd="@drawable/caret_right"
@@ -206,9 +208,10 @@
             android:id="@+id/help"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="15dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
+            android:padding="5dp"
             android:text="@string/help_title"
             android:drawableStart="@drawable/question"
             android:drawableEnd="@drawable/caret_right"
@@ -239,9 +242,10 @@
             android:id="@+id/quit"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="15dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
+            android:padding="5dp"
             android:text="@string/help_quit_title"
             android:visibility="@{viewModel.hideQuitButton ? View.GONE : View.VISIBLE, default=gone}"
             android:drawableStart="@drawable/power"
diff --git a/app/src/main/res/layout/drawer_shortcuts_list_cell.xml b/app/src/main/res/layout/drawer_shortcuts_list_cell.xml
index 1784467a5..7f047f08c 100644
--- a/app/src/main/res/layout/drawer_shortcuts_list_cell.xml
+++ b/app/src/main/res/layout/drawer_shortcuts_list_cell.xml
@@ -12,8 +12,8 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
         android:layout_marginBottom="10dp"
+        android:padding="5dp"
         android:background="@drawable/squircle_transparent_button_background">
 
         <ImageView