diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 9ed297e5e8..d203bb19a7 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -1622,9 +1622,7 @@ public class FragmentCompose extends FragmentBase {
         ssbZoom.append(' ');
         for (int i = 0; i <= zoom; i++)
             ssbZoom.append('+');
-        menu.findItem(R.id.menu_zoom)
-                .setIcon(R.drawable.twotone_format_size_24)
-                .setTitle(ssbZoom);
+        menu.findItem(R.id.menu_zoom).setTitle(ssbZoom);
         PopupMenuLifecycle.insertIcon(context, menu.findItem(R.id.menu_zoom));
 
         int colorEncrypt = Helper.resolveColor(context, R.attr.colorEncrypt);
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 70073dcf78..1c1e0454d9 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -4384,7 +4384,10 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         inflater.inflate(R.menu.menu_messages, menu);
 
-        LayoutInflater infl = LayoutInflater.from(getContext());
+        final Context context = getContext();
+        PopupMenuLifecycle.insertIcons(context, menu);
+
+        LayoutInflater infl = LayoutInflater.from(context);
         ImageButton ib = (ImageButton) infl.inflate(R.layout.action_button, null);
         ib.setId(View.generateViewId());
         ib.setImageResource(R.drawable.twotone_folder_24);
@@ -4414,7 +4417,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
     @Override
     public void onPrepareOptionsMenu(Menu menu) {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
+        final Context context = getContext();
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         String sort = prefs.getString("sort", "time");
         boolean ascending = prefs.getBoolean(
                 viewType == AdapterMessage.ViewType.THREAD ? "ascending_thread" : "ascending_list", false);
@@ -4446,7 +4450,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                 : MenuItem.SHOW_AS_ACTION_NEVER);
         MenuItemCompat.setIconTintList(menuFilter,
                 folder && filter_active ?
-                        ColorStateList.valueOf(Helper.resolveColor(getContext(), R.attr.colorAccent)) : null);
+                        ColorStateList.valueOf(Helper.resolveColor(context, R.attr.colorAccent)) : null);
         menuFilter.setIcon(folder && filter_active ? R.drawable.twotone_filter_alt_24 : R.drawable.twotone_filter_list_24);
 
         MenuItem menuSearch = menu.findItem(R.id.menu_search);
@@ -4554,6 +4558,9 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         ibUnflagged.setVisibility(quick_filter && folder ? View.VISIBLE : View.GONE);
         ibSnoozed.setVisibility(quick_filter && folder && !drafts ? View.VISIBLE : View.GONE);
 
+        PopupMenuLifecycle.insertIcon(context, menu.findItem(R.id.menu_zoom));
+        PopupMenuLifecycle.insertIcon(context, menu.findItem(R.id.menu_padding));
+
         super.onPrepareOptionsMenu(menu);
     }
 
diff --git a/app/src/main/java/eu/faircode/email/PopupMenuLifecycle.java b/app/src/main/java/eu/faircode/email/PopupMenuLifecycle.java
index 8a2409ed63..342ad15d34 100644
--- a/app/src/main/java/eu/faircode/email/PopupMenuLifecycle.java
+++ b/app/src/main/java/eu/faircode/email/PopupMenuLifecycle.java
@@ -136,6 +136,7 @@ public class PopupMenuLifecycle extends PopupMenu {
         ssb.insert(0, "\uFFFC\u2002"); // object replacement character, en space
         ssb.setSpan(imageSpan, 0, 1, 0);
         menuItem.setTitle(ssb);
-        menuItem.setIcon(null);
+        //menuItem.setIcon(null);
+        menuItem.setTitleCondensed("");
     }
 }