diff --git a/src/components/ha-color-picker.ts b/src/components/ha-color-picker.ts
index 3a608c0a4485..d29b45b26f85 100644
--- a/src/components/ha-color-picker.ts
+++ b/src/components/ha-color-picker.ts
@@ -9,7 +9,7 @@ import { LocalizeKeys } from "../common/translations/localize";
 import { HomeAssistant } from "../types";
 import "./ha-list-item";
 import "./ha-select";
-import "./ha-divider";
+import "./ha-md-divider";
 
 @customElement("ha-color-picker")
 export class HaColorPicker extends LitElement {
@@ -95,7 +95,7 @@ export class HaColorPicker extends LitElement {
             `
           : nothing}
         ${this.includeState || this.includeNone
-          ? html`<ha-divider role="separator" tabindex="-1"></ha-divider>`
+          ? html`<ha-md-divider role="separator" tabindex="-1"></ha-md-divider>`
           : nothing}
         ${Array.from(THEME_COLORS).map(
           (color) => html`
diff --git a/src/components/ha-divider.ts b/src/components/ha-md-divider.ts
similarity index 75%
rename from src/components/ha-divider.ts
rename to src/components/ha-md-divider.ts
index 8d2e3d419efa..63bac722d568 100644
--- a/src/components/ha-divider.ts
+++ b/src/components/ha-md-divider.ts
@@ -2,8 +2,8 @@ import { MdDivider } from "@material/web/divider/divider";
 import { css } from "lit";
 import { customElement } from "lit/decorators";
 
-@customElement("ha-divider")
-export class HaDivider extends MdDivider {
+@customElement("ha-md-divider")
+export class HaMdDivider extends MdDivider {
   static override styles = [
     ...super.styles,
     css`
@@ -16,6 +16,6 @@ export class HaDivider extends MdDivider {
 
 declare global {
   interface HTMLElementTagNameMap {
-    "ha-divider": HaDivider;
+    "ha-md-divider": HaMdDivider;
   }
 }
diff --git a/src/layouts/hass-tabs-subpage-data-table.ts b/src/layouts/hass-tabs-subpage-data-table.ts
index 92bdf8398060..9b3231f283bb 100644
--- a/src/layouts/hass-tabs-subpage-data-table.ts
+++ b/src/layouts/hass-tabs-subpage-data-table.ts
@@ -36,7 +36,7 @@ import type {
 } from "../components/data-table/ha-data-table";
 import "../components/ha-md-button-menu";
 import "../components/ha-dialog";
-import "../components/ha-divider";
+import "../components/ha-md-divider";
 import { HaMenu } from "../components/ha-menu";
 import "../components/ha-md-menu-item";
 import "../components/search-input-outlined";
@@ -364,7 +364,7 @@ export class HaTabsSubpageDataTable extends LitElement {
                       )}
                     </div>
                   </ha-md-menu-item>
-                  <ha-divider role="separator" tabindex="-1"></ha-divider>
+                  <ha-md-divider role="separator" tabindex="-1"></ha-md-divider>
                   <ha-md-menu-item
                     .value=${undefined}
                     @click=${this._disableSelectMode}
@@ -501,7 +501,7 @@ export class HaTabsSubpageDataTable extends LitElement {
         >
           ${localize("ui.components.subpage-data-table.dont_group_by")}
         </ha-md-menu-item>
-        <ha-divider role="separator" tabindex="-1"></ha-divider>
+        <ha-md-divider role="separator" tabindex="-1"></ha-md-divider>
         <ha-md-menu-item
           @click=${this._collapseAllGroups}
           .disabled=${this._groupColumn === undefined}
diff --git a/src/panels/config/automation/add-automation-element-dialog.ts b/src/panels/config/automation/add-automation-element-dialog.ts
index 635a622b8f6c..55401c5f7542 100644
--- a/src/panels/config/automation/add-automation-element-dialog.ts
+++ b/src/panels/config/automation/add-automation-element-dialog.ts
@@ -23,7 +23,7 @@ import { deepEqual } from "../../../common/util/deep-equal";
 import "../../../components/ha-dialog";
 import type { HaDialog } from "../../../components/ha-dialog";
 import "../../../components/ha-dialog-header";
-import "../../../components/ha-divider";
+import "../../../components/ha-md-divider";
 import "../../../components/ha-domain-icon";
 import "../../../components/ha-icon-button";
 import "../../../components/ha-icon-button-prev";
@@ -559,7 +559,7 @@ class DialogAddAutomationElement extends LitElement implements HassDialog {
                   ></ha-svg-icon
                   ><ha-svg-icon slot="end" .path=${mdiPlus}></ha-svg-icon>
                 </ha-md-list-item>
-                <ha-divider role="separator" tabindex="-1"></ha-divider>`
+                <ha-md-divider role="separator" tabindex="-1"></ha-md-divider>`
             : ""}
           ${repeat(
             items,
diff --git a/src/panels/config/automation/ha-automation-picker.ts b/src/panels/config/automation/ha-automation-picker.ts
index a7d7ea283871..1bb6d64b3c52 100644
--- a/src/panels/config/automation/ha-automation-picker.ts
+++ b/src/panels/config/automation/ha-automation-picker.ts
@@ -55,7 +55,7 @@ import type {
 } from "../../../components/data-table/ha-data-table";
 import "../../../components/data-table/ha-data-table-labels";
 import "../../../components/entity/ha-entity-toggle";
-import "../../../components/ha-divider";
+import "../../../components/ha-md-divider";
 import "../../../components/ha-fab";
 import "../../../components/ha-filter-blueprints";
 import "../../../components/ha-filter-categories";
@@ -420,7 +420,7 @@ class HaAutomationPicker extends SubscribeMixin(LitElement) {
           )}
         </div>
       </ha-md-menu-item>
-      <ha-divider role="separator" tabindex="-1"></ha-divider>
+      <ha-md-divider role="separator" tabindex="-1"></ha-md-divider>
       <ha-md-menu-item @click=${this._bulkCreateCategory}>
         <div slot="headline">
           ${this.hass.localize("ui.panel.config.category.editor.add")}
@@ -457,7 +457,7 @@ class HaAutomationPicker extends SubscribeMixin(LitElement) {
           </ha-label>
         </ha-md-menu-item>`;
       })}
-      <ha-divider role="separator" tabindex="-1"></ha-divider>
+      <ha-md-divider role="separator" tabindex="-1"></ha-md-divider>
       <ha-md-menu-item @click=${this._bulkCreateLabel}>
         <div slot="headline">
           ${this.hass.localize("ui.panel.config.labels.add_label")}
@@ -486,7 +486,7 @@ class HaAutomationPicker extends SubscribeMixin(LitElement) {
           )}
         </div>
       </ha-md-menu-item>
-      <ha-divider role="separator" tabindex="-1"></ha-divider>
+      <ha-md-divider role="separator" tabindex="-1"></ha-md-divider>
       <ha-md-menu-item @click=${this._bulkCreateArea}>
         <div slot="headline">
           ${this.hass.localize(
@@ -867,7 +867,7 @@ class HaAutomationPicker extends SubscribeMixin(LitElement) {
             )}
           </div>
         </ha-md-menu-item>
-        <ha-divider role="separator" tabindex="-1"></ha-divider>
+        <ha-md-divider role="separator" tabindex="-1"></ha-md-divider>
         <ha-md-menu-item .clickAction=${this._duplicate}>
           <ha-svg-icon .path=${mdiContentDuplicate} slot="start"></ha-svg-icon>
           <div slot="headline">
diff --git a/src/panels/config/devices/ha-config-devices-dashboard.ts b/src/panels/config/devices/ha-config-devices-dashboard.ts
index ed89a3e1caab..b6493252c49b 100644
--- a/src/panels/config/devices/ha-config-devices-dashboard.ts
+++ b/src/panels/config/devices/ha-config-devices-dashboard.ts
@@ -47,7 +47,7 @@ import "../../../components/entity/ha-battery-icon";
 import "../../../components/ha-alert";
 import "../../../components/ha-button-menu";
 import "../../../components/ha-check-list-item";
-import "../../../components/ha-divider";
+import "../../../components/ha-md-divider";
 import "../../../components/ha-fab";
 import "../../../components/ha-filter-devices";
 import "../../../components/ha-filter-floor-areas";
@@ -650,7 +650,7 @@ export class HaConfigDeviceDashboard extends SubscribeMixin(LitElement) {
           )}
         </div>
       </ha-md-menu-item>
-      <ha-divider role="separator" tabindex="-1"></ha-divider>
+      <ha-md-divider role="separator" tabindex="-1"></ha-md-divider>
       <ha-md-menu-item @click=${this._bulkCreateArea}>
         <div slot="headline">
           ${this.hass.localize(
@@ -689,7 +689,7 @@ export class HaConfigDeviceDashboard extends SubscribeMixin(LitElement) {
           </ha-label>
         </ha-md-menu-item>`;
       })}
-      <ha-divider role="separator" tabindex="-1"></ha-divider>
+      <ha-md-divider role="separator" tabindex="-1"></ha-md-divider>
       <ha-md-menu-item @click=${this._bulkCreateLabel}>
         <div slot="headline">
           ${this.hass.localize("ui.panel.config.labels.add_label")}
diff --git a/src/panels/config/entities/ha-config-entities.ts b/src/panels/config/entities/ha-config-entities.ts
index 5f8c4ac2dc97..50466f24300c 100644
--- a/src/panels/config/entities/ha-config-entities.ts
+++ b/src/panels/config/entities/ha-config-entities.ts
@@ -53,7 +53,7 @@ import "../../../components/data-table/ha-data-table-labels";
 import "../../../components/ha-alert";
 import "../../../components/ha-button-menu";
 import "../../../components/ha-check-list-item";
-import "../../../components/ha-divider";
+import "../../../components/ha-md-divider";
 import "../../../components/ha-filter-devices";
 import "../../../components/ha-filter-domains";
 import "../../../components/ha-filter-floor-areas";
@@ -721,7 +721,7 @@ export class HaConfigEntities extends SubscribeMixin(LitElement) {
           </ha-label>
         </ha-md-menu-item>`;
       })}
-      <ha-divider role="separator" tabindex="-1"></ha-divider>
+      <ha-md-divider role="separator" tabindex="-1"></ha-md-divider>
       <ha-md-menu-item @click=${this._bulkCreateLabel}>
         <div slot="headline">
           ${this.hass.localize("ui.panel.config.labels.add_label")}
@@ -831,7 +831,7 @@ ${
             </ha-md-menu-item>
             <ha-menu slot="menu">${labelItems}</ha-menu>
           </ha-sub-menu>
-          <ha-divider role="separator" tabindex="-1"></ha-divider>`
+          <ha-md-divider role="separator" tabindex="-1"></ha-md-divider>`
       : nothing
   }
 
@@ -854,7 +854,7 @@ ${
       )}
     </div>
   </ha-md-menu-item>
