diff --git a/app/src/main/res/layout/fragment_compose.xml b/app/src/main/res/layout/fragment_compose.xml
index c4488f503f..b7672c1cb1 100644
--- a/app/src/main/res/layout/fragment_compose.xml
+++ b/app/src/main/res/layout/fragment_compose.xml
@@ -217,9 +217,7 @@
                     android:id="@+id/rvAttachment"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="6dp"
                     android:layout_marginTop="6dp"
-                    android:layout_marginEnd="6dp"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/vSeparatorAttachments" />
diff --git a/app/src/main/res/layout/include_message_attachments.xml b/app/src/main/res/layout/include_message_attachments.xml
index 07a28871da..39d1f320a0 100644
--- a/app/src/main/res/layout/include_message_attachments.xml
+++ b/app/src/main/res/layout/include_message_attachments.xml
@@ -18,9 +18,7 @@
         android:id="@+id/rvAttachment"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="6dp"
         android:layout_marginTop="3dp"
-        android:layout_marginEnd="6dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/vSeparatorAttachments" />
@@ -31,35 +29,39 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="3dp"
         android:text="@string/title_show_inline"
-        app:layout_constraintEnd_toStartOf="@+id/ibSaveAttachments"
+        app:layout_constraintEnd_toStartOf="@+id/ibDownloadAttachments"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/rvAttachment" />
 
     <ImageButton
-        android:id="@+id/ibSaveAttachments"
-        android:layout_width="36dp"
+        android:id="@+id/ibDownloadAttachments"
+        android:layout_width="39dp"
         android:layout_height="36dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
-        android:contentDescription="@string/title_save_all"
-        android:padding="6dp"
+        android:contentDescription="@string/title_download_all"
+        android:paddingVertical="6dp"
+        android:paddingStart="9dp"
+        android:paddingEnd="3dp"
         android:scaleType="fitCenter"
-        android:tooltipText="@string/title_save_all"
-        app:layout_constraintEnd_toStartOf="@id/ibDownloadAttachments"
+        android:tooltipText="@string/title_download_all"
+        app:layout_constraintEnd_toStartOf="@id/ibSaveAttachments"
         app:layout_constraintTop_toBottomOf="@+id/rvAttachment"
-        app:srcCompat="@drawable/baseline_save_alt_24" />
+        app:srcCompat="@drawable/baseline_cloud_download_24" />
 
     <ImageButton
-        android:id="@+id/ibDownloadAttachments"
-        android:layout_width="36dp"
+        android:id="@+id/ibSaveAttachments"
+        android:layout_width="39dp"
         android:layout_height="36dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
-        android:contentDescription="@string/title_download_all"
-        android:padding="6dp"
+        android:contentDescription="@string/title_save_all"
+        android:paddingVertical="6dp"
+        android:paddingStart="9dp"
+        android:paddingEnd="3dp"
         android:scaleType="fitCenter"
-        android:tooltipText="@string/title_download_all"
+        android:tooltipText="@string/title_save_all"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/rvAttachment"
-        app:srcCompat="@drawable/baseline_cloud_download_24" />
+        app:srcCompat="@drawable/baseline_save_24" />
 
     <androidx.constraintlayout.widget.Barrier
         android:id="@+id/barrier_internet"
diff --git a/app/src/main/res/layout/item_attachment.xml b/app/src/main/res/layout/item_attachment.xml
index ea9585591f..32e071e1cc 100644
--- a/app/src/main/res/layout/item_attachment.xml
+++ b/app/src/main/res/layout/item_attachment.xml
@@ -15,12 +15,12 @@
 
         <ImageButton
             android:id="@+id/ibDelete"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
             android:background="?android:attr/selectableItemBackgroundBorderless"
             android:contentDescription="@string/title_legend_delete"
-            android:paddingEnd="12dp"
-            android:visibility="visible"
+            android:padding="6dp"
+            android:scaleType="fitCenter"
             app:layout_constraintBottom_toBottomOf="@+id/tvType"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -28,8 +28,10 @@
 
         <ImageView
             android:id="@+id/ivType"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:padding="3dp"
+            android:scaleType="fitCenter"
             app:layout_constraintBottom_toBottomOf="@+id/tvType"
             app:layout_constraintStart_toEndOf="@id/ibDelete"
             app:layout_constraintTop_toTopOf="parent"
@@ -50,8 +52,11 @@
 
         <ImageView
             android:id="@+id/ivStatus"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:layout_marginEnd="3dp"
+            android:padding="6dp"
+            android:scaleType="fitCenter"
             app:layout_constraintBottom_toBottomOf="@+id/tvType"
             app:layout_constraintEnd_toStartOf="@+id/ibSave"
             app:layout_constraintTop_toTopOf="parent"
@@ -59,11 +64,12 @@
 
         <ImageButton
             android:id="@+id/ibSave"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
             android:background="?android:attr/selectableItemBackgroundBorderless"
             android:contentDescription="@string/title_legend_save"
-            android:paddingStart="12dp"
+            android:padding="6dp"
+            android:scaleType="fitCenter"
             app:layout_constraintBottom_toBottomOf="@+id/tvType"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"