--- a/mail/themes/linux/mail/messenger.css
+++ b/mail/themes/linux/mail/messenger.css
@@ -108,21 +108,16 @@ menulist > menupopup >
 
 .toolbarbutton-1 {
   -moz-box-orient: vertical;
   -moz-context-properties: fill, fill-opacity;
   fill: currentColor;
   fill-opacity: var(--toolbarbutton-icon-fill-opacity);
 }
 
-.toolbarbutton-1:-moz-lwtheme,
-.toolbarbutton-menubutton-button:-moz-lwtheme {
-  color: inherit;
-}
-
 toolbox[labelalign="end"] .toolbarbutton-1,
 toolbox[labelalign="end"] .toolbarbutton-1[type="menu-button"]
   > .toolbarbutton-menubutton-button {
   -moz-box-orient: horizontal;
 }
 
 toolbox[labelalign="end"] > toolbar[mode="full"] .toolbarbutton-1 .toolbarbutton-text {
   padding-inline-start: 2px;
@@ -146,16 +141,17 @@ toolbox[labelalign="end"] .toolbarbutton
   min-height: 24px;
   min-width: 32px;
   margin: 1px;
   padding: 1px 6px;
   border: 1px solid transparent;
   border-radius: var(--toolbarbutton-border-radius);
   transition-property: background-color, border-color;
   transition-duration: 150ms;
+  color: inherit;
 }
 
 .toolbarbutton-menubutton-button {
   min-height: 0;
   margin: 0;
   border-top-style: none;
   border-inline-start-style: none;
   border-bottom-style: none;
@@ -255,20 +251,16 @@ toolbox:not([labelalign="end"]) toolbar[
   margin-inline-start: 3px;
 }
 
 .toolbarbutton-1 .toolbarbutton-icon,
 .formatting-button .toolbarbutton-icon {
   margin-inline-end: 0;
 }
 
-.toolbarbutton-1:not(:-moz-lwtheme) .toolbarbutton-text {
-  color: var(--toolbarbutton-text-color);
-}
-
 toolbar:not(.inline-toolbar):not(:-moz-lwtheme)
 .toolbarbutton-1 .toolbarbutton-text {
   color: -moz-menubartext;
 }
 
 .toolbarbutton-1[disabled=true] .toolbarbutton-icon,
 .toolbarbutton-1[disabled=true] .toolbarbutton-text,
 .toolbarbutton-1[disabled=true] .toolbarbutton-menu-dropmarker,
@@ -278,21 +270,16 @@ toolbar:not(.inline-toolbar):not(:-moz-l
   opacity: .4;
 }
 
 .toolbarbutton-menubutton-button > .toolbarbutton-icon,
 .toolbarbutton-1 .toolbarbutton-icon {
   padding: 1px;
 }
 
-.toolbarbutton-1[disabled=true]:-moz-lwtheme,
-.toolbarbutton-menubutton-button[disabled=true]:-moz-lwtheme {
-  color: inherit;
-}
-
 toolbar[mode="full"] .toolbarbutton-1 {
   min-width: 55px;
 }
 
 sidebarheader .toolbarbutton-text:not([value]) {
   display: none;
 }
 

--- a/mail/themes/osx/mail/messenger.css
+++ b/mail/themes/osx/mail/messenger.css
@@ -186,18 +186,22 @@ toolbox[labelalign="end"] toolbarpalette
 
 .toolbarbutton-1 {
   margin: 4px 2px;
   -moz-context-properties: fill, fill-opacity;
   fill: currentColor;
   fill-opacity: var(--toolbarbutton-icon-fill-opacity);
 }
 
+.toolbarbutton-1,
+.toolbarbutton-menubutton-button {
+  color: inherit;
+}
+
 .toolbarbutton-1:-moz-lwtheme {
-  color: inherit;
   text-shadow: inherit;
 }
 
 .toolbarbutton-1[open],
 .toolbarbutton-1[open] > .toolbarbutton-menubutton-button {
   text-shadow: none;
 }
 
@@ -237,21 +241,16 @@ toolbar:not([mode="icons"]) .toolbarbutt
 toolbar:not([mode="icons"]) .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   min-width: 0;
 }
 
 .toolbarbutton-1 .toolbarbutton-icon {
   padding: 1px;
 }
 
-.toolbarbutton-1[disabled=true]:-moz-lwtheme,
-.toolbarbutton-menubutton-button[disabled=true]:-moz-lwtheme {
-  color: inherit !important;
-}
-
 .toolbarbutton-1[disabled="true"] .toolbarbutton-text,
 .toolbarbutton-1[type="menu-button"] > .toolbarbutton-menubutton-button[disabled="true"]
   > .toolbarbutton-icon {
   opacity: .4;
 }
 
 /* Separator between menu and split type buttons */
 .toolbarbutton-1:not(:hover):not(:active):not([open]):not([checked]) >

--- a/mail/themes/windows/mail/messenger.css
+++ b/mail/themes/windows/mail/messenger.css
@@ -99,16 +99,17 @@ toolbar[brighttext] {
 toolbox[labelalign="end"] .toolbarbutton-1,
 toolbox[labelalign="end"] .toolbarbutton-1[type="menu-button"]
   > .toolbarbutton-menubutton-button {
   -moz-box-orient: horizontal;
 }
 
 .toolbarbutton-1,
 .toolbarbutton-menubutton-button {
+  color: inherit;
   padding-top: 5px;
   padding-bottom: 6px;
   padding-inline-start: 4px;
   padding-inline-end: 5px;
 }
 
 .toolbarbutton-1:hover:active:not([disabled]),
 .toolbarbutton-1[open="true"],
@@ -116,30 +117,24 @@ toolbox[labelalign="end"] .toolbarbutton
 .toolbarbutton-menubutton-button[open="true"] {
   padding-top: 6px;
   padding-bottom: 5px;
   padding-inline-start: 5px;
   padding-inline-end: 4px;
 }
 
 .toolbarbutton-1[checked="true"] {
-  color: inherit;
   padding: 1px 5px !important;
 }
 
 .toolbarbutton-1[disabled=true]:-moz-lwtheme,
 .toolbarbutton-menubutton-button[disabled=true]:-moz-lwtheme {
-  color: inherit;
   text-shadow: inherit;
 }
 
-.toolbarbutton-1[disabled=true]:-moz-lwtheme .toolbarbutton-text {
-  opacity: .4;
-}
-
 toolbox[labelalign="end"] > toolbar[mode="full"] .toolbarbutton-1 .toolbarbutton-text {
   padding-inline-start: 2px;
 }
 
 toolbox[labelalign="end"] > toolbar[mode="full"] deck .toolbarbutton-text {
   text-align: start;
 }
 
@@ -289,16 +284,17 @@ button[type="menu-button"] > button {
   min-height: 24px;
 }
 
 .findbar-button {
   padding: 2px 6px;
 }
 
 .toolbarbutton-1[disabled=true] .toolbarbutton-icon,
+.toolbarbutton-1[disabled=true] .toolbarbutton-text,
 .toolbarbutton-1[disabled=true] .toolbarbutton-menu-dropmarker,
 .toolbarbutton-1[disabled=true] > .toolbarbutton-menubutton-dropmarker,
 .toolbarbutton-1[disabled=true] > .toolbarbutton-menubutton-button >
 .toolbarbutton-icon {
   opacity: .4;
 }
 
 .toolbarbutton-menubutton-button > .toolbarbutton-icon,