diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 9c9f5a61ea..e3d750fdfa 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -387,10 +387,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             tvNoInternetAttachments = attachments.findViewById(R.id.tvNoInternetAttachments);
 
             bnvActions = vsBody.findViewById(R.id.bnvActions);
-
-            for (int i = 0; i < bnvActions.getMenu().size(); i++)
-                bnvActions.getMenu().getItem(i).getIcon().mutate();
-
             if (compact) {
                 bnvActions.setLabelVisibilityMode(LabelVisibilityMode.LABEL_VISIBILITY_UNLABELED);
                 ViewGroup.LayoutParams lparam = bnvActions.getLayoutParams();
diff --git a/app/src/main/java/eu/faircode/email/FragmentAnswer.java b/app/src/main/java/eu/faircode/email/FragmentAnswer.java
index 7ffff6e3e6..6c3325a61a 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAnswer.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAnswer.java
@@ -74,9 +74,6 @@ public class FragmentAnswer extends FragmentBase {
 
         bottom_navigation = view.findViewById(R.id.bottom_navigation);
 
-        for (int i = 0; i < bottom_navigation.getMenu().size(); i++)
-            bottom_navigation.getMenu().getItem(i).getIcon().mutate();
-
         pbWait = view.findViewById(R.id.pbWait);
         grpReady = view.findViewById(R.id.grpReady);
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 884a8a7398..513dca3d82 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -243,12 +243,8 @@ public class FragmentCompose extends FragmentBase {
         ibReferenceEdit = view.findViewById(R.id.ibReferenceEdit);
         ibReferenceImages = view.findViewById(R.id.ibReferenceImages);
         edit_bar = view.findViewById(R.id.edit_bar);
-
         bottom_navigation = view.findViewById(R.id.bottom_navigation);
 
-        for (int i = 0; i < bottom_navigation.getMenu().size(); i++)
-            bottom_navigation.getMenu().getItem(i).getIcon().mutate();
-
         pbWait = view.findViewById(R.id.pbWait);
         grpHeader = view.findViewById(R.id.grpHeader);
         grpExtra = view.findViewById(R.id.grpExtra);
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 6ac738812e..d1759e8754 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -314,12 +314,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         seekBar = view.findViewById(R.id.seekBar);
         ibDown = view.findViewById(R.id.ibDown);
         ibUp = view.findViewById(R.id.ibUp);
-
         bottom_navigation = view.findViewById(R.id.bottom_navigation);
 
-        for (int i = 0; i < bottom_navigation.getMenu().size(); i++)
-            bottom_navigation.getMenu().getItem(i).getIcon().mutate();
-
         pbWait = view.findViewById(R.id.pbWait);
         grpSupport = view.findViewById(R.id.grpSupport);
         grpHintSupport = view.findViewById(R.id.grpHintSupport);
@@ -1162,7 +1158,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
             if (dX > 0) {
                 // Right swipe
-                Drawable d = getResources().getDrawable(EntityFolder.getIcon(swipes.right_type), getContext().getTheme());
+                Drawable d = getResources().getDrawable(
+                        EntityFolder.getIcon(swipes.right_type), getContext().getTheme()).mutate();
                 d.setAlpha(Math.round(255 * Math.min(dX / (2 * margin + size), 1.0f)));
                 int padding = (rect.height() - size);
                 d.setBounds(
@@ -1173,7 +1170,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                 d.draw(canvas);
             } else if (dX < 0) {
                 // Left swipe
-                Drawable d = getResources().getDrawable(EntityFolder.getIcon(swipes.left_type), getContext().getTheme());
+                Drawable d = getResources().getDrawable(
+                        EntityFolder.getIcon(swipes.left_type), getContext().getTheme()).mutate();
                 d.setAlpha(Math.round(255 * Math.min(-dX / (2 * margin + size), 1.0f)));
                 int padding = (rect.height() - size);
                 d.setBounds(
diff --git a/app/src/main/java/eu/faircode/email/FragmentRule.java b/app/src/main/java/eu/faircode/email/FragmentRule.java
index 0551f5e766..cf76072033 100644
--- a/app/src/main/java/eu/faircode/email/FragmentRule.java
+++ b/app/src/main/java/eu/faircode/email/FragmentRule.java
@@ -202,9 +202,6 @@ public class FragmentRule extends FragmentBase {
 
         bottom_navigation = view.findViewById(R.id.bottom_navigation);
 
-        for (int i = 0; i < bottom_navigation.getMenu().size(); i++)
-            bottom_navigation.getMenu().getItem(i).getIcon().mutate();
-
         pbWait = view.findViewById(R.id.pbWait);
 
         grpReady = view.findViewById(R.id.grpReady);