diff --git a/app/src/main/res/layout/item_attachment.xml b/app/src/main/res/layout/item_attachment.xml
index c39f5981b..c602cc72b 100644
--- a/app/src/main/res/layout/item_attachment.xml
+++ b/app/src/main/res/layout/item_attachment.xml
@@ -70,40 +70,42 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_width="48dp"
-        android:layout_height="48dp">
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
         <androidx.appcompat.widget.AppCompatImageButton
             android:id="@+id/item_attachment_delete_button"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
+            android:layout_gravity="center"
             android:contentDescription="@string/content_description_remove_field"
             android:src="@drawable/ic_content_delete_white_24dp"
             style="@style/KeepassDXStyle.ImageButton.Simple" />
         <FrameLayout
             android:id="@+id/item_attachment_progress_container"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center">
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/item_attachment_icon"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:padding="12dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
                 android:src="@drawable/ic_file_download_white_24dp"
                 android:contentDescription="@string/download"
-                android:tint="?attr/colorAccent" />
+                style="@style/KeepassDXStyle.ImageButton.Simple" />
             <ProgressBar
                 android:id="@+id/item_attachment_progress"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
                 style="@style/KeepassDXStyle.ProgressBar.Circle"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_width="36dp"
+                android:layout_height="36dp"
                 android:max="100"
                 android:progress="60" />
         </FrameLayout>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 3d32d2812..f535e51f2 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -341,9 +341,9 @@
         <item name="tint">@color/background_button_color_accent</item>
         <item name="android:background">@null</item>
         <item name="backgroundTint">@null</item>
-        <item name="android:padding">12dp</item>
-        <item name="android:layout_width">48dp</item>
-        <item name="android:layout_height">48dp</item>
+        <item name="android:padding">6dp</item>
+        <item name="android:layout_width">36dp</item>
+        <item name="android:layout_height">36dp</item>
     </style>
     <style name="KeepassDXStyle.ImageButton.Simple.Secondary" parent="KeepassDXStyle.ImageButton.Simple">
         <item name="android:colorForeground">@color/background_button_color_secondary</item>