diff --git a/src/panels/config/automation/action/ha-automation-action-row.ts b/src/panels/config/automation/action/ha-automation-action-row.ts
index 6bdc6c58c4..565096f607 100644
--- a/src/panels/config/automation/action/ha-automation-action-row.ts
+++ b/src/panels/config/automation/action/ha-automation-action-row.ts
@@ -513,7 +513,7 @@ export default class HaAutomationActionRow extends LitElement {
         @media (min-width: 870px) {
           .action-icon {
             display: inline-block;
-            color: var(--primary-color);
+            color: var(--secondary-text-color);
             opacity: 0.9;
             margin-right: 8px;
           }
diff --git a/src/panels/config/automation/condition/ha-automation-condition-row.ts b/src/panels/config/automation/condition/ha-automation-condition-row.ts
index 6d755e59cd..4f201144ec 100644
--- a/src/panels/config/automation/condition/ha-automation-condition-row.ts
+++ b/src/panels/config/automation/condition/ha-automation-condition-row.ts
@@ -429,7 +429,7 @@ export default class HaAutomationConditionRow extends LitElement {
         @media (min-width: 870px) {
           .condition-icon {
             display: inline-block;
-            color: var(--primary-color);
+            color: var(--secondary-text-color);
             opacity: 0.9;
             margin-right: 8px;
           }
diff --git a/src/panels/config/automation/ha-automation-editor.ts b/src/panels/config/automation/ha-automation-editor.ts
index 8a379645e7..a09ebf556c 100644
--- a/src/panels/config/automation/ha-automation-editor.ts
+++ b/src/panels/config/automation/ha-automation-editor.ts
@@ -230,6 +230,14 @@ export class HaAutomationEditor extends KeyboardShortcutMixin(LitElement) {
 
         ${this._config
           ? html`
+              ${this.narrow
+                ? html`<span slot="header"
+                    >${this._config!.alias ||
+                    this.hass.localize(
+                      "ui.panel.config.automation.editor.default_name"
+                    )}</span
+                  >`
+                : ""}
               <div
                 class="content ${classMap({
                   "yaml-mode": this._mode === "yaml",
@@ -242,12 +250,7 @@ export class HaAutomationEditor extends KeyboardShortcutMixin(LitElement) {
                 ${this._mode === "gui"
                   ? html`
                       ${this.narrow
-                        ? html`<span slot="header"
-                            >${this._config!.alias ||
-                            this.hass.localize(
-                              "ui.panel.config.automation.editor.default_name"
-                            )}</span
-                          >`
+                        ? ""
                         : html`
                             <div class="header-name">
                               <h1>
diff --git a/src/panels/config/automation/manual-automation-editor.ts b/src/panels/config/automation/manual-automation-editor.ts
index 8610c8e6b0..c96f7fee13 100644
--- a/src/panels/config/automation/manual-automation-editor.ts
+++ b/src/panels/config/automation/manual-automation-editor.ts
@@ -319,7 +319,7 @@ export class HaManualAutomationEditor extends LitElement {
         @media (min-width: 870px) {
           .settings-icon {
             display: inline-block;
-            color: var(--primary-color);
+            color: var(--secondary-text-color);
             opacity: 0.9;
             margin-right: 8px;
           }
diff --git a/src/panels/config/automation/trigger/ha-automation-trigger-row.ts b/src/panels/config/automation/trigger/ha-automation-trigger-row.ts
index f3351fc2b8..9956bbf3c0 100644
--- a/src/panels/config/automation/trigger/ha-automation-trigger-row.ts
+++ b/src/panels/config/automation/trigger/ha-automation-trigger-row.ts
@@ -538,7 +538,7 @@ export default class HaAutomationTriggerRow extends LitElement {
         @media (min-width: 870px) {
           .trigger-icon {
             display: inline-block;
-            color: var(--primary-color);
+            color: var(--secondary-text-color);
             opacity: 0.9;
             margin-right: 8px;
           }