diff --git a/app/src/main/res/layout/include_message_attachments.xml b/app/src/main/res/layout/include_message_attachments.xml
index bf3bfb39d6..acc401d24c 100644
--- a/app/src/main/res/layout/include_message_attachments.xml
+++ b/app/src/main/res/layout/include_message_attachments.xml
@@ -19,6 +19,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="3dp"
+        android:layout_marginEnd="6dp"
         android:text="@string/title_show_inline"
         app:layout_constraintEnd_toStartOf="@+id/ibDownloadAttachments"
         app:layout_constraintStart_toStartOf="parent"
@@ -26,13 +27,11 @@
 
     <ImageButton
         android:id="@+id/ibDownloadAttachments"
-        android:layout_width="39dp"
+        android:layout_width="36dp"
         android:layout_height="36dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/title_download_all"
-        android:paddingVertical="6dp"
-        android:paddingStart="9dp"
-        android:paddingEnd="6dp"
+        android:padding="6dp"
         android:scaleType="fitCenter"
         android:tooltipText="@string/title_download_all"
         app:layout_constraintEnd_toStartOf="@id/ibSaveAttachments"
@@ -41,13 +40,11 @@
 
     <ImageButton
         android:id="@+id/ibSaveAttachments"
-        android:layout_width="39dp"
+        android:layout_width="36dp"
         android:layout_height="36dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/title_save_all"
-        android:paddingVertical="6dp"
-        android:paddingStart="9dp"
-        android:paddingEnd="6dp"
+        android:padding="6dp"
         android:scaleType="fitCenter"
         android:tooltipText="@string/title_save_all"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/item_attachment.xml b/app/src/main/res/layout/item_attachment.xml
index 5de75c27fb..dce85dba77 100644
--- a/app/src/main/res/layout/item_attachment.xml
+++ b/app/src/main/res/layout/item_attachment.xml
@@ -63,7 +63,6 @@
             android:id="@+id/ivStatus"
             android:layout_width="36dp"
             android:layout_height="36dp"
-            android:layout_marginEnd="3dp"
             android:padding="6dp"
             android:scaleType="fitCenter"
             app:layout_constraintBottom_toBottomOf="@+id/tvType"