diff --git a/app/src/main/res/drawable/ic_compose_attachment_play.xml b/app/src/main/res/drawable/ic_compose_attachment_play.xml
index 9edb5960..9b7ecb7f 100644
--- a/app/src/main/res/drawable/ic_compose_attachment_play.xml
+++ b/app/src/main/res/drawable/ic_compose_attachment_play.xml
@@ -4,9 +4,9 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?attr/colorAccent"
+        android:fillColor="?attr/colorControlNormal"
         android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2z" />
     <path
-        android:fillColor="?attr/backgroundColor"
+        android:fillColor="?attr/colorPrimary"
         android:pathData="M10,16.5v-9l6,4.5 -6,4.5z" />
 </vector>
diff --git a/app/src/main/res/layout/compose_attachment_item.xml b/app/src/main/res/layout/compose_attachment_item.xml
index 156827b1..d4b0f5ec 100644
--- a/app/src/main/res/layout/compose_attachment_item.xml
+++ b/app/src/main/res/layout/compose_attachment_item.xml
@@ -30,13 +30,15 @@
              android:layout_width="48dp"
              android:layout_height="48dp"
              android:adjustViewBounds="true"
-             android:padding="6dp"
+             android:padding="0dp"
+             app:icon="@drawable/ic_compose_attachment_play"
+             app:iconGravity="textStart"
              android:scaleType="fitCenter"
-             android:src="@drawable/ic_compose_attachment_play"
+             app:iconPadding="0dp"
              app:layout_constraintBottom_toBottomOf="@id/preview"
              app:layout_constraintEnd_toEndOf="@id/preview"
-            app:layout_constraintStart_toStartOf="@id/preview"
-            app:layout_constraintTop_toTopOf="@id/preview" />
+             app:layout_constraintStart_toStartOf="@id/preview"
+             app:layout_constraintTop_toTopOf="@id/preview" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/edit_preview"
@@ -44,6 +46,9 @@
             android:layout_width="36dp"
             android:layout_height="36dp"
             android:adjustViewBounds="true"
+            android:padding="0dp"
+            app:iconGravity="textStart"
+            app:iconPadding="0dp"
             android:backgroundTint="@color/editColor"
             app:icon="@drawable/ic_baseline_mode_edit_24"
             app:layout_constraintStart_toStartOf="parent"
@@ -51,6 +56,9 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/button_remove"
+            android:padding="0dp"
+            app:iconGravity="textStart"
+            app:iconPadding="0dp"
             style="@style/Widget.Material3.Button.Icon"
             android:layout_width="36dp"
             android:layout_height="36dp"
diff --git a/app/src/main/res/layout/drawer_status_compose.xml b/app/src/main/res/layout/drawer_status_compose.xml
index 898ff375..efb976da 100644
--- a/app/src/main/res/layout/drawer_status_compose.xml
+++ b/app/src/main/res/layout/drawer_status_compose.xml
@@ -162,6 +162,7 @@
                 android:layout_width="48dp"
                 android:layout_height="48dp"
                 app:icon="@drawable/ic_compose_attach"
+                android:padding="0dp"
                 app:iconGravity="textStart"
                 app:iconPadding="0dp" />
 
@@ -172,6 +173,7 @@
                 android:layout_height="48dp"
                 android:layout_marginTop="6dp"
                 app:icon="@drawable/ic_compose_sensitive"
+                android:padding="0dp"
                 app:iconGravity="textStart"
                 app:iconPadding="0dp" />
 
@@ -181,6 +183,7 @@
                 android:layout_width="48dp"
                 android:layout_height="48dp"
                 app:icon="@drawable/ic_compose_visibility_public"
+                android:padding="0dp"
                 app:iconGravity="textStart"
                 app:iconPadding="0dp" />