diff --git a/chrome/button_effect_scale_onclick.css b/chrome/button_effect_scale_onclick.css
index 58d41af..3c536fc 100644
--- a/chrome/button_effect_scale_onclick.css
+++ b/chrome/button_effect_scale_onclick.css
@@ -5,7 +5,7 @@ See the above repository for updates as well as full license text. */
 .urlbar-icon,
 .toolbarbutton-icon,
 .downloadIconShow > .button-box > .button-icon,
-.menuitem-iconic .menu-iconic-icon,
+.menuitem-iconic :is(.menu-iconic-icon,.menu-icon),
 #downloads-indicator-icon,
 .urlbar-input-container [role="button"] image{
   transition: transform 83ms linear !important;
@@ -19,7 +19,7 @@ toolbar .toolbarbutton-1 > .toolbarbutton-icon{
 toolbarbutton#scrollbutton-up:active > .toolbarbutton-icon,
 toolbarbutton:not(.toolbarbutton-1):active > .toolbarbutton-icon,
 toolbar .toolbarbutton-1:not([disabled]):active > .toolbarbutton-badge-stack > .toolbarbutton-icon,
-.menuitem-iconic:active .menu-iconic-icon,
+.menuitem-iconic:active :is(.menu-iconic-icon,.menu-icon),
 .urlbar-page-action:active > .urlbar-icon{
   transform: scale(0.6) !important;
 }
diff --git a/chrome/button_effect_scale_onhover.css b/chrome/button_effect_scale_onhover.css
index 8509261..37e4c17 100644
--- a/chrome/button_effect_scale_onhover.css
+++ b/chrome/button_effect_scale_onhover.css
@@ -6,7 +6,7 @@ See the above repository for updates as well as full license text. */
 .toolbarbutton-icon,
 .tab-close-button,
 .downloadIconShow > .button-box > .button-icon,
-.menuitem-iconic .menu-iconic-icon,
+.menuitem-iconic is(.menu-iconic-icon,.menu-icon),
 #downloads-indicator-icon,
 .urlbar-input-container [role="button"] image{
   transition: transform 83ms linear !important;
@@ -23,7 +23,7 @@ toolbar .toolbarbutton-1 > .toolbarbutton-icon{
 toolbarbutton#scrollbutton-up > .toolbarbutton-icon,
 toolobar .toolbarbutton-1 > .toolbarbutton-icon,
 toolbar .toolbarbutton-1 > .toolbarbutton-badge-stack > .toolbarbutton-icon,
-.menuitem-iconic .menu-iconic-icon,
+.menuitem-iconic is(.menu-iconic-icon,.menu-icon),
 .urlbar-icon{
   transform: scale(0.8) !important;
 }
@@ -39,7 +39,7 @@ toolbar .toolbarbutton-1 > .toolbarbutton-icon{
 toolbarbutton#scrollbutton-up:not([disabled]):hover > .toolbarbutton-icon,
 toolbarbutton:not(.toolbarbutton-1):not([disabled]):hover > .toolbarbutton-icon,
 toolbar .toolbarbutton-1:not([disabled]):hover > .toolbarbutton-badge-stack > .toolbarbutton-icon,
-.menuitem-iconic:not([disabled]):hover .menu-iconic-icon,
+.menuitem-iconic:not([disabled]):hover :is(.menu-iconic-icon,.menu-icon),
 .urlbar-page-action:hover > .urlbar-icon{
   transform: none !important;
 }
diff --git a/chrome/context_menus_more_proton.css b/chrome/context_menus_more_proton.css
index 5190b9e..679f964 100644
--- a/chrome/context_menus_more_proton.css
+++ b/chrome/context_menus_more_proton.css
@@ -57,10 +57,10 @@ menuseparator:not(.in-menulist){
   margin-block: var(--panel-separator-margin-vertical) !important;
 }
 
-#context-navigation > menuitem[_moz-menuactive] .menu-iconic-icon{
+#context-navigation > menuitem[_moz-menuactive] :is(.menu-iconic-icon){
   border-radius: var(--arrowpanel-menuitem-border-radius) !important;
 }
-#context-navigation > menuitem[_moz-menuactive]:not([disabled]) .menu-iconic-icon,
+#context-navigation > menuitem[_moz-menuactive]:not([disabled]) :is(.menu-iconic-icon,.menu-icon),
 menupopup > menuitem[_moz-menuactive],
 menupopup > menu[_moz-menuactive]{
   background-color: var(--panel-item-hover-bgcolor) !important;
diff --git a/chrome/iconized_content_context_menu.css b/chrome/iconized_content_context_menu.css
index 2d6422e..073f541 100644
--- a/chrome/iconized_content_context_menu.css
+++ b/chrome/iconized_content_context_menu.css
@@ -25,7 +25,7 @@ See the above repository for updates as well as full license text. */
 #contentAreaContextMenu > menuitem[type="checkbox"]::before{
   content: url("chrome://devtools/skin/images/checkbox.svg");
 }
-#contentAreaContextMenu > menuitem[type="checkbox"] > .menu-iconic-left{
+#contentAreaContextMenu > menuitem[type="checkbox"] > :is(.menu-iconic-left,.menu-icon){
   display: none;
 }
 #contentAreaContextMenu > menuitem[type="checkbox"][_moz-menuactive]::before,
diff --git a/chrome/iconized_places_context_menu.css b/chrome/iconized_places_context_menu.css
index e9e5468..8f8b231 100644
--- a/chrome/iconized_places_context_menu.css
+++ b/chrome/iconized_places_context_menu.css
@@ -26,7 +26,7 @@ See the above repository for updates as well as full license text. */
 #placesContext > menuitem[type="checkbox"]::before{
   content: url("chrome://devtools/skin/images/checkbox.svg");
 }
-#placesContext > menuitem[type="checkbox"] > .menu-iconic-left{
+#placesContext > menuitem[type="checkbox"] > :is(.menu-iconic-left,.menu-icon){
   display: none;
 }
 #placesContext > menuitem[type="checkbox"][_moz-menuactive]::before,
diff --git a/chrome/iconized_tabs_context_menu.css b/chrome/iconized_tabs_context_menu.css
index 6c7f45b..b7922b2 100644
--- a/chrome/iconized_tabs_context_menu.css
+++ b/chrome/iconized_tabs_context_menu.css
@@ -25,7 +25,7 @@ See the above repository for updates as well as full license text. */
 #tabContextMenu > menuitem[type="checkbox"]::before{
   content: url("chrome://devtools/skin/images/checkbox.svg");
 }