-  <ha-divider role="separator" tabindex="-1"></ha-divider>
+  <ha-md-divider role="separator" tabindex="-1"></ha-md-divider>
 
   <ha-md-menu-item @click=${this._unhideSelected}>
     <ha-svg-icon
@@ -878,7 +878,7 @@ ${
       )}
     </div>
   </ha-md-menu-item>
-  <ha-divider role="separator" tabindex="-1"></ha-divider>
+  <ha-md-divider role="separator" tabindex="-1"></ha-md-divider>
 
   <ha-md-menu-item @click=${this._removeSelected} class="warning">
     <ha-svg-icon
diff --git a/src/panels/config/helpers/ha-config-helpers.ts b/src/panels/config/helpers/ha-config-helpers.ts
index a3b49a7b12d0..3051c1e55cb0 100644
--- a/src/panels/config/helpers/ha-config-helpers.ts
+++ b/src/panels/config/helpers/ha-config-helpers.ts
@@ -44,7 +44,7 @@ import {
   SortingChangedEvent,
 } from "../../../components/data-table/ha-data-table";
 import "../../../components/data-table/ha-data-table-labels";
-import "../../../components/ha-divider";
+import "../../../components/ha-md-divider";
 import "../../../components/ha-fab";
 import "../../../components/ha-filter-categories";
 import "../../../components/ha-filter-devices";
