diff --git a/src/dialogs/quick-bar/ha-quick-bar.ts b/src/dialogs/quick-bar/ha-quick-bar.ts
index 42d5181425..bb4fa61afe 100644
--- a/src/dialogs/quick-bar/ha-quick-bar.ts
+++ b/src/dialogs/quick-bar/ha-quick-bar.ts
@@ -329,11 +329,6 @@ export class QuickBar extends LitElement {
           padding: 8px 20px 0px;
         }
 
-        mwc-list-item span[slot="secondary"],
-        ha-icon[slot="graphic"] {
-          color: var(--secondary-text-color);
-        }
-
         ha-dialog {
           --dialog-z-index: 8;
           --dialog-content-padding: 0;
@@ -349,10 +344,6 @@ export class QuickBar extends LitElement {
           }
         }
 
-        ha-icon {
-          color: var(--secondary-text-color);
-        }
-
         ha-svg-icon.prefix {
           margin: 8px;
         }
diff --git a/src/panels/config/automation/ha-automation-editor.ts b/src/panels/config/automation/ha-automation-editor.ts
index a5c00ff58c..9552fd5d9f 100644
--- a/src/panels/config/automation/ha-automation-editor.ts
+++ b/src/panels/config/automation/ha-automation-editor.ts
@@ -171,7 +171,6 @@ export class HaAutomationEditor extends KeyboardShortcutMixin(LitElement) {
             <ha-svg-icon
               slot="graphic"
               .path=${mdiContentDuplicate}
-              class=${classMap({ enabled_icon: this.automationId })}
             ></ha-svg-icon>
           </mwc-list-item>
 
@@ -778,9 +777,6 @@ export class HaAutomationEditor extends KeyboardShortcutMixin(LitElement) {
         mwc-fab.dirty {
           bottom: 0;
         }
-        .enabled_icon {
-          color: var(--primary-text-color);
-        }
         .selected_menu_item {
           color: var(--primary-color);
         }
diff --git a/src/resources/styles.ts b/src/resources/styles.ts
index 61457fdd87..948102eb4d 100644
--- a/src/resources/styles.ts
+++ b/src/resources/styles.ts
@@ -76,6 +76,7 @@ export const derivedStyles = {
   "mdc-theme-on-surface": "var(--primary-text-color)",
   "mdc-theme-text-primary-on-background": "var(--primary-text-color)",
   "mdc-theme-text-secondary-on-background": "var(--secondary-text-color)",
+  "mdc-theme-text-icon-on-background": "var(--secondary-text-color)",
   "app-header-text-color": "var(--text-primary-color)",
   "app-header-background-color": "var(--primary-color)",
   "material-body-text-color": "var(--primary-text-color)",