--- a/browser/themes/shared/toolbarbutton-icons.inc.css
+++ b/browser/themes/shared/toolbarbutton-icons.inc.css
@@ -1,20 +1,20 @@
 :root {
   --toolbarbutton-icon-fill: #4c4c4c;
   --toolbarbutton-icon-fill-inverted: #fff;
   --toolbarbutton-icon-fill-attention: #177ee5;
 }
 
-:-moz-any(@primaryToolbarButtons@) {
+.toolbarbutton-1 {
   -moz-context-properties: fill;
   fill: var(--toolbarbutton-icon-fill);
 }
 
-toolbar[brighttext] :-moz-any(@primaryToolbarButtons@) {
+toolbar[brighttext] .toolbarbutton-1 {
   fill: var(--toolbarbutton-icon-fill-inverted);
 }
 
 #back-button:-moz-locale-dir(rtl) > .toolbarbutton-icon,
 %ifdef MOZ_PHOTON_THEME
 #forward-button:-moz-locale-dir(rtl) > .toolbarbutton-icon,
 #reload-button:-moz-locale-dir(rtl) > .toolbarbutton-icon,
 %endif