@@ -497,7 +497,7 @@ export class HaConfigHelpers extends SubscribeMixin(LitElement) {
           )}
         </div>
       </ha-md-menu-item>
-      <ha-divider role="separator" tabindex="-1"></ha-divider>
+      <ha-md-divider role="separator" tabindex="-1"></ha-md-divider>
       <ha-md-menu-item @click=${this._bulkCreateCategory}>
         <div slot="headline">
           ${this.hass.localize("ui.panel.config.category.editor.add")}
@@ -532,7 +532,7 @@ export class HaConfigHelpers extends SubscribeMixin(LitElement) {
             ${label.name}
           </ha-label>
         </ha-md-menu-item> `;
-      })}<ha-divider role="separator" tabindex="-1"></ha-divider>
+      })}<ha-md-divider role="separator" tabindex="-1"></ha-md-divider>
       <ha-md-menu-item @click=${this._bulkCreateLabel}>
         <div slot="headline">
           ${this.hass.localize("ui.panel.config.labels.add_label")}
diff --git a/src/panels/config/integrations/ha-config-integration-page.ts b/src/panels/config/integrations/ha-config-integration-page.ts
index da8c513c9796..9ec4756effda 100644
--- a/src/panels/config/integrations/ha-config-integration-page.ts
+++ b/src/panels/config/integrations/ha-config-integration-page.ts
@@ -45,7 +45,7 @@ import { caseInsensitiveStringCompare } from "../../../common/string/compare";
 import { nextRender } from "../../../common/util/render-status";
 import "../../../components/ha-button";
 import "../../../components/ha-card";
-import "../../../components/ha-divider";
+import "../../../components/ha-md-divider";
 import "../../../components/ha-list-item";
 import "../../../components/ha-md-button-menu";
 import "../../../components/ha-md-list";
@@ -533,10 +533,10 @@ class HaConfigIntegrationPage extends SubscribeMixin(LitElement) {
                       (item, index) =>
                         html`${this._renderConfigEntry(item)}
                         ${index < attentionEntries.length - 1
-                          ? html` <ha-divider
+                          ? html` <ha-md-divider
                               role="separator"
                               tabindex="-1"
-                            ></ha-divider>`
+                            ></ha-md-divider>`
                           : ""} `
                     )}
                   </ha-md-list>
@@ -573,10 +573,10 @@ class HaConfigIntegrationPage extends SubscribeMixin(LitElement) {
                   (item, index) =>
                     html`${this._renderConfigEntry(item)}
                     ${index < normalEntries.length - 1
-                      ? html` <ha-divider
+                      ? html` <ha-md-divider
                           role="separator"
                           tabindex="-1"
-                        ></ha-divider>`
+                        ></ha-md-divider>`
                       : ""} `
                 )}
               </ha-md-list>
@@ -882,7 +882,7 @@ class HaConfigIntegrationPage extends SubscribeMixin(LitElement) {
           )}
         </ha-md-menu-item>
 
-        <ha-divider role="separator" tabindex="-1"></ha-divider>
+        <ha-md-divider role="separator" tabindex="-1"></ha-md-divider>
 
         ${this._diagnosticHandler && item.state === "loaded"
           ? html`
diff --git a/src/panels/config/scene/ha-scene-dashboard.ts b/src/panels/config/scene/ha-scene-dashboard.ts
index 1c94c5b816d4..e544a15792e9 100644
--- a/src/panels/config/scene/ha-scene-dashboard.ts
+++ b/src/panels/config/scene/ha-scene-dashboard.ts
@@ -50,7 +50,7 @@ import {
 } from "../../../components/data-table/ha-data-table";
 import "../../../components/data-table/ha-data-table-labels";
 import "../../../components/ha-button";
-import "../../../components/ha-divider";
+import "../../../components/ha-md-divider";
 import "../../../components/ha-fab";
 import "../../../components/ha-filter-categories";
 import "../../../components/ha-filter-devices";
@@ -441,7 +441,7 @@ class HaSceneDashboard extends SubscribeMixin(LitElement) {
           )}
         </div>
       </ha-md-menu-item>
