diff --git a/src/dev-app/dev-app/dev-app-layout.scss b/src/dev-app/dev-app/dev-app-layout.scss
index 214a603ffa0b..4055beea071b 100644
--- a/src/dev-app/dev-app/dev-app-layout.scss
+++ b/src/dev-app/dev-app/dev-app-layout.scss
@@ -73,8 +73,4 @@ body {
 .demo-config-buttons {
   display: flex;
   align-items: center;
-
-  .mat-mdc-button-base {
-    --mdc-text-button-label-text-color: inherit;
-  }
 }
diff --git a/src/material/toolbar/toolbar.scss b/src/material/toolbar/toolbar.scss
index c3f323e3a3ef..624126e7b6bd 100644
--- a/src/material/toolbar/toolbar.scss
+++ b/src/material/toolbar/toolbar.scss
@@ -10,6 +10,11 @@ $height-mobile-portrait: 56px !default;
   @include cdk.high-contrast(active, off) {
     outline: solid 1px;
   }
+
+  .mat-mdc-button-base {
+    --mdc-text-button-label-text-color: inherit;
+    --mdc-outlined-button-label-text-color: inherit;
+  }
 }
 
 .mat-toolbar-row, .mat-toolbar-single-row {