diff --git a/src/panels/config/automation/ha-automation-picker.ts b/src/panels/config/automation/ha-automation-picker.ts
index f6d8834fa6..12e870be15 100644
--- a/src/panels/config/automation/ha-automation-picker.ts
+++ b/src/panels/config/automation/ha-automation-picker.ts
@@ -213,21 +213,21 @@ class HaAutomationPicker extends LitElement {
               .label="${this.hass.localize(
                 "ui.panel.config.automation.picker.edit_automation"
               )}"
-            ><ha-svg-icon .path=${
-              automation.attributes.id ? mdiPencil : mdiPencilOff
-            }></ha-svg-icon>
+            >
+              <ha-svg-icon
+                .path=${automation.attributes.id ? mdiPencil : mdiPencilOff}
+              ></ha-svg-icon>
+            </mwc-icon-button>
           </a>
-          ${
-            !automation.attributes.id
-              ? html`
-                  <paper-tooltip animation-delay="0" position="left">
-                    ${this.hass.localize(
-                      "ui.panel.config.automation.picker.only_editable"
-                    )}
-                  </paper-tooltip>
-                `
-              : ""
-          }
+          ${!automation.attributes.id
+            ? html`
+                <paper-tooltip animation-delay="0" position="left">
+                  ${this.hass.localize(
+                    "ui.panel.config.automation.picker.only_editable"
+                  )}
+                </paper-tooltip>
+              `
+            : ""}
         `,
       };
       return columns;
diff --git a/src/resources/styles.ts b/src/resources/styles.ts
index 952193d6e9..6be57cf1f2 100644
--- a/src/resources/styles.ts
+++ b/src/resources/styles.ts
@@ -75,6 +75,7 @@ export const derivedStyles = {
   "mdc-theme-on-primary": "var(--text-primary-color)",
   "mdc-theme-on-secondary": "var(--text-primary-color)",
   "mdc-theme-on-surface": "var(--primary-text-color)",
+  "mdc-theme-text-disabled-on-light": "var(--disabled-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)",