diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index 2fbb895..9f43e8f 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -12471,12 +12471,72 @@
         padding-inline-start: var(--menu-background-padding-default) !important;
         margin-left: 0 !important;
       }
+      :not(menu, #ContentSelectDropdown, #context-navigation)
+        > menupopup:not(.in-menulist)
+        > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"])
+        > .menu-icon,
+      :not(menu, #ContentSelectDropdown, #context-navigation)
+        > menupopup:not(.in-menulist)
+        > menu:not(.menu-iconic, .in-menulist, [checked="true"])
+        > .menu-icon,
+      menupopup:is(
+          #menu_FilePopup,
+          #menu_EditPopup,
+          #menu_viewPopup,
+          #goPopup,
+          #historyMenuPopup,
+          #bookmarksMenuPopup,
+          #menu_ProfilesPopup,
+          #menu_ToolsPopup,
+          #windowPopup,
+          #menu_HelpPopup,
+          #usercssloader-menupopup,
+          #sidebar-context-menu
+        )
+        menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"])
+        > .menu-icon,
+      menupopup:is(
+          #menu_FilePopup,
+          #menu_EditPopup,
+          #menu_viewPopup,
+          #goPopup,
+          #historyMenuPopup,
+          #bookmarksMenuPopup,
+          #menu_ProfilesPopup,
+          #menu_ToolsPopup,
+          #windowPopup,
+          #menu_HelpPopup,
+          #usercssloader-menupopup,
+          #sidebar-context-menu
+        )
+        menu:not(.menu-iconic, .in-menulist, [checked="true"])
+        > .menu-icon,
+      menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
+        > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"])
+        > .menu-icon,
+      menupopup:is(#viewMenuPopup, #maintenanceButtonPopup)
+        > menu:not(.menu-iconic, .in-menulist, [checked="true"])
+        > .menu-icon,
+      menupopup:is(
+          #context_sendTabToDevicePopupMenu,
+          #context-sendpagetodevice-popup,
+          #context-sendlinktodevice-popup,
+          #frame > menupopup,
+          #spell-dictionaries-menu,
+          #context-ask-chat > menupopup
+        )
+        > menuitem:not([type="checkbox"][checked="true"], [type="radio"])
+        > .menu-icon,
+      .openintabs-menuitem > .menu-icon,
+      #blockedPopupDontShowMessage > .menu-icon,
+      #BMB_viewBookmarksToolbar > .menu-icon,
+      #sidebarMenu-popup:is(menupopup) > .menu-icon,
+      #context_openANewTab.tabmix-newtab-menu-icon > .menu-icon {
+        display: none !important;
+      }
       .menupopup-arrowscrollbox {
         padding-inline: 0 !important; /* Original: padding: var(--panel-padding); --panel-padding-block: 4px; */
       }
-      menupopup[needsgutter] > :is(menu, menuitem) > .menu-icon {
-        display: none !important;
-      }
     }
     @media (-moz-platform: windows), (-moz-gtk-csd-available) {
       @media -moz-pref("userChrome.theme.non_native_menu") {
@@ -12548,12 +12608,72 @@
             padding-inline-start: var(--menu-background-padding-default) !important;
             margin-left: 0 !important;
           }
+          :not(menu, #ContentSelectDropdown, #context-navigation)
+            > menupopup:not(.in-menulist)
+            > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"])
+            > .menu-icon,
+          :not(menu, #ContentSelectDropdown, #context-navigation)
+            > menupopup:not(.in-menulist)
+            > menu:not(.menu-iconic, .in-menulist, [checked="true"])
+            > .menu-icon,
+          menupopup:is(
+              #menu_FilePopup,
+              #menu_EditPopup,
+              #menu_viewPopup,
+              #goPopup,
+              #historyMenuPopup,
+              #bookmarksMenuPopup,
+              #menu_ProfilesPopup,
+              #menu_ToolsPopup,
+              #windowPopup,
+              #menu_HelpPopup,
+              #usercssloader-menupopup,
+              #sidebar-context-menu
+            )
+            menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"])
+            > .menu-icon,
+          menupopup:is(
+              #menu_FilePopup,
+              #menu_EditPopup,
+              #menu_viewPopup,
+              #goPopup,
+              #historyMenuPopup,
+              #bookmarksMenuPopup,
+              #menu_ProfilesPopup,
+              #menu_ToolsPopup,
+              #windowPopup,
+              #menu_HelpPopup,
+              #usercssloader-menupopup,
+              #sidebar-context-menu
+            )
+            menu:not(.menu-iconic, .in-menulist, [checked="true"])
+            > .menu-icon,
+          menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
+            > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"])
+            > .menu-icon,
+          menupopup:is(#viewMenuPopup, #maintenanceButtonPopup)
+            > menu:not(.menu-iconic, .in-menulist, [checked="true"])
+            > .menu-icon,
+          menupopup:is(
+              #context_sendTabToDevicePopupMenu,
+              #context-sendpagetodevice-popup,
+              #context-sendlinktodevice-popup,
+              #frame > menupopup,
+              #spell-dictionaries-menu,
+              #context-ask-chat > menupopup
+            )
+            > menuitem:not([type="checkbox"][checked="true"], [type="radio"])
+            > .menu-icon,
+          .openintabs-menuitem > .menu-icon,
+          #blockedPopupDontShowMessage > .menu-icon,
+          #BMB_viewBookmarksToolbar > .menu-icon,
+          #sidebarMenu-popup:is(menupopup) > .menu-icon,
+          #context_openANewTab.tabmix-newtab-menu-icon > .menu-icon {
+            display: none !important;
+          }
           .menupopup-arrowscrollbox {
             padding-inline: 0 !important; /* Original: padding: var(--panel-padding); --panel-padding-block: 4px; */
           }
-          menupopup[needsgutter] > :is(menu, menuitem) > .menu-icon {
-            display: none !important;
-          }
         }
       }
     }
@@ -28260,12 +28380,72 @@
     padding-inline-start: var(--menu-background-padding-default) !important;
     margin-left: 0 !important;
   }