-#tabContextMenu > menuitem[type="checkbox"] > .menu-iconic-left{
+#tabContextMenu > menuitem[type="checkbox"] > :is(.menu-iconic-left,.menu-icon){
   display: none;
 }
 #tabContextMenu > menuitem[type="checkbox"][_moz-menuactive]::before,
diff --git a/chrome/iconized_textbox_context_menu.css b/chrome/iconized_textbox_context_menu.css
index 71e32bb..57c7828 100644
--- a/chrome/iconized_textbox_context_menu.css
+++ b/chrome/iconized_textbox_context_menu.css
@@ -25,7 +25,7 @@ See the above repository for updates as well as full license text. */
 .textbox-contextmenu > menuitem[type="checkbox"]::before{
   content: url("chrome://devtools/skin/images/checkbox.svg");
 }
-.textbox-contextmenu > menuitem[type="checkbox"] > .menu-iconic-left{
+.textbox-contextmenu > menuitem[type="checkbox"] > :is(.menu-iconic-left,.menu-icon){
   display: none;
 }
 .textbox-contextmenu > [data-l10n-id="text-action-undo"]::before,
diff --git a/chrome/textual_context_navigation.css b/chrome/textual_context_navigation.css
index 11fe6a7..db21c2f 100644
--- a/chrome/textual_context_navigation.css
+++ b/chrome/textual_context_navigation.css
@@ -4,10 +4,10 @@ See the above repository for updates as well as full license text. */
 /* Makes constext navigation buttons appears as normal textual menuitems */
 
 #context-navigation{ flex-direction: column !important; }
-#context-navigation > menuitem > .menu-iconic-left{ display: none }
+#context-navigation > menuitem > :is(.menu-iconic-left,.menu-icon){ display: none }
+
 #context-navigation > menuitem{
-  padding-block: 0.5em;
-  padding-inline-start: 1em;
+  padding: var(--menuitem-padding,0.5em 1em) !important;
   justify-content: start !important;
   width: auto !important;
 }