diff --git a/cast/src/launcher/layout/hc-connect.ts b/cast/src/launcher/layout/hc-connect.ts
index 8ace920cbc..8aab0f0e6f 100644
--- a/cast/src/launcher/layout/hc-connect.ts
+++ b/cast/src/launcher/layout/hc-connect.ts
@@ -134,7 +134,7 @@ export class HcConnect extends LitElement {
             <ha-button appearance="plain" @click=${this._handleDemo}>
               Show Demo
               <ha-svg-icon
-                slot="suffix"
+                slot="end"
                 .path=${this.castManager.castState === "CONNECTED"
                   ? mdiCastConnected
                   : mdiCast}
diff --git a/gallery/src/pages/components/ha-button.ts b/gallery/src/pages/components/ha-button.ts
index 55674c4603..a0a07fbb75 100644
--- a/gallery/src/pages/components/ha-button.ts
+++ b/gallery/src/pages/components/ha-button.ts
@@ -71,7 +71,7 @@ export class DemoHaButton extends LitElement {
                             ${titleCase(`${variant} ${appearance}`)}
                             <ha-svg-icon
                               .path=${mdiHome}
-                              slot="suffix"
+                              slot="end"
                             ></ha-svg-icon>
                           </ha-button>
                         `
diff --git a/src/components/ha-multi-textfield.ts b/src/components/ha-multi-textfield.ts
index d03a7b529a..9c5ebf3b0c 100644
--- a/src/components/ha-multi-textfield.ts
+++ b/src/components/ha-multi-textfield.ts
@@ -86,7 +86,7 @@ class HaMultiTextField extends LitElement {
               })
             : this.hass?.localize("ui.common.add")) ??
           "Add"}
-          <ha-svg-icon slot="suffix" .path=${mdiPlus}></ha-svg-icon>
+          <ha-svg-icon slot="end" .path=${mdiPlus}></ha-svg-icon>
         </ha-button>
       </div>
       ${this.helper
diff --git a/src/dialogs/voice-command-dialog/ha-voice-command-dialog.ts b/src/dialogs/voice-command-dialog/ha-voice-command-dialog.ts
index 17f3e5538f..d5b0866e42 100644
--- a/src/dialogs/voice-command-dialog/ha-voice-command-dialog.ts
+++ b/src/dialogs/voice-command-dialog/ha-voice-command-dialog.ts
@@ -117,10 +117,7 @@ export class HaVoiceCommandDialog extends LitElement {
                 size="small"
               >
                 ${this._pipeline?.name}
-                <ha-svg-icon
-                  slot="suffix"
-                  .path=${mdiChevronDown}
-                ></ha-svg-icon>
+                <ha-svg-icon slot="end" .path=${mdiChevronDown}></ha-svg-icon>
               </ha-button>
               ${!this._pipelines
                 ? html`<div class="pipelines-loading">
diff --git a/src/panels/config/automation/ha-automation-picker.ts b/src/panels/config/automation/ha-automation-picker.ts
index 30b07fedd3..fd103962e9 100644
--- a/src/panels/config/automation/ha-automation-picker.ts
+++ b/src/panels/config/automation/ha-automation-picker.ts
@@ -816,8 +816,7 @@ class HaAutomationPicker extends SubscribeMixin(LitElement) {
                   size="small"
                 >
                   ${this.hass.localize("ui.panel.config.common.learn_more")}
-                  <ha-svg-icon slot="suffix" .path=${mdiOpenInNew}>
-                  </ha-svg-icon>
+                  <ha-svg-icon slot="end" .path=${mdiOpenInNew}> </ha-svg-icon>
                 </ha-button>
               </div>`
             : nothing
diff --git a/src/panels/config/blueprint/dialog-import-blueprint.ts b/src/panels/config/blueprint/dialog-import-blueprint.ts
index 76c96719a1..495cfbcf00 100644
--- a/src/panels/config/blueprint/dialog-import-blueprint.ts
+++ b/src/panels/config/blueprint/dialog-import-blueprint.ts
@@ -147,10 +147,7 @@ class DialogImportBlueprint extends LitElement {
                   ${this.hass.localize(
                     "ui.panel.config.blueprint.add.community_forums"
                   )}
-                  <ha-svg-icon
-                    slot="suffix"
-                    .path=${mdiOpenInNew}
-                  ></ha-svg-icon>
+                  <ha-svg-icon slot="end" .path=${mdiOpenInNew}></ha-svg-icon>
                 </ha-button>
                 <ha-textfield
                   id="input"
diff --git a/src/panels/config/blueprint/ha-blueprint-overview.ts b/src/panels/config/blueprint/ha-blueprint-overview.ts
index d9b14079b3..ac1befec81 100644
--- a/src/panels/config/blueprint/ha-blueprint-overview.ts
+++ b/src/panels/config/blueprint/ha-blueprint-overview.ts
@@ -309,7 +309,7 @@ class HaBlueprintOverview extends LitElement {
             ${this.hass.localize(
               "ui.panel.config.blueprint.overview.discover_more"
             )}
-            <ha-svg-icon slot="suffix" .path=${mdiOpenInNew}></ha-svg-icon>
+            <ha-svg-icon slot="end" .path=${mdiOpenInNew}></ha-svg-icon>
           </ha-button>
         </div>`}
         .initialGroupColumn=${this._activeGrouping}
diff --git a/src/panels/config/core/ha-config-analytics.ts b/src/panels/config/core/ha-config-analytics.ts
index 4de52cd159..2dac5e0c5a 100644
--- a/src/panels/config/core/ha-config-analytics.ts
+++ b/src/panels/config/core/ha-config-analytics.ts
@@ -61,7 +61,7 @@ class ConfigAnalytics extends LitElement {
           target="_blank"
           rel="noreferrer"
         >
-          <ha-svg-icon slot="suffix" .path=${mdiOpenInNew}></ha-svg-icon>
+          <ha-svg-icon slot="end" .path=${mdiOpenInNew}></ha-svg-icon>
           ${this.hass.localize("ui.panel.config.analytics.learn_more")}
         </ha-button>
       </div>
diff --git a/src/panels/config/devices/ha-config-device-page.ts b/src/panels/config/devices/ha-config-device-page.ts
index 42e0cf44e3..9bc5eb7d63 100644
--- a/src/panels/config/devices/ha-config-device-page.ts
+++ b/src/panels/config/devices/ha-config-device-page.ts
@@ -789,7 +789,7 @@ export class HaConfigDevicePage extends LitElement {
                           ? html`
                               <ha-svg-icon
                                 .path=${firstDeviceAction!.trailingIcon}
-                                slot="suffix"
+                                slot="end"
                               ></ha-svg-icon>
                             `
                           : nothing}
diff --git a/src/panels/config/logs/ha-config-logs.ts b/src/panels/config/logs/ha-config-logs.ts
index 283ef66a9e..03e2d62fdd 100644
--- a/src/panels/config/logs/ha-config-logs.ts
+++ b/src/panels/config/logs/ha-config-logs.ts
@@ -118,10 +118,7 @@ export class HaConfigLogs extends LitElement {
           ? html`
               <ha-button-menu slot="toolbar-icon">
                 <ha-button slot="trigger" appearance="filled">
-                  <ha-svg-icon
-                    slot="suffix"
-                    .path=${mdiChevronDown}
-                  ></ha-svg-icon>
+                  <ha-svg-icon slot="end" .path=${mdiChevronDown}></ha-svg-icon>
                   ${this._logProviders.find(
                     (p) => p.key === this._selectedLogProvider
                   )!.name}
diff --git a/src/panels/config/scene/ha-scene-dashboard.ts b/src/panels/config/scene/ha-scene-dashboard.ts
index 235ed869c0..8390a2891c 100644
--- a/src/panels/config/scene/ha-scene-dashboard.ts
+++ b/src/panels/config/scene/ha-scene-dashboard.ts
@@ -789,7 +789,7 @@ class HaSceneDashboard extends SubscribeMixin(LitElement) {
                 size="small"
               >
                 ${this.hass.localize("ui.panel.config.common.learn_more")}
-                <ha-svg-icon slot="suffix" .path=${mdiOpenInNew}></ha-svg-icon>
+                <ha-svg-icon slot="end" .path=${mdiOpenInNew}></ha-svg-icon>
               </ha-button>
             </div>`
           : nothing}
diff --git a/src/panels/config/script/ha-script-picker.ts b/src/panels/config/script/ha-script-picker.ts
index 7a0f2a1921..46d6330f29 100644
--- a/src/panels/config/script/ha-script-picker.ts
+++ b/src/panels/config/script/ha-script-picker.ts
@@ -788,7 +788,7 @@ class HaScriptPicker extends SubscribeMixin(LitElement) {
                 size="small"
               >
                 ${this.hass.localize("ui.panel.config.common.learn_more")}
-                <ha-svg-icon slot="suffix" .path=${mdiOpenInNew}></ha-svg-icon>
+                <ha-svg-icon slot="end" .path=${mdiOpenInNew}></ha-svg-icon>
               </ha-button>
             </div>`
           : nothing}
diff --git a/src/panels/config/voice-assistants/cloud-discover.ts b/src/panels/config/voice-assistants/cloud-discover.ts
index 03b235cb21..13f323964f 100644
--- a/src/panels/config/voice-assistants/cloud-discover.ts
+++ b/src/panels/config/voice-assistants/cloud-discover.ts
@@ -91,7 +91,7 @@ export class CloudDiscover extends LitElement {
               ${this.hass.localize(
                 "ui.panel.config.voice_assistants.assistants.cloud.and_more"
               )}
-              <ha-svg-icon slot="suffix" .path=${mdiOpenInNew}></ha-svg-icon>
+              <ha-svg-icon slot="end" .path=${mdiOpenInNew}></ha-svg-icon>
             </ha-button>
           </div>
         </div>