diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 636ea72d4a..40452ddc7b 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -3244,7 +3244,7 @@ class Core {
                         .putExtra("group", group);
                 PendingIntent piJunk = PendingIntent.getService(context, ServiceUI.PI_JUNK, junk, PendingIntent.FLAG_UPDATE_CURRENT);
                 NotificationCompat.Action.Builder actionJunk = new NotificationCompat.Action.Builder(
-                        R.drawable.baseline_flag_24,
+                        R.drawable.baseline_report_problem_24,
                         context.getString(R.string.title_advanced_notify_action_junk),
                         piJunk)
                         .setAllowGeneratedReplies(false);
diff --git a/app/src/main/java/eu/faircode/email/EntityFolder.java b/app/src/main/java/eu/faircode/email/EntityFolder.java
index e860fd1844..04c91b03ec 100644
--- a/app/src/main/java/eu/faircode/email/EntityFolder.java
+++ b/app/src/main/java/eu/faircode/email/EntityFolder.java
@@ -288,7 +288,7 @@ public class EntityFolder extends EntityOrder implements Serializable {
         if (EntityFolder.TRASH.equals(type))
             return R.drawable.baseline_delete_24;
         if (EntityFolder.JUNK.equals(type))
-            return R.drawable.baseline_flag_24;
+            return R.drawable.baseline_report_problem_24;
         if (EntityFolder.SYSTEM.equals(type))
             return R.drawable.baseline_folder_special_24;
         return R.drawable.baseline_folder_24;
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index b3ce71863b..9eac723ada 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -1739,7 +1739,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
             else if (FragmentAccount.SWIPE_ACTION_MOVE.equals(action))
                 icon = R.drawable.baseline_folder_24;
             else if (FragmentAccount.SWIPE_ACTION_JUNK.equals(action))
-                icon = R.drawable.baseline_flag_24;
+                icon = R.drawable.baseline_report_problem_24;
             else if (FragmentAccount.SWIPE_ACTION_DELETE.equals(action) ||
                     (action.equals(message.folder) && EntityFolder.TRASH.equals(message.folderType)) ||
                     (EntityFolder.TRASH.equals(actionType) && EntityFolder.JUNK.equals(message.folderType)))
diff --git a/app/src/main/res/layout/fragment_legend_folders.xml b/app/src/main/res/layout/fragment_legend_folders.xml
index badecc1dcf..4fbc228248 100644
--- a/app/src/main/res/layout/fragment_legend_folders.xml
+++ b/app/src/main/res/layout/fragment_legend_folders.xml
@@ -152,7 +152,7 @@
             android:padding="12dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/ivTrash"
-            app:srcCompat="@drawable/baseline_flag_24" />
+            app:srcCompat="@drawable/baseline_report_problem_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvJunk"
diff --git a/app/src/main/res/layout/include_message_navigation.xml b/app/src/main/res/layout/include_message_navigation.xml
index 2aac72847f..b3edbac367 100644
--- a/app/src/main/res/layout/include_message_navigation.xml
+++ b/app/src/main/res/layout/include_message_navigation.xml
@@ -57,7 +57,7 @@
         android:padding="6dp"
         android:scaleType="fitCenter"
         android:tooltipText="@string/title_spam"
-        app:srcCompat="@drawable/baseline_flag_24"
+        app:srcCompat="@drawable/baseline_report_problem_24"
         tools:ignore="MissingConstraints" />
 
     <ImageButton