-      <ha-divider role="separator" tabindex="-1"></ha-divider>
+      <ha-md-divider role="separator" tabindex="-1"></ha-md-divider>
       <ha-md-menu-item @click=${this._bulkCreateCategory}>
         <div slot="headline">
           ${this.hass.localize("ui.panel.config.category.editor.add")}
@@ -478,7 +478,7 @@ class HaSceneDashboard extends SubscribeMixin(LitElement) {
           </ha-label>
         </ha-md-menu-item>`;
       })}
-      <ha-divider role="separator" tabindex="-1"></ha-divider>
+      <ha-md-divider role="separator" tabindex="-1"></ha-md-divider>
       <ha-md-menu-item @click=${this._bulkCreateLabel}>
         <div slot="headline">
           ${this.hass.localize("ui.panel.config.labels.add_label")}
@@ -507,7 +507,7 @@ class HaSceneDashboard extends SubscribeMixin(LitElement) {
           )}
         </div>
       </ha-md-menu-item>
-      <ha-divider role="separator" tabindex="-1"></ha-divider>
+      <ha-md-divider role="separator" tabindex="-1"></ha-md-divider>
       <ha-md-menu-item @click=${this._bulkCreateArea}>
         <div slot="headline">
           ${this.hass.localize(
diff --git a/src/panels/config/script/ha-script-picker.ts b/src/panels/config/script/ha-script-picker.ts
index 92bd6265a10d..d62033d6e0eb 100644
--- a/src/panels/config/script/ha-script-picker.ts
+++ b/src/panels/config/script/ha-script-picker.ts
@@ -50,7 +50,7 @@ import {
   SortingChangedEvent,
 } from "../../../components/data-table/ha-data-table";
 import "../../../components/data-table/ha-data-table-labels";
-import "../../../components/ha-divider";
+import "../../../components/ha-md-divider";
 import "../../../components/ha-fab";
 import "../../../components/ha-filter-blueprints";
 import "../../../components/ha-filter-categories";
@@ -430,7 +430,7 @@ class HaScriptPicker extends SubscribeMixin(LitElement) {
             "ui.panel.config.automation.picker.bulk_actions.no_category"
           )}
         </div> </ha-md-menu-item
-      ><ha-divider role="separator" tabindex="-1"></ha-divider>
+      ><ha-md-divider role="separator" tabindex="-1"></ha-md-divider>
       <ha-md-menu-item @click=${this._bulkCreateCategory}>
         <div slot="headline">
           ${this.hass.localize("ui.panel.config.category.editor.add")}
@@ -467,7 +467,7 @@ class HaScriptPicker extends SubscribeMixin(LitElement) {
           </ha-label>
         </ha-md-menu-item>`;
       })}
-      <ha-divider role="separator" tabindex="-1"></ha-divider>
+      <ha-md-divider role="separator" tabindex="-1"></ha-md-divider>
       <ha-md-menu-item @click=${this._bulkCreateLabel}>
         <div slot="headline">
           ${this.hass.localize("ui.panel.config.labels.add_label")}
@@ -496,7 +496,7 @@ class HaScriptPicker extends SubscribeMixin(LitElement) {
           )}
         </div>
       </ha-md-menu-item>
-      <ha-divider role="separator" tabindex="-1"></ha-divider>
+      <ha-md-divider role="separator" tabindex="-1"></ha-md-divider>
       <ha-md-menu-item @click=${this._bulkCreateArea}>
         <div slot="headline">
           ${this.hass.localize(