diff --git a/app/src/main/res/layout/include_message_navigation.xml b/app/src/main/res/layout/include_message_navigation.xml
index a00ce1c945..b0a27e679f 100644
--- a/app/src/main/res/layout/include_message_navigation.xml
+++ b/app/src/main/res/layout/include_message_navigation.xml
@@ -29,7 +29,7 @@
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/title_more"
         android:foregroundTint="?android:attr/textColorSecondary"
-        android:padding="3dp"
+        android:padding="6dp"
         android:scaleType="fitCenter"
         android:tooltipText="@string/title_more"
         app:layout_constraintStart_toStartOf="parent"
@@ -44,7 +44,7 @@
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/title_delete"
         android:foregroundTint="?android:attr/textColorSecondary"
-        android:padding="3dp"
+        android:padding="6dp"
         android:scaleType="fitCenter"
         android:tooltipText="@string/title_delete"
         app:layout_constraintStart_toEndOf="@id/ibMore"
@@ -60,7 +60,7 @@
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/title_spam"
         android:foregroundTint="?android:attr/textColorSecondary"
-        android:padding="3dp"
+        android:padding="6dp"
         android:scaleType="fitCenter"
         android:tooltipText="@string/title_spam"
         app:layout_constraintStart_toEndOf="@id/ibMore"
@@ -76,7 +76,7 @@
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/title_delete"
         android:foregroundTint="?android:attr/textColorSecondary"
-        android:padding="3dp"
+        android:padding="6dp"
         android:scaleType="fitCenter"
         android:tooltipText="@string/title_delete"
         app:layout_constraintStart_toEndOf="@id/ibJunk"
@@ -92,7 +92,7 @@
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/title_archive"
         android:foregroundTint="?android:attr/textColorSecondary"
-        android:padding="3dp"
+        android:padding="6dp"
         android:scaleType="fitCenter"
         android:tooltipText="@string/title_archive"
         app:layout_constraintStart_toEndOf="@id/ibTrash"
@@ -108,7 +108,7 @@
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/title_undo"
         android:foregroundTint="?android:attr/textColorSecondary"
-        android:padding="3dp"
+        android:padding="6dp"
         android:scaleType="fitCenter"
         android:tooltipText="@string/title_undo"
         app:layout_constraintEnd_toStartOf="@+id/ibVerify"
@@ -123,7 +123,7 @@
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/title_sign"
         android:foregroundTint="?android:attr/textColorSecondary"
-        android:padding="3dp"
+        android:padding="6dp"
         android:scaleType="fitCenter"
         android:tooltipText="@string/title_sign"
         app:layout_constraintEnd_toStartOf="@+id/ibDecrypt"
@@ -138,7 +138,7 @@
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/title_decrypt"
         android:foregroundTint="?android:attr/textColorSecondary"
-        android:padding="3dp"
+        android:padding="6dp"
         android:scaleType="fitCenter"
         android:tooltipText="@string/title_decrypt"
         app:layout_constraintEnd_toStartOf="@+id/ibUnsubscribe"
@@ -153,7 +153,7 @@
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/title_legend_show_unsubscribe"
         android:foregroundTint="?android:attr/textColorSecondary"
-        android:padding="3dp"
+        android:padding="6dp"
         android:scaleType="fitCenter"
         android:tooltipText="@string/title_legend_show_unsubscribe"
         app:layout_constraintEnd_toStartOf="@+id/ibImages"
@@ -168,7 +168,7 @@
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/title_legend_show_images"
         android:foregroundTint="?android:attr/textColorSecondary"
-        android:padding="3dp"
+        android:padding="6dp"
         android:scaleType="fitCenter"
         android:tooltipText="@string/title_legend_show_images"
         app:layout_constraintEnd_toStartOf="@+id/ibFull"