diff --git a/src/components/ha-button.ts b/src/components/ha-button.ts
index af92b2717a..cd72bc8f4f 100644
--- a/src/components/ha-button.ts
+++ b/src/components/ha-button.ts
@@ -57,6 +57,8 @@ export class HaButton extends Button {
             --ha-button-height,
             var(--button-height, 40px)
           );
+
+          font-size: var(--ha-font-size-l);
         }
 
         :host([size="small"]) .button {
@@ -64,6 +66,7 @@ export class HaButton extends Button {
             --ha-button-height,
             var(--button-height, 32px)
           );
+          font-size: var(--wa-font-size-s, var(--ha-font-size-l));
         }
 
         :host([variant="brand"]) {
diff --git a/src/panels/config/automation/ha-automation-editor.ts b/src/panels/config/automation/ha-automation-editor.ts
index 4336b7e72b..f8141b2e32 100644
--- a/src/panels/config/automation/ha-automation-editor.ts
+++ b/src/panels/config/automation/ha-automation-editor.ts
@@ -216,6 +216,7 @@ export class HaAutomationEditor extends PreventUnsavedMixin(
           ? html`
               <ha-button
                 appearance="plain"
+                size="small"
                 @click=${this._showTrace}
                 slot="toolbar-icon"
               >
diff --git a/src/panels/config/repairs/dialog-repairs-issue.ts b/src/panels/config/repairs/dialog-repairs-issue.ts
index 5de0edb0f2..2f8eae0db5 100644
--- a/src/panels/config/repairs/dialog-repairs-issue.ts
+++ b/src/panels/config/repairs/dialog-repairs-issue.ts
@@ -145,7 +145,7 @@ class DialogRepairsIssue extends LitElement {
                     : undefined}
                 >
                   ${this.hass!.localize("ui.panel.config.repairs.dialog.learn")}
-                  <ha-svg-icon .path=${mdiOpenInNew}></ha-svg-icon>
+                  <ha-svg-icon slot="end" .path=${mdiOpenInNew}></ha-svg-icon>
                 </ha-button>
               `
             : ""}