+  :not(menu, #ContentSelectDropdown, #context-navigation)
+    > menupopup:not(.in-menulist)
+    > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"])
+    > .menu-icon,
+  :not(menu, #ContentSelectDropdown, #context-navigation)
+    > menupopup:not(.in-menulist)
+    > menu:not(.menu-iconic, .in-menulist, [checked="true"])
+    > .menu-icon,
+  menupopup:is(
+      #menu_FilePopup,
+      #menu_EditPopup,
+      #menu_viewPopup,
+      #goPopup,
+      #historyMenuPopup,
+      #bookmarksMenuPopup,
+      #menu_ProfilesPopup,
+      #menu_ToolsPopup,
+      #windowPopup,
+      #menu_HelpPopup,
+      #usercssloader-menupopup,
+      #sidebar-context-menu
+    )
+    menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"])
+    > .menu-icon,
+  menupopup:is(
+      #menu_FilePopup,
+      #menu_EditPopup,
+      #menu_viewPopup,
+      #goPopup,
+      #historyMenuPopup,
+      #bookmarksMenuPopup,
+      #menu_ProfilesPopup,
+      #menu_ToolsPopup,
+      #windowPopup,
+      #menu_HelpPopup,
+      #usercssloader-menupopup,
+      #sidebar-context-menu
+    )
+    menu:not(.menu-iconic, .in-menulist, [checked="true"])
+    > .menu-icon,
+  menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
+    > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"])
+    > .menu-icon,
+  menupopup:is(#viewMenuPopup, #maintenanceButtonPopup)
+    > menu:not(.menu-iconic, .in-menulist, [checked="true"])
+    > .menu-icon,
+  menupopup:is(
+      #context_sendTabToDevicePopupMenu,
+      #context-sendpagetodevice-popup,
+      #context-sendlinktodevice-popup,
+      #frame > menupopup,
+      #spell-dictionaries-menu,
+      #context-ask-chat > menupopup
+    )
+    > menuitem:not([type="checkbox"][checked="true"], [type="radio"])
+    > .menu-icon,
+  .openintabs-menuitem > .menu-icon,
+  #blockedPopupDontShowMessage > .menu-icon,
+  #BMB_viewBookmarksToolbar > .menu-icon,
+  #sidebarMenu-popup:is(menupopup) > .menu-icon,
+  #context_openANewTab.tabmix-newtab-menu-icon > .menu-icon {
+    display: none !important;
+  }
   .menupopup-arrowscrollbox {
     padding-inline: 0 !important; /* Original: padding: var(--panel-padding); --panel-padding-block: 4px; */
   }
-  menupopup[needsgutter] > :is(menu, menuitem) > .menu-icon {
-    display: none !important;
-  }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-platform: windows) and (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available),
   (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
@@ -28332,12 +28512,72 @@
     padding-inline-start: var(--menu-background-padding-default) !important;
     margin-left: 0 !important;
   }
+  :not(menu, #ContentSelectDropdown, #context-navigation)
+    > menupopup:not(.in-menulist)
+    > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"])
+    > .menu-icon,
+  :not(menu, #ContentSelectDropdown, #context-navigation)
+    > menupopup:not(.in-menulist)
+    > menu:not(.menu-iconic, .in-menulist, [checked="true"])
+    > .menu-icon,
+  menupopup:is(
+      #menu_FilePopup,
+      #menu_EditPopup,
+      #menu_viewPopup,
+      #goPopup,
+      #historyMenuPopup,
+      #bookmarksMenuPopup,
+      #menu_ProfilesPopup,
+      #menu_ToolsPopup,
+      #windowPopup,
+      #menu_HelpPopup,
+      #usercssloader-menupopup,
+      #sidebar-context-menu
+    )
+    menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"])
+    > .menu-icon,
+  menupopup:is(
+      #menu_FilePopup,
+      #menu_EditPopup,
+      #menu_viewPopup,
+      #goPopup,
+      #historyMenuPopup,
+      #bookmarksMenuPopup,
+      #menu_ProfilesPopup,
+      #menu_ToolsPopup,
+      #windowPopup,
+      #menu_HelpPopup,
+      #usercssloader-menupopup,
+      #sidebar-context-menu
+    )
+    menu:not(.menu-iconic, .in-menulist, [checked="true"])
+    > .menu-icon,
+  menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
+    > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"])
+    > .menu-icon,
+  menupopup:is(#viewMenuPopup, #maintenanceButtonPopup)
+    > menu:not(.menu-iconic, .in-menulist, [checked="true"])
+    > .menu-icon,
+  menupopup:is(
+      #context_sendTabToDevicePopupMenu,
+      #context-sendpagetodevice-popup,
+      #context-sendlinktodevice-popup,
+      #frame > menupopup,
+      #spell-dictionaries-menu,
+      #context-ask-chat > menupopup
+    )
+    > menuitem:not([type="checkbox"][checked="true"], [type="radio"])
+    > .menu-icon,
+  .openintabs-menuitem > .menu-icon,
+  #blockedPopupDontShowMessage > .menu-icon,
+  #BMB_viewBookmarksToolbar > .menu-icon,
+  #sidebarMenu-popup:is(menupopup) > .menu-icon,
+  #context_openANewTab.tabmix-newtab-menu-icon > .menu-icon {
+    display: none !important;
+  }
   .menupopup-arrowscrollbox {
     padding-inline: 0 !important; /* Original: padding: var(--panel-padding); --panel-padding-block: 4px; */
   }
-  menupopup[needsgutter] > :is(menu, menuitem) > .menu-icon {
-    display: none !important;
-  }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-platform: windows) {
   :root {
diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css
index bba6411..1b477d1 100644
--- a/css/leptonChromeESR.css
+++ b/css/leptonChromeESR.css
@@ -12960,12 +12960,72 @@
         padding-inline-start: var(--menu-background-padding-default) !important;
         margin-left: 0 !important;
       }
+      :not(menu, #ContentSelectDropdown, #context-navigation)
+        > menupopup:not(.in-menulist)
+        > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"])
+        > .menu-icon,
+      :not(menu, #ContentSelectDropdown, #context-navigation)
+        > menupopup:not(.in-menulist)
+        > menu:not(.menu-iconic, .in-menulist, [checked="true"])
+        > .menu-icon,
+      menupopup:is(
+          #menu_FilePopup,
+          #menu_EditPopup,
+          #menu_viewPopup,
+          #goPopup,
+          #historyMenuPopup,
+          #bookmarksMenuPopup,
+          #menu_ProfilesPopup,
+          #menu_ToolsPopup,
+          #windowPopup,
+          #menu_HelpPopup,
+          #usercssloader-menupopup,
+          #sidebar-context-menu
+        )
+        menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"])
+        > .menu-icon,
+      menupopup:is(
+          #menu_FilePopup,
+          #menu_EditPopup,
+          #menu_viewPopup,
+          #goPopup,
+          #historyMenuPopup,
+          #bookmarksMenuPopup,
+          #menu_ProfilesPopup,
+          #menu_ToolsPopup,
+          #windowPopup,
+          #menu_HelpPopup,
+          #usercssloader-menupopup,
+          #sidebar-context-menu
+        )
+        menu:not(.menu-iconic, .in-menulist, [checked="true"])
+        > .menu-icon,
+      menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
+        > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"])
+        > .menu-icon,
+      menupopup:is(#viewMenuPopup, #maintenanceButtonPopup)
+        > menu:not(.menu-iconic, .in-menulist, [checked="true"])
+        > .menu-icon,
+      menupopup:is(
+          #context_sendTabToDevicePopupMenu,
+          #context-sendpagetodevice-popup,
+          #context-sendlinktodevice-popup,
+          #frame > menupopup,
+          #spell-dictionaries-menu,
+          #context-ask-chat > menupopup
+        )
+        > menuitem:not([type="checkbox"][checked="true"], [type="radio"])
+        > .menu-icon,
+      .openintabs-menuitem > .menu-icon,
+      #blockedPopupDontShowMessage > .menu-icon,
+      #BMB_viewBookmarksToolbar > .menu-icon,
+      #sidebarMenu-popup:is(menupopup) > .menu-icon,
+      #context_openANewTab.tabmix-newtab-menu-icon > .menu-icon {
+        display: none !important;
+      }
       .menupopup-arrowscrollbox {
         padding-inline: 0 !important; /* Original: padding: var(--panel-padding); --panel-padding-block: 4px; */
       }
-      menupopup[needsgutter] > :is(menu, menuitem) > .menu-icon {
-        display: none !important;
-      }
     }
     @media (-moz-os-version: windows-win7),
       (-moz-os-version: windows-win8),
@@ -13044,12 +13104,72 @@
             padding-inline-start: var(--menu-background-padding-default) !important;
             margin-left: 0 !important;
           }
+          :not(menu, #ContentSelectDropdown, #context-navigation)
+            > menupopup:not(.in-menulist)
+            > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"])
+            > .menu-icon,
+          :not(menu, #ContentSelectDropdown, #context-navigation)
+            > menupopup:not(.in-menulist)
+            > menu:not(.menu-iconic, .in-menulist, [checked="true"])
+            > .menu-icon,
+          menupopup:is(
+              #menu_FilePopup,
+              #menu_EditPopup,
+              #menu_viewPopup,
+              #goPopup,
+              #historyMenuPopup,
+              #bookmarksMenuPopup,
+              #menu_ProfilesPopup,
+              #menu_ToolsPopup,
+              #windowPopup,
+              #menu_HelpPopup,
+              #usercssloader-menupopup,
+              #sidebar-context-menu
+            )
+            menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"])
+            > .menu-icon,
+          menupopup:is(
+              #menu_FilePopup,
+              #menu_EditPopup,
+              #menu_viewPopup,
+              #goPopup,
+              #historyMenuPopup,
+              #bookmarksMenuPopup,
+              #menu_ProfilesPopup,
+              #menu_ToolsPopup,
+              #windowPopup,
+              #menu_HelpPopup,
+              #usercssloader-menupopup,
+              #sidebar-context-menu
+            )
+            menu:not(.menu-iconic, .in-menulist, [checked="true"])
+            > .menu-icon,
+          menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
+            > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"])
+            > .menu-icon,
+          menupopup:is(#viewMenuPopup, #maintenanceButtonPopup)
+            > menu:not(.menu-iconic, .in-menulist, [checked="true"])
+            > .menu-icon,
+          menupopup:is(
+              #context_sendTabToDevicePopupMenu,
+              #context-sendpagetodevice-popup,
+              #context-sendlinktodevice-popup,
+              #frame > menupopup,
+              #spell-dictionaries-menu,
+              #context-ask-chat > menupopup
+            )
+            > menuitem:not([type="checkbox"][checked="true"], [type="radio"])
+            > .menu-icon,
+          .openintabs-menuitem > .menu-icon,
+          #blockedPopupDontShowMessage > .menu-icon,
+          #BMB_viewBookmarksToolbar > .menu-icon,
+          #sidebarMenu-popup:is(menupopup) > .menu-icon,
+          #context_openANewTab.tabmix-newtab-menu-icon > .menu-icon {
+            display: none !important;
+          }
           .menupopup-arrowscrollbox {
             padding-inline: 0 !important; /* Original: padding: var(--panel-padding); --panel-padding-block: 4px; */
           }
-          menupopup[needsgutter] > :is(menu, menuitem) > .menu-icon {
-            display: none !important;
-          }
         }
       }
     }
diff --git a/src/icons/layout/_menu.scss b/src/icons/layout/_menu.scss
index 1807962..8dd626c 100644
--- a/src/icons/layout/_menu.scss
+++ b/src/icons/layout/_menu.scss
@@ -102,17 +102,17 @@ $_layoutCommonMenus: (
     @include _layout_root_non_native;
     @include _layoutIconMenus {
       @include _layout_init_non_native();
+
+      // FF v141 #1128
+      > .menu-icon {
+        display: none !important;
+      }
     }
 
     // FF v121
     .menupopup-arrowscrollbox {
       padding-inline: 0 !important; /* Original: padding: var(--panel-padding); --panel-padding-block: 4px; */
     }
-
-    // FF v141 #1128
-    menupopup[needsgutter] > :is(menu, menuitem) > .menu-icon {
-      display: none !important;
-    }
   }
 }