diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 28a6f0d45e..434fe206d6 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -2880,7 +2880,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                             .setIcon(R.drawable.twotone_star_border_24);
                 if (result.unflagged || result.flagged)
                     popupMenu.getMenu().add(Menu.NONE, R.string.title_flag_color, order++, R.string.title_flag_color)
-                            .setIcon(R.drawable.twotone_stars_24);
+                            .setIcon(R.drawable.twotone_auto_awesome_24);
 
                 SubMenu importance = popupMenu.getMenu()
                         .addSubMenu(Menu.NONE, Menu.NONE, order++, R.string.title_set_importance)
diff --git a/app/src/main/res/drawable/twotone_auto_awesome_24.xml b/app/src/main/res/drawable/twotone_auto_awesome_24.xml
new file mode 100644
index 0000000000..d8935dd999
--- /dev/null
+++ b/app/src/main/res/drawable/twotone_auto_awesome_24.xml
@@ -0,0 +1,21 @@
+<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="M9.99,11.01l-0.99,-2.18l-0.99,2.18l-2.18,0.99l2.18,0.99l0.99,2.18l0.99,-2.18l2.18,-0.99z"
+      android:strokeAlpha="0.3"
+      android:fillAlpha="0.3"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M19,9l1.25,-2.75l2.75,-1.25l-2.75,-1.25l-1.25,-2.75l-1.25,2.75l-2.75,1.25l2.75,1.25z"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M19,15l-1.25,2.75l-2.75,1.25l2.75,1.25l1.25,2.75l1.25,-2.75l2.75,-1.25l-2.75,-1.25z"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M11.5,9.5L9,4L6.5,9.5L1,12l5.5,2.5L9,20l2.5,-5.5L17,12L11.5,9.5zM9.99,12.99L9,15.17l-0.99,-2.18L5.83,12l2.18,-0.99L9,8.83l0.99,2.18L12.17,12L9.99,12.99z"/>
+</vector>
diff --git a/app/src/main/res/drawable/twotone_stars_24.xml b/app/src/main/res/drawable/twotone_stars_24.xml
deleted file mode 100644
index e4075a08a5..0000000000
--- a/app/src/main/res/drawable/twotone_stars_24.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<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="M19.47,9.16c-1.1,-2.87 -3.8,-4.95 -7.01,-5.14l2,4.71 5.01,0.43zM11.54,4.02c-3.22,0.18 -5.92,2.27 -7.02,5.15l5.02,-0.43 2,-4.72zM4.23,10.14C4.08,10.74 4,11.36 4,12c0,2.48 1.14,4.7 2.91,6.17l1.11,-4.75 -3.79,-3.28zM19.77,10.13l-3.79,3.28 1.1,4.76C18.86,16.7 20,14.48 20,12c0,-0.64 -0.09,-1.27 -0.23,-1.87zM7.84,18.82c1.21,0.74 2.63,1.18 4.15,1.18 1.53,0 2.95,-0.44 4.17,-1.18L12,16.31l-4.16,2.51z"
-      android:strokeAlpha="0.3"
-      android:fillAlpha="0.3"/>
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM19.47,9.16l-5.01,-0.43 -2,-4.71c3.21,0.19 5.91,2.27 7.01,5.14zM12,8.06l1.09,2.56 2.78,0.24 -2.11,1.83 0.63,2.73L12,13.98l-2.39,1.44 0.63,-2.72 -2.11,-1.83 2.78,-0.24L12,8.06zM11.54,4.02l-2,4.72 -5.02,0.43c1.1,-2.88 3.8,-4.97 7.02,-5.15zM4,12c0,-0.64 0.08,-1.26 0.23,-1.86l3.79,3.28 -1.11,4.75C5.14,16.7 4,14.48 4,12zM11.99,20c-1.52,0 -2.94,-0.44 -4.15,-1.18L12,16.31l4.16,2.51c-1.22,0.74 -2.64,1.18 -4.17,1.18zM17.09,18.17l-1.1,-4.76 3.79,-3.28c0.13,0.6 0.22,1.23 0.22,1.87 0,2.48 -1.14,4.7 -2.91,6.17z"/>
-</vector>
diff --git a/app/src/main/res/menu/popup_message_more.xml b/app/src/main/res/menu/popup_message_more.xml
index 46a5f53942..c079d1ef3c 100644
--- a/app/src/main/res/menu/popup_message_more.xml
+++ b/app/src/main/res/menu/popup_message_more.xml
@@ -20,7 +20,7 @@
 
     <item
         android:id="@+id/menu_flag_color"
-        android:icon="@drawable/twotone_stars_24"
+        android:icon="@drawable/twotone_auto_awesome_24"
         android:title="@string/title_flag_color" />
 
     <item