diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 1d75fbb42a..998f28754c 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -4168,38 +4168,48 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             PopupMenuLifecycle popupMenu = new PopupMenuLifecycle(context, powner, ibMore);
             popupMenu.inflate(R.menu.popup_message_more);
 
-            popupMenu.getMenu().findItem(R.id.menu_unseen).setTitle(message.ui_seen ? R.string.title_unseen : R.string.title_seen);
-            popupMenu.getMenu().findItem(R.id.menu_unseen).setEnabled(
-                    (message.uid != null && !message.folderReadOnly) || message.accountProtocol != EntityAccount.TYPE_IMAP);
+            popupMenu.getMenu().findItem(R.id.menu_unseen)
+                    .setTitle(message.ui_seen ? R.string.title_unseen : R.string.title_seen)
+                    .setIcon(message.ui_seen ? R.drawable.twotone_drafts_24 : R.drawable.twotone_mail_24)
+                    .setEnabled((message.uid != null && !message.folderReadOnly) ||
+                            message.accountProtocol != EntityAccount.TYPE_IMAP);
 
-            popupMenu.getMenu().findItem(R.id.menu_hide).setTitle(message.ui_snoozed == null ? R.string.title_hide : R.string.title_unhide);
+            popupMenu.getMenu().findItem(R.id.menu_hide)
+                    .setTitle(message.ui_snoozed == null ? R.string.title_hide : R.string.title_unhide)
+                    .setIcon(message.ui_snoozed == null ? R.drawable.twotone_visibility_off_24 : R.drawable.twotone_visibility_24);
 
-            popupMenu.getMenu().findItem(R.id.menu_flag_color).setEnabled(
-                    (message.uid != null && !message.folderReadOnly) || message.accountProtocol != EntityAccount.TYPE_IMAP);
+            popupMenu.getMenu().findItem(R.id.menu_flag_color)
+                    .setEnabled((message.uid != null && !message.folderReadOnly) ||
+                            message.accountProtocol != EntityAccount.TYPE_IMAP);
 
             int i = (message.importance == null ? EntityMessage.PRIORITIY_NORMAL : message.importance);
             popupMenu.getMenu().findItem(R.id.menu_set_importance_low).setEnabled(!EntityMessage.PRIORITIY_LOW.equals(i));
             popupMenu.getMenu().findItem(R.id.menu_set_importance_normal).setEnabled(!EntityMessage.PRIORITIY_NORMAL.equals(i));
             popupMenu.getMenu().findItem(R.id.menu_set_importance_high).setEnabled(!EntityMessage.PRIORITIY_HIGH.equals(i));
 
-            popupMenu.getMenu().findItem(R.id.menu_move_to).setEnabled(message.uid != null && !message.folderReadOnly);
-            popupMenu.getMenu().findItem(R.id.menu_move_to).setVisible(message.accountProtocol == EntityAccount.TYPE_IMAP);
+            popupMenu.getMenu().findItem(R.id.menu_move_to)
+                    .setEnabled(message.uid != null && !message.folderReadOnly)
+                    .setVisible(message.accountProtocol == EntityAccount.TYPE_IMAP);
 
-            popupMenu.getMenu().findItem(R.id.menu_copy_to).setEnabled(message.uid != null && !message.folderReadOnly);
-            popupMenu.getMenu().findItem(R.id.menu_copy_to).setVisible(message.accountProtocol == EntityAccount.TYPE_IMAP);
+            popupMenu.getMenu().findItem(R.id.menu_copy_to)
+                    .setEnabled(message.uid != null && !message.folderReadOnly)
+                    .setVisible(message.accountProtocol == EntityAccount.TYPE_IMAP);
 
-            popupMenu.getMenu().findItem(R.id.menu_delete).setEnabled(message.uid == null || !message.folderReadOnly);
-            popupMenu.getMenu().findItem(R.id.menu_delete).setVisible(message.accountProtocol == EntityAccount.TYPE_IMAP);
+            popupMenu.getMenu().findItem(R.id.menu_delete)
+                    .setEnabled(message.uid == null || !message.folderReadOnly)
+                    .setVisible(message.accountProtocol == EntityAccount.TYPE_IMAP);
 
-            popupMenu.getMenu().findItem(R.id.menu_search_in_text).setEnabled(message.content && !full);
+            popupMenu.getMenu().findItem(R.id.menu_resync)
+                    .setEnabled(message.uid != null)
+                    .setVisible(message.accountProtocol == EntityAccount.TYPE_IMAP);
 
-            popupMenu.getMenu().findItem(R.id.menu_resync).setEnabled(message.uid != null);
-            popupMenu.getMenu().findItem(R.id.menu_resync).setVisible(message.accountProtocol == EntityAccount.TYPE_IMAP);
+            popupMenu.getMenu().findItem(R.id.menu_search_in_text).setEnabled(message.content && !full);
 
             popupMenu.getMenu().findItem(R.id.menu_create_rule).setVisible(!message.folderReadOnly);
 
-            popupMenu.getMenu().findItem(R.id.menu_manage_keywords).setEnabled(message.uid != null && !message.folderReadOnly);
-            popupMenu.getMenu().findItem(R.id.menu_manage_keywords).setVisible(message.accountProtocol == EntityAccount.TYPE_IMAP);
+            popupMenu.getMenu().findItem(R.id.menu_manage_keywords)
+                    .setEnabled(message.uid != null && !message.folderReadOnly)
+                    .setVisible(message.accountProtocol == EntityAccount.TYPE_IMAP);
 
             popupMenu.getMenu().findItem(R.id.menu_share).setEnabled(message.content);
             popupMenu.getMenu().findItem(R.id.menu_pin).setVisible(pin);
@@ -4217,6 +4227,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             popupMenu.getMenu().findItem(R.id.menu_raw_save).setVisible(message.accountProtocol == EntityAccount.TYPE_IMAP);
             popupMenu.getMenu().findItem(R.id.menu_raw_send).setVisible(message.accountProtocol == EntityAccount.TYPE_IMAP);
 
+            popupMenu.insertIcons(context);
+
             popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
                 @Override
                 public boolean onMenuItemClick(MenuItem target) {
diff --git a/app/src/main/res/drawable/twotone_smart_button_24.xml b/app/src/main/res/drawable/twotone_smart_button_24.xml
new file mode 100644
index 0000000000..9f77a98473
--- /dev/null
+++ b/app/src/main/res/drawable/twotone_smart_button_24.xml
@@ -0,0 +1,10 @@
+<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="M22,9v6c0,1.1 -0.9,2 -2,2h-1l0,-2h1V9H4v6h6v2H4c-1.1,0 -2,-0.9 -2,-2V9c0,-1.1 0.9,-2 2,-2h16C21.1,7 22,7.9 22,9zM14.5,19l1.09,-2.41L18,15.5l-2.41,-1.09L14.5,12l-1.09,2.41L11,15.5l2.41,1.09L14.5,19zM17,14l0.62,-1.38L19,12l-1.38,-0.62L17,10l-0.62,1.38L15,12l1.38,0.62L17,14zM14.5,19l1.09,-2.41L18,15.5l-2.41,-1.09L14.5,12l-1.09,2.41L11,15.5l2.41,1.09L14.5,19zM17,14l0.62,-1.38L19,12l-1.38,-0.62L17,10l-0.62,1.38L15,12l1.38,0.62L17,14z"/>
+</vector>
diff --git a/app/src/main/res/menu/popup_message_more.xml b/app/src/main/res/menu/popup_message_more.xml
index 4cee960af3..46a5f53942 100644
--- a/app/src/main/res/menu/popup_message_more.xml
+++ b/app/src/main/res/menu/popup_message_more.xml
@@ -2,6 +2,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/menu_button"
+        android:icon="@drawable/twotone_smart_button_24"
         android:title="@string/title_configure_buttons" />
 
     <item
@@ -10,6 +11,7 @@
 
     <item
         android:id="@+id/menu_snooze"
+        android:icon="@drawable/twotone_timelapse_24"
         android:title="@string/title_snooze" />
 
     <item
@@ -18,10 +20,12 @@
 
     <item
         android:id="@+id/menu_flag_color"
+        android:icon="@drawable/twotone_stars_24"
         android:title="@string/title_flag_color" />
 
     <item
         android:id="@+id/menu_set_importance"
+        android:icon="@drawable/twotone_priority_high_24"
         android:title="@string/title_set_importance">
         <menu>
             <item
@@ -38,64 +42,79 @@
 
     <item
         android:id="@+id/menu_move_to"
+        android:icon="@drawable/twotone_drive_file_move_24"
         android:title="@string/title_move_to" />
 
     <item
         android:id="@+id/menu_copy_to"
+        android:icon="@drawable/twotone_file_copy_24"
         android:title="@string/title_copy_to" />
 
     <item
         android:id="@+id/menu_delete"
-        android:title="@string/title_delete" />
+        android:icon="@drawable/twotone_delete_forever_24"
+        android:title="@string/title_delete_permanently" />
 
     <item
         android:id="@+id/menu_resync"
+        android:icon="@drawable/twotone_sync_24"
         android:title="@string/title_resync" />
 
     <item
         android:id="@+id/menu_edit_notes"
+        android:icon="@drawable/twotone_sticky_note_2_24"
         android:title="@string/title_edit_notes" />
 
     <item
         android:id="@+id/menu_search_in_text"
+        android:icon="@drawable/twotone_search_24"
         android:title="@string/title_search_in_text" />
 
     <item
         android:id="@+id/menu_create_rule"
+        android:icon="@drawable/twotone_filter_alt_24"
         android:title="@string/title_create_rule" />
 
     <item
         android:id="@+id/menu_manage_keywords"
+        android:icon="@drawable/twotone_label_important_24"
         android:title="@string/title_manage_keywords" />
 
     <item
         android:id="@+id/menu_event"
+        android:icon="@drawable/twotone_event_24"
         android:title="@string/title_event" />
 
     <item
         android:id="@+id/menu_share"
+        android:icon="@drawable/twotone_share_24"
         android:title="@string/title_share" />
 
     <item
         android:id="@+id/menu_pin"
+        android:icon="@drawable/baseline_push_pin_24"
         android:title="@string/title_pin" />
 
     <item
         android:id="@+id/menu_print"
+        android:icon="@drawable/twotone_print_24"
         android:title="@string/title_print" />
 
     <item
         android:id="@+id/menu_show_headers"
         android:checkable="true"
+        android:icon="@drawable/twotone_info_24"
         android:title="@string/title_show_headers" />
 
     <item
         android:id="@+id/menu_raw_save"
         android:enabled="false"
+        android:icon="@drawable/twotone_save_24"
         android:title="@string/title_raw_save" />
 
     <item
         android:id="@+id/menu_raw_send"
         android:enabled="false"
+        android:icon="@drawable/twotone_attachment_24"
         android:title="@string/title_raw_send" />
 </menu>