diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 49227aab9f..01ce6e74b3 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -3678,7 +3678,7 @@ public class FragmentMessages extends FragmentBase
 
                 if (ids.length < MAX_SEND_RAW)
                     popupMenu.getMenu().add(Menu.NONE, R.string.title_raw_send, order++, R.string.title_raw_send)
-                            .setIcon(R.drawable.twotone_attachment_24);
+                            .setIcon(R.drawable.twotone_attach_email_24);
 
                 if (result.canInbox()) // not is inbox
                     popupMenu.getMenu().add(Menu.FIRST, R.string.title_folder_inbox, order++, R.string.title_folder_inbox)
diff --git a/app/src/main/res/drawable/twotone_attach_email_24.xml b/app/src/main/res/drawable/twotone_attach_email_24.xml
new file mode 100644
index 0000000000..5428ddd7d9
--- /dev/null
+++ b/app/src/main/res/drawable/twotone_attach_email_24.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M3,6l8,5l8,-5v3h2V4c0,-1.1 -0.9,-2 -2,-2H3C1.9,2 1.01,2.9 1.01,4L1,16c0,1.1 0.9,2 2,2h10v-2H3V6zM19,4l-8,5L3,4H19z"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M21,14v4c0,1.1 -0.9,2 -2,2s-2,-0.9 -2,-2v-4.5c0,-0.28 0.22,-0.5 0.5,-0.5s0.5,0.22 0.5,0.5V18h2v-4.5c0,-1.38 -1.12,-2.5 -2.5,-2.5S15,12.12 15,13.5V18c0,2.21 1.79,4 4,4s4,-1.79 4,-4v-4H21z"/>
+</vector>
diff --git a/app/src/main/res/menu/popup_message_more.xml b/app/src/main/res/menu/popup_message_more.xml
index 3587af6a86..5a2b7976cb 100644
--- a/app/src/main/res/menu/popup_message_more.xml
+++ b/app/src/main/res/menu/popup_message_more.xml
@@ -135,7 +135,7 @@
 
         <item
             android:id="@+id/menu_raw_send"
-            android:icon="@drawable/twotone_attachment_24"
+            android:icon="@drawable/twotone_attach_email_24"
             android:title="@string/title_raw_send">
             <menu>
                 <item