Restore safe area margins, leave full height width

Remove safe area for custom panels
Hardware panel imporve chart loading UI (#29528 )
2026-08-21 06:08:25 +00:00 · 2026-02-10 12:38:43 +00:00 · 2026-02-10 11:09:32 +00:00 · 2026-02-10 10:42:57 +00:00 · 2026-02-10 09:28:52 +00:00 · 2026-02-10 10:07:31 +01:00
240 changed files with 5834 additions and 4800 deletions
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/python:1-3.14
+FROM mcr.microsoft.com/devcontainers/python:3.14

 ENV \
  DEBIAN_FRONTEND=noninteractive \
@@ -251,7 +251,6 @@ For browser support, API details, and current specifications, refer to these aut
 **Available Dialog Types:**

 - `ha-wa-dialog` - Preferred for new dialogs (Web Awesome based)
- `ha-md-dialog` - Material Design 3 dialog component
 - `ha-dialog` - Legacy component (still widely used)

 **Opening Dialogs (Fire Event Pattern - Recommended):**
@@ -36,14 +36,14 @@ jobs:

      # Initializes the CodeQL tools for scanning.
      - name: Initialize CodeQL
-        uses: github/codeql-action/init@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0
+        uses: github/codeql-action/init@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # v4.32.2
        with:
          languages: ${{ matrix.language }}

      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
      # If this step fails, then you should remove it and run the build manually (see below)
      - name: Autobuild
-        uses: github/codeql-action/autobuild@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0
+        uses: github/codeql-action/autobuild@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # v4.32.2

      # ℹ️ Command-line programs to run using the OS shell.
      # 📚 https://git.io/JvXDl
@@ -57,4 +57,4 @@ jobs:
      #   make release

      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0
+        uses: github/codeql-action/analyze@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # v4.32.2
@@ -1,14 +1,12 @@
 import type { MockHomeAssistant } from "../../../src/fake_data/provide_hass";

-let changeFunction;
+let sidebarChangeCallback;

 export const mockFrontend = (hass: MockHomeAssistant) => {
-  hass.mockWS("frontend/get_user_data", () => ({
-    value: null,
-  }));
+  hass.mockWS("frontend/get_user_data", () => ({ value: null }));
  hass.mockWS("frontend/set_user_data", ({ key, value }) => {
    if (key === "sidebar") {
-      changeFunction?.({
+      sidebarChangeCallback?.({
        value: {
          panelOrder: value.panelOrder || [],
          hiddenPanels: value.hiddenPanels || [],
@@ -16,14 +14,11 @@ export const mockFrontend = (hass: MockHomeAssistant) => {
      });
    }
  });
-  hass.mockWS("frontend/subscribe_user_data", (_msg, _hass, onChange) => {
-    changeFunction = onChange;
-    onChange?.({
-      value: {
-        panelOrder: [],
-        hiddenPanels: [],
-      },
-    });
+  hass.mockWS("frontend/subscribe_user_data", (msg, _hass, onChange) => {
+    if (msg.key === "sidebar") {
+      sidebarChangeCallback = onChange;
+    }
+    onChange?.({ value: null });
    // eslint-disable-next-line @typescript-eslint/no-empty-function
    return () => {};
  });
@@ -48,4 +43,5 @@ export const mockFrontend = (hass: MockHomeAssistant) => {
    return () => {};
  });
  hass.mockWS("repairs/list_issues", () => ({ issues: [] }));
+  hass.mockWS("frontend/get_themes", (_msg, currentHass) => currentHass.themes);
 };
@@ -29,6 +29,7 @@ export const mockLovelace = (

  hass.mockWS("lovelace/config/save", () => Promise.resolve());
  hass.mockWS("lovelace/resources", () => Promise.resolve([]));
+  hass.mockWS("lovelace/dashboards/list", () => Promise.resolve([]));
 };

 customElements.whenDefined("hui-root").then(() => {
@@ -10,7 +10,9 @@ As a community, we are proud of our logo. Follow these guidelines to ensure it a

 ![Logo](/images/brand/logo.png)

-Please note that this logo is not released under the CC license. All rights reserved.
+<ha-alert alert-type="info">
+This logo is trademarked and the property of the Open Home Foundation. This means it is not available for commercial use without express written permission from the foundation. We regard commercial use as anything designed to market or promote a product, software or service that is for sale. Please contact <a href="mailto:partner@openhomefoundation.org">partner@openhomefoundation.org</a> for further information
+</ha-alert>

 # Design

@@ -0,0 +1 @@
+import "../../../../src/components/ha-alert";
@@ -18,7 +18,7 @@ The Home Assistant interface is based on Material Design. It's a design system c

 We want to make it as easy for designers to contribute as it is for developers. There’s a lot a designer can contribute to:

- Meet us at <a href="https://www.home-assistant.io/join-chat" rel="noopener noreferrer" target="_blank">devs_ux Discord</a>. Feel free to share your designs, user test or strategic ideas.
+- Meet us at <a href="https://www.home-assistant.io/join-chat-design" rel="noopener noreferrer" target="_blank">Discord #designers channel</a>. If you can't see the channel, make sure you set the correct role in Channels & Roles.
 - Start designing with our <a href="https://www.figma.com/community/file/967153512097289521/Home-Assistant-DesignKit" rel="noopener noreferrer" target="_blank">Figma DesignKit</a>.
 - Find the latest UX <a href="https://github.com/home-assistant/frontend/discussions?discussions_q=label%3Aux" rel="noopener noreferrer" target="_blank">discussions</a> and <a href="https://github.com/home-assistant/frontend/labels/ux" rel="noopener noreferrer" target="_blank">issues</a> on GitHub. Everyone can start a new issue or discussion!

@@ -100,7 +100,6 @@ class HaLandingPage extends LandingPageBaseElement {
          button-style
          native-name
          @value-changed=${this._languageChanged}
-          inline-arrow
        ></ha-language-picker>
        <ha-button
          appearance="plain"
@@ -29,7 +29,7 @@
    "@babel/runtime": "7.28.6",
    "@braintree/sanitize-url": "7.1.2",
    "@codemirror/autocomplete": "6.20.0",
-    "@codemirror/commands": "6.10.1",
+    "@codemirror/commands": "6.10.2",
    "@codemirror/language": "6.12.1",
    "@codemirror/legacy-modes": "6.5.2",
    "@codemirror/search": "6.6.0",
@@ -37,15 +37,15 @@
    "@codemirror/view": "6.39.12",
    "@date-fns/tz": "1.4.1",
    "@egjs/hammerjs": "2.0.17",
-    "@formatjs/intl-datetimeformat": "7.2.0",
-    "@formatjs/intl-displaynames": "7.2.0",
-    "@formatjs/intl-durationformat": "0.10.0",
-    "@formatjs/intl-getcanonicallocales": "3.2.0",
-    "@formatjs/intl-listformat": "8.2.0",
-    "@formatjs/intl-locale": "5.2.0",
-    "@formatjs/intl-numberformat": "9.2.1",
-    "@formatjs/intl-pluralrules": "6.2.1",
-    "@formatjs/intl-relativetimeformat": "12.2.1",
+    "@formatjs/intl-datetimeformat": "7.2.1",
+    "@formatjs/intl-displaynames": "7.2.1",
+    "@formatjs/intl-durationformat": "0.10.1",
+    "@formatjs/intl-getcanonicallocales": "3.2.1",
+    "@formatjs/intl-listformat": "8.2.1",
+    "@formatjs/intl-locale": "5.2.1",
+    "@formatjs/intl-numberformat": "9.2.2",
+    "@formatjs/intl-pluralrules": "6.2.2",
+    "@formatjs/intl-relativetimeformat": "12.2.2",
    "@fullcalendar/core": "6.1.20",
    "@fullcalendar/daygrid": "6.1.20",
    "@fullcalendar/interaction": "6.1.20",
@@ -71,7 +71,6 @@
    "@material/mwc-icon-button": "0.27.0",
    "@material/mwc-linear-progress": "0.27.0",
    "@material/mwc-list": "patch:@material/mwc-list@npm%3A0.27.0#~/.yarn/patches/@material-mwc-list-npm-0.27.0-5344fc9de4.patch",
-    "@material/mwc-menu": "0.27.0",
    "@material/mwc-radio": "0.27.0",
    "@material/mwc-select": "0.27.0",
    "@material/mwc-snackbar": "0.27.0",
@@ -112,7 +111,7 @@
    "hls.js": "1.6.15",
    "home-assistant-js-websocket": "9.6.0",
    "idb-keyval": "6.2.2",
-    "intl-messageformat": "11.1.1",
+    "intl-messageformat": "11.1.2",
    "js-yaml": "4.1.1",
    "leaflet": "1.9.4",
    "leaflet-draw": "patch:leaflet-draw@npm%3A1.0.4#./.yarn/patches/leaflet-draw-npm-1.0.4-0ca0ebcf65.patch",
@@ -133,7 +132,7 @@
    "stacktrace-js": "2.0.2",
    "superstruct": "2.0.2",
    "tinykeys": "3.0.0",
-    "ua-parser-js": "2.0.8",
+    "ua-parser-js": "2.0.9",
    "vue": "2.7.16",
    "vue2-daterange-picker": "0.6.8",
    "weekstart": "2.0.0",
@@ -146,17 +145,17 @@
    "xss": "1.0.15"
  },
  "devDependencies": {
-    "@babel/core": "7.28.6",
+    "@babel/core": "7.29.0",
    "@babel/helper-define-polyfill-provider": "0.6.6",
-    "@babel/plugin-transform-runtime": "7.28.5",
-    "@babel/preset-env": "7.28.6",
+    "@babel/plugin-transform-runtime": "7.29.0",
+    "@babel/preset-env": "7.29.0",
    "@bundle-stats/plugin-webpack-filter": "4.21.9",
    "@lokalise/node-api": "15.6.1",
    "@octokit/auth-oauth-device": "8.0.3",
    "@octokit/plugin-retry": "8.0.3",
    "@octokit/rest": "22.0.1",
-    "@rsdoctor/rspack-plugin": "1.5.1",
-    "@rspack/core": "1.7.4",
+    "@rsdoctor/rspack-plugin": "1.5.2",
+    "@rspack/core": "1.7.5",
    "@rspack/dev-server": "1.2.1",
    "@types/babel__plugin-transform-runtime": "7.9.5",
    "@types/chromecast-caf-receiver": "6.0.25",
@@ -192,14 +191,14 @@
    "eslint-plugin-wc": "3.0.2",
    "fancy-log": "2.0.0",
    "fs-extra": "11.3.3",
-    "glob": "13.0.0",
+    "glob": "13.0.1",
    "gulp": "5.0.1",
    "gulp-brotli": "3.0.0",
    "gulp-json-transform": "0.5.0",
    "gulp-rename": "2.1.0",
    "html-minifier-terser": "7.2.0",
    "husky": "9.1.7",
-    "jsdom": "27.4.0",
+    "jsdom": "28.0.0",
    "jszip": "3.10.1",
    "lint-staged": "16.2.7",
    "lit-analyzer": "2.0.3",
@@ -229,7 +228,7 @@
    "clean-css": "5.3.3",
    "@lit/reactive-element": "2.1.2",
    "@fullcalendar/daygrid": "6.1.20",
-    "globals": "17.2.0",
+    "globals": "17.3.0",
    "tslib": "2.8.1",
    "@material/mwc-list@^0.27.0": "patch:@material/mwc-list@npm%3A0.27.0#~/.yarn/patches/@material-mwc-list-npm-0.27.0-5344fc9de4.patch",
    "glob@^10.2.2": "^10.5.0"
@@ -16,6 +16,12 @@ if [[ -n "$DEVCONTAINER" ]]; then
        nvm install --reinstall-packages-from="$nodeCurrent" --default
        nvm uninstall "$nodeCurrent"
    fi
+
+    # install yarn if not already available
+    if ! command -v yarn &> /dev/null; then
+        npm install -g corepack
+        yes | yarn
+    fi
 fi

 if ! command -v yarn &> /dev/null; then
@@ -194,7 +194,6 @@ export class HaAuthorize extends litLocalizeLiteMixin(LitElement) {
          button-style
          native-name
          @value-changed=${this._languageChanged}
-          inline-arrow
        ></ha-language-picker>
        <ha-button
          appearance="plain"
@@ -3,13 +3,14 @@ import { UNAVAILABLE, UNKNOWN } from "../../data/entity/entity";
 import type { EntityRegistryDisplayEntry } from "../../data/entity/entity_registry";
 import type { FrontendLocaleData } from "../../data/translation";
 import { TimeZone } from "../../data/translation";
-import type { HomeAssistant } from "../../types";
+import type { HomeAssistant, ValuePart } from "../../types";
 import { formatDate } from "../datetime/format_date";
 import { formatDateTime } from "../datetime/format_date_time";
 import { DURATION_UNITS, formatDuration } from "../datetime/format_duration";
 import { formatTime } from "../datetime/format_time";
 import {
  formatNumber,
+  formatNumberToParts,
  getNumberFormatOptions,
  isNumericFromAttributes,
 } from "../number/format_number";
@@ -51,8 +52,36 @@ export const computeStateDisplayFromEntityAttributes = (
  attributes: any,
  state: string
 ): string => {
+  const parts = computeStateToPartsFromEntityAttributes(
+    localize,
+    locale,
+    sensorNumericDeviceClasses,
+    config,
+    entity,
+    entityId,
+    attributes,
+    state
+  );
+  return parts.map((part) => part.value).join("");
+};
+
+const computeStateToPartsFromEntityAttributes = (
+  localize: LocalizeFunc,
+  locale: FrontendLocaleData,
+  sensorNumericDeviceClasses: string[],
+  config: HassConfig,
+  entity: EntityRegistryDisplayEntry | undefined,
+  entityId: string,
+  attributes: any,
+  state: string
+): ValuePart[] => {
  if (state === UNKNOWN || state === UNAVAILABLE) {
-    return localize(`state.default.${state}`);
+    return [
+      {
+        type: "value",
+        value: localize(`state.default.${state}`),
+      },
+    ];
  }

  const domain = computeDomain(entityId);
@@ -73,19 +102,27 @@ export const computeStateDisplayFromEntityAttributes = (
      DURATION_UNITS.includes(attributes.unit_of_measurement)
    ) {
      try {
-        return formatDuration(
-          locale,
-          state,
-          attributes.unit_of_measurement,
-          entity?.display_precision
-        );
+        return [
+          {
+            type: "value",
+            value: formatDuration(
+              locale,
+              state,
+              attributes.unit_of_measurement,
+              entity?.display_precision
+            ),
+          },
+        ];
      } catch (_err) {
        // fallback to default
      }
    }
+
+    // state is monetary
    if (attributes.device_class === "monetary") {
+      let parts: Record<string, string>[] = [];
      try {
-        return formatNumber(state, locale, {
+        parts = formatNumberToParts(state, locale, {
          style: "currency",
          currency: attributes.unit_of_measurement,
          minimumFractionDigits: 2,
@@ -98,8 +135,34 @@ export const computeStateDisplayFromEntityAttributes = (
      } catch (_err) {
        // fallback to default
      }
+
+      const TYPE_MAP: Record<string, ValuePart["type"]> = {
+        integer: "value",
+        group: "value",
+        decimal: "value",
+        fraction: "value",
+        literal: "literal",
+        currency: "unit",
+      };
+
+      const valueParts: ValuePart[] = [];
+
+      for (const part of parts) {
+        const type = TYPE_MAP[part.type];
+        if (!type) continue;
+        const last = valueParts[valueParts.length - 1];
+        // Merge consecutive numeric parts (e.g. "1" + "," + "234" + "." + "56" → "1,234.56")
+        if (type === "value" && last?.type === "value") {
+          last.value += part.value;
+        } else {
+          valueParts.push({ type, value: part.value });
+        }
+      }
+
+      return valueParts;
    }

+    // default processing of numeric values
    const value = formatNumber(
      state,
      locale,
@@ -114,10 +177,14 @@ export const computeStateDisplayFromEntityAttributes = (
      attributes.unit_of_measurement;

    if (unit) {
-      return `${value}${blankBeforeUnit(unit, locale)}${unit}`;
+      return [
+        { type: "value", value: value },
+        { type: "literal", value: blankBeforeUnit(unit, locale) },
+        { type: "unit", value: unit },
+      ];
    }

-    return value;
+    return [{ type: "value", value: value }];
  }

  if (["date", "input_datetime", "time"].includes(domain)) {
@@ -129,36 +196,51 @@ export const computeStateDisplayFromEntityAttributes = (
      const components = state.split(" ");
      if (components.length === 2) {
        // Date and time.
-        return formatDateTime(
-          new Date(components.join("T")),
-          { ...locale, time_zone: TimeZone.local },
-          config
-        );
+        return [
+          {
+            type: "value",
+            value: formatDateTime(
+              new Date(components.join("T")),
+              { ...locale, time_zone: TimeZone.local },
+              config
+            ),
+          },
+        ];
      }
      if (components.length === 1) {
        if (state.includes("-")) {
          // Date only.
-          return formatDate(
-            new Date(`${state}T00:00`),
-            { ...locale, time_zone: TimeZone.local },
-            config
-          );
+          return [
+            {
+              type: "value",
+              value: formatDate(
+                new Date(`${state}T00:00`),
+                { ...locale, time_zone: TimeZone.local },
+                config
+              ),
+            },
+          ];
        }
        if (state.includes(":")) {
          // Time only.
          const now = new Date();
-          return formatTime(
-            new Date(`${now.toISOString().split("T")[0]}T${state}`),
-            { ...locale, time_zone: TimeZone.local },
-            config
-          );
+          return [
+            {
+              type: "value",
+              value: formatTime(
+                new Date(`${now.toISOString().split("T")[0]}T${state}`),
+                { ...locale, time_zone: TimeZone.local },
+                config
+              ),
+            },
+          ];
        }
      }
-      return state;
+      return [{ type: "value", value: state }];
    } catch (_e) {
      // Formatting methods may throw error if date parsing doesn't go well,
      // just return the state string in that case.
-      return state;
+      return [{ type: "value", value: state }];
    }
  }

@@ -182,25 +264,58 @@ export const computeStateDisplayFromEntityAttributes = (
    (domain === "sensor" && attributes.device_class === "timestamp")
  ) {
    try {
-      return formatDateTime(new Date(state), locale, config);
+      return [
+        {
+          type: "value",
+          value: formatDateTime(new Date(state), locale, config),
+        },
+      ];
    } catch (_err) {
-      return state;
+      return [{ type: "value", value: state }];
    }
  }

-  return (
-    (entity?.translation_key &&
-      localize(
-        `component.${entity.platform}.entity.${domain}.${entity.translation_key}.state.${state}`
-      )) ||
-    // Return device class translation
-    (attributes.device_class &&
-      localize(
-        `component.${domain}.entity_component.${attributes.device_class}.state.${state}`
-      )) ||
-    // Return default translation
-    localize(`component.${domain}.entity_component._.state.${state}`) ||
-    // We don't know! Return the raw state.
-    state
+  return [
+    {
+      type: "value",
+      value:
+        (entity?.translation_key &&
+          localize(
+            `component.${entity.platform}.entity.${domain}.${entity.translation_key}.state.${state}`
+          )) ||
+        // Return device class translation
+        (attributes.device_class &&
+          localize(
+            `component.${domain}.entity_component.${attributes.device_class}.state.${state}`
+          )) ||
+        // Return default translation
+        localize(`component.${domain}.entity_component._.state.${state}`) ||
+        // We don't know! Return the raw state.
+        state,
+    },
+  ];
+};
+
+export const computeStateToParts = (
+  localize: LocalizeFunc,
+  stateObj: HassEntity,
+  locale: FrontendLocaleData,
+  sensorNumericDeviceClasses: string[],
+  config: HassConfig,
+  entities: HomeAssistant["entities"],
+  state?: string
+): ValuePart[] => {
+  const entity = entities?.[stateObj.entity_id] as
+    | EntityRegistryDisplayEntry
+    | undefined;
+  return computeStateToPartsFromEntityAttributes(
+    localize,
+    locale,
+    sensorNumericDeviceClasses,
+    config,
+    entity,
+    stateObj.entity_id,
+    stateObj.attributes,
+    state !== undefined ? state : stateObj.state
  );
 };
@@ -5,7 +5,6 @@ import type {
 import type { EntityRegistryDisplayEntry } from "../../data/entity/entity_registry";
 import type { FrontendLocaleData } from "../../data/translation";
 import { NumberFormat } from "../../data/translation";
-import { round } from "./round";

 /**
 * Returns true if the entity is considered numeric based on the attributes it has
@@ -52,7 +51,22 @@ export const formatNumber = (
  num: string | number,
  localeOptions?: FrontendLocaleData,
  options?: Intl.NumberFormatOptions
-): string => {
+): string =>
+  formatNumberToParts(num, localeOptions, options)
+    .map((part) => part.value)
+    .join("");
+
+/**
+ * Returns an array of objects containing the formatted number in parts
+ * Similar to Intl.NumberFormat.prototype.formatToParts()
+ *
+ * Input params - same as for formatNumber()
+ */
+export const formatNumberToParts = (
+  num: string | number,
+  localeOptions?: FrontendLocaleData,
+  options?: Intl.NumberFormatOptions
+): any[] => {
  const locale = localeOptions
    ? numberFormatToLocale(localeOptions)
    : undefined;
@@ -71,7 +85,7 @@ export const formatNumber = (
    return new Intl.NumberFormat(
      locale,
      getDefaultFormatOptions(num, options)
-    ).format(Number(num));
+    ).formatToParts(Number(num));
  }

  if (
@@ -86,15 +100,10 @@ export const formatNumber = (
        ...options,
        useGrouping: false,
      })
-    ).format(Number(num));
+    ).formatToParts(Number(num));
  }

-  if (typeof num === "string") {
-    return num;
-  }
-  return `${round(num, options?.maximumFractionDigits).toString()}${
-    options?.style === "currency" ? ` ${options.currency}` : ""
-  }`;
+  return [{ type: "literal", value: num }];
 };

 /**
@@ -12,6 +12,10 @@ export type FormatEntityStateFunc = (
  stateObj: HassEntity,
  state?: string
 ) => string;
+export type FormatEntityStateToPartsFunc = (
+  stateObj: HassEntity,
+  state?: string
+) => ValuePart[];
 export type FormatEntityAttributeValueFunc = (
  stateObj: HassEntity,
  attribute: string,
@@ -46,12 +50,13 @@ export const computeFormatFunctions = async (
  sensorNumericDeviceClasses: string[]
 ): Promise<{
  formatEntityState: FormatEntityStateFunc;
+  formatEntityStateToParts: FormatEntityStateToPartsFunc;
  formatEntityAttributeValue: FormatEntityAttributeValueFunc;
  formatEntityAttributeValueToParts: FormatEntityAttributeValueToPartsFunc;
  formatEntityAttributeName: FormatEntityAttributeNameFunc;
  formatEntityName: FormatEntityNameFunc;
 }> => {
-  const { computeStateDisplay } =
+  const { computeStateDisplay, computeStateToParts } =
    await import("../entity/compute_state_display");
  const {
    computeAttributeValueDisplay,
@@ -70,6 +75,16 @@ export const computeFormatFunctions = async (
        entities,
        state
      ),
+    formatEntityStateToParts: (stateObj, state) =>
+      computeStateToParts(
+        localize,
+        stateObj,
+        locale,
+        sensorNumericDeviceClasses,
+        config,
+        entities,
+        state
+      ),
    formatEntityAttributeValue: (stateObj, attribute, value) =>
      computeAttributeValueDisplay(
        localize,
@@ -19,6 +19,7 @@ import { styleMap } from "lit/directives/style-map";
 import { ensureArray } from "../../common/array/ensure-array";
 import { getAllGraphColors } from "../../common/color/colors";
 import { fireEvent } from "../../common/dom/fire_event";
+import type { HASSDomEvent } from "../../common/dom/fire_event";
 import { listenMediaQuery } from "../../common/dom/media_query";
 import { themesContext } from "../../data/context";
 import type { Themes } from "../../data/ws-themes";
@@ -27,6 +28,7 @@ import type { HomeAssistant } from "../../types";
 import { isMac } from "../../util/is_mac";
 import "../chips/ha-assist-chip";
 import "../ha-icon-button";
+import { afterNextRender } from "../../common/util/render-status";
 import { filterXSS } from "../../common/util/xss";
 import { formatTimeLabel } from "./axis-label";
 import { downSampleLineData } from "./down-sample";
@@ -92,10 +94,18 @@ export class HaChartBase extends LitElement {

  private _resizeAnimationDuration?: number;

+  private _suspendResize = false;
+
+  private _layoutTransitionActive = false;
+
  // @ts-ignore
  private _resizeController = new ResizeController(this, {
    callback: () => {
      if (this.chart) {
+        if (this._suspendResize) {
+          this._shouldResizeChart = true;
+          return;
+        }
        if (!this.chart.getZr().animation.isFinished()) {
          this._shouldResizeChart = true;
        } else {
@@ -113,8 +123,11 @@ export class HaChartBase extends LitElement {

  private _originalZrFlush?: () => void;

+  private _pendingSetup = false;
+
  public disconnectedCallback() {
    super.disconnectedCallback();
+    this._pendingSetup = false;
    while (this._listeners.length) {
      this._listeners.pop()!();
    }
@@ -126,7 +139,13 @@ export class HaChartBase extends LitElement {
  public connectedCallback() {
    super.connectedCallback();
    if (this.hasUpdated) {
-      this._setupChart();
+      this._pendingSetup = true;
+      afterNextRender(() => {
+        if (this.isConnected && this._pendingSetup) {
+          this._pendingSetup = false;
+          this._setupChart();
+        }
+      });
    }

    this._listeners.push(
@@ -181,6 +200,26 @@ export class HaChartBase extends LitElement {
        () => window.removeEventListener("keyup", handleKeyUp)
      );
    }
+
+    const handleLayoutTransition: EventListener = (ev) => {
+      const event = ev as HASSDomEvent<HASSDomEvents["hass-layout-transition"]>;
+      this._layoutTransitionActive = Boolean(event.detail?.active);
+      this.toggleAttribute(
+        "layout-transition-active",
+        this._layoutTransitionActive
+      );
+      this._suspendResize = this._layoutTransitionActive;
+      if (!this._suspendResize) {
+        this._resizeChartIfNeeded();
+      }
+    };
+    window.addEventListener("hass-layout-transition", handleLayoutTransition);
+    this._listeners.push(() =>
+      window.removeEventListener(
+        "hass-layout-transition",
+        handleLayoutTransition
+      )
+    );
  }

  protected firstUpdated() {
@@ -988,19 +1027,29 @@ export class HaChartBase extends LitElement {
  }

  private _handleChartRenderFinished = () => {
-    if (this._shouldResizeChart) {
-      this.chart?.resize({
-        animation:
-          this._reducedMotion ||
-          typeof this._resizeAnimationDuration !== "number"
-            ? undefined
-            : { duration: this._resizeAnimationDuration },
-      });
-      this._shouldResizeChart = false;
-      this._resizeAnimationDuration = undefined;
-    }
+    this._resizeChartIfNeeded();
  };

+  private _resizeChartIfNeeded() {
+    if (!this.chart || !this._shouldResizeChart) {
+      return;
+    }
+    if (this._suspendResize) {
+      return;
+    }
+    if (!this.chart.getZr().animation.isFinished()) {
+      return;
+    }
+    this.chart.resize({
+      animation:
+        this._reducedMotion || typeof this._resizeAnimationDuration !== "number"
+          ? undefined
+          : { duration: this._resizeAnimationDuration },
+    });
+    this._shouldResizeChart = false;
+    this._resizeAnimationDuration = undefined;
+  }
+
  private _compareCustomLegendOptions(
    oldOptions: ECOption | undefined,
    newOptions: ECOption | undefined
@@ -1022,11 +1071,18 @@ export class HaChartBase extends LitElement {
      display: block;
      position: relative;
      letter-spacing: normal;
+      overflow: visible;
+    }
+    :host([layout-transition-active]),
+    :host([layout-transition-active]) .container,
+    :host([layout-transition-active]) .chart-container {
+      overflow: hidden;
    }
    .container {
      display: flex;
      flex-direction: column;
      position: relative;
+      overflow: visible;
    }
    .container.has-height {
      max-height: var(--chart-max-height, 350px);
@@ -1034,6 +1090,7 @@ export class HaChartBase extends LitElement {
    .chart-container {
      width: 100%;
      max-height: var(--chart-max-height, 350px);
+      overflow: visible;
    }
    .has-height .chart-container {
      flex: 1;
@@ -572,6 +572,7 @@ export class StatisticsChart extends LitElement {
      let firstSum: number | null | undefined = null;
      stats.forEach((stat) => {
        const startDate = new Date(stat.start);
+        const endDate = new Date(stat.end);
        if (prevDate === startDate) {
          return;
        }
@@ -601,10 +602,25 @@ export class StatisticsChart extends LitElement {
          dataValues.push(val);
        });
        if (!this._hiddenStats.has(statistic_id)) {
-          pushData(startDate, new Date(stat.end), dataValues);
+          pushData(
+            startDate,
+            endDate.getTime() < endTime.getTime() ? endDate : endTime,
+            dataValues
+          );
        }
      });

+      // Close out the last stat segment at prevEndTime
+      const lastEndTime = prevEndTime;
+      const lastValues = prevValues;
+      if (lastEndTime && lastValues) {
+        statDataSets.forEach((d, i) => {
+          d.data!.push(
+            this._transformDataValue([lastEndTime, ...lastValues[i]!])
+          );
+        });
+      }
+
      // Append current state if viewing recent data
      const now = new Date();
      // allow 10m of leeway for "now", because stats are 5 minute aggregated
@@ -619,16 +635,6 @@ export class StatisticsChart extends LitElement {
              isFinite(currentValue) &&
              !this._hiddenStats.has(statistic_id)
            ) {
-              // First, close out the last stat segment at prevEndTime
-              const lastEndTime = prevEndTime;
-              const lastValues = prevValues;
-              if (lastEndTime && lastValues) {
-                statDataSets.forEach((d, i) => {
-                  d.data!.push(
-                    this._transformDataValue([lastEndTime, ...lastValues[i]!])
-                  );
-                });
-              }
              // Then push the current state at now
              statTypes.forEach((type, i) => {
                const val: (number | null)[] = [];
@@ -1192,6 +1192,7 @@ export class HaDataTable extends LitElement {

        .mdc-data-table__cell--numeric {
          text-align: var(--float-end);
+          direction: ltr;
        }

        .mdc-data-table__cell--icon {
@@ -11,7 +11,7 @@ import {
  sortDeviceAutomations,
 } from "../../data/device/device_automation";
 import type { EntityRegistryEntry } from "../../data/entity/entity_registry";
-import type { HomeAssistant } from "../../types";
+import type { HomeAssistant, ValueChangedEvent } from "../../types";
 import "../ha-generic-picker";
 import "../ha-md-select";
 import "../ha-md-select-option";
@@ -192,7 +192,7 @@ export abstract class HaDeviceAutomationPicker<
    this._renderEmpty = false;
  }

-  private _automationChanged(ev: CustomEvent<{ value: string }>) {
+  private _automationChanged(ev: ValueChangedEvent<string>) {
    ev.stopPropagation();
    const value = ev.detail.value;
    if (!value || NO_AUTOMATION_KEY === value) {
@@ -9,16 +9,7 @@ import secondsToDuration from "../../common/datetime/seconds_to_duration";
 import { computeStateDomain } from "../../common/entity/compute_state_domain";
 import { computeStateName } from "../../common/entity/compute_state_name";
 import { FIXED_DOMAIN_STATES } from "../../common/entity/get_states";
-import {
-  formatNumber,
-  getNumberFormatOptions,
-  isNumericState,
-} from "../../common/number/format_number";
-import {
-  isUnavailableState,
-  UNAVAILABLE,
-  UNKNOWN,
-} from "../../data/entity/entity";
+import { isUnavailableState, UNAVAILABLE } from "../../data/entity/entity";
 import type { EntityRegistryDisplayEntry } from "../../data/entity/entity_registry";
 import { timerTimeRemaining } from "../../data/timer";
 import type { HomeAssistant } from "../../types";
@@ -180,16 +171,11 @@ export class HaStateLabelBadge extends LitElement {
        }
      // eslint-disable-next-line: disable=no-fallthrough
      default:
-        return entityState.state === UNKNOWN ||
-          entityState.state === UNAVAILABLE
+        return isUnavailableState(entityState.state)
          ? "—"
-          : isNumericState(entityState)
-            ? formatNumber(
-                entityState.state,
-                this.hass!.locale,
-                getNumberFormatOptions(entityState, entry)
-              )
-            : this.hass!.formatEntityState(entityState);
+          : this.hass!.formatEntityStateToParts(entityState).find(
+              (part) => part.type === "value"
+            )?.value;
    }
  }

@@ -48,7 +48,6 @@ export class HaAnsiToHtml extends LitElement {

  static styles = css`
    pre {
-      overflow-x: auto;
      margin: 0;
    }
    pre.wrap {
@@ -163,7 +163,7 @@ export class HaAreaPicker extends LitElement {
        {
          id: ADD_NEW_ID + searchString,
          primary: this.hass.localize(
-            "ui.components.area-picker.add_new_sugestion",
+            "ui.components.area-picker.add_new_suggestion",
            {
              name: searchString,
            }
@@ -9,7 +9,7 @@ import { computeFloorName } from "../common/entity/compute_floor_name";
 import { getAreaContext } from "../common/entity/context/get_area_context";
 import type { FloorRegistryEntry } from "../data/floor_registry";
 import { getFloors } from "../panels/lovelace/strategies/areas/helpers/areas-strategy-helper";
-import type { HomeAssistant } from "../types";
+import type { HomeAssistant, ValueChangedEvent } from "../types";
 import "./ha-expansion-panel";
 import "./ha-floor-icon";
 import "./ha-items-display-editor";
@@ -200,7 +200,7 @@ export class HaAreasFloorsDisplayEditor extends LitElement {
    fireEvent(this, "value-changed", { value: newValue });
  }

-  private async _areaDisplayChanged(ev: CustomEvent<{ value: DisplayValue }>) {
+  private async _areaDisplayChanged(ev: ValueChangedEvent<DisplayValue>) {
    ev.stopPropagation();
    const value = ev.detail.value;
    const currentFloorId = (ev.currentTarget as any).floorId;
@@ -2,14 +2,12 @@ import type { PropertyValueMap } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../common/dom/fire_event";
-import { stopPropagation } from "../common/dom/stop_propagation";
 import { formatLanguageCode } from "../common/language/format_language";
 import type { AssistPipeline } from "../data/assist_pipeline";
 import { listAssistPipelines } from "../data/assist_pipeline";
 import type { HomeAssistant } from "../types";
-import "./ha-list-item";
+import type { HaSelectOption, HaSelectSelectEvent } from "./ha-select";
 import "./ha-select";
-import type { HaSelect } from "./ha-select";

 const PREFERRED = "preferred";
 const LAST_USED = "last_used";
@@ -41,6 +39,31 @@ export class HaAssistPipelinePicker extends LitElement {
      return nothing;
    }
    const value = this.value ?? this._default;
+    const options: HaSelectOption[] = [
+      {
+        value: PREFERRED,
+        label: this.hass.localize("ui.components.pipeline-picker.preferred", {
+          preferred: this._pipelines.find(
+            (pipeline) => pipeline.id === this._preferredPipeline
+          )?.name,
+        }),
+      },
+    ];
+
+    if (this.includeLastUsed) {
+      options.unshift({
+        value: LAST_USED,
+        label: this.hass.localize("ui.components.pipeline-picker.last_used"),
+      });
+    }
+
+    options.push(
+      ...this._pipelines.map((pipeline) => ({
+        value: pipeline.id,
+        label: `${pipeline.name} (${formatLanguageCode(pipeline.language, this.hass.locale)})`,
+      }))
+    );
+
    return html`
      <ha-select
        .label=${this.label ||
@@ -49,33 +72,8 @@ export class HaAssistPipelinePicker extends LitElement {
        .required=${this.required}
        .disabled=${this.disabled}
        @selected=${this._changed}
-        @closed=${stopPropagation}
-        fixedMenuPosition
-        naturalMenuWidth
+        .options=${options}
      >
-        ${this.includeLastUsed
-          ? html`
-              <ha-list-item .value=${LAST_USED}>
-                ${this.hass!.localize(
-                  "ui.components.pipeline-picker.last_used"
-                )}
-              </ha-list-item>
-            `
-          : null}
-        <ha-list-item .value=${PREFERRED}>
-          ${this.hass!.localize("ui.components.pipeline-picker.preferred", {
-            preferred: this._pipelines.find(
-              (pipeline) => pipeline.id === this._preferredPipeline
-            )?.name,
-          })}
-        </ha-list-item>
-        ${this._pipelines.map(
-          (pipeline) =>
-            html`<ha-list-item .value=${pipeline.id}>
-              ${pipeline.name}
-              (${formatLanguageCode(pipeline.language, this.hass.locale)})
-            </ha-list-item>`
-        )}
      </ha-select>
    `;
  }
@@ -96,17 +94,17 @@ export class HaAssistPipelinePicker extends LitElement {
    }
  `;

-  private _changed(ev): void {
-    const target = ev.target as HaSelect;
+  private _changed(ev: HaSelectSelectEvent): void {
+    const value = ev.detail.value;
    if (
      !this.hass ||
-      target.value === "" ||
-      target.value === this.value ||
-      (this.value === undefined && target.value === this._default)
+      value === "" ||
+      value === this.value ||
+      (this.value === undefined && value === this._default)
    ) {
      return;
    }
-    this.value = target.value === this._default ? undefined : target.value;
+    this.value = value === this._default ? undefined : value;
    fireEvent(this, "value-changed", { value: this.value });
  }
 }
@@ -4,10 +4,9 @@ import { css, html, LitElement, nothing } from "lit";
 import { customElement, property } from "lit/decorators";
 import { ifDefined } from "lit/directives/if-defined";
 import { fireEvent } from "../common/dom/fire_event";
-import { stopPropagation } from "../common/dom/stop_propagation";
+import type { HaSelectSelectEvent } from "./ha-select";
 import "./ha-icon-button";
 import "./ha-input-helper-text";
-import "./ha-list-item";
 import "./ha-select";
 import "./ha-textfield";
 import type { HaTextField } from "./ha-textfield";
@@ -260,14 +259,10 @@ export class HaBaseTimeInput extends LitElement {
              .required=${this.required}
              .value=${this.amPm}
              .disabled=${this.disabled}
-              name="amPm"
-              naturalMenuWidth
-              fixedMenuPosition
+              .name=${"amPm"}
              @selected=${this._valueChanged}
-              @closed=${stopPropagation}
+              .options=${["AM", "PM"]}
            >
-              <ha-list-item value="AM">AM</ha-list-item>
-              <ha-list-item value="PM">PM</ha-list-item>
            </ha-select>`}
      </div>
      ${this.helper
@@ -282,10 +277,12 @@ export class HaBaseTimeInput extends LitElement {
    fireEvent(this, "value-changed");
  }

-  private _valueChanged(ev: InputEvent) {
+  private _valueChanged(ev: InputEvent | HaSelectSelectEvent): void {
    const textField = ev.currentTarget as HaTextField;
    this[textField.name] =
-      textField.name === "amPm" ? textField.value : Number(textField.value);
+      textField.name === "amPm"
+        ? (ev as HaSelectSelectEvent).detail.value
+        : Number(textField.value);
    const value: TimeChangedEvent = {
      hours: this.hours,
      minutes: this.minutes,
@@ -366,10 +363,6 @@ export class HaBaseTimeInput extends LitElement {
    ha-textfield:last-child {
      --text-field-border-top-right-radius: var(--mdc-shape-medium);
    }
-    ha-select {
-      --mdc-shape-small: 0;
-      width: 85px;
-    }
    :host([clearable]) .mdc-select__anchor {
      padding-inline-end: var(--select-selected-text-padding-end, 12px);
    }
@@ -2,12 +2,11 @@ import { css, html, LitElement, nothing } from "lit";
 import { customElement, property } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { fireEvent } from "../common/dom/fire_event";
-import { stopPropagation } from "../common/dom/stop_propagation";
 import { stringCompare } from "../common/string/compare";
 import type { Blueprint, BlueprintDomain, Blueprints } from "../data/blueprint";
 import { fetchBlueprints } from "../data/blueprint";
 import type { HomeAssistant } from "../types";
-import "./ha-list-item";
+import type { HaSelectSelectEvent } from "./ha-select";
 import "./ha-select";

@customElement("ha-blueprint-picker")
@@ -55,20 +54,16 @@ class HaBluePrintPicker extends LitElement {
      <ha-select
        .label=${this.label ||
        this.hass.localize("ui.components.blueprint-picker.select_blueprint")}
-        fixedMenuPosition
-        naturalMenuWidth
        .value=${this.value}
        .disabled=${this.disabled}
        @selected=${this._blueprintChanged}
-        @closed=${stopPropagation}
-      >
-        ${this._processedBlueprints(this.blueprints).map(
-          (blueprint) => html`
-            <ha-list-item .value=${blueprint.path}>
-              ${blueprint.name}
-            </ha-list-item>
-          `
+        .options=${this._processedBlueprints(this.blueprints).map(
+          (blueprint) => ({
+            value: blueprint.path,
+            label: blueprint.name,
+          })
        )}
+      >
      </ha-select>
    `;
  }
@@ -82,8 +77,8 @@ class HaBluePrintPicker extends LitElement {
    }
  }

-  private _blueprintChanged(ev) {
-    const newValue = ev.target.value;
+  private _blueprintChanged(ev: HaSelectSelectEvent) {
+    const newValue = ev.detail.value;

    if (newValue !== this.value) {
      this.value = newValue;
@@ -3,7 +3,6 @@ import type { PropertyValues } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../common/dom/fire_event";
-import { stopPropagation } from "../common/dom/stop_propagation";
 import { debounce } from "../common/util/debounce";
 import type { ConfigEntry, SubEntry } from "../data/config_entries";
 import { getConfigEntry, getSubEntries } from "../data/config_entries";
@@ -14,9 +13,8 @@ import { fetchIntegrationManifest } from "../data/integration";
 import { showOptionsFlowDialog } from "../dialogs/config-flow/show-dialog-options-flow";
 import { showSubConfigFlowDialog } from "../dialogs/config-flow/show-dialog-sub-config-flow";
 import type { HomeAssistant } from "../types";
-import "./ha-list-item";
 import "./ha-select";
-import type { HaSelect } from "./ha-select";
+import type { HaSelectOption, HaSelectSelectEvent } from "./ha-select";

 const NONE = "__NONE_OPTION__";

@@ -73,37 +71,35 @@ export class HaConversationAgentPicker extends LitElement {
      value = NONE;
    }

+    const options: HaSelectOption[] = this._agents.map((agent) => ({
+      value: agent.id,
+      label: agent.name,
+      disabled:
+        agent.supported_languages !== "*" &&
+        agent.supported_languages.length === 0,
+    }));
+
+    if (!this.required) {
+      options.unshift({
+        value: NONE,
+        label: this.hass.localize(
+          "ui.components.conversation-agent-picker.none"
+        ),
+      });
+    }
+
    return html`
      <ha-select
        .label=${this.label ||
        this.hass!.localize(
-          "ui.components.coversation-agent-picker.conversation_agent"
+          "ui.components.conversation-agent-picker.conversation_agent"
        )}
        .value=${value}
        .required=${this.required}
        .disabled=${this.disabled}
        @selected=${this._changed}
-        @closed=${stopPropagation}
-        fixedMenuPosition
-        naturalMenuWidth
-      >
-        ${!this.required
-          ? html`<ha-list-item .value=${NONE}>
-              ${this.hass!.localize(
-                "ui.components.coversation-agent-picker.none"
-              )}
-            </ha-list-item>`
-          : nothing}
-        ${this._agents.map(
-          (agent) =>
-            html`<ha-list-item
-              .value=${agent.id}
-              .disabled=${agent.supported_languages !== "*" &&
-              agent.supported_languages.length === 0}
-            >
-              ${agent.name}
-            </ha-list-item>`
-        )}</ha-select
+        .options=${options}
+      ></ha-select
      >${(this._subConfigEntry &&
        this._configEntry?.supported_subentry_types[
          this._subConfigEntry.subentry_type
@@ -238,17 +234,17 @@ export class HaConversationAgentPicker extends LitElement {
    }
  `;

-  private _changed(ev): void {
-    const target = ev.target as HaSelect;
+  private _changed(ev: HaSelectSelectEvent): void {
+    const value = ev.detail.value;
    if (
      !this.hass ||
-      target.value === "" ||
-      target.value === this.value ||
-      (this.value === undefined && target.value === NONE)
+      value === "" ||
+      value === this.value ||
+      (this.value === undefined && value === NONE)
    ) {
      return;
    }
-    this.value = target.value === NONE ? undefined : target.value;
+    this.value = value === NONE ? undefined : value;
    fireEvent(this, "value-changed", { value: this.value });
    fireEvent(this, "supported-languages-changed", {
      value: this._agents!.find((agent) => agent.id === this.value)
@@ -65,6 +65,10 @@ export class HaDateRangePicker extends LitElement {
  @property({ attribute: "time-picker", type: Boolean })
  public timePicker = false;

+  public open(): void {
+    this._openPicker();
+  }
+
  @property({ type: Boolean }) public disabled = false;

  @property({ type: Boolean }) public minimal = false;
@@ -306,6 +310,15 @@ export class HaDateRangePicker extends LitElement {
    return dateRangePicker.vueComponent.$children[0];
  }

+  private _openPicker() {
+    if (!this._dateRangePicker.open) {
+      const datePicker = this.shadowRoot!.querySelector(
+        "date-range-picker div.date-range-inputs"
+      ) as any;
+      datePicker?.click();
+    }
+  }
+
  private _handleInputClick() {
    // close the date picker, so it will open again on the click event
    if (this._dateRangePicker.open) {
@@ -76,6 +76,18 @@ export class HaDialog extends DialogBase {
          var(--divider-color)
        );
        z-index: var(--dialog-z-index, 8);
+        --mdc-dialog-box-shadow: var(--dialog-box-shadow, none);
+        --mdc-typography-headline6-font-weight: var(--ha-font-weight-normal);
+        --mdc-typography-headline6-font-size: 1.574rem;
+      }
+      .mdc-dialog::before {
+        content: "";
+        position: absolute;
+        width: 100%;
+        height: 100%;
+        top: 0;
+        left: 0;
+        pointer-events: none;
        -webkit-backdrop-filter: var(
          --ha-dialog-scrim-backdrop-filter,
          var(--dialog-backdrop-filter, none)
@@ -84,9 +96,6 @@ export class HaDialog extends DialogBase {
          --ha-dialog-scrim-backdrop-filter,
          var(--dialog-backdrop-filter, none)
        );
-        --mdc-dialog-box-shadow: var(--dialog-box-shadow, none);
-        --mdc-typography-headline6-font-weight: var(--ha-font-weight-normal);
-        --mdc-typography-headline6-font-size: 1.574rem;
      }
      .mdc-dialog .mdc-dialog__scrim {
        background-color: var(--mdc-dialog-scrim-color, none);
@@ -4,6 +4,18 @@ import type { PropertyValues } from "lit";
 import { css } from "lit";
 import { customElement, property } from "lit/decorators";
 import { fireEvent } from "../common/dom/fire_event";
+import type { HASSDomEvent } from "../common/dom/fire_event";
+
+declare global {
+  interface HASSDomEvents {
+    "hass-layout-transition": { active: boolean; reason?: string };
+  }
+  interface HTMLElementEventMap {
+    "hass-layout-transition": HASSDomEvent<
+      HASSDomEvents["hass-layout-transition"]
+    >;
+  }
+}

 const blockingElements = (document as any).$blockingElements;

@@ -15,6 +27,30 @@ export class HaDrawer extends DrawerBase {

  private _rtlStyle?: HTMLElement;

+  private _sidebarTransitionActive = false;
+
+  private _handleDrawerTransitionStart = (ev: TransitionEvent) => {
+    if (ev.propertyName !== "width" || this._sidebarTransitionActive) {
+      return;
+    }
+    this._sidebarTransitionActive = true;
+    fireEvent(window, "hass-layout-transition", {
+      active: true,
+      reason: "sidebar",
+    });
+  };
+
+  private _handleDrawerTransitionEnd = (ev: TransitionEvent) => {
+    if (ev.propertyName !== "width" || !this._sidebarTransitionActive) {
+      return;
+    }
+    this._sidebarTransitionActive = false;
+    fireEvent(window, "hass-layout-transition", {
+      active: false,
+      reason: "sidebar",
+    });
+  };
+
  protected createAdapter() {
    return {
      ...super.createAdapter(),
@@ -63,6 +99,38 @@ export class HaDrawer extends DrawerBase {
    }
  }

+  protected firstUpdated() {
+    super.firstUpdated();
+    this.mdcRoot?.addEventListener(
+      "transitionstart",
+      this._handleDrawerTransitionStart
+    );
+    this.mdcRoot?.addEventListener(
+      "transitionend",
+      this._handleDrawerTransitionEnd
+    );
+    this.mdcRoot?.addEventListener(
+      "transitioncancel",
+      this._handleDrawerTransitionEnd
+    );
+  }
+
+  public disconnectedCallback() {
+    super.disconnectedCallback();
+    this.mdcRoot?.removeEventListener(
+      "transitionstart",
+      this._handleDrawerTransitionStart
+    );
+    this.mdcRoot?.removeEventListener(
+      "transitionend",
+      this._handleDrawerTransitionEnd
+    );
+    this.mdcRoot?.removeEventListener(
+      "transitioncancel",
+      this._handleDrawerTransitionEnd
+    );
+  }
+
  private async _setupSwipe() {
    const hammer = await import("../resources/hammer");
    this._mc = new hammer.Manager(document, {
@@ -90,6 +158,16 @@ export class HaDrawer extends DrawerBase {
        border-color: var(--divider-color, rgba(0, 0, 0, 0.12));
        inset-inline-start: 0 !important;
        inset-inline-end: initial !important;
+        transition-property: transform, width;
+        transition-duration:
+          var(--mdc-drawer-transition-duration, 0.2s),
+          var(--ha-animation-duration-normal);
+        transition-timing-function:
+          var(
+            --mdc-drawer-transition-timing-function,
+            cubic-bezier(0.4, 0, 0.2, 1)
+          ),
+          ease;
      }
      .mdc-drawer.mdc-drawer--modal.mdc-drawer--open {
        z-index: 200;
@@ -103,6 +181,15 @@ export class HaDrawer extends DrawerBase {
        direction: var(--direction);
        width: 100%;
        box-sizing: border-box;
+        transition:
+          padding-left var(--ha-animation-duration-normal) ease,
+          padding-inline-start var(--ha-animation-duration-normal) ease;
+      }
+      @media (prefers-reduced-motion: reduce) {
+        .mdc-drawer,
+        .mdc-drawer-app-content {
+          transition: none;
+        }
      }
    `,
  ];
@@ -37,6 +37,7 @@ export class HaDropdownItem extends DropdownItem {

        #check {
          visibility: visible;
+          flex-shrink: 0;
        }

        #icon ::slotted(*) {
@@ -1,9 +1,16 @@
+import type WaButton from "@home-assistant/webawesome/dist/components/button/button";
 import Dropdown from "@home-assistant/webawesome/dist/components/dropdown/dropdown";
 import { css, type CSSResultGroup } from "lit";
 import { customElement, property } from "lit/decorators";
 import type { HaDropdownItem } from "./ha-dropdown-item";

-export type HaDropdownSelectEvent = CustomEvent<{ item: HaDropdownItem }>;
+/**
+ * Event type for the ha-dropdown component when an item is selected.
+ * @param T - The type of the value of the selected item.
+ */
+export type HaDropdownSelectEvent<T = string> = CustomEvent<{
+  item: Omit<HaDropdownItem, "value"> & { value: T };
+}>;

 /**
 * Home Assistant dropdown component
@@ -16,11 +23,37 @@ export type HaDropdownSelectEvent = CustomEvent<{ item: HaDropdownItem }>;
 *
 */
@customElement("ha-dropdown")
+// @ts-ignore Allow to set an alternative anchor element
 export class HaDropdown extends Dropdown {
  @property({ attribute: false }) dropdownTag = "ha-dropdown";

  @property({ attribute: false }) dropdownItemTag = "ha-dropdown-item";

+  public get anchorElement(): HTMLButtonElement | WaButton | undefined {
+    // @ts-ignore Allow to set an anchor element on popup
+    return this.popup?.anchor as HTMLButtonElement | WaButton | undefined;
+  }
+
+  public set anchorElement(element: HTMLButtonElement | WaButton | undefined) {
+    // @ts-ignore Allow to get the current anchor element from popup
+    if (!this.popup) {
+      return;
+    }
+    // @ts-ignore Allow to get the current anchor element from popup
+    this.popup.anchor = element;
+  }
+
+  /** Get the slotted trigger button, a <wa-button> or <button> element */
+  // @ts-ignore Override parent method to be able to use alternative anchor
+  // eslint-disable-next-line @typescript-eslint/naming-convention
+  private override getTrigger(): HTMLButtonElement | WaButton | null {
+    if (this.anchorElement) {
+      return this.anchorElement;
+    }
+    // @ts-ignore fallback to default trigger slot if no anchorElement is set
+    return super.getTrigger();
+  }
+
  static get styles(): CSSResultGroup {
    return [
      Dropdown.styles,
@@ -315,9 +315,13 @@ export class HaFilterCategories extends SubscribeMixin(LitElement) {
        }
        ha-list {
          --mdc-list-item-meta-size: auto;
-          --mdc-list-side-padding-right: 4px;
+          --mdc-list-side-padding-right: var(--ha-space-1);
+          --mdc-list-side-padding-left: var(--ha-space-4);
          --mdc-icon-button-size: 36px;
        }
+        ha-list-item {
+          --mdc-list-item-graphic-margin: var(--ha-space-4);
+        }
        ha-dropdown-item {
          font-size: var(--ha-font-size-m);
        }
@@ -179,6 +179,9 @@ export class HaFilterDomains extends LitElement {
          margin-inline-start: initial;
          margin-inline-end: 8px;
        }
+        ha-check-list-item {
+          --mdc-list-item-graphic-margin: var(--ha-space-4);
+        }
        .badge {
          display: inline-block;
          margin-left: 8px;
@@ -199,6 +199,9 @@ export class HaFilterIntegrations extends LitElement {
          margin-inline-start: auto;
          margin-inline-end: 8px;
        }
+        ha-check-list-item {
+          --mdc-list-item-graphic-margin: var(--ha-space-4);
+        }
        .badge {
          display: inline-block;
          margin-left: 8px;
@@ -164,6 +164,9 @@ export class HaFilterVoiceAssistants extends LitElement {
          margin-inline-start: auto;
          margin-inline-end: 8px;
        }
+        ha-check-list-item {
+          --mdc-list-item-graphic-margin: var(--ha-space-4);
+        }
        .badge {
          display: inline-block;
          margin-left: 8px;
@@ -359,7 +359,7 @@ export class HaFloorPicker extends LitElement {
        {
          id: ADD_NEW_ID + searchString,
          primary: this.hass.localize(
-            "ui.components.floor-picker.add_new_sugestion",
+            "ui.components.floor-picker.add_new_suggestion",
            {
              name: searchString,
            }
@@ -182,7 +182,7 @@ export class HaLabelPicker extends SubscribeMixin(LitElement) {
        {
          id: ADD_NEW_ID + searchString,
          primary: this.hass.localize(
-            "ui.components.label-picker.add_new_sugestion",
+            "ui.components.label-picker.add_new_suggestion",
            {
              name: searchString,
            }
@@ -107,9 +107,6 @@ export class HaLanguagePicker extends LitElement {

  @property({ attribute: "no-sort", type: Boolean }) public noSort = false;

-  @property({ attribute: "inline-arrow", type: Boolean })
-  public inlineArrow = false;
-
  @state() _defaultLanguages: string[] = [];

  @query("ha-generic-picker", true) public genericPicker!: HaGenericPicker;
@@ -1,263 +0,0 @@
-import { Dialog } from "@material/web/dialog/internal/dialog";
-import { styles } from "@material/web/dialog/internal/dialog-styles";
-import {
-  type DialogAnimation,
-  DIALOG_DEFAULT_CLOSE_ANIMATION,
-  DIALOG_DEFAULT_OPEN_ANIMATION,
-} from "@material/web/dialog/internal/animations";
-import { css } from "lit";
-import { customElement, property } from "lit/decorators";
-
-// workaround to be able to overlay a dialog with another dialog
-Dialog.addInitializer(async (instance) => {
-  await instance.updateComplete;
-
-  const dialogInstance = instance as HaMdDialog;
-
-  // @ts-expect-error dialog is private
-  dialogInstance.dialog.prepend(dialogInstance.scrim);
-  // @ts-expect-error scrim is private
-  dialogInstance.scrim.style.inset = 0;
-  // @ts-expect-error scrim is private
-  dialogInstance.scrim.style.zIndex = 0;
-
-  const { getOpenAnimation, getCloseAnimation } = dialogInstance;
-  dialogInstance.getOpenAnimation = () => {
-    const animations = getOpenAnimation.call(this);
-    animations.container = [
-      ...(animations.container ?? []),
-      ...(animations.dialog ?? []),
-    ];
-    animations.dialog = [];
-    return animations;
-  };
-  dialogInstance.getCloseAnimation = () => {
-    const animations = getCloseAnimation.call(this);
-    animations.container = [
-      ...(animations.container ?? []),
-      ...(animations.dialog ?? []),
-    ];
-    animations.dialog = [];
-    return animations;
-  };
-});
-
-// eslint-disable-next-line @typescript-eslint/consistent-type-imports
-let DIALOG_POLYFILL: Promise<typeof import("dialog-polyfill")>;
-
-/**
- * Based on the home assistant design: https://design.home-assistant.io/#components/ha-dialogs
- *
- */
-@customElement("ha-md-dialog")
-export class HaMdDialog extends Dialog {
-  /**
-   * When true the dialog will not close when the user presses the esc key or press out of the dialog.
-   */
-  @property({ attribute: "disable-cancel-action", type: Boolean })
-  public disableCancelAction = false;
-
-  private _polyfillDialogRegistered = false;
-
-  constructor() {
-    super();
-    this.addEventListener("cancel", this._handleCancel);
-
-    if (typeof HTMLDialogElement !== "function") {
-      this.addEventListener("open", this._handleOpen);
-
-      if (!DIALOG_POLYFILL) {
-        DIALOG_POLYFILL = import("dialog-polyfill");
-      }
-    }
-
-    // if browser doesn't support animate API disable open/close animations
-    if (this.animate === undefined) {
-      this.quick = true;
-    }
-
-    // if browser doesn't support animate API disable open/close animations
-    if (this.animate === undefined) {
-      this.quick = true;
-    }
-  }
-
-  // prevent open in older browsers and wait for polyfill to load
-  private async _handleOpen(openEvent: Event) {
-    openEvent.preventDefault();
-
-    if (this._polyfillDialogRegistered) {
-      return;
-    }
-
-    this._polyfillDialogRegistered = true;
-    this._loadPolyfillStylesheet("/static/polyfills/dialog-polyfill.css");
-    const dialog = this.shadowRoot?.querySelector(
-      "dialog"
-    ) as HTMLDialogElement;
-
-    const dialogPolyfill = await DIALOG_POLYFILL;
-    dialogPolyfill.default.registerDialog(dialog);
-    this.removeEventListener("open", this._handleOpen);
-
-    this.show();
-  }
-
-  private async _loadPolyfillStylesheet(href) {
-    const link = document.createElement("link");
-    link.rel = "stylesheet";
-    link.href = href;
-
-    return new Promise<void>((resolve, reject) => {
-      link.onload = () => resolve();
-      link.onerror = () =>
-        reject(new Error(`Stylesheet failed to load: ${href}`));
-
-      this.shadowRoot?.appendChild(link);
-    });
-  }
-
-  private _handleCancel(closeEvent: Event) {
-    if (this.disableCancelAction) {
-      closeEvent.preventDefault();
-      const dialogElement = this.shadowRoot?.querySelector("dialog .container");
-      if (this.animate !== undefined) {
-        dialogElement?.animate(
-          [
-            {
-              transform: "rotate(-1deg)",
-              "animation-timing-function": "ease-in",
-            },
-            {
-              transform: "rotate(1.5deg)",
-              "animation-timing-function": "ease-out",
-            },
-            {
-              transform: "rotate(0deg)",
-              "animation-timing-function": "ease-in",
-            },
-          ],
-          {
-            duration: 200,
-            iterations: 2,
-          }
-        );
-      }
-    }
-  }
-
-  static override styles = [
-    styles,
-    css`
-      :host {
-        --md-dialog-container-color: var(--card-background-color);
-        --md-dialog-headline-color: var(--primary-text-color);
-        --md-dialog-supporting-text-color: var(--primary-text-color);
-        --md-sys-color-scrim: #000000;
-
-        --md-dialog-headline-weight: var(--ha-font-weight-normal);
-        --md-dialog-headline-size: var(--ha-font-size-xl);
-        --md-dialog-supporting-text-size: var(--ha-font-size-m);
-        --md-dialog-supporting-text-line-height: var(--ha-line-height-normal);
-        --md-divider-color: var(--divider-color);
-      }
-
-      :host([type="alert"]) {
-        min-width: 320px;
-      }
-
-      @media all and (max-width: 450px), all and (max-height: 500px) {
-        :host(:not([type="alert"])) {
-          min-width: var(--mdc-dialog-min-width, 100vw);
-          min-height: 100%;
-          max-height: 100%;
-          --md-dialog-container-shape: 0;
-        }
-
-        .container {
-          margin-top: var(--safe-area-inset-top, 0);
-          margin-bottom: var(--safe-area-inset-bottom, 0);
-          margin-left: var(--safe-area-inset-left, 0);
-          margin-right: var(--safe-area-inset-right, 0);
-        }
-      }
-
-      ::slotted(ha-dialog-header[slot="headline"]) {
-        display: contents;
-      }
-
-      slot[name="actions"]::slotted(*) {
-        padding: var(--ha-space-4);
-      }
-
-      .scroller {
-        overflow: var(--dialog-content-overflow, auto);
-      }
-
-      slot[name="content"]::slotted(*) {
-        padding: var(--dialog-content-padding, var(--ha-space-6));
-      }
-      .scrim {
-        z-index: 10; /* overlay navigation */
-      }
-    `,
-  ];
-}
-
-// by default the dialog open/close animation will be from/to the top
-// but if we have a special mobile dialog which is at the bottom of the screen, a from bottom animation can be used:
-const OPEN_FROM_BOTTOM_ANIMATION: DialogAnimation = {
-  ...DIALOG_DEFAULT_OPEN_ANIMATION,
-  dialog: [
-    [
-      // Dialog slide up
-      [{ transform: "translateY(50px)" }, { transform: "translateY(0)" }],
-      { duration: 500, easing: "cubic-bezier(.3,0,0,1)" },
-    ],
-  ],
-  container: [
-    [
-      // Container fade in
-      [{ opacity: 0 }, { opacity: 1 }],
-      { duration: 50, easing: "linear", pseudoElement: "::before" },
-    ],
-  ],
-};
-
-const CLOSE_TO_BOTTOM_ANIMATION: DialogAnimation = {
-  ...DIALOG_DEFAULT_CLOSE_ANIMATION,
-  dialog: [
-    [
-      // Dialog slide down
-      [{ transform: "translateY(0)" }, { transform: "translateY(50px)" }],
-      { duration: 150, easing: "cubic-bezier(.3,0,0,1)" },
-    ],
-  ],
-  container: [
-    [
-      // Container fade out
-      [{ opacity: "1" }, { opacity: "0" }],
-      { delay: 100, duration: 50, easing: "linear", pseudoElement: "::before" },
-    ],
-  ],
-};
-
-export const getMobileOpenFromBottomAnimation = () => {
-  const matches = window.matchMedia(
-    "all and (max-width: 450px), all and (max-height: 500px)"
-  ).matches;
-  return matches ? OPEN_FROM_BOTTOM_ANIMATION : DIALOG_DEFAULT_OPEN_ANIMATION;
-};
-
-export const getMobileCloseToBottomAnimation = () => {
-  const matches = window.matchMedia(
-    "all and (max-width: 450px), all and (max-height: 500px)"
-  ).matches;
-  return matches ? CLOSE_TO_BOTTOM_ANIMATION : DIALOG_DEFAULT_CLOSE_ANIMATION;
-};
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-md-dialog": HaMdDialog;
-  }
-}
@@ -1,45 +0,0 @@
-import { MenuBase } from "@material/mwc-menu/mwc-menu-base";
-import { styles } from "@material/mwc-menu/mwc-menu.css";
-import { html } from "lit";
-import { customElement } from "lit/decorators";
-import { classMap } from "lit/directives/class-map";
-import "./ha-list";
-
-@customElement("ha-menu")
-export class HaMenu extends MenuBase {
-  protected get listElement() {
-    if (!this.listElement_) {
-      this.listElement_ = this.renderRoot.querySelector("ha-list");
-      return this.listElement_;
-    }
-
-    return this.listElement_;
-  }
-
-  protected renderList() {
-    const itemRoles = this.innerRole === "menu" ? "menuitem" : "option";
-    const classes = this.renderListClasses();
-
-    return html`<ha-list
-      rootTabbable
-      .innerAriaLabel=${this.innerAriaLabel}
-      .innerRole=${this.innerRole}
-      .multi=${this.multi}
-      class=${classMap(classes)}
-      .itemRoles=${itemRoles}
-      .wrapFocus=${this.wrapFocus}
-      .activatable=${this.activatable}
-      @action=${this.onAction}
-    >
-      <slot></slot>
-    </ha-list>`;
-  }
-
-  static styles = styles;
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-menu": HaMenu;
-  }
-}
@@ -5,7 +5,6 @@ import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { isComponentLoaded } from "../common/config/is_component_loaded";
 import { fireEvent } from "../common/dom/fire_event";
-import { stopPropagation } from "../common/dom/stop_propagation";
 import { caseInsensitiveStringCompare } from "../common/string/compare";
 import type { SupervisorMounts } from "../data/supervisor/mounts";
 import {
@@ -15,9 +14,9 @@ import {
 } from "../data/supervisor/mounts";
 import type { HomeAssistant } from "../types";
 import "./ha-alert";
+import type { HaSelectOption, HaSelectSelectEvent } from "./ha-select";
 import "./ha-list-item";
 import "./ha-select";
-import type { HaSelect } from "./ha-select";

 const _BACKUP_DATA_DISK_ = "/backup";

@@ -52,60 +51,54 @@ class HaMountPicker extends LitElement {
    if (!this._mounts) {
      return nothing;
    }
-    const dataDiskOption = html`<ha-list-item
-      graphic="icon"
-      .value=${_BACKUP_DATA_DISK_}
-    >
-      <span>
-        ${this.hass.localize("ui.components.mount-picker.use_datadisk") ||
-        "Use data disk for backup"}
-      </span>
-      <ha-svg-icon slot="graphic" .path=${mdiHarddisk}></ha-svg-icon>
-    </ha-list-item>`;
+
+    const options: HaSelectOption[] = this._filterMounts(
+      this._mounts,
+      this.usage
+    ).map((mount) => ({
+      value: mount.name,
+      label: mount.name,
+      secondary: `${mount.server}${mount.port ? `:${mount.port}` : ""}${
+        mount.type === SupervisorMountType.NFS ? mount.path : `:${mount.share}`
+      }`,
+      iconPath:
+        mount.usage === SupervisorMountUsage.MEDIA
+          ? mdiPlayBox
+          : mount.usage === SupervisorMountUsage.SHARE
+            ? mdiFolder
+            : mdiBackupRestore,
+    }));
+
+    if (this.usage === SupervisorMountUsage.BACKUP) {
+      const dataDiskOption = {
+        value: _BACKUP_DATA_DISK_,
+        iconPath: mdiHarddisk,
+        label:
+          this.hass.localize("ui.components.mount-picker.use_datadisk") ||
+          "Use data disk for backup",
+      };
+      if (
+        !this._mounts.default_backup_mount ||
+        this._mounts.default_backup_mount === _BACKUP_DATA_DISK_
+      ) {
+        options.unshift(dataDiskOption);
+      } else {
+        options.push(dataDiskOption);
+      }
+    }
+
    return html`
      <ha-select
        .label=${this.label === undefined && this.hass
          ? this.hass.localize("ui.components.mount-picker.mount")
          : this.label}
-        .value=${this._value}
+        .value=${this.value}
        .required=${this.required}
        .disabled=${this.disabled}
        .helper=${this.helper}
        @selected=${this._mountChanged}
-        @closed=${stopPropagation}
-        fixedMenuPosition
-        naturalMenuWidth
+        .options=${options}
      >
-        ${this.usage === SupervisorMountUsage.BACKUP &&
-        (!this._mounts.default_backup_mount ||
-          this._mounts.default_backup_mount === _BACKUP_DATA_DISK_)
-          ? dataDiskOption
-          : nothing}
-        ${this._filterMounts(this._mounts, this.usage).map(
-          (mount) =>
-            html`<ha-list-item twoline graphic="icon" .value=${mount.name}>
-              <span>${mount.name}</span>
-              <span slot="secondary"
-                >${mount.server}${mount.port
-                  ? `:${mount.port}`
-                  : nothing}${mount.type === SupervisorMountType.NFS
-                  ? mount.path
-                  : `:${mount.share}`}</span
-              >
-              <ha-svg-icon
-                slot="graphic"
-                .path=${mount.usage === SupervisorMountUsage.MEDIA
-                  ? mdiPlayBox
-                  : mount.usage === SupervisorMountUsage.SHARE
-                    ? mdiFolder
-                    : mdiBackupRestore}
-              ></ha-svg-icon>
-            </ha-list-item>`
-        )}
-        ${this.usage === SupervisorMountUsage.BACKUP &&
-        this._mounts.default_backup_mount
-          ? dataDiskOption
-          : nothing}
      </ha-select>
    `;
  }
@@ -153,16 +146,10 @@ class HaMountPicker extends LitElement {
    }
  }

-  private get _value() {
-    return this.value || "";
-  }
+  private _mountChanged(ev: HaSelectSelectEvent) {
+    const newValue = ev.detail.value;

-  private _mountChanged(ev: Event) {
-    ev.stopPropagation();
-    const target = ev.target as HaSelect;
-    const newValue = target.value;
-
-    if (newValue !== this._value) {
+    if (newValue !== this.value) {
      this._setValue(newValue);
    }
  }
@@ -262,12 +262,7 @@ export class HaNavigationPicker extends LitElement {

    const viewConfigs = await Promise.all(
      lovelacePanels.map((panel) =>
-        fetchConfig(
-          this.hass!.connection,
-          // path should be null to fetch default lovelace panel
-          panel.url_path === "lovelace" ? null : panel.url_path,
-          true
-        )
+        fetchConfig(this.hass!.connection, panel.url_path, true)
          .then((config) => [panel.id, config] as [string, typeof config])
          .catch((_) => [panel.id, undefined] as [string, undefined])
      )
@@ -55,6 +55,7 @@ export interface PickerComboBoxItem {
  sorting_label?: string;
  icon_path?: string;
  icon?: string;
+  isRelated?: boolean;
 }

 export interface PickerComboBoxIndexSelectedDetail {
@@ -1,187 +1,221 @@
-import { SelectBase } from "@material/mwc-select/mwc-select-base";
-import { styles } from "@material/mwc-select/mwc-select.css";
-import { mdiClose } from "@mdi/js";
-import { css, html, nothing } from "lit";
-import { customElement, property } from "lit/decorators";
-import { classMap } from "lit/directives/class-map";
-import { debounce } from "../common/util/debounce";
-import { nextRender } from "../common/util/render-status";
-import "./ha-icon-button";
-import "./ha-menu";
+import { css, html, LitElement, nothing } from "lit";
+import { customElement, property, query, state } from "lit/decorators";
+import { ifDefined } from "lit/directives/if-defined";
+import memoizeOne from "memoize-one";
+import { fireEvent } from "../common/dom/fire_event";
+import "./ha-dropdown";
+import "./ha-dropdown-item";
+import "./ha-picker-field";
+import type { HaPickerField } from "./ha-picker-field";
+import "./ha-svg-icon";
+
+export interface HaSelectOption {
+  value: string;
+  label?: string;
+  secondary?: string;
+  iconPath?: string;
+  disabled?: boolean;
+}
+
+/**
+ * Event type for the ha-select component when an item is selected.
+ * @param T - The type of the value of the selected item.
+ * @param Clearable - Whether the select is clearable (allows undefined values).
+ */
+export type HaSelectSelectEvent<
+  T = string,
+  Clearable extends boolean = false,
+> = CustomEvent<{
+  value: Clearable extends true ? T | undefined : T;
+}>;

@customElement("ha-select")
-export class HaSelect extends SelectBase {
-  // @ts-ignore
-  @property({ type: Boolean }) public icon = false;
+export class HaSelect extends LitElement {
+  @property({ type: Boolean }) public clearable = false;

-  @property({ type: Boolean, reflect: true }) public clearable = false;
+  @property({ attribute: false }) public options?: HaSelectOption[] | string[];

-  @property({ attribute: "inline-arrow", type: Boolean })
-  public inlineArrow = false;
+  @property() public label?: string;

-  @property() public options;
+  @property() public helper?: string;
+
+  @property() public value?: string;
+
+  @property({ type: Boolean }) public required = false;
+
+  @property({ type: Boolean }) public disabled = false;
+
+  @state() private _opened = false;
+
+  @query("ha-picker-field") private _triggerField!: HaPickerField;
+
+  private _getValueLabel = memoizeOne(
+    (
+      options: HaSelectOption[] | string[] | undefined,
+      value: string | undefined
+    ) => {
+      if (!options || !value) {
+        return value;
+      }
+
+      for (const option of options) {
+        if (
+          (typeof option === "string" && option === value) ||
+          (typeof option !== "string" && option.value === value)
+        ) {
+          return typeof option === "string"
+            ? option
+            : option.label || option.value;
+        }
+      }
+
+      return value;
+    }
+  );

  protected override render() {
+    if (this.disabled) {
+      return this._renderField();
+    }
+
    return html`
-      ${super.render()}
-      ${this.clearable && !this.required && !this.disabled && this.value
-        ? html`<ha-icon-button
-            label="clear"
-            @click=${this._clearValue}
-            .path=${mdiClose}
-          ></ha-icon-button>`
-        : nothing}
+      <ha-dropdown
+        placement="bottom"
+        @wa-select=${this._handleSelect}
+        @wa-show=${this._handleShow}
+        @wa-hide=${this._handleHide}
+      >
+        ${this._renderField()}
+        ${this.options
+          ? this.options.map(
+              (option) => html`
+                <ha-dropdown-item
+                  .value=${typeof option === "string" ? option : option.value}
+                  .disabled=${typeof option === "string"
+                    ? false
+                    : (option.disabled ?? false)}
+                  class=${this.value ===
+                  (typeof option === "string" ? option : option.value)
+                    ? "selected"
+                    : ""}
+                >
+                  ${option.iconPath
+                    ? html`<ha-svg-icon
+                        slot="icon"
+                        .path=${option.iconPath}
+                      ></ha-svg-icon>`
+                    : nothing}
+                  <div class="content">
+                    ${typeof option === "string"
+                      ? option
+                      : option.label || option.value}
+                    ${option.secondary
+                      ? html`<div class="secondary">${option.secondary}</div>`
+                      : nothing}
+                  </div>
+                </ha-dropdown-item>
+              `
+            )
+          : html`<slot></slot>`}
+      </ha-dropdown>
    `;
  }

-  protected override renderMenu() {
-    const classes = this.getMenuClasses();
-    return html`<ha-menu
-      innerRole="listbox"
-      wrapFocus
-      class=${classMap(classes)}
-      activatable
-      .fullwidth=${this.fixedMenuPosition ? false : !this.naturalMenuWidth}
-      .open=${this.menuOpen}
-      .anchor=${this.anchorElement}
-      .fixed=${this.fixedMenuPosition}
-      @selected=${this.onSelected}
-      @opened=${this.onOpened}
-      @closed=${this.onClosed}
-      @items-updated=${this.onItemsUpdated}
-      @keydown=${this.handleTypeahead}
-    >
-      ${this.renderMenuContent()}
-    </ha-menu>`;
+  private _renderField() {
+    const valueLabel = this._getValueLabel(this.options, this.value);
+
+    return html`
+      <ha-picker-field
+        slot="trigger"
+        type="button"
+        class=${this._opened ? "opened" : ""}
+        compact
+        aria-label=${ifDefined(this.label)}
+        @clear=${this._clearValue}
+        .label=${this.label}
+        .helper=${this.helper}
+        .value=${valueLabel}
+        .required=${this.required}
+        .disabled=${this.disabled}
+        .hideClearIcon=${!this.clearable ||
+        this.required ||
+        this.disabled ||
+        !this.value}
+      >
+      </ha-picker-field>
+    `;
  }

-  protected override renderLeadingIcon() {
-    if (!this.icon) {
-      return nothing;
+  private _handleSelect(ev: CustomEvent<{ item: { value: string } }>) {
+    ev.stopPropagation();
+    const value = ev.detail.item.value;
+    if (value === this.value) {
+      return;
    }
-
-    return html`<span class="mdc-select__icon"
-      ><slot name="icon"></slot
-    ></span>`;
-  }
-
-  connectedCallback() {
-    super.connectedCallback();
-    window.addEventListener("translations-updated", this._translationsUpdated);
-  }
-
-  protected async firstUpdated() {
-    super.firstUpdated();
-
-    if (this.inlineArrow) {
-      this.shadowRoot
-        ?.querySelector(".mdc-select__selected-text-container")
-        ?.classList.add("inline-arrow");
-    }
-  }
-
-  protected updated(changedProperties) {
-    super.updated(changedProperties);
-
-    if (changedProperties.has("inlineArrow")) {
-      const textContainerElement = this.shadowRoot?.querySelector(
-        ".mdc-select__selected-text-container"
-      );
-      if (this.inlineArrow) {
-        textContainerElement?.classList.add("inline-arrow");
-      } else {
-        textContainerElement?.classList.remove("inline-arrow");
-      }
-    }
-    if (changedProperties.get("options")) {
-      this.layoutOptions();
-      this.selectByValue(this.value);
-    }
-  }
-
-  disconnectedCallback() {
-    super.disconnectedCallback();
-    window.removeEventListener(
-      "translations-updated",
-      this._translationsUpdated
-    );
+    fireEvent(this, "selected", { value });
  }

  private _clearValue(): void {
    if (this.disabled || !this.value) {
      return;
    }
-    this.valueSetDirectly = true;
-    this.select(-1);
-    this.mdcFoundation.handleChange();
+
+    fireEvent(this, "selected", { value: undefined });
  }

-  private _translationsUpdated = debounce(async () => {
-    await nextRender();
-    this.layoutOptions();
-  }, 500);
+  private _handleShow() {
+    this.style.setProperty(
+      "--select-menu-width",
+      `${this._triggerField.offsetWidth}px`
+    );
+    this._opened = true;
+  }

-  static override styles = [
-    styles,
-    css`
-      :host([clearable]) {
-        position: relative;
-      }
-      .mdc-select:not(.mdc-select--disabled) .mdc-select__icon {
-        color: var(--secondary-text-color);
-      }
-      .mdc-select__anchor {
-        width: var(--ha-select-min-width, 200px);
-      }
-      .mdc-select--filled .mdc-select__anchor {
-        height: var(--ha-select-height, 56px);
-      }
-      .mdc-select--filled .mdc-floating-label {
-        inset-inline-start: var(--ha-space-4);
-        inset-inline-end: initial;
-        direction: var(--direction);
-      }
-      .mdc-select--filled.mdc-select--with-leading-icon .mdc-floating-label {
-        inset-inline-start: 48px;
-        inset-inline-end: initial;
-        direction: var(--direction);
-      }
-      .mdc-select .mdc-select__anchor {
-        padding-inline-start: var(--ha-space-4);
-        padding-inline-end: 0px;
-        direction: var(--direction);
-      }
-      .mdc-select__anchor .mdc-floating-label--float-above {
-        transform-origin: var(--float-start);
-      }
-      .mdc-select__selected-text-container {
-        padding-inline-end: var(--select-selected-text-padding-end, 0px);
-      }
-      :host([clearable]) .mdc-select__selected-text-container {
-        padding-inline-end: var(
-          --select-selected-text-padding-end,
-          var(--ha-space-4)
-        );
-      }
-      ha-icon-button {
-        position: absolute;
-        top: 10px;
-        right: 28px;
-        --mdc-icon-button-size: 36px;
-        --mdc-icon-size: 20px;
-        color: var(--secondary-text-color);
-        inset-inline-start: initial;
-        inset-inline-end: 28px;
-        direction: var(--direction);
-      }
-      .inline-arrow {
-        flex-grow: 0;
-      }
-    `,
-  ];
+  private _handleHide() {
+    this._opened = false;
+  }
+
+  static styles = css`
+    :host {
+      position: relative;
+    }
+    ha-picker-field.opened {
+      --mdc-text-field-idle-line-color: var(--primary-color);
+    }
+    ha-dropdown-item.selected:hover {
+      background-color: var(--ha-color-fill-primary-quiet-hover);
+    }
+
+    ha-dropdown-item .content {
+      display: flex;
+      gap: var(--ha-space-1);
+      flex-direction: column;
+    }
+
+    ha-dropdown-item .secondary {
+      font-size: var(--ha-font-size-s);
+      color: var(--ha-color-text-secondary);
+    }
+
+    ha-dropdown::part(menu) {
+      min-width: var(--select-menu-width);
+    }
+
+    :host ::slotted(ha-dropdown-item.selected),
+    ha-dropdown-item.selected {
+      font-weight: var(--ha-font-weight-medium);
+      color: var(--primary-color);
+      background-color: var(--ha-color-fill-primary-quiet-resting);
+      --icon-primary-color: var(--primary-color);
+    }
+  `;
 }
 declare global {
  interface HTMLElementTagNameMap {
    "ha-select": HaSelect;
  }
+
+  interface HASSDomEvents {
+    selected: { value: string | undefined };
+  }
 }
@@ -5,17 +5,16 @@ import { repeat } from "lit/directives/repeat";
 import memoizeOne from "memoize-one";
 import { ensureArray } from "../../common/array/ensure-array";
 import { fireEvent } from "../../common/dom/fire_event";
-import { stopPropagation } from "../../common/dom/stop_propagation";
 import { caseInsensitiveStringCompare } from "../../common/string/compare";
 import type { SelectOption, SelectSelector } from "../../data/selector";
 import type { HomeAssistant } from "../../types";
 import "../chips/ha-chip-set";
 import "../chips/ha-input-chip";
 import "../ha-checkbox";
+import "../ha-dropdown-item";
 import "../ha-formfield";
 import "../ha-generic-picker";
 import "../ha-input-helper-text";
-import "../ha-list-item";
 import "../ha-radio";
 import "../ha-select";
 import "../ha-select-box";
@@ -231,24 +230,15 @@ export class HaSelectSelector extends LitElement {

    return html`
      <ha-select
-        fixedMenuPosition
-        naturalMenuWidth
        .label=${this.label ?? ""}
-        .value=${this.value ?? ""}
+        .value=${(this.value as string) ?? ""}
        .helper=${this.helper ?? ""}
        .disabled=${this.disabled}
        .required=${this.required}
        clearable
-        @closed=${stopPropagation}
        @selected=${this._valueChanged}
+        .options=${options}
      >
-        ${options.map(
-          (item: SelectOption) => html`
-            <ha-list-item .value=${item.value} .disabled=${!!item.disabled}
-              >${item.label}</ha-list-item
-            >
-          `
-        )}
      </ha-select>
    `;
  }
@@ -295,7 +285,7 @@ export class HaSelectSelector extends LitElement {
  private _valueChanged(ev) {
    ev.stopPropagation();

-    if (ev.detail?.index === -1 && this.value !== undefined) {
+    if (ev.detail?.value === undefined && this.value !== undefined) {
      fireEvent(this, "value-changed", {
        value: undefined,
      });
@@ -385,7 +375,7 @@ export class HaSelectSelector extends LitElement {
    ha-formfield {
      display: block;
    }
-    ha-list-item[disabled] {
+    ha-dropdown-item[disabled] {
      --mdc-theme-text-primary-on-background: var(--disabled-text-color);
    }
    ha-chip-set {
@@ -108,6 +108,7 @@ export class HaSettingsRow extends LitElement {
      white-space: normal;
    }
    .prefix-wrap {
+      flex: 1;
      display: var(--settings-row-prefix-display);
    }
    :host([narrow]) .prefix-wrap {
@@ -492,19 +492,22 @@ class HaSidebar extends SubscribeMixin(ScrollableFadeMixin(LitElement)) {
        @mouseleave=${this._itemMouseLeave}
      >
        <ha-svg-icon slot="start" .path=${mdiCog}></ha-svg-icon>
-        ${!this.alwaysExpand &&
-        (this._updatesCount > 0 || this._issuesCount > 0)
-          ? html`<span class="badge" slot="start"
-              >${this._updatesCount + this._issuesCount}</span
-            >`
+        ${this._updatesCount > 0 || this._issuesCount > 0
+          ? html`
+              <span class="badge" slot="start">
+                ${this._updatesCount + this._issuesCount}
+              </span>
+            `
          : nothing}
        <span class="item-text" slot="headline"
          >${this.hass.localize("panel.config")}</span
        >
-        ${this.alwaysExpand && (this._updatesCount > 0 || this._issuesCount > 0)
-          ? html`<span class="badge" slot="end"
-              >${this._updatesCount + this._issuesCount}</span
-            >`
+        ${this._updatesCount > 0 || this._issuesCount > 0
+          ? html`
+              <span class="badge" slot="end"
+                >${this._updatesCount + this._issuesCount}</span
+              >
+            `
          : nothing}
      </ha-md-list-item>
    `;
@@ -524,13 +527,15 @@ class HaSidebar extends SubscribeMixin(ScrollableFadeMixin(LitElement)) {
        type="button"
      >
        <ha-svg-icon slot="start" .path=${mdiBell}></ha-svg-icon>
-        ${!this.alwaysExpand && notificationCount > 0
-          ? html`<span class="badge" slot="start">${notificationCount}</span>`
+        ${notificationCount > 0
+          ? html`
+              <span class="badge" slot="start"> ${notificationCount} </span>
+            `
          : nothing}
        <span class="item-text" slot="headline"
          >${this.hass.localize("ui.notification_drawer.title")}</span
        >
-        ${this.alwaysExpand && notificationCount > 0
+        ${notificationCount > 0
          ? html`<span class="badge" slot="end">${notificationCount}</span>`
          : nothing}
      </ha-md-list-item>
@@ -739,6 +744,8 @@ class HaSidebar extends SubscribeMixin(ScrollableFadeMixin(LitElement)) {
          );
          font-size: var(--ha-font-size-xl);
          align-items: center;
+          overflow: hidden;
+          width: calc(56px + var(--safe-area-inset-left, 0px));
          padding-left: calc(
            var(--ha-space-1) + var(--safe-area-inset-left, 0px)
          );
@@ -747,6 +754,7 @@ class HaSidebar extends SubscribeMixin(ScrollableFadeMixin(LitElement)) {
          );
          padding-inline-end: initial;
          padding-top: var(--safe-area-inset-top, 0px);
+          transition: width var(--ha-animation-duration-normal) ease;
        }
        :host([expanded]) .menu {
          width: calc(256px + var(--safe-area-inset-left, 0px));
@@ -761,15 +769,22 @@ class HaSidebar extends SubscribeMixin(ScrollableFadeMixin(LitElement)) {
          margin-left: 3px;
          margin-inline-start: 3px;
          margin-inline-end: initial;
-          width: 100%;
-          display: none;
+          flex: 1;
+          min-width: 0;
+          max-width: 0;
+          opacity: 0;
+          transition:
+            max-width var(--ha-animation-duration-normal) ease,
+            opacity var(--ha-animation-duration-normal) ease;
        }
        :host([narrow]) .title {
          margin: 0;
          padding: 0 var(--ha-space-4);
        }
        :host([expanded]) .title {
-          display: initial;
+          max-width: 100%;
+          opacity: 1;
+          transition-delay: 0ms, 80ms;
        }

        .panels-list {
@@ -827,6 +842,7 @@ class HaSidebar extends SubscribeMixin(ScrollableFadeMixin(LitElement)) {
          --md-list-item-leading-space: var(--ha-space-3);
          --md-list-item-trailing-space: var(--ha-space-3);
          --md-list-item-leading-icon-size: var(--ha-space-6);
+          transition: width var(--ha-animation-duration-normal) ease;
        }
        :host([expanded]) ha-md-list-item {
          width: 248px;
@@ -867,11 +883,22 @@ class HaSidebar extends SubscribeMixin(ScrollableFadeMixin(LitElement)) {
        }

        ha-md-list-item .item-text {
-          display: none;
+          display: block;
+          max-width: 0;
+          opacity: 0;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
          font-size: var(--ha-font-size-m);
          font-weight: var(--ha-font-weight-medium);
+          transition:
+            max-width var(--ha-animation-duration-normal) ease,
+            opacity var(--ha-animation-duration-normal) ease;
        }
        :host([expanded]) ha-md-list-item .item-text {
+          max-width: 100%;
+          opacity: 1;
+          transition-delay: 0ms, 80ms;
          display: block;
          overflow: hidden;
          text-overflow: ellipsis;
@@ -889,6 +916,9 @@ class HaSidebar extends SubscribeMixin(ScrollableFadeMixin(LitElement)) {
          background-color: var(--accent-color);
          padding: 2px 6px;
          color: var(--text-accent-color, var(--text-primary-color));
+          transition:
+            opacity var(--ha-animation-duration-normal) ease,
+            transform var(--ha-animation-duration-normal) ease;
        }

        ha-svg-icon + .badge {
@@ -900,6 +930,12 @@ class HaSidebar extends SubscribeMixin(ScrollableFadeMixin(LitElement)) {
          line-height: var(--ha-line-height-expanded);
          padding: 0 var(--ha-space-1);
        }
+        :host([expanded]) .badge[slot="start"],
+        :host(:not([expanded])) .badge[slot="end"] {
+          opacity: 0;
+          transform: scale(0.8);
+          pointer-events: none;
+        }

        ha-md-list-item.user {
          --md-list-item-leading-icon-size: var(--ha-space-10);
@@ -938,6 +974,15 @@ class HaSidebar extends SubscribeMixin(ScrollableFadeMixin(LitElement)) {
          -webkit-transform: scaleX(var(--scale-direction));
          transform: scaleX(var(--scale-direction));
        }
+
+        @media (prefers-reduced-motion: reduce) {
+          .menu,
+          ha-md-list-item,
+          ha-md-list-item .item-text,
+          .title {
+            transition: none;
+          }
+        }
      `,
    ];
  }
@@ -2,16 +2,14 @@ import type { PropertyValues } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../common/dom/fire_event";
-import { stopPropagation } from "../common/dom/stop_propagation";
+import { computeDomain } from "../common/entity/compute_domain";
 import { computeStateName } from "../common/entity/compute_state_name";
 import { debounce } from "../common/util/debounce";
 import type { STTEngine } from "../data/stt";
 import { listSTTEngines } from "../data/stt";
 import type { HomeAssistant } from "../types";
-import "./ha-list-item";
+import type { HaSelectOption, HaSelectSelectEvent } from "./ha-select";
 import "./ha-select";
-import type { HaSelect } from "./ha-select";
-import { computeDomain } from "../common/entity/compute_domain";

 const NONE = "__NONE_OPTION__";

@@ -61,6 +59,30 @@ export class HaSTTPicker extends LitElement {
      value = NONE;
    }

+    const options: HaSelectOption[] = this._engines
+      .filter((engine) => !engine.deprecated || engine.engine_id !== value)
+      .map((engine) => {
+        let label: string;
+        if (engine.engine_id.includes(".")) {
+          const stateObj = this.hass.states[engine.engine_id];
+          label = stateObj ? computeStateName(stateObj) : engine.engine_id;
+        } else {
+          label = engine.name || engine.engine_id;
+        }
+        return {
+          value: engine.engine_id,
+          label,
+          disabled: engine.supported_languages?.length === 0,
+        };
+      });
+
+    if (this.required || value === NONE) {
+      options.unshift({
+        value: NONE,
+        label: this.hass.localize("ui.components.stt-picker.none") || "None",
+      });
+    }
+
    return html`
      <ha-select
        .label=${this.label ||
@@ -69,33 +91,8 @@ export class HaSTTPicker extends LitElement {
        .required=${this.required}
        .disabled=${this.disabled}
        @selected=${this._changed}
-        @closed=${stopPropagation}
-        fixedMenuPosition
-        naturalMenuWidth
+        .options=${options}
      >
-        ${!this.required
-          ? html`<ha-list-item .value=${NONE}>
-              ${this.hass!.localize("ui.components.stt-picker.none")}
-            </ha-list-item>`
-          : nothing}
-        ${this._engines.map((engine) => {
-          if (engine.deprecated && engine.engine_id !== value) {
-            return nothing;
-          }
-          let label: string;
-          if (engine.engine_id.includes(".")) {
-            const stateObj = this.hass!.states[engine.engine_id];
-            label = stateObj ? computeStateName(stateObj) : engine.engine_id;
-          } else {
-            label = engine.name || engine.engine_id;
-          }
-          return html`<ha-list-item
-            .value=${engine.engine_id}
-            .disabled=${engine.supported_languages?.length === 0}
-          >
-            ${label}
-          </ha-list-item>`;
-        })}
      </ha-select>
    `;
  }
@@ -144,17 +141,17 @@ export class HaSTTPicker extends LitElement {
    }
  `;

-  private _changed(ev): void {
-    const target = ev.target as HaSelect;
+  private _changed(ev: HaSelectSelectEvent): void {
+    const value = ev.detail.value;
    if (
      !this.hass ||
-      target.value === "" ||
-      target.value === this.value ||
-      (this.value === undefined && target.value === NONE)
+      value === "" ||
+      value === this.value ||
+      (this.value === undefined && value === NONE)
    ) {
      return;
    }
-    this.value = target.value === NONE ? undefined : target.value;
+    this.value = value === NONE ? undefined : value;
    fireEvent(this, "value-changed", { value: this.value });
    fireEvent(this, "supported-languages-changed", {
      value: this._engines!.find((engine) => engine.engine_id === this.value)
@@ -53,7 +53,7 @@ import {
  multiTermSortedSearch,
  type FuseWeightedKey,
 } from "../resources/fuseMultiTerm";
-import type { HomeAssistant } from "../types";
+import type { HomeAssistant, ValueChangedEvent } from "../types";
 import { brandsUrl } from "../util/brands-url";
 import type { HaDevicePickerDeviceFilterFunc } from "./device/ha-device-picker";
 import "./ha-generic-picker";
@@ -403,7 +403,7 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) {
    `;
  }

-  private _targetPicked(ev: CustomEvent<{ value: string }>) {
+  private _targetPicked(ev: ValueChangedEvent<string>) {
    ev.stopPropagation();
    const value = ev.detail.value;
    if (value.startsWith(CREATE_ID)) {
@@ -1,11 +1,10 @@
 import type { TemplateResult } from "lit";
-import { css, html, nothing, LitElement } from "lit";
+import { css, html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
 import { fireEvent } from "../common/dom/fire_event";
-import { stopPropagation } from "../common/dom/stop_propagation";
 import type { HomeAssistant } from "../types";
+import type { HaSelectOption, HaSelectSelectEvent } from "./ha-select";
 import "./ha-select";
-import "./ha-list-item";

 const DEFAULT_THEME = "default";

@@ -25,6 +24,26 @@ export class HaThemePicker extends LitElement {
  @property({ type: Boolean }) public required = false;

  protected render(): TemplateResult {
+    const options: HaSelectOption[] = Object.keys(
+      this.hass?.themes.themes || {}
+    ).map((theme) => ({
+      value: theme,
+    }));
+
+    if (this.includeDefault) {
+      options.unshift({
+        value: DEFAULT_THEME,
+        label: "Home Assistant",
+      });
+    }
+
+    if (!this.required) {
+      options.unshift({
+        value: "remove",
+        label: this.hass!.localize("ui.components.theme-picker.no_theme"),
+      });
+    }
+
    return html`
      <ha-select
        .label=${this.label ||
@@ -33,31 +52,8 @@ export class HaThemePicker extends LitElement {
        .required=${this.required}
        .disabled=${this.disabled}
        @selected=${this._changed}
-        @closed=${stopPropagation}
-        fixedMenuPosition
-        naturalMenuWidth
-      >
-        ${!this.required
-          ? html`
-              <ha-list-item value="remove">
-                ${this.hass!.localize("ui.components.theme-picker.no_theme")}
-              </ha-list-item>
-            `
-          : nothing}
-        ${this.includeDefault
-          ? html`
-              <ha-list-item .value=${DEFAULT_THEME}>
-                Home Assistant
-              </ha-list-item>
-            `
-          : nothing}
-        ${Object.keys(this.hass!.themes.themes)
-          .sort()
-          .map(
-            (theme) =>
-              html`<ha-list-item .value=${theme}>${theme}</ha-list-item>`
-          )}
-      </ha-select>
+        .options=${options}
+      ></ha-select>
    `;
  }

@@ -67,11 +63,11 @@ export class HaThemePicker extends LitElement {
    }
  `;

-  private _changed(ev): void {
-    if (!this.hass || ev.target.value === "") {
+  private _changed(ev: HaSelectSelectEvent): void {
+    if (!this.hass || ev.detail.value === "") {
      return;
    }
-    this.value = ev.target.value === "remove" ? undefined : ev.target.value;
+    this.value = ev.detail.value === "remove" ? undefined : ev.detail.value;
    fireEvent(this, "value-changed", { value: this.value });
  }
 }
@@ -36,10 +36,19 @@ export class HaTopAppBarFixed extends TopAppBarFixedBase {
        );
        padding-top: var(--safe-area-inset-top);
        padding-right: var(--safe-area-inset-right);
+        transition:
+          width var(--ha-animation-duration-normal) ease,
+          padding-left var(--ha-animation-duration-normal) ease,
+          padding-right var(--ha-animation-duration-normal) ease;
      }
      :host([narrow]) .mdc-top-app-bar {
        padding-left: var(--safe-area-inset-left);
      }
+      @media (prefers-reduced-motion: reduce) {
+        .mdc-top-app-bar {
+          transition: none;
+        }
+      }
      .mdc-top-app-bar__title {
        font-size: var(--ha-font-size-xl);
        padding-inline-start: var(--ha-space-6);
@@ -2,16 +2,14 @@ import type { PropertyValues } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../common/dom/fire_event";
-import { stopPropagation } from "../common/dom/stop_propagation";
+import { computeDomain } from "../common/entity/compute_domain";
 import { computeStateName } from "../common/entity/compute_state_name";
 import { debounce } from "../common/util/debounce";
 import type { TTSEngine } from "../data/tts";
 import { listTTSEngines } from "../data/tts";
 import type { HomeAssistant } from "../types";
-import "./ha-list-item";
+import type { HaSelectOption, HaSelectSelectEvent } from "./ha-select";
 import "./ha-select";
-import type { HaSelect } from "./ha-select";
-import { computeDomain } from "../common/entity/compute_domain";

 const NONE = "__NONE_OPTION__";

@@ -61,6 +59,30 @@ export class HaTTSPicker extends LitElement {
      value = NONE;
    }

+    const options: HaSelectOption[] = this._engines
+      .filter((engine) => !engine.deprecated || engine.engine_id === value)
+      .map((engine) => {
+        let label: string;
+        if (engine.engine_id.includes(".")) {
+          const stateObj = this.hass.states[engine.engine_id];
+          label = stateObj ? computeStateName(stateObj) : engine.engine_id;
+        } else {
+          label = engine.name || engine.engine_id;
+        }
+        return {
+          value: engine.engine_id,
+          label,
+          disabled: engine.supported_languages?.length === 0,
+        };
+      });
+
+    if (!this.required || value === NONE) {
+      options.unshift({
+        value: NONE,
+        label: this.hass.localize("ui.components.tts-picker.none"),
+      });
+    }
+
    return html`
      <ha-select
        .label=${this.label ||
@@ -69,33 +91,8 @@ export class HaTTSPicker extends LitElement {
        .required=${this.required}
        .disabled=${this.disabled}
        @selected=${this._changed}
-        @closed=${stopPropagation}
-        fixedMenuPosition
-        naturalMenuWidth
+        .options=${options}
      >
-        ${!this.required
-          ? html`<ha-list-item .value=${NONE}>
-              ${this.hass!.localize("ui.components.tts-picker.none")}
-            </ha-list-item>`
-          : nothing}
-        ${this._engines.map((engine) => {
-          if (engine.deprecated && engine.engine_id !== value) {
-            return nothing;
-          }
-          let label: string;
-          if (engine.engine_id.includes(".")) {
-            const stateObj = this.hass!.states[engine.engine_id];
-            label = stateObj ? computeStateName(stateObj) : engine.engine_id;
-          } else {
-            label = engine.name || engine.engine_id;
-          }
-          return html`<ha-list-item
-            .value=${engine.engine_id}
-            .disabled=${engine.supported_languages?.length === 0}
-          >
-            ${label}
-          </ha-list-item>`;
-        })}
      </ha-select>
    `;
  }
@@ -144,17 +141,17 @@ export class HaTTSPicker extends LitElement {
    }
  `;

-  private _changed(ev): void {
-    const target = ev.target as HaSelect;
+  private _changed(ev: HaSelectSelectEvent): void {
+    const value = ev.detail.value;
    if (
      !this.hass ||
-      target.value === "" ||
-      target.value === this.value ||
-      (this.value === undefined && target.value === NONE)
+      value === "" ||
+      value === this.value ||
+      (this.value === undefined && value === NONE)
    ) {
      return;
    }
-    this.value = target.value === NONE ? undefined : target.value;
+    this.value = value === NONE ? undefined : value;
    fireEvent(this, "value-changed", { value: this.value });
    fireEvent(this, "supported-languages-changed", {
      value: this._engines!.find((engine) => engine.engine_id === this.value)
@@ -1,15 +1,13 @@
 import type { PropertyValues } from "lit";
 import { css, html, LitElement, nothing } from "lit";
-import { customElement, property, query, state } from "lit/decorators";
+import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../common/dom/fire_event";
-import { stopPropagation } from "../common/dom/stop_propagation";
 import { debounce } from "../common/util/debounce";
 import type { TTSVoice } from "../data/tts";
 import { listTTSVoices } from "../data/tts";
 import type { HomeAssistant } from "../types";
-import "./ha-list-item";
+import type { HaSelectOption, HaSelectSelectEvent } from "./ha-select";
 import "./ha-select";
-import type { HaSelect } from "./ha-select";

 const NONE = "__NONE_OPTION__";

@@ -31,14 +29,25 @@ export class HaTTSVoicePicker extends LitElement {

  @state() _voices?: TTSVoice[] | null;

-  @query("ha-select") private _select?: HaSelect;
-
  protected render() {
    if (!this._voices) {
      return nothing;
    }
    const value =
      this.value ?? (this.required ? this._voices[0]?.voice_id : NONE);
+
+    const options: HaSelectOption[] = (this._voices || []).map((voice) => ({
+      value: voice.voice_id,
+      label: voice.name,
+    }));
+
+    if (!this.required || !this.value) {
+      options.unshift({
+        value: NONE,
+        label: this.hass!.localize("ui.components.tts-voice-picker.none"),
+      });
+    }
+
    return html`
      <ha-select
        .label=${this.label ||
@@ -47,21 +56,8 @@ export class HaTTSVoicePicker extends LitElement {
        .required=${this.required}
        .disabled=${this.disabled}
        @selected=${this._changed}
-        @closed=${stopPropagation}
-        fixedMenuPosition
-        naturalMenuWidth
+        .options=${options}
      >
-        ${!this.required
-          ? html`<ha-list-item .value=${NONE}>
-              ${this.hass!.localize("ui.components.tts-voice-picker.none")}
-            </ha-list-item>`
-          : nothing}
-        ${this._voices.map(
-          (voice) =>
-            html`<ha-list-item .value=${voice.voice_id}>
-              ${voice.name}
-            </ha-list-item>`
-        )}
      </ha-select>
    `;
  }
@@ -102,34 +98,25 @@ export class HaTTSVoicePicker extends LitElement {
    }
  }

-  protected updated(changedProperties: PropertyValues<this>) {
-    super.updated(changedProperties);
-    if (
-      changedProperties.has("_voices") &&
-      this._select?.value !== this.value
-    ) {
-      this._select?.layoutOptions();
-      fireEvent(this, "value-changed", { value: this._select?.value });
-    }
-  }
-
  static styles = css`
    ha-select {
      width: 100%;
+      text-align: start;
+      display: block;
    }
  `;

-  private _changed(ev): void {
-    const target = ev.target as HaSelect;
+  private _changed(ev: HaSelectSelectEvent): void {
+    const value = ev.detail.value;
    if (
      !this.hass ||
-      target.value === "" ||
-      target.value === this.value ||
-      (this.value === undefined && target.value === NONE)
+      value === "" ||
+      value === this.value ||
+      (this.value === undefined && value === NONE)
    ) {
      return;
    }
-    this.value = target.value === NONE ? undefined : target.value;
+    this.value = value === NONE ? undefined : value;
    fireEvent(this, "value-changed", { value: this.value });
  }
 }
@@ -288,10 +288,19 @@ export class TopAppBarBaseBase extends BaseElement {
        );
        padding-top: var(--safe-area-inset-top);
        padding-right: var(--safe-area-inset-right);
+        transition:
+          width var(--ha-animation-duration-normal) ease,
+          padding-left var(--ha-animation-duration-normal) ease,
+          padding-right var(--ha-animation-duration-normal) ease;
      }
      :host([narrow]) .mdc-top-app-bar {
        padding-left: var(--safe-area-inset-left);
      }
+      @media (prefers-reduced-motion: reduce) {
+        .mdc-top-app-bar {
+          transition: none;
+        }
+      }
      .mdc-top-app-bar--pane.mdc-top-app-bar--fixed-scrolled {
        box-shadow: none;
      }
@@ -1,11 +1,9 @@
 import { mdiClose } from "@mdi/js";
-import type { HassEntity } from "home-assistant-js-websocket";
 import type { CSSResultGroup } from "lit";
 import { LitElement, css, html, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../../common/dom/fire_event";
 import { computeDomain } from "../../common/entity/compute_domain";
-import { computeStateName } from "../../common/entity/compute_state_name";
 import { supportsFeature } from "../../common/entity/supports-feature";
 import type { EntityRegistryDisplayEntry } from "../../data/entity/entity_registry";
 import { extractApiErrorMessage } from "../../data/hassio/common";
@@ -19,8 +17,9 @@ import { haStyleDialog } from "../../resources/styles";
 import type { HomeAssistant } from "../../types";
 import "../ha-alert";
 import "../ha-button";
-import "../ha-dialog";
+import "../ha-dialog-footer";
 import "../ha-dialog-header";
+import "../ha-wa-dialog";
 import "./ha-media-player-toggle";
 import type { JoinMediaPlayersDialogParams } from "./show-join-media-players-dialog";

@@ -38,8 +37,11 @@ class DialogJoinMediaPlayers extends LitElement {

  @state() private _error?: string;

+  @state() private _open = false;
+
  public showDialog(params: JoinMediaPlayersDialogParams): void {
    this._entityId = params.entityId;
+    this._open = true;

    const stateObj = this.hass.states[params.entityId] as
      | MediaPlayerEntity
@@ -54,6 +56,11 @@ class DialogJoinMediaPlayers extends LitElement {
  }

  public closeDialog() {
+    this._open = false;
+  }
+
+  private _dialogClosed(): void {
+    this._open = false;
    this._entityId = undefined;
    this._selectedEntities = [];
    this._groupMembers = [];
@@ -68,23 +75,18 @@ class DialogJoinMediaPlayers extends LitElement {
    }

    const entityId = this._entityId;
-    const stateObj = this.hass.states[entityId] as HassEntity | undefined;
-    const name = (stateObj && computeStateName(stateObj)) || entityId;
-
    return html`
-      <ha-dialog
-        open
-        scrimClickAction
-        escapeKeyAction
-        flexContent
-        .heading=${name}
-        @closed=${this.closeDialog}
+      <ha-wa-dialog
+        .hass=${this.hass}
+        .open=${this._open}
+        flexcontent
+        @closed=${this._dialogClosed}
      >
-        <ha-dialog-header show-border slot="heading">
+        <ha-dialog-header show-border slot="header">
          <ha-icon-button
            .label=${this.hass.localize("ui.common.close")}
            .path=${mdiClose}
-            dialogAction="close"
+            data-dialog="close"
            slot="navigationIcon"
          ></ha-icon-button>
          <span slot="title"
@@ -118,21 +120,23 @@ class DialogJoinMediaPlayers extends LitElement {
              ></ha-media-player-toggle>`
          )}
        </div>
-        <ha-button
-          appearance="plain"
-          slot="secondaryAction"
-          @click=${this.closeDialog}
-        >
-          ${this.hass.localize("ui.common.cancel")}
-        </ha-button>
-        <ha-button
-          .disabled=${!!this._submitting}
-          slot="primaryAction"
-          @click=${this._submit}
-        >
-          ${this.hass.localize("ui.common.apply")}
-        </ha-button>
-      </ha-dialog>
+        <ha-dialog-footer slot="footer">
+          <ha-button
+            appearance="plain"
+            slot="secondaryAction"
+            @click=${this.closeDialog}
+          >
+            ${this.hass.localize("ui.common.cancel")}
+          </ha-button>
+          <ha-button
+            .disabled=${!!this._submitting}
+            slot="primaryAction"
+            @click=${this._submit}
+          >
+            ${this.hass.localize("ui.common.apply")}
+          </ha-button>
+        </ha-dialog-footer>
+      </ha-wa-dialog>
    `;
  }

@@ -217,6 +221,7 @@ class DialogJoinMediaPlayers extends LitElement {
        .content {
          display: flex;
          flex-direction: column;
+          padding-top: var(--ha-space-6);
          row-gap: var(--ha-space-4);
        }

@@ -24,6 +24,8 @@ import "../ha-icon-button";
 import "./hat-logbook-note";
 import type { NodeInfo } from "./hat-script-graph";
 import { traceTabStyles } from "./trace-tab-styles";
+import type { Trigger } from "../../data/automation";
+import { migrateAutomationTrigger } from "../../data/automation";

 const TRACE_PATH_TABS = [
  "step_config",
@@ -166,7 +168,9 @@ export class HaTracePathDetails extends LitElement {
                : selectedType === "trigger"
                  ? html`<h2>
                      ${describeTrigger(
-                        currentDetail,
+                        migrateAutomationTrigger({
+                          ...currentDetail,
+                        }) as Trigger,
                        this.hass,
                        this._entityReg
                      )}
@@ -32,12 +32,13 @@ export class VoiceAssistantBrandicon extends LitElement {
    return [
      haStyle,
      css`
+        :host {
+          display: inline;
+        }
        .logo {
          position: relative;
+          vertical-align: middle;
          height: 24px;
-          margin-right: 16px;
-          margin-inline-end: 16px;
-          margin-inline-start: initial;
        }
      `,
    ];
@@ -142,7 +142,7 @@ export const subscribeHistory = (
  );
 };

-class HistoryStream {
+export class HistoryStream {
  hass: HomeAssistant;

  hoursToShow?: number;
@@ -221,6 +221,7 @@ class HistoryStream {
        // only expire the rest of the history as it ages.
        const lastExpiredState = expiredStates[expiredStates.length - 1];
        lastExpiredState.lu = purgeBeforePythonTime;
+        delete lastExpiredState.lc;
        newHistory[entityId].unshift(lastExpiredState);
      }
    }
@@ -13,7 +13,6 @@ import "../../../components/ha-cover-controls";
 import "../../../components/ha-cover-tilt-controls";
 import "../../../components/ha-date-input";
 import "../../../components/ha-humidifier-state";
-import "../../../components/ha-list-item";
 import "../../../components/ha-select";
 import "../../../components/ha-slider";
 import "../../../components/ha-time-input";
@@ -296,17 +295,11 @@ class EntityPreviewRow extends LitElement {
          .label=${computeStateName(stateObj)}
          .value=${stateObj.state}
          .disabled=${isUnavailableState(stateObj.state)}
-          naturalMenuWidth
+          .options=${stateObj.attributes.options?.map((option) => ({
+            value: option,
+            label: this.hass!.formatEntityState(stateObj, option),
+          })) || []}
        >
-          ${stateObj.attributes.options
-            ? stateObj.attributes.options.map(
-                (option) => html`
-                  <ha-list-item .value=${option}>
-                    ${this.hass!.formatEntityState(stateObj, option)}
-                  </ha-list-item>
-                `
-              )
-            : ""}
        </ha-select>
      `;
    }
@@ -1,17 +1,12 @@
-import { mdiClose } from "@mdi/js";
 import type { CSSResultGroup } from "lit";
 import { css, html, LitElement, nothing } from "lit";
-import { customElement, property, query, state } from "lit/decorators";
+import { customElement, property, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import "../../../../components/ha-button";
-import "../../../../components/ha-dialog-header";
+import "../../../../components/ha-dialog-footer";
 import "../../../../components/ha-icon-button-toggle";
-import type { HaMdDialog } from "../../../../components/ha-md-dialog";
-import {
-  getMobileCloseToBottomAnimation,
-  getMobileOpenFromBottomAnimation,
-} from "../../../../components/ha-md-dialog";
+import "../../../../components/ha-wa-dialog";
 import type { EntityRegistryEntry } from "../../../../data/entity/entity_registry";
 import type { LightColor, LightEntity } from "../../../../data/light";
 import {
@@ -41,7 +36,7 @@ class DialogLightColorFavorite extends LitElement {

  @state() private _modes: LightPickerMode[] = [];

-  @query("ha-md-dialog") private _dialog?: HaMdDialog;
+  @state() private _open = false;

  public async showDialog(
    dialogParams: LightColorFavoriteDialogParams
@@ -50,10 +45,11 @@ class DialogLightColorFavorite extends LitElement {
    this._dialogParams = dialogParams;
    this._color = dialogParams.initialColor ?? this._computeCurrentColor();
    this._updateModes();
+    this._open = true;
  }

  public closeDialog(): void {
-    this._dialog?.close();
+    this._open = false;
  }

  private _updateModes() {
@@ -120,16 +116,8 @@ class DialogLightColorFavorite extends LitElement {
    );
  }

-  private async _cancel() {
-    this._dialogParams?.cancel?.();
-  }
-
-  private _cancelDialog() {
-    this._cancel();
-    this.closeDialog();
-  }
-
  private _dialogClosed(): void {
+    this._open = false;
    this._dialogParams = undefined;
    this._entry = undefined;
    this._color = undefined;
@@ -138,7 +126,7 @@ class DialogLightColorFavorite extends LitElement {

  private async _save() {
    if (!this._color) {
-      this._cancel();
+      this.closeDialog();
      return;
    }
    this._dialogParams?.submit?.(this._color);
@@ -159,83 +147,76 @@ class DialogLightColorFavorite extends LitElement {
    }

    return html`
-      <ha-md-dialog
-        open
-        @cancel=${this._cancel}
+      <ha-wa-dialog
+        .hass=${this.hass}
+        .open=${this._open}
+        .headerTitle=${this._dialogParams?.title}
        @closed=${this._dialogClosed}
-        aria-labelledby="dialog-light-color-favorite-title"
-        .getOpenAnimation=${getMobileOpenFromBottomAnimation}
-        .getCloseAnimation=${getMobileCloseToBottomAnimation}
      >
-        <ha-dialog-header slot="headline">
-          <ha-icon-button
-            slot="navigationIcon"
-            @click=${this.closeDialog}
-            .label=${this.hass.localize("ui.common.close")}
-            .path=${mdiClose}
-          ></ha-icon-button>
-          <span slot="title" id="dialog-light-color-favorite-title"
-            >${this._dialogParams?.title}</span
-          >
-        </ha-dialog-header>
-        <div slot="content">
-          <div class="header">
-            ${this._modes.length > 1
-              ? html`
-                  <div class="modes">
-                    ${this._modes.map(
-                      (value) => html`
-                        <ha-icon-button-toggle
-                          border-only
-                          .selected=${value === this._mode}
-                          .label=${this.hass.localize(
-                            `ui.dialogs.more_info_control.light.color_picker.mode.${value}`
-                          )}
-                          .mode=${value}
-                          @click=${this._modeChanged}
-                        >
-                          <span
-                            class="wheel ${classMap({ [value]: true })}"
-                          ></span>
-                        </ha-icon-button-toggle>
-                      `
-                    )}
-                  </div>
-                `
-              : nothing}
-          </div>
-          <div class="content">
-            ${this._mode === "color_temp"
-              ? html`
-                  <light-color-temp-picker
-                    .hass=${this.hass}
-                    .stateObj=${this.stateObj}
-                    @color-changed=${this._colorChanged}
-                  >
-                  </light-color-temp-picker>
-                `
-              : nothing}
-            ${this._mode === "color"
-              ? html`
-                  <light-color-rgb-picker
-                    .hass=${this.hass}
-                    .stateObj=${this.stateObj}
-                    @color-changed=${this._colorChanged}
-                  >
-                  </light-color-rgb-picker>
-                `
-              : nothing}
-          </div>
+        <div class="header">
+          ${this._modes.length > 1
+            ? html`
+                <div class="modes">
+                  ${this._modes.map(
+                    (value) => html`
+                      <ha-icon-button-toggle
+                        border-only
+                        .selected=${value === this._mode}
+                        .label=${this.hass.localize(
+                          `ui.dialogs.more_info_control.light.color_picker.mode.${value}`
+                        )}
+                        .mode=${value}
+                        @click=${this._modeChanged}
+                      >
+                        <span
+                          class="wheel ${classMap({ [value]: true })}"
+                        ></span>
+                      </ha-icon-button-toggle>
+                    `
+                  )}
+                </div>
+              `
+            : nothing}
        </div>
-        <div slot="actions">
-          <ha-button appearance="plain" @click=${this._cancelDialog}>
+        <div class="content">
+          ${this._mode === "color_temp"
+            ? html`
+                <light-color-temp-picker
+                  .hass=${this.hass}
+                  .stateObj=${this.stateObj}
+                  @color-changed=${this._colorChanged}
+                >
+                </light-color-temp-picker>
+              `
+            : nothing}
+          ${this._mode === "color"
+            ? html`
+                <light-color-rgb-picker
+                  .hass=${this.hass}
+                  .stateObj=${this.stateObj}
+                  @color-changed=${this._colorChanged}
+                >
+                </light-color-rgb-picker>
+              `
+            : nothing}
+        </div>
+        <ha-dialog-footer slot="footer">
+          <ha-button
+            slot="secondaryAction"
+            appearance="plain"
+            @click=${this.closeDialog}
+          >
            ${this.hass.localize("ui.common.cancel")}
          </ha-button>
-          <ha-button @click=${this._save} .disabled=${!this._color}
-            >${this.hass.localize("ui.common.save")}</ha-button
+          <ha-button
+            slot="primaryAction"
+            @click=${this._save}
+            .disabled=${!this._color}
          >
-        </div>
-      </ha-md-dialog>
+            ${this.hass.localize("ui.common.save")}
+          </ha-button>
+        </ha-dialog-footer>
+      </ha-wa-dialog>
    `;
  }

@@ -243,23 +224,18 @@ class DialogLightColorFavorite extends LitElement {
    return [
      haStyleDialog,
      css`
-        ha-md-dialog {
-          min-width: 420px; /* prevent width jumps when switching modes */
-          max-height: min(
+        ha-wa-dialog {
+          --ha-dialog-width-md: 420px; /* prevent width jumps when switching modes */
+          --ha-dialog-max-height: min(
            600px,
            100% - 48px
          ); /* prevent scrolling on desktop */
        }

        @media all and (max-width: 450px), all and (max-height: 500px) {
-          ha-md-dialog {
-            min-width: 100%;
-            min-height: auto;
-            max-height: calc(100% - 100px);
-            margin-bottom: 0;
-
-            --md-dialog-container-shape-start-start: 28px;
-            --md-dialog-container-shape-start-end: 28px;
+          ha-wa-dialog {
+            --ha-dialog-width-md: 100vw;
+            --ha-dialog-max-height: calc(100% - 100px);
          }
        }

@@ -7,7 +7,6 @@ export interface LightColorFavoriteDialogParams {
  title: string;
  initialColor?: LightColor;
  submit?: (color?: LightColor) => void;
-  cancel?: () => void;
 }

 export const loadLightColorFavoriteDialog = () =>
@@ -18,7 +17,6 @@ export const showLightColorFavoriteDialog = (
  dialogParams: LightColorFavoriteDialogParams
 ) =>
  new Promise<LightColor | null>((resolve) => {
-    const origCancel = dialogParams.cancel;
    const origSubmit = dialogParams.submit;

    fireEvent(element, "show-dialog", {
@@ -26,12 +24,6 @@ export const showLightColorFavoriteDialog = (
      dialogImport: loadLightColorFavoriteDialog,
      dialogParams: {
        ...dialogParams,
-        cancel: () => {
-          resolve(null);
-          if (origCancel) {
-            origCancel();
-          }
-        },
        submit: (color: LightColor) => {
          resolve(color);
          if (origSubmit) {
@@ -1,23 +1,19 @@
-import { mdiClose, mdiPlay, mdiStop } from "@mdi/js";
+import { mdiPlay, mdiStop } from "@mdi/js";
 import type { HassEntity } from "home-assistant-js-websocket";
 import type { CSSResultGroup } from "lit";
 import { css, html, LitElement, nothing } from "lit";
-import { customElement, property, query, state } from "lit/decorators";
+import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../../../../common/dom/fire_event";
-import { stopPropagation } from "../../../../common/dom/stop_propagation";
 import { supportsFeature } from "../../../../common/entity/supports-feature";
 import "../../../../components/ha-button";
 import "../../../../components/ha-control-button";
-import "../../../../components/ha-dialog-header";
+import type { HaSelectSelectEvent } from "../../../../components/ha-select";
+import "../../../../components/ha-dialog-footer";
 import "../../../../components/ha-icon-button";
 import "../../../../components/ha-list-item";
-import type { HaMdDialog } from "../../../../components/ha-md-dialog";
-import {
-  getMobileCloseToBottomAnimation,
-  getMobileOpenFromBottomAnimation,
-} from "../../../../components/ha-md-dialog";
 import "../../../../components/ha-select";
 import "../../../../components/ha-textfield";
+import "../../../../components/ha-wa-dialog";
 import { SirenEntityFeature } from "../../../../data/siren";
 import { haStyle } from "../../../../resources/styles";
 import type { HomeAssistant } from "../../../../types";
@@ -28,23 +24,25 @@ class MoreInfoSirenAdvancedControls extends LitElement {

  @state() _stateObj?: HassEntity;

+  @state() private _open = false;
+
  @state() _tone?: string;

  @state() _volume?: number;

  @state() _duration?: number;

-  @query("ha-md-dialog") private _dialog?: HaMdDialog;
-
  public showDialog({ stateObj }: { stateObj: HassEntity }) {
    this._stateObj = stateObj;
+    this._open = true;
  }

  public closeDialog(): void {
-    this._dialog?.close();
+    this._open = false;
  }

  private _dialogClosed(): void {
+    this._open = false;
    this._stateObj = undefined;
    fireEvent(this, "dialog-closed", { dialog: this.localName });
  }
@@ -65,50 +63,33 @@ class MoreInfoSirenAdvancedControls extends LitElement {
      SirenEntityFeature.DURATION
    );
    return html`
-      <ha-md-dialog
-        open
+      <ha-wa-dialog
+        .open=${this._open}
+        .hass=${this.hass}
+        header-title=${this.hass.localize(
+          "ui.components.siren.advanced_controls"
+        )}
        @closed=${this._dialogClosed}
-        aria-labelledby="dialog-light-color-favorite-title"
-        .getOpenAnimation=${getMobileOpenFromBottomAnimation}
-        .getCloseAnimation=${getMobileCloseToBottomAnimation}
      >
-        <ha-dialog-header slot="headline">
-          <ha-icon-button
-            slot="navigationIcon"
-            @click=${this.closeDialog}
-            .label=${this.hass.localize("ui.common.close")}
-            .path=${mdiClose}
-          ></ha-icon-button>
-          <span slot="title" id="dialog-light-color-favorite-title"
-            >${this.hass.localize(
-              "ui.components.siren.advanced_controls"
-            )}</span
-          >
-        </ha-dialog-header>
-        <div slot="content">
+        <div>
          <div class="options">
            ${supportsTones
              ? html`
                  <ha-select
                    .label=${this.hass.localize("ui.components.siren.tone")}
-                    @closed=${stopPropagation}
-                    @change=${this._handleToneChange}
+                    @selected=${this._handleToneChange}
                    .value=${this._tone}
+                    .options=${Object.entries(
+                      this._stateObj!.attributes.available_tones
+                    ).map(([toneId, toneName]) => ({
+                      value: Array.isArray(
+                        this._stateObj!.attributes.available_tones
+                      )
+                        ? toneName
+                        : toneId,
+                      label: toneName,
+                    }))}
                  >
-                    ${Object.entries(
-                      this._stateObj.attributes.available_tones
-                    ).map(
-                      ([toneId, toneName]) => html`
-                        <ha-list-item
-                          .value=${Array.isArray(
-                            this._stateObj!.attributes.available_tones
-                          )
-                            ? toneName
-                            : toneId}
-                          >${toneName}</ha-list-item
-                        >
-                      `
-                    )}
                  </ha-select>
                `
              : nothing}
@@ -153,17 +134,21 @@ class MoreInfoSirenAdvancedControls extends LitElement {
            </ha-control-button>
          </div>
        </div>
-        <div slot="actions">
-          <ha-button @click=${this.closeDialog}>
+        <ha-dialog-footer slot="footer">
+          <ha-button
+            slot="secondaryAction"
+            appearance="plain"
+            @click=${this.closeDialog}
+          >
            ${this.hass.localize("ui.common.close")}
          </ha-button>
-        </div>
-      </ha-md-dialog>
+        </ha-dialog-footer>
+      </ha-wa-dialog>
    `;
  }

-  private _handleToneChange(ev) {
-    this._tone = ev.target.value;
+  private _handleToneChange(ev: HaSelectSelectEvent) {
+    this._tone = ev.detail.value;
  }

  private _handleVolumeChange(ev) {
@@ -5,7 +5,7 @@ import "../../../components/ha-date-input";
 import "../../../components/ha-time-input";
 import { setDateValue } from "../../../data/date";
 import { isUnavailableState, UNAVAILABLE } from "../../../data/entity/entity";
-import type { HomeAssistant } from "../../../types";
+import type { HomeAssistant, ValueChangedEvent } from "../../../types";

@customElement("more-info-date")
 class MoreInfoDate extends LitElement {
@@ -31,7 +31,7 @@ class MoreInfoDate extends LitElement {
    `;
  }

-  private _dateChanged(ev: CustomEvent<{ value: string }>): void {
+  private _dateChanged(ev: ValueChangedEvent<string>): void {
    if (ev.detail.value) {
      setDateValue(this.hass!, this.stateObj!.entity_id, ev.detail.value);
    }
@@ -6,7 +6,7 @@ import "../../../components/ha-date-input";
 import "../../../components/ha-time-input";
 import { setDateTimeValue } from "../../../data/datetime";
 import { isUnavailableState, UNAVAILABLE } from "../../../data/entity/entity";
-import type { HomeAssistant } from "../../../types";
+import type { HomeAssistant, ValueChangedEvent } from "../../../types";

@customElement("more-info-datetime")
 class MoreInfoDatetime extends LitElement {
@@ -45,7 +45,7 @@ class MoreInfoDatetime extends LitElement {
    ev.stopPropagation();
  }

-  private _timeChanged(ev: CustomEvent<{ value: string }>): void {
+  private _timeChanged(ev: ValueChangedEvent<string>): void {
    if (ev.detail.value) {
      const dateObj = new Date(this.stateObj!.state);
      const newTime = ev.detail.value.split(":").map(Number);
@@ -55,7 +55,7 @@ class MoreInfoDatetime extends LitElement {
    }
  }

-  private _dateChanged(ev: CustomEvent<{ value: string }>): void {
+  private _dateChanged(ev: ValueChangedEvent<string>): void {
    if (ev.detail.value) {
      const dateObj = new Date(this.stateObj!.state);
      const newDate = ev.detail.value.split("-").map(Number);
@@ -8,7 +8,7 @@ import {
  setInputDateTimeValue,
  stateToIsoDateString,
 } from "../../../data/input_datetime";
-import type { HomeAssistant } from "../../../types";
+import type { HomeAssistant, ValueChangedEvent } from "../../../types";

@customElement("more-info-input_datetime")
 class MoreInfoInputDatetime extends LitElement {
@@ -55,7 +55,7 @@ class MoreInfoInputDatetime extends LitElement {
    ev.stopPropagation();
  }

-  private _timeChanged(ev: CustomEvent<{ value: string }>): void {
+  private _timeChanged(ev: ValueChangedEvent<string>): void {
    setInputDateTimeValue(
      this.hass!,
      this.stateObj!.entity_id,
@@ -66,7 +66,7 @@ class MoreInfoInputDatetime extends LitElement {
    );
  }

-  private _dateChanged(ev: CustomEvent<{ value: string }>): void {
+  private _dateChanged(ev: ValueChangedEvent<string>): void {
    setInputDateTimeValue(
      this.hass!,
      this.stateObj!.entity_id,
@@ -202,12 +202,11 @@ class MoreInfoMediaPlayer extends LitElement {
      return nothing;
    }

-    return html`<ha-dropdown>
+    return html`<ha-dropdown @wa-select=${this._handleSourceChange}>
      <ha-icon-button
        slot="trigger"
        .label=${this.hass.localize(`ui.card.media_player.source`)}
        .path=${mdiLoginVariant}
-        @wa-select=${this._handleSourceChange}
      >
      </ha-icon-button>
      ${this.stateObj.attributes.source_list!.map(
@@ -1,12 +1,11 @@
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property } from "lit/decorators";
-import { stopPropagation } from "../../../common/dom/stop_propagation";
 import { supportsFeature } from "../../../common/entity/supports-feature";
+import type { HaSelectSelectEvent } from "../../../components/ha-select";
+import "../../../components/ha-select";
 import type { RemoteEntity } from "../../../data/remote";
 import { REMOTE_SUPPORT_ACTIVITY } from "../../../data/remote";
 import type { HomeAssistant } from "../../../types";
-import "../../../components/ha-select";
-import "../../../components/ha-list-item";

@customElement("more-info-remote")
 class MoreInfoRemote extends LitElement {
@@ -30,30 +29,24 @@ class MoreInfoRemote extends LitElement {
              )}
              .value=${stateObj.attributes.current_activity || ""}
              @selected=${this._handleActivityChanged}
-              fixedMenuPosition
-              naturalMenuWidth
-              @closed=${stopPropagation}
+              .options=${stateObj.attributes.activity_list?.map((activity) => ({
+                value: activity,
+                label: this.hass!.formatEntityAttributeValue(
+                  stateObj,
+                  "activity",
+                  activity
+                ),
+              }))}
            >
-              ${stateObj.attributes.activity_list?.map(
-                (activity) => html`
-                  <ha-list-item .value=${activity}>
-                    ${this.hass.formatEntityAttributeValue(
-                      stateObj,
-                      "activity",
-                      activity
-                    )}
-                  </ha-list-item>
-                `
-              )}
            </ha-select>
          `
        : nothing}
    `;
  }

-  private _handleActivityChanged(ev) {
+  private _handleActivityChanged(ev: HaSelectSelectEvent) {
    const oldVal = this.stateObj!.attributes.current_activity;
-    const newVal = ev.target.value;
+    const newVal = ev.detail.value;

    if (!newVal || oldVal === newVal) {
      return;
@@ -5,7 +5,7 @@ import "../../../components/ha-date-input";
 import "../../../components/ha-time-input";
 import { isUnavailableState, UNAVAILABLE } from "../../../data/entity/entity";
 import { setTimeValue } from "../../../data/time";
-import type { HomeAssistant } from "../../../types";
+import type { HomeAssistant, ValueChangedEvent } from "../../../types";

@customElement("more-info-time")
 class MoreInfoTime extends LitElement {
@@ -35,7 +35,7 @@ class MoreInfoTime extends LitElement {
    ev.stopPropagation();
  }

-  private _timeChanged(ev: CustomEvent<{ value: string }>): void {
+  private _timeChanged(ev: ValueChangedEvent<string>): void {
    if (ev.detail.value) {
      setTimeValue(this.hass!, this.stateObj!.entity_id, ev.detail.value);
    }
@@ -11,13 +11,12 @@ import {
 import { LitElement, css, html, nothing } from "lit";
 import { customElement, property } from "lit/decorators";
 import memoizeOne from "memoize-one";
-import { stopPropagation } from "../../../common/dom/stop_propagation";
 import { computeStateDomain } from "../../../common/entity/compute_state_domain";
 import { supportsFeature } from "../../../common/entity/supports-feature";
 import "../../../components/entity/ha-battery-icon";
+import type { HaSelectSelectEvent } from "../../../components/ha-select";
 import "../../../components/ha-icon";
 import "../../../components/ha-icon-button";
-import "../../../components/ha-list-item";
 import "../../../components/ha-select";
 import { UNAVAILABLE } from "../../../data/entity/entity";
 import type { EntityRegistryDisplayEntry } from "../../../data/entity/entity_registry";
@@ -172,21 +171,17 @@ class MoreInfoVacuum extends LitElement {
                  .disabled=${stateObj.state === UNAVAILABLE}
                  .value=${stateObj.attributes.fan_speed}
                  @selected=${this._handleFanSpeedChanged}
-                  fixedMenuPosition
-                  naturalMenuWidth
-                  @closed=${stopPropagation}
-                >
-                  ${stateObj.attributes.fan_speed_list!.map(
-                    (mode) => html`
-                      <ha-list-item .value=${mode}>
-                        ${this.hass.formatEntityAttributeValue(
-                          stateObj,
-                          "fan_speed",
-                          mode
-                        )}
-                      </ha-list-item>
-                    `
+                  .options=${stateObj.attributes.fan_speed_list!.map(
+                    (mode) => ({
+                      value: mode,
+                      label: this.hass!.formatEntityAttributeValue(
+                        stateObj,
+                        "fan_speed",
+                        mode
+                      ),
+                    })
                  )}
+                >
                </ha-select>
                <div
                  style="justify-content: center; align-self: center; padding-top: 1.3em"
@@ -291,9 +286,9 @@ class MoreInfoVacuum extends LitElement {
    });
  }

-  private _handleFanSpeedChanged(ev) {
+  private _handleFanSpeedChanged(ev: HaSelectSelectEvent) {
    const oldVal = this.stateObj!.attributes.fan_speed;
-    const newVal = ev.target.value;
+    const newVal = ev.detail.value;

    if (!newVal || oldVal === newVal) {
      return;
@@ -313,113 +313,119 @@ class MoreInfoWeather extends LitElement {
            </div>
          `
        : nothing}
-
-      <div class="section">
-        ${this.hass.localize("ui.card.weather.forecast")}:
-      </div>
-      ${supportedForecasts?.length > 1
-        ? html`<ha-tab-group @wa-tab-show=${this._handleForecastTypeChanged}>
-            ${supportedForecasts.map(
-              (forecastType) =>
-                html`<ha-tab-group-tab
-                  slot="nav"
-                  .panel=${forecastType}
-                  .active=${this._forecastType === forecastType}
+      ${supportedForecasts?.length
+        ? html`
+            <div class="section">
+              ${this.hass.localize("ui.card.weather.forecast")}:
+            </div>
+            ${supportedForecasts?.length > 1
+              ? html`<ha-tab-group
+                  @wa-tab-show=${this._handleForecastTypeChanged}
                >
-                  ${this.hass!.localize(`ui.card.weather.${forecastType}`)}
-                </ha-tab-group-tab>`
-            )}
-          </ha-tab-group>`
-        : nothing}
-      <div class="forecast">
-        ${forecast?.length
-          ? this._groupForecastByDay(forecast).map((dayForecast) => {
-              const showDayHeader = hourly || dayNight;
-              return html`
-                <div class="forecast-day">
-                  ${showDayHeader
-                    ? html`<div class="forecast-day-header">
-                        ${formatDateWeekdayShort(
-                          new Date(dayForecast[0].datetime),
-                          this.hass!.locale,
-                          this.hass!.config
+                  ${supportedForecasts.map(
+                    (forecastType) =>
+                      html`<ha-tab-group-tab
+                        slot="nav"
+                        .panel=${forecastType}
+                        .active=${this._forecastType === forecastType}
+                      >
+                        ${this.hass!.localize(
+                          `ui.card.weather.${forecastType}`
                        )}
-                      </div>`
-                    : nothing}
-                  <div class="forecast-day-content">
-                    ${dayForecast.map((item) =>
-                      this._showValue(item.templow) ||
-                      this._showValue(item.temperature)
-                        ? html`
-                            <div class="forecast-item">
-                              <div
-                                class="forecast-item-label ${showDayHeader
-                                  ? ""
-                                  : "no-header"}"
-                              >
-                                ${hourly
-                                  ? formatTime(
-                                      new Date(item.datetime),
-                                      this.hass!.locale,
-                                      this.hass!.config
-                                    )
-                                  : dayNight
-                                    ? html`<div class="daynight">
-                                        ${item.is_daytime !== false
-                                          ? this.hass!.localize(
-                                              "ui.card.weather.day"
-                                            )
-                                          : this.hass!.localize(
-                                              "ui.card.weather.night"
+                      </ha-tab-group-tab>`
+                  )}
+                </ha-tab-group>`
+              : nothing}
+            <div class="forecast">
+              ${forecast?.length
+                ? this._groupForecastByDay(forecast).map((dayForecast) => {
+                    const showDayHeader = hourly || dayNight;
+                    return html`
+                      <div class="forecast-day">
+                        ${showDayHeader
+                          ? html`<div class="forecast-day-header">
+                              ${formatDateWeekdayShort(
+                                new Date(dayForecast[0].datetime),
+                                this.hass!.locale,
+                                this.hass!.config
+                              )}
+                            </div>`
+                          : nothing}
+                        <div class="forecast-day-content">
+                          ${dayForecast.map((item) =>
+                            this._showValue(item.templow) ||
+                            this._showValue(item.temperature)
+                              ? html`
+                                  <div class="forecast-item">
+                                    <div
+                                      class="forecast-item-label ${showDayHeader
+                                        ? ""
+                                        : "no-header"}"
+                                    >
+                                      ${hourly
+                                        ? formatTime(
+                                            new Date(item.datetime),
+                                            this.hass!.locale,
+                                            this.hass!.config
+                                          )
+                                        : dayNight
+                                          ? html`<div class="daynight">
+                                              ${item.is_daytime !== false
+                                                ? this.hass!.localize(
+                                                    "ui.card.weather.day"
+                                                  )
+                                                : this.hass!.localize(
+                                                    "ui.card.weather.night"
+                                                  )}
+                                            </div>`
+                                          : formatDateWeekdayShort(
+                                              new Date(item.datetime),
+                                              this.hass!.locale,
+                                              this.hass!.config
                                            )}
-                                      </div>`
-                                    : formatDateWeekdayShort(
-                                        new Date(item.datetime),
-                                        this.hass!.locale,
-                                        this.hass!.config
-                                      )}
-                              </div>
-                              ${this._showValue(item.condition)
-                                ? html`
-                                    <div class="forecast-image-icon">
-                                      ${getWeatherStateIcon(
-                                        item.condition!,
-                                        this,
-                                        !(
-                                          item.is_daytime ||
-                                          item.is_daytime === undefined
-                                        )
-                                      )}
                                    </div>
-                                  `
-                                : nothing}
-                              <div class="temp">
-                                ${this._showValue(item.temperature)
-                                  ? html`${formatNumber(
-                                      item.temperature,
-                                      this.hass!.locale
-                                    )}°`
-                                  : "—"}
-                              </div>
-                              <div class="templow">
-                                ${this._showValue(item.templow)
-                                  ? html`${formatNumber(
-                                      item.templow!,
-                                      this.hass!.locale
-                                    )}°`
-                                  : nothing}
-                              </div>
-                            </div>
-                          `
-                        : nothing
-                    )}
-                  </div>
-                </div>
-              `;
-            })
-          : html`<ha-spinner size="medium"></ha-spinner>`}
-      </div>
-
+                                    ${this._showValue(item.condition)
+                                      ? html`
+                                          <div class="forecast-image-icon">
+                                            ${getWeatherStateIcon(
+                                              item.condition!,
+                                              this,
+                                              !(
+                                                item.is_daytime ||
+                                                item.is_daytime === undefined
+                                              )
+                                            )}
+                                          </div>
+                                        `
+                                      : nothing}
+                                    <div class="temp">
+                                      ${this._showValue(item.temperature)
+                                        ? html`${formatNumber(
+                                            item.temperature,
+                                            this.hass!.locale
+                                          )}°`
+                                        : "—"}
+                                    </div>
+                                    <div class="templow">
+                                      ${this._showValue(item.templow)
+                                        ? html`${formatNumber(
+                                            item.templow!,
+                                            this.hass!.locale
+                                          )}°`
+                                        : nothing}
+                                    </div>
+                                  </div>
+                                `
+                              : nothing
+                          )}
+                        </div>
+                      </div>
+                    `;
+                  })
+                : html`<ha-spinner size="medium"></ha-spinner>`}
+            </div>
+          `
+        : nothing}
      ${this.stateObj.attributes.attribution
        ? html`
            <div class="attribution">
@@ -47,6 +47,7 @@ import {
  type ActionCommandComboBoxItem,
  type NavigationComboBoxItem,
 } from "../../data/quick_bar";
+import type { RelatedResult } from "../../data/search";
 import {
  multiTermSortedSearch,
  type FuseWeightedKey,
@@ -75,6 +76,8 @@ export class QuickBar extends LitElement {

  @state() private _opened = false;

+  @state() private _relatedResult?: RelatedResult;
+
  @query("ha-picker-combo-box") private _comboBox?: HaPickerComboBox;

  private get _showEntityId() {
@@ -100,6 +103,9 @@ export class QuickBar extends LitElement {
    this._initialize();
    this._selectedSection = params.mode;
    this._showHint = params.showHint ?? false;
+
+    this._relatedResult = params.contextItem ? params.related : undefined;
+
    this._open = true;
  }

@@ -417,6 +423,7 @@ export class QuickBar extends LitElement {
    this._selectedSection = section as QuickBarSection | undefined;
    return this._getItemsMemoized(
      this._configEntryLookup,
+      this._relatedResult,
      searchString,
      this._selectedSection
    );
@@ -425,10 +432,12 @@ export class QuickBar extends LitElement {
  private _getItemsMemoized = memoizeOne(
    (
      configEntryLookup: Record<string, ConfigEntry>,
+      relatedResult: RelatedResult | undefined,
      filter?: string,
      section?: QuickBarSection
    ) => {
      const items: (string | PickerComboBoxItem)[] = [];
+      const relatedIdSets = this._getRelatedIdSets(relatedResult);

      if (!section || section === "navigate") {
        let navigateItems = this._generateNavigationCommandsMemoized(
@@ -477,17 +486,29 @@ export class QuickBar extends LitElement {
      }

      if (!section || section === "entity") {
-        let entityItems = this._getEntitiesMemoized(this.hass).sort(
-          this._sortBySortingLabel
-        );
+        let entityItems = this._getEntitiesMemoized(this.hass);
+
+        // Mark related items
+        if (relatedIdSets.entities.size > 0) {
+          entityItems = entityItems.map((item) => ({
+            ...item,
+            isRelated: relatedIdSets.entities.has(
+              (item as EntityComboBoxItem).stateObj?.entity_id || ""
+            ),
+          }));
+        }

        if (filter) {
-          entityItems = this._filterGroup(
-            "entity",
-            entityItems,
-            filter,
-            entityComboBoxKeys
-          ) as EntityComboBoxItem[];
+          entityItems = this._sortRelatedFirst(
+            this._filterGroup(
+              "entity",
+              entityItems,
+              filter,
+              entityComboBoxKeys
+            ) as EntityComboBoxItem[]
+          );
+        } else {
+          entityItems = this._sortRelatedByLabel(entityItems);
        }

        if (!section && entityItems.length) {
@@ -504,15 +525,25 @@ export class QuickBar extends LitElement {
        let deviceItems = this._getDevicesMemoized(
          this.hass,
          configEntryLookup
-        ).sort(this._sortBySortingLabel);
+        );
+
+        // Mark related items
+        if (relatedIdSets.devices.size > 0) {
+          deviceItems = deviceItems.map((item) => {
+            const deviceId = item.id.split(SEPARATOR)[1];
+            return {
+              ...item,
+              isRelated: relatedIdSets.devices.has(deviceId || ""),
+            };
+          });
+        }

        if (filter) {
-          deviceItems = this._filterGroup(
-            "device",
-            deviceItems,
-            filter,
-            deviceComboBoxKeys
+          deviceItems = this._sortRelatedFirst(
+            this._filterGroup("device", deviceItems, filter, deviceComboBoxKeys)
          );
+        } else {
+          deviceItems = this._sortRelatedByLabel(deviceItems);
        }

        if (!section && deviceItems.length) {
@@ -528,13 +559,23 @@ export class QuickBar extends LitElement {
      if (this.hass.user?.is_admin && (!section || section === "area")) {
        let areaItems = this._getAreasMemoized(this.hass);

+        // Mark related items
+        if (relatedIdSets.areas.size > 0) {
+          areaItems = areaItems.map((item) => {
+            const areaId = item.id.split(SEPARATOR)[1];
+            return {
+              ...item,
+              isRelated: relatedIdSets.areas.has(areaId || ""),
+            };
+          });
+        }
+
        if (filter) {
-          areaItems = this._filterGroup(
-            "area",
-            areaItems,
-            filter,
-            areaComboBoxKeys
+          areaItems = this._sortRelatedFirst(
+            this._filterGroup("area", areaItems, filter, areaComboBoxKeys)
          );
+        } else {
+          areaItems = this._sortRelatedByLabel(areaItems);
        }

        if (!section && areaItems.length) {
@@ -551,6 +592,12 @@ export class QuickBar extends LitElement {
    }
  );

+  private _getRelatedIdSets = memoizeOne((related?: RelatedResult) => ({
+    entities: new Set(related?.entity || []),
+    devices: new Set(related?.device || []),
+    areas: new Set(related?.area || []),
+  }));
+
  private _getEntitiesMemoized = memoizeOne((hass: HomeAssistant) =>
    getEntities(
      hass,
@@ -654,6 +701,23 @@ export class QuickBar extends LitElement {
      this.hass.locale.language
    );

+  private _sortRelatedByLabel = (items: PickerComboBoxItem[]) =>
+    [...items].sort((a, b) => {
+      if (a.isRelated && !b.isRelated) return -1;
+      if (!a.isRelated && b.isRelated) return 1;
+      return this._sortBySortingLabel(a, b);
+    });
+
+  private _sortRelatedFirst = (items: PickerComboBoxItem[]) =>
+    [...items].sort((a, b) => {
+      const aRelated = Boolean(a.isRelated);
+      const bRelated = Boolean(b.isRelated);
+      if (aRelated === bRelated) {
+        return 0;
+      }
+      return aRelated ? -1 : 1;
+    });
+
  // #endregion data

  // #region interaction
@@ -1,4 +1,5 @@
 import { fireEvent } from "../../common/dom/fire_event";
+import type { ItemType, RelatedResult } from "../../data/search";
 import { closeDialog } from "../make-dialog-manager";

 export type QuickBarSection =
@@ -8,10 +9,17 @@ export type QuickBarSection =
  | "navigate"
  | "command";

+export interface QuickBarContextItem {
+  itemType: ItemType;
+  itemId: string;
+}
+
 export interface QuickBarParams {
  entityFilter?: string;
  mode?: QuickBarSection;
  showHint?: boolean;
+  contextItem?: QuickBarContextItem;
+  related?: RelatedResult;
 }

 export const loadQuickBar = () => import("./ha-quick-bar");
@@ -30,7 +30,7 @@ import {
  getPanelIconPath,
  getPanelTitle,
 } from "../../data/panel";
-import type { HomeAssistant } from "../../types";
+import type { HomeAssistant, ValueChangedEvent } from "../../types";
 import { showConfirmationDialog } from "../generic/show-dialog-box";

@customElement("dialog-edit-sidebar")
@@ -206,7 +206,7 @@ class DialogEditSidebar extends LitElement {
    `;
  }

-  private _changed(ev: CustomEvent<{ value: DisplayValue }>): void {
+  private _changed(ev: ValueChangedEvent<DisplayValue>): void {
    const { order = [], hidden = [] } = ev.detail.value;
    this._order = [...order];
    this._hidden = [...hidden];
@@ -129,11 +129,12 @@ export class CloudStepIntro extends LitElement {
      }
      .feature .logos {
        margin-bottom: 16px;
+        display: flex;
+        gap: var(--ha-space-4);
      }
      .feature .logos > * {
        width: 40px;
        height: 40px;
-        margin: 0 4px;
      }
      .round-icon {
        border-radius: var(--ha-border-radius-circle);
@@ -5,8 +5,8 @@ import "../../components/ha-button";
 import "../../components/ha-spinner";
 import { testAssistSatelliteConnection } from "../../data/assist_satellite";
 import type { HomeAssistant } from "../../types";
-import { AssistantSetupStyles } from "./styles";
 import { documentationUrl } from "../../util/documentation-url";
+import { AssistantSetupStyles } from "./styles";

@customElement("ha-voice-assistant-setup-step-check")
 export class HaVoiceAssistantSetupStepCheck extends LitElement {
@@ -58,7 +58,7 @@ export class HaVoiceAssistantSetupStepCheck extends LitElement {
                  "/voice_control/troubleshooting/#i-dont-get-a-voice-response"
                )}
              >
-                >${this.hass.localize(
+                ${this.hass.localize(
                  "ui.panel.config.voice_assistants.satellite_wizard.check.help"
                )}</ha-button
              >
@@ -4,11 +4,11 @@ import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../../common/dom/fire_event";
 import { stopPropagation } from "../../common/dom/stop_propagation";
+import type { HaSelectSelectEvent } from "../../components/ha-select";
 import {
  computeDeviceName,
  computeDeviceNameDisplay,
 } from "../../common/entity/compute_device_name";
-import "../../components/ha-list-item";
 import "../../components/ha-select";
 import "../../components/ha-tts-voice-picker";
 import type { AssistPipeline } from "../../data/assist_pipeline";
@@ -115,19 +115,15 @@ export class HaVoiceAssistantSetupStepSuccess extends LitElement {
                  .label=${this.hass.localize(
                    "ui.panel.config.voice_assistants.assistants.pipeline.detail.form.wake_word_id"
                  )}
-                  @closed=${stopPropagation}
-                  fixedMenuPosition
-                  naturalMenuWidth
                  .value=${this.assistConfiguration.active_wake_words[0]}
                  @selected=${this._wakeWordPicked}
-                >
-                  ${this.assistConfiguration.available_wake_words.map(
-                    (wakeword) =>
-                      html`<ha-list-item .value=${wakeword.id}>
-                        ${wakeword.wake_word}
-                      </ha-list-item>`
+                  .options=${this.assistConfiguration.available_wake_words.map(
+                    (wakeword) => ({
+                      value: wakeword.id,
+                      label: wakeword.wake_word,
+                    })
                  )}
-                </ha-select>
+                ></ha-select>
                <ha-button
                  appearance="plain"
                  size="small"
@@ -151,16 +147,17 @@ export class HaVoiceAssistantSetupStepSuccess extends LitElement {
                  )}
                  @closed=${stopPropagation}
                  .value=${pipelineEntity?.state}
-                  fixedMenuPosition
-                  naturalMenuWidth
                  @selected=${this._pipelinePicked}
-                >
-                  ${pipelineEntity?.attributes.options.map(
-                    (pipeline) =>
-                      html`<ha-list-item .value=${pipeline}>
-                        ${this.hass.formatEntityState(pipelineEntity, pipeline)}
-                      </ha-list-item>`
+                  .options=${pipelineEntity?.attributes.options.map(
+                    (pipeline) => ({
+                      value: pipeline,
+                      label: this.hass.formatEntityState(
+                        pipelineEntity,
+                        pipeline
+                      ),
+                    })
                  )}
+                >
                </ha-select>
                <ha-button
                  appearance="plain"
@@ -235,16 +232,19 @@ export class HaVoiceAssistantSetupStepSuccess extends LitElement {
    this._deviceName = ev.target.value;
  }

-  private async _wakeWordPicked(ev) {
-    const option = ev.target.value;
+  private async _wakeWordPicked(ev: HaSelectSelectEvent) {
+    const option = ev.detail.value;
+    if (this.assistConfiguration) {
+      this.assistConfiguration.active_wake_words = [option];
+    }
    await setWakeWords(this.hass, this.assistEntityId!, [option]);
  }

-  private _pipelinePicked(ev) {
+  private _pipelinePicked(ev: HaSelectSelectEvent) {
    const stateObj = this.hass!.states[
      this.assistConfiguration!.pipeline_entity_id
    ] as InputSelectEntity;
-    const option = ev.target.value;
+    const option = ev.detail.value;
    if (
      option === stateObj.state ||
      !stateObj.attributes.options.includes(option)
@@ -384,6 +384,11 @@ export class HaVoiceAssistantSetupStepSuccess extends LitElement {
      .row ha-button {
        width: 82px;
      }
+
+      ha-select {
+        display: block;
+        text-align: start;
+      }
    `,
  ];
 }
@@ -3,8 +3,8 @@ import type { Panels } from "../types";
 export const demoPanels: Panels = {
  lovelace: {
    component_name: "lovelace",
-    icon: null,
-    title: null,
+    icon: "mdi:view-dashboard",
+    title: "demo",
    config: { mode: "storage" },
    url_path: "lovelace",
  },
@@ -52,6 +52,7 @@ export interface MockHomeAssistant extends HomeAssistant {
  mockEvent(event);
  mockTheme(theme: Record<string, string> | null);
  formatEntityState(stateObj: HassEntity, state?: string): string;
+  formatEntityStateToParts(stateObj: HassEntity, state?: string): ValuePart[];
  formatEntityAttributeValue(
    stateObj: HassEntity,
    attribute: string,
@@ -117,6 +118,7 @@ export const provideHass = (
  async function updateFormatFunctions() {
    const {
      formatEntityState,
+      formatEntityStateToParts,
      formatEntityAttributeName,
      formatEntityAttributeValue,
      formatEntityAttributeValueToParts,
@@ -133,6 +135,7 @@ export const provideHass = (
    );
    hass().updateHass({
      formatEntityState,
+      formatEntityStateToParts,
      formatEntityAttributeName,
      formatEntityAttributeValue,
      formatEntityAttributeValueToParts,
@@ -256,6 +259,10 @@ export const provideHass = (
      darkMode: false,
      theme: "default",
    },
+    selectedTheme: {
+      theme: "default",
+      dark: false,
+    },
    panels: demoPanels,
    services: demoServices,
    user: {
@@ -348,7 +355,7 @@ export const provideHass = (
    mockTheme(theme) {
      invalidateThemeCache();
      hass().updateHass({
-        selectedTheme: { theme: theme ? "mock" : "default" },
+        selectedTheme: { theme: theme ? "mock" : "default", dark: false },
        themes: {
          ...hass().themes,
          themes: {
@@ -361,7 +368,7 @@ export const provideHass = (
        document.documentElement,
        themes,
        selectedTheme!.theme,
-        undefined,
+        { dark: false },
        true
      );
    },
@@ -371,6 +378,12 @@ export const provideHass = (
    floors: {},
    formatEntityState: (stateObj, state) =>
      (state !== null ? state : stateObj.state) ?? "",
+    formatEntityStateToParts: (stateObj, state) => [
+      {
+        type: "value",
+        value: (state !== null ? state : stateObj.state) ?? "",
+      },
+    ],
    formatEntityAttributeName: (_stateObj, attribute) => attribute,
    formatEntityAttributeValue: (stateObj, attribute, value) =>
      value !== null ? value : (stateObj.attributes[attribute] ?? ""),
@@ -29,11 +29,11 @@
        }
      }
      ::view-transition-group(launch-screen) {
-        animation-duration: var(--ha-animation-base-duration, 350ms);
+        animation-duration: var(--ha-animation-duration-slow, 350ms);
        animation-timing-function: ease-out;
      }
      ::view-transition-old(launch-screen) {
-        animation: fade-out var(--ha-animation-base-duration, 350ms) ease-out;
+        animation: fade-out var(--ha-animation-duration-slow, 350ms) ease-out;
      }
      html {
        background-color: var(--primary-background-color, #fafafa);
@@ -144,7 +144,6 @@ class HaOnboarding extends litLocalizeLiteMixin(HassElement) {
          .label=${""}
          native-name
          @value-changed=${this._languageChanged}
-          inline-arrow
        ></ha-language-picker>
        <a
          href="https://www.home-assistant.io/getting-started/onboarding/"
@@ -74,6 +74,8 @@ export class HAFullCalendar extends LitElement {

  @property({ type: Boolean, reflect: true }) public narrow = false;

+  @property({ attribute: "add-fab", type: Boolean }) public addFab = false;
+
  @property({ attribute: false }) public events: CalendarEvent[] = [];

  @property({ attribute: false }) public calendars: CalendarData[] = [];
@@ -208,7 +210,7 @@ export class HAFullCalendar extends LitElement {
        : ""}

      <div id="calendar"></div>
-      ${this._hasMutableCalendars
+      ${this.addFab && this._hasMutableCalendars
        ? html`<ha-fab
            slot="fab"
            .label=${this.hass.localize("ui.components.calendar.event.add")}
@@ -193,6 +193,7 @@ class PanelCalendar extends SubscribeMixin(LitElement) {
              </ha-list-item>`
          : nothing}
        <ha-full-calendar
+          add-fab
          .events=${this._events}
          .calendars=${this._calendars}
          .narrow=${this.narrow}
@@ -330,6 +331,8 @@ class PanelCalendar extends SubscribeMixin(LitElement) {

        ha-dropdown-item {
          padding-left: 32px;
+          padding-inline-start: 32px;
+          padding-inline-end: initial;
          --icon-primary-color: var(--ha-color-fill-neutral-loud-resting);
        }

@@ -339,6 +342,8 @@ class PanelCalendar extends SubscribeMixin(LitElement) {

        :host([mobile]) {
          padding-left: unset;
+          padding-inline-start: unset;
+          padding-inline-end: initial;
        }
        .loading {
          display: flex;
@@ -1,19 +1,17 @@
-import type { SelectedDetail } from "@material/mwc-list";
 import { TZDate } from "@date-fns/tz";
 import type { PropertyValues } from "lit";
 import { LitElement, css, html, nothing } from "lit";
-import { customElement, property, query, state } from "lit/decorators";
-import type { Options, WeekdayStr, ByWeekday } from "rrule";
+import { customElement, property, state } from "lit/decorators";
+import type { ByWeekday, Options, WeekdayStr } from "rrule";
 import { RRule, Weekday } from "rrule";
+import { formatDate, formatTime } from "../../common/datetime/calc_date";
 import { firstWeekdayIndex } from "../../common/datetime/first_weekday";
-import { stopPropagation } from "../../common/dom/stop_propagation";
 import type { LocalizeKeys } from "../../common/translations/localize";
 import "../../components/chips/ha-chip-set";
 import "../../components/chips/ha-filter-chip";
 import "../../components/ha-date-input";
-import "../../components/ha-list-item";
 import "../../components/ha-select";
-import type { HaSelect } from "../../components/ha-select";
+import type { HaSelectSelectEvent } from "../../components/ha-select";
 import "../../components/ha-textfield";
 import type { HomeAssistant } from "../../types";
 import type {
@@ -33,7 +31,6 @@ import {
  ruleByWeekDay,
  untilValue,
 } from "./recurrence";
-import { formatDate, formatTime } from "../../common/datetime/calc_date";

@customElement("ha-recurrence-rule-editor")
 export class RecurrenceRuleEditor extends LitElement {
@@ -71,8 +68,6 @@ export class RecurrenceRuleEditor extends LitElement {

  @state() private _untilDay?: Date;

-  @query("#monthly") private _monthlyRepeatSelect!: HaSelect;
-
  private _allWeekdays?: WeekdayStr[];

  private _monthlyRepeatItems: MonthlyRepeatItem[] = [];
@@ -91,14 +86,6 @@ export class RecurrenceRuleEditor extends LitElement {
        ? getMonthlyRepeatItems(this.hass, this._interval, this.dtstart)
        : [];
      this._computeWeekday();
-      const selectElement = this._monthlyRepeatSelect;
-      if (selectElement) {
-        const oldSelected = selectElement.index;
-        selectElement.select(-1);
-        this.updateComplete.then(() => {
-          selectElement.select(changedProps.has("dtstart") ? 0 : oldSelected);
-        });
-      }
    }

    if (
@@ -184,35 +171,16 @@ export class RecurrenceRuleEditor extends LitElement {
        id="freq"
        label=${this.hass.localize("ui.components.calendar.event.repeat.label")}
        @selected=${this._onRepeatSelected}
-        @closed=${stopPropagation}
-        fixedMenuPosition
-        naturalMenuWidth
        .value=${this._freq}
-      >
-        <ha-list-item value="none">
-          ${this.hass.localize("ui.components.calendar.event.repeat.freq.none")}
-        </ha-list-item>
-        <ha-list-item value="yearly">
-          ${this.hass.localize(
-            "ui.components.calendar.event.repeat.freq.yearly"
-          )}
-        </ha-list-item>
-        <ha-list-item value="monthly">
-          ${this.hass.localize(
-            "ui.components.calendar.event.repeat.freq.monthly"
-          )}
-        </ha-list-item>
-        <ha-list-item value="weekly">
-          ${this.hass.localize(
-            "ui.components.calendar.event.repeat.freq.weekly"
-          )}
-        </ha-list-item>
-        <ha-list-item value="daily">
-          ${this.hass.localize(
-            "ui.components.calendar.event.repeat.freq.daily"
-          )}
-        </ha-list-item>
-      </ha-select>
+        .options=${["none", "yearly", "monthly", "weekly", "daily"].map(
+          (freq) => ({
+            value: freq,
+            label: this.hass.localize(
+              `ui.components.calendar.event.repeat.freq.${freq}` as LocalizeKeys
+            ),
+          })
+        )}
+      ></ha-select>
    `;
  }

@@ -227,18 +195,8 @@ export class RecurrenceRuleEditor extends LitElement {
            )}
            @selected=${this._onMonthlyDetailSelected}
            .value=${this._monthlyRepeat || this._monthlyRepeatItems[0]?.value}
-            @closed=${stopPropagation}
-            fixedMenuPosition
-            naturalMenuWidth
-          >
-            ${this._monthlyRepeatItems!.map(
-              (item) => html`
-                <ha-list-item .value=${item.value} .item=${item}>
-                  ${item.label}
-                </ha-list-item>
-              `
-            )}
-          </ha-select>`
+            .options=${this._monthlyRepeatItems}
+          ></ha-select>`
        : nothing}
    `;
  }
@@ -299,19 +257,13 @@ export class RecurrenceRuleEditor extends LitElement {
        )}
        .value=${this._end}
        @selected=${this._onEndSelected}
-        @closed=${stopPropagation}
-        fixedMenuPosition
-        naturalMenuWidth
+        .options=${["never", "after", "on"].map((end) => ({
+          value: end,
+          label: this.hass.localize(
+            `ui.components.calendar.event.repeat.end.${end as RepeatEnd}`
+          ),
+        }))}
      >
-        <ha-list-item value="never">
-          ${this.hass.localize("ui.components.calendar.event.repeat.end.never")}
-        </ha-list-item>
-        <ha-list-item value="after">
-          ${this.hass.localize("ui.components.calendar.event.repeat.end.after")}
-        </ha-list-item>
-        <ha-list-item value="on">
-          ${this.hass.localize("ui.components.calendar.event.repeat.end.on")}
-        </ha-list-item>
      </ha-select>
      ${this._end === "after"
        ? html`
@@ -360,8 +312,8 @@ export class RecurrenceRuleEditor extends LitElement {
    this._interval = (e.target! as any).value;
  }

-  private _onRepeatSelected(e: CustomEvent<SelectedDetail<number>>) {
-    this._freq = (e.target as HaSelect).value as RepeatFrequency;
+  private _onRepeatSelected(e: HaSelectSelectEvent<RepeatFrequency>) {
+    this._freq = e.detail.value;

    if (this._freq === "yearly") {
      this._interval = 1;
@@ -370,12 +322,14 @@ export class RecurrenceRuleEditor extends LitElement {
      this._weekday.clear();
      this._computeWeekday();
    }
-    e.stopPropagation();
  }

-  private _onMonthlyDetailSelected(e: CustomEvent<SelectedDetail<number>>) {
-    e.stopPropagation();
-    const selectedItem = this._monthlyRepeatItems[e.detail.index];
+  private _onMonthlyDetailSelected(
+    e: HaSelectSelectEvent<MonthlyRepeatItem["value"]>
+  ) {
+    const selectedItem = this._monthlyRepeatItems.find(
+      (item) => item.value === e.detail.value
+    );
    if (!selectedItem) {
      return;
    }
@@ -395,8 +349,8 @@ export class RecurrenceRuleEditor extends LitElement {
    this.requestUpdate("_weekday");
  }

-  private _onEndSelected(e: CustomEvent<SelectedDetail<number>>) {
-    const end = (e.target as HaSelect).value as RepeatEnd;
+  private _onEndSelected(e: HaSelectSelectEvent<RepeatEnd>) {
+    const end = e.detail.value;
    if (end === this._end) {
      return;
    }
@@ -186,7 +186,6 @@ class PanelClimate extends LitElement {
          );
          padding-top: var(--safe-area-inset-top);
          z-index: 4;
-          transition: box-shadow 200ms linear;
          display: flex;
          flex-direction: row;
          -webkit-backdrop-filter: var(--app-header-backdrop-filter, none);
@@ -1,12 +1,11 @@
 import type { CSSResultGroup, PropertyValues, TemplateResult } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import { stopPropagation } from "../../../../../common/dom/stop_propagation";
 import "../../../../../components/buttons/ha-progress-button";
 import "../../../../../components/ha-alert";
 import "../../../../../components/ha-card";
-import "../../../../../components/ha-list-item";
 import "../../../../../components/ha-select";
+import type { HaSelectSelectEvent } from "../../../../../components/ha-select";
 import type {
  HassioAddonDetails,
  HassioAddonSetOptionParams,
@@ -16,8 +15,8 @@ import type { HassioHardwareAudioDevice } from "../../../../../data/hassio/hardw
 import { fetchHassioHardwareAudio } from "../../../../../data/hassio/hardware";
 import { haStyle } from "../../../../../resources/styles";
 import type { HomeAssistant } from "../../../../../types";
-import { suggestSupervisorAppRestart } from "../dialogs/suggestSupervisorAppRestart";
 import { supervisorAppsStyle } from "../../resources/supervisor-apps-style";
+import { suggestSupervisorAppRestart } from "../dialogs/suggestSupervisorAppRestart";

@customElement("supervisor-app-audio")
 class SupervisorAppAudio extends LitElement {
@@ -55,19 +54,13 @@ class SupervisorAppAudio extends LitElement {
              "ui.panel.config.apps.configuration.audio.input"
            )}
            @selected=${this._setInputDevice}
-            @closed=${stopPropagation}
-            fixedMenuPosition
-            naturalMenuWidth
            .value=${this._selectedInput!}
            .disabled=${this.disabled}
+            .options=${this._inputDevices.map((item) => ({
+              value: item.device || "",
+              label: item.name,
+            }))}
          >
-            ${this._inputDevices.map(
-              (item) => html`
-                <ha-list-item .value=${item.device || ""}>
-                  ${item.name}
-                </ha-list-item>
-              `
-            )}
          </ha-select>`}
          ${this._outputDevices &&
          html`<ha-select
@@ -75,19 +68,13 @@ class SupervisorAppAudio extends LitElement {
              "ui.panel.config.apps.configuration.audio.output"
            )}
            @selected=${this._setOutputDevice}
-            @closed=${stopPropagation}
-            fixedMenuPosition
-            naturalMenuWidth
            .value=${this._selectedOutput!}
            .disabled=${this.disabled}
+            .options=${this._outputDevices.map((item) => ({
+              value: item.device || "",
+              label: item.name,
+            }))}
          >
-            ${this._outputDevices.map(
-              (item) => html`
-                <ha-list-item .value=${item.device || ""}
-                  >${item.name}</ha-list-item
-                >
-              `
-            )}
          </ha-select>`}
        </div>
        <div class="card-actions">
@@ -116,6 +103,7 @@ class SupervisorAppAudio extends LitElement {
        }
        ha-select {
          width: 100%;
+          display: block;
        }
        ha-select:last-child {
          margin-top: var(--ha-space-2);
@@ -131,14 +119,14 @@ class SupervisorAppAudio extends LitElement {
    }
  }

-  private _setInputDevice(ev): void {
-    const device = ev.target.value;
-    this._selectedInput = device;
+  private _setInputDevice(ev: HaSelectSelectEvent): void {
+    const device = ev.detail.value;
+    this._selectedInput = device ?? null;
  }

-  private _setOutputDevice(ev): void {
-    const device = ev.target.value;
-    this._selectedOutput = device;
+  private _setOutputDevice(ev: HaSelectSelectEvent): void {
+    const device = ev.detail.value;
+    this._selectedOutput = device ?? null;
  }

  private async _addonChanged(): Promise<void> {
@@ -63,6 +63,7 @@ class SupervisorAppDocumentationDashboard extends LitElement {
          margin: auto;
          padding: var(--ha-space-2);
          max-width: 1024px;
+          direction: ltr;
        }
        ha-markdown {
          padding: var(--ha-space-4);
@@ -2,13 +2,12 @@ import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { fireEvent } from "../../../../../common/dom/fire_event";
-import { stopPropagation } from "../../../../../common/dom/stop_propagation";
 import { stringCompare } from "../../../../../common/string/compare";
 import type { LocalizeFunc } from "../../../../../common/translations/localize";
 import { CONDITION_ICONS } from "../../../../../components/ha-condition-icon";
-import "../../../../../components/ha-list-item";
+import "../../../../../components/ha-dropdown-item";
 import "../../../../../components/ha-select";
-import type { HaSelect } from "../../../../../components/ha-select";
+import type { HaSelectSelectEvent } from "../../../../../components/ha-select";
 import {
  DYNAMIC_PREFIX,
  getValueFromDynamic,
@@ -85,37 +84,47 @@ export class HaConditionAction
      this.action.condition
    );

+    const value =
+      this.action.condition in this._conditionDescriptions
+        ? `${DYNAMIC_PREFIX}${this.action.condition}`
+        : this.action.condition;
+
+    let valueLabel = value;
+
+    const items = html`${this._processedTypes(
+      this._conditionDescriptions,
+      this.hass.localize
+    ).map(([opt, label, condition]) => {
+      const selected = value === opt;
+
+      if (selected) {
+        valueLabel = label;
+      }
+
+      return html`
+        <ha-dropdown-item .value=${opt} class=${selected ? "selected" : ""}>
+          <ha-condition-icon
+            .hass=${this.hass}
+            slot="icon"
+            .condition=${condition}
+          ></ha-condition-icon>
+          ${label}
+        </ha-dropdown-item>
+      `;
+    })}`;
+
    return html`
      ${this.inSidebar || (!this.inSidebar && !this.indent)
        ? html`
            <ha-select
-              fixedMenuPosition
              .label=${this.hass.localize(
                "ui.panel.config.automation.editor.conditions.type_select"
              )}
              .disabled=${this.disabled}
-              .value=${this.action.condition in this._conditionDescriptions
-                ? `${DYNAMIC_PREFIX}${this.action.condition}`
-                : this.action.condition}
-              naturalMenuWidth
+              .value=${valueLabel}
              @selected=${this._typeChanged}
-              @closed=${stopPropagation}
            >
-              ${this._processedTypes(
-                this._conditionDescriptions,
-                this.hass.localize
-              ).map(
-                ([opt, label, condition]) => html`
-                  <ha-list-item .value=${opt} graphic="icon">
-                    ${label}
-                    <ha-condition-icon
-                      .hass=${this.hass}
-                      slot="graphic"
-                      .condition=${condition}
-                    ></ha-condition-icon>
-                  </ha-list-item>
-                `
-              )}
+              ${items}
            </ha-select>
          `
        : nothing}
@@ -192,8 +201,8 @@ export class HaConditionAction
    });
  }

-  private _typeChanged(ev: CustomEvent) {
-    const type = (ev.target as HaSelect).value;
+  private _typeChanged(ev: HaSelectSelectEvent) {
+    const type = ev.detail.value;

    if (!type) {
      return;
@@ -242,6 +251,7 @@ export class HaConditionAction
  static styles = css`
    ha-select {
      margin-bottom: 24px;
+      display: block;
    }
  `;
 }
@@ -8,7 +8,7 @@ import "../../../../../components/ha-duration-input";
 import "../../../../../components/ha-formfield";
 import "../../../../../components/ha-textfield";
 import type { WaitForTriggerAction } from "../../../../../data/script";
-import type { HomeAssistant } from "../../../../../types";
+import type { HomeAssistant, ValueChangedEvent } from "../../../../../types";
 import "../../trigger/ha-automation-trigger";
 import type { ActionElement } from "../ha-automation-action-row";
 import { handleChangeEvent } from "../ha-automation-action-row";
@@ -78,7 +78,7 @@ export class HaWaitForTriggerAction
    `;
  }

-  private _timeoutChanged(ev: CustomEvent<{ value: TimeChangedEvent }>): void {
+  private _timeoutChanged(ev: ValueChangedEvent<TimeChangedEvent>): void {
    ev.stopPropagation();
    const value = ev.detail.value;
    fireEvent(this, "value-changed", {
@@ -114,7 +114,7 @@ import {
 } from "../../../data/trigger";
 import type { HassDialog } from "../../../dialogs/make-dialog-manager";
 import { KeyboardShortcutMixin } from "../../../mixins/keyboard-shortcut-mixin";
-import type { HomeAssistant } from "../../../types";
+import type { HomeAssistant, ValueChangedEvent } from "../../../types";
 import { isMac } from "../../../util/is_mac";
 import { showToast } from "../../../util/toast";
 import "./add-automation-element/ha-automation-add-from-target";
@@ -1752,7 +1752,7 @@ class DialogAddAutomationElement
    this.closeDialog();
  }

-  private _selected(ev: CustomEvent<{ value: string }>) {
+  private _selected(ev: ValueChangedEvent<string>) {
    let target: HassServiceTarget | undefined;
    if (
      this._tab === "targets" &&
@@ -1766,7 +1766,7 @@ class DialogAddAutomationElement
  }

  private _handleTargetSelected = (
-    ev: CustomEvent<{ value: SingleHassServiceTarget }>
+    ev: ValueChangedEvent<SingleHassServiceTarget>
  ) => {
    this._targetItems = undefined;
    this._loadItemsError = false;
@@ -77,7 +77,12 @@ import "../../../layouts/hass-subpage";
 import { KeyboardShortcutMixin } from "../../../mixins/keyboard-shortcut-mixin";
 import { PreventUnsavedMixin } from "../../../mixins/prevent-unsaved-mixin";
 import { haStyle } from "../../../resources/styles";
-import type { Entries, HomeAssistant, Route } from "../../../types";
+import type {
+  Entries,
+  HomeAssistant,
+  Route,
+  ValueChangedEvent,
+} from "../../../types";
 import { isMac } from "../../../util/is_mac";
 import { showToast } from "../../../util/toast";
 import { showAssignCategoryDialog } from "../category/show-dialog-assign-category";
@@ -753,7 +758,7 @@ export class HaAutomationEditor extends PreventUnsavedMixin(
    }
  }

-  private _valueChanged(ev: CustomEvent<{ value: AutomationConfig }>) {
+  private _valueChanged(ev: ValueChangedEvent<AutomationConfig>) {
    ev.stopPropagation();

    if (this._config) {
@@ -19,7 +19,6 @@ import {
  mdiToggleSwitchOffOutline,
  mdiTransitConnection,
 } from "@mdi/js";
-import { differenceInDays } from "date-fns";
 import type { UnsubscribeFunc } from "home-assistant-js-websocket";
 import type { CSSResultGroup, PropertyValues, TemplateResult } from "lit";
 import { LitElement, css, html, nothing } from "lit";
@@ -28,14 +27,11 @@ import { styleMap } from "lit/directives/style-map";
 import memoizeOne from "memoize-one";
 import { computeCssColor } from "../../../common/color/compute-color";
 import { isComponentLoaded } from "../../../common/config/is_component_loaded";
-import { formatShortDateTimeWithConditionalYear } from "../../../common/datetime/format_date_time";
-import { relativeTime } from "../../../common/datetime/relative_time";
 import { storage } from "../../../common/decorators/storage";
 import type { HASSDomEvent } from "../../../common/dom/fire_event";
 import { fireEvent } from "../../../common/dom/fire_event";
 import { computeStateName } from "../../../common/entity/compute_state_name";
 import { navigate } from "../../../common/navigate";
-import { slugify } from "../../../common/string/slugify";
 import type { LocalizeFunc } from "../../../common/translations/localize";
 import {
  hasRejectedItems,
@@ -51,6 +47,10 @@ import type {
 import "../../../components/data-table/ha-data-table-labels";
 import "../../../components/entity/ha-entity-toggle";
 import "../../../components/ha-dropdown";
+import type {
+  HaDropdown,
+  HaDropdownSelectEvent,
+} from "../../../components/ha-dropdown";
 import "../../../components/ha-dropdown-item";
 import "../../../components/ha-fab";
 import "../../../components/ha-filter-blueprints";
@@ -61,10 +61,6 @@ import "../../../components/ha-filter-floor-areas";
 import "../../../components/ha-filter-labels";
 import "../../../components/ha-filter-voice-assistants";
 import "../../../components/ha-icon-button";
-import "../../../components/ha-md-menu";
-import type { HaMdMenu } from "../../../components/ha-md-menu";
-import "../../../components/ha-md-menu-item";
-import type { HaMdMenuItem } from "../../../components/ha-md-menu-item";
 import "../../../components/ha-sub-menu";
 import "../../../components/ha-svg-icon";
 import "../../../components/ha-tooltip";
@@ -88,9 +84,9 @@ import { fullEntitiesContext } from "../../../data/context";
 import type { DataTableFilters } from "../../../data/data_table_filters";
 import {
  deserializeFilters,
-  serializeFilters,
  isFilterUsed,
  isRelatedItemsFilterUsed,
+  serializeFilters,
 } from "../../../data/data_table_filters";
 import { UNAVAILABLE } from "../../../data/entity/entity";
 import type {
@@ -118,6 +114,13 @@ import { turnOnOffEntity } from "../../lovelace/common/entity/turn-on-off-entity
 import { showAreaRegistryDetailDialog } from "../areas/show-dialog-area-registry-detail";
 import { showAssignCategoryDialog } from "../category/show-dialog-assign-category";
 import { showCategoryRegistryDetailDialog } from "../category/show-dialog-category-registry-detail";
+import {
+  getAreaTableColumn,
+  getCategoryTableColumn,
+  getEntityIdHiddenTableColumn,
+  getLabelsTableColumn,
+  getTriggeredAtTableColumn,
+} from "../common/data-table-columns";
 import { configSections } from "../ha-panel-config";
 import { showLabelDetailDialog } from "../labels/show-dialog-label-detail";
 import {
@@ -126,7 +129,6 @@ import {
 } from "../voice-assistants/expose/assistants-table-column";
 import { getAvailableAssistants } from "../voice-assistants/expose/available-assistants";
 import { showNewAutomationDialog } from "./show-dialog-new-automation";
-import type { HaDropdownSelectEvent } from "../../../components/ha-dropdown";

 type AutomationItem = AutomationEntity & {
  name: string;
@@ -134,7 +136,7 @@ type AutomationItem = AutomationEntity & {
  last_triggered: string | undefined;
  formatted_state: string;
  category: string | undefined;
-  labels: LabelRegistryEntry[];
+  label_entries: LabelRegistryEntry[];
  assistants: string[];
  assistants_sortable_key: string | undefined;
 };
@@ -220,7 +222,7 @@ class HaAutomationPicker extends SubscribeMixin(LitElement) {
  })
  private _activeHiddenColumns?: string[];

-  @query("#overflow-menu") private _overflowMenu!: HaMdMenu;
+  @query("#overflow-menu") private _overflowMenu!: HaDropdown;

  private _sizeController = new ResizeController(this, {
    callback: (entries) => entries[0]?.contentRect.width,
@@ -230,6 +232,8 @@ class HaAutomationPicker extends SubscribeMixin(LitElement) {
    return getAvailableAssistants(this.cloudStatus, this.hass);
  }

+  private _openingOverflow = false;
+
  private _automations = memoizeOne(
    (
      automations: AutomationEntity[],
@@ -269,7 +273,7 @@ class HaAutomationPicker extends SubscribeMixin(LitElement) {
          category: category
            ? categoryReg?.find((cat) => cat.category_id === category)?.name
            : undefined,
-          labels: (labels || []).map(
+          label_entries: (labels || []).map(
            (lbl) => labelReg!.find((label) => label.label_id === lbl)!
          ),
          assistants,
@@ -284,7 +288,6 @@ class HaAutomationPicker extends SubscribeMixin(LitElement) {
    (
      narrow: boolean,
      localize: LocalizeFunc,
-      locale: HomeAssistant["locale"],
      entitiesToCheck?: any[]
    ): DataTableColumnContainer<AutomationItem> => {
      const columns: DataTableColumnContainer<AutomationItem> = {
@@ -306,11 +309,7 @@ class HaAutomationPicker extends SubscribeMixin(LitElement) {
              })}
            ></ha-state-icon>`,
        },
-        entity_id: {
-          title: "",
-          hidden: true,
-          filterable: true,
-        },
+        entity_id: getEntityIdHiddenTableColumn(),
        name: {
          title: localize("ui.panel.config.automation.picker.headers.name"),
          main: true,
@@ -319,59 +318,17 @@ class HaAutomationPicker extends SubscribeMixin(LitElement) {
          direction: "asc",
          flex: 2,
          extraTemplate: (automation) =>
-            automation.labels.length
+            automation.label_entries.length
              ? html`<ha-data-table-labels
                  @label-clicked=${narrow ? undefined : this._labelClicked}
-                  .labels=${automation.labels}
+                  .labels=${automation.label_entries}
                ></ha-data-table-labels>`
              : nothing,
        },
-        area: {
-          title: localize("ui.panel.config.automation.picker.headers.area"),
-          groupable: true,
-          filterable: true,
-          sortable: true,
-        },
-        category: {
-          title: localize("ui.panel.config.automation.picker.headers.category"),
-          defaultHidden: true,
-          groupable: true,
-          filterable: true,
-          sortable: true,
-        },
-        labels: {
-          title: "",
-          hidden: true,
-          filterable: true,
-          template: (automation) =>
-            automation.labels.map((lbl) => lbl.name).join(" "),
-        },
-        last_triggered: {
-          sortable: true,
-          title: localize("ui.card.automation.last_triggered"),
-          template: (automation) => {
-            if (!automation.last_triggered) {
-              return this.hass.localize("ui.components.relative_time.never");
-            }
-            const date = new Date(automation.last_triggered);
-            const now = new Date();
-            const dayDifference = differenceInDays(now, date);
-            const formattedTime = formatShortDateTimeWithConditionalYear(
-              date,
-              this.hass.locale,
-              this.hass.config
-            );
-            const elementId = "last-triggered-" + slugify(automation.entity_id);
-            return html`
-              ${dayDifference > 3
-                ? formattedTime
-                : html`
-                    <ha-tooltip for=${elementId}>${formattedTime}</ha-tooltip>
-                    <span id=${elementId}>${relativeTime(date, locale)}</span>
-                  `}
-            `;
-          },
-        },
+        area: getAreaTableColumn(localize),
+        category: getCategoryTableColumn(localize),
+        labels: getLabelsTableColumn(),
+        last_triggered: getTriggeredAtTableColumn(localize, this.hass),
        formatted_state: {
          minWidth: "82px",
          maxWidth: "82px",
@@ -415,16 +372,27 @@ class HaAutomationPicker extends SubscribeMixin(LitElement) {
  );

  private _showOverflowMenu = (ev) => {
-    if (
-      this._overflowMenu.open &&
-      ev.target === this._overflowMenu.anchorElement
-    ) {
-      this._overflowMenu.close();
+    if (this._overflowMenu.anchorElement === ev.target) {
+      this._overflowMenu.anchorElement = undefined;
      return;
    }
-    this._overflowAutomation = ev.target.automation;
+    this._openingOverflow = true;
    this._overflowMenu.anchorElement = ev.target;
-    this._overflowMenu.show();
+    this._overflowAutomation = ev.target.automation;
+    this._overflowMenu.open = true;
+  };
+
+  private _overflowMenuOpened = () => {
+    this._openingOverflow = false;
+  };
+
+  private _overflowMenuClosed = () => {
+    // changing the anchorElement triggers a close event, ignore it
+    if (this._openingOverflow) {
+      return;
+    }
+
+    this._overflowMenu.anchorElement = undefined;
  };

  protected hassSubscribe(): (UnsubscribeFunc | Promise<UnsubscribeFunc>)[] {
@@ -485,12 +453,7 @@ class HaAutomationPicker extends SubscribeMixin(LitElement) {
                Array.isArray(val) ? val.length : val
              )
        ).length}
-        .columns=${this._columns(
-          this.narrow,
-          this.hass.localize,
-          this.hass.locale,
-          automations
-        )}
+        .columns=${this._columns(this.narrow, this.hass.localize, automations)}
        .initialGroupColumn=${this._activeGrouping ?? "category"}
        .initialCollapsedGroups=${this._activeCollapsed}
        .initialSorting=${this._activeSorting}
@@ -746,74 +709,58 @@ class HaAutomationPicker extends SubscribeMixin(LitElement) {
          <ha-svg-icon slot="icon" .path=${mdiPlus}></ha-svg-icon>
        </ha-fab>
      </hass-tabs-subpage-data-table>
-      <ha-md-menu id="overflow-menu" positioning="fixed">
-        <ha-md-menu-item .clickAction=${this._showInfo}>
-          <ha-svg-icon
-            .path=${mdiInformationOutline}
-            slot="start"
-          ></ha-svg-icon>
-          <div slot="headline">
-            ${this.hass.localize("ui.panel.config.automation.editor.show_info")}
-          </div>
-        </ha-md-menu-item>
+      <ha-dropdown
+        id="overflow-menu"
+        @wa-select=${this._handleOverflowAction}
+        @wa-after-show=${this._overflowMenuOpened}
+        @wa-after-hide=${this._overflowMenuClosed}
+      >
+        <ha-dropdown-item value="show_info">
+          <ha-svg-icon .path=${mdiInformationOutline} slot="icon"></ha-svg-icon>
+          ${this.hass.localize("ui.panel.config.automation.editor.show_info")}
+        </ha-dropdown-item>

-        <ha-md-menu-item .clickAction=${this._showSettings}>
-          <ha-svg-icon .path=${mdiCog} slot="start"></ha-svg-icon>
-          <div slot="headline">
-            ${this.hass.localize(
-              "ui.panel.config.automation.picker.show_settings"
-            )}
-          </div>
-        </ha-md-menu-item>
-        <ha-md-menu-item .clickAction=${this._editCategory}>
-          <ha-svg-icon .path=${mdiTag} slot="start"></ha-svg-icon>
-          <div slot="headline">
-            ${this.hass.localize(
-              `ui.panel.config.automation.picker.${this._overflowAutomation?.category ? "edit_category" : "assign_category"}`
-            )}
-          </div>
-        </ha-md-menu-item>
-        <ha-md-menu-item .clickAction=${this._runActions}>
-          <ha-svg-icon .path=${mdiPlay} slot="start"></ha-svg-icon>
-          <div slot="headline">
-            ${this.hass.localize("ui.panel.config.automation.editor.run")}
-          </div>
-        </ha-md-menu-item>
-        <ha-md-menu-item .clickAction=${this._showTrace}>
-          <ha-svg-icon .path=${mdiTransitConnection} slot="start"></ha-svg-icon>
-          <div slot="headline">
-            ${this.hass.localize(
-              "ui.panel.config.automation.editor.show_trace"
-            )}
-          </div>
-        </ha-md-menu-item>
+        <ha-dropdown-item value="show_settings">
+          <ha-svg-icon .path=${mdiCog} slot="icon"></ha-svg-icon>
+          ${this.hass.localize(
+            "ui.panel.config.automation.picker.show_settings"
+          )}
+        </ha-dropdown-item>
+        <ha-dropdown-item value="edit_category">
+          <ha-svg-icon .path=${mdiTag} slot="icon"></ha-svg-icon>
+          ${this.hass.localize(
+            `ui.panel.config.automation.picker.${this._overflowAutomation?.category ? "edit_category" : "assign_category"}`
+          )}
+        </ha-dropdown-item>
+        <ha-dropdown-item value="run_actions">
+          <ha-svg-icon .path=${mdiPlay} slot="icon"></ha-svg-icon>
+          ${this.hass.localize("ui.panel.config.automation.editor.run")}
+        </ha-dropdown-item>
+        <ha-dropdown-item value="show_trace">
+          <ha-svg-icon .path=${mdiTransitConnection} slot="icon"></ha-svg-icon>
+          ${this.hass.localize("ui.panel.config.automation.editor.show_trace")}
+        </ha-dropdown-item>
        <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">
-            ${this.hass.localize("ui.panel.config.automation.picker.duplicate")}
-          </div>
-        </ha-md-menu-item>
-        <ha-md-menu-item .clickAction=${this._toggle}>
+        <ha-dropdown-item value="duplicate">
+          <ha-svg-icon .path=${mdiContentDuplicate} slot="icon"></ha-svg-icon>
+          ${this.hass.localize("ui.panel.config.automation.picker.duplicate")}
+        </ha-dropdown-item>
+        <ha-dropdown-item value="toggle">
          <ha-svg-icon
            .path=${this._overflowAutomation?.state === "off"
              ? mdiToggleSwitch
              : mdiToggleSwitchOffOutline}
-            slot="start"
+            slot="icon"
          ></ha-svg-icon>
-          <div slot="headline">
-            ${this._overflowAutomation?.state === "off"
-              ? this.hass.localize("ui.panel.config.automation.editor.enable")
-              : this.hass.localize("ui.panel.config.automation.editor.disable")}
-          </div>
-        </ha-md-menu-item>
-        <ha-md-menu-item .clickAction=${this._deleteConfirm} class="warning">
-          <ha-svg-icon .path=${mdiDelete} slot="start"></ha-svg-icon>
-          <div slot="headline">
-            ${this.hass.localize("ui.panel.config.automation.picker.delete")}
-          </div>
-        </ha-md-menu-item>
-      </ha-md-menu>
+          ${this._overflowAutomation?.state === "off"
+            ? this.hass.localize("ui.panel.config.automation.editor.enable")
+            : this.hass.localize("ui.panel.config.automation.editor.disable")}
+        </ha-dropdown-item>
+        <ha-dropdown-item value="delete" variant="danger">
+          <ha-svg-icon .path=${mdiDelete} slot="icon"></ha-svg-icon>
+          ${this.hass.localize("ui.panel.config.automation.picker.delete")}
+        </ha-dropdown-item>
+      </ha-dropdown>
    `;
  }

@@ -950,33 +897,59 @@ class HaAutomationPicker extends SubscribeMixin(LitElement) {
    this._applyFilters();
  }

-  private _showInfo = (item: HaMdMenuItem) => {
-    const automation = ((item.parentElement as HaMdMenu)!.anchorElement as any)!
-      .automation;
-    fireEvent(this, "hass-more-info", { entityId: automation.entity_id });
+  private _handleOverflowAction = (ev: HaDropdownSelectEvent) => {
+    const action = ev.detail.item.value;
+
+    if (!action || !this._overflowAutomation) {
+      return;
+    }
+
+    switch (action) {
+      case "show_info":
+        this._showInfo(this._overflowAutomation);
+        break;
+      case "show_settings":
+        this._showSettings(this._overflowAutomation);
+        break;
+      case "edit_category":
+        this._editCategory(this._overflowAutomation);
+        break;
+      case "run_actions":
+        this._runActions(this._overflowAutomation);
+        break;
+      case "show_trace":
+        this._showTrace(this._overflowAutomation);
+        break;
+      case "toggle":
+        this._toggle(this._overflowAutomation);
+        break;
+      case "delete":
+        this._deleteConfirm(this._overflowAutomation);
+        break;
+      case "duplicate":
+        this._duplicate(this._overflowAutomation);
+        break;
+    }
  };

-  private _showSettings = (item: HaMdMenuItem) => {
-    const automation = ((item.parentElement as HaMdMenu)!.anchorElement as any)!
-      .automation;
+  private _showInfo = (automation: AutomationItem) => {
+    fireEvent(this, "hass-more-info", {
+      entityId: automation.entity_id,
+    });
+  };

+  private _showSettings = (automation: AutomationItem) => {
    fireEvent(this, "hass-more-info", {
      entityId: automation.entity_id,
      view: "settings",
    });
  };

-  private _runActions = (item: HaMdMenuItem) => {
-    const automation = ((item.parentElement as HaMdMenu)!.anchorElement as any)!
-      .automation;
-
+  private _runActions = (automation: AutomationItem) => {
    triggerAutomationActions(this.hass, automation.entity_id);
  };

-  private _editCategory = (item: HaMdMenuItem) => {
-    const automation = ((item.parentElement as HaMdMenu)!.anchorElement as any)!
-      .automation;
-
+  private _editCategory = (automation: AutomationItem) => {
    const entityReg = this._entityReg.find(
      (reg) => reg.entity_id === automation.entity_id
    );
@@ -997,10 +970,7 @@ class HaAutomationPicker extends SubscribeMixin(LitElement) {
    });
  };

-  private _showTrace = (item: HaMdMenuItem) => {
-    const automation = ((item.parentElement as HaMdMenu)!.anchorElement as any)!
-      .automation;
-
+  private _showTrace = (automation: AutomationItem) => {
    if (!automation.attributes.id) {
      showAlertDialog(this, {
        text: this.hass.localize(
@@ -1014,20 +984,14 @@ class HaAutomationPicker extends SubscribeMixin(LitElement) {
    );
  };

-  private _toggle = async (item: HaMdMenuItem): Promise<void> => {
-    const automation = ((item.parentElement as HaMdMenu)!.anchorElement as any)!
-      .automation;
-
+  private _toggle = async (automation: AutomationItem): Promise<void> => {
    const service = automation.state === "off" ? "turn_on" : "turn_off";
    await this.hass.callService("automation", service, {
      entity_id: automation.entity_id,
    });
  };

-  private _deleteConfirm = async (item: HaMdMenuItem) => {
-    const automation = ((item.parentElement as HaMdMenu)!.anchorElement as any)!
-      .automation;
-
+  private _deleteConfirm = async (automation: AutomationItem) => {
    showConfirmationDialog(this, {
      title: this.hass.localize(
        "ui.panel.config.automation.picker.delete_confirm_title"
@@ -1043,9 +1007,9 @@ class HaAutomationPicker extends SubscribeMixin(LitElement) {
    });
  };

-  private async _delete(automation) {
+  private async _delete(automation: AutomationItem) {
    try {
-      await deleteAutomation(this.hass, automation.attributes.id);
+      await deleteAutomation(this.hass, automation.attributes.id!);
      this._selected = this._selected.filter(
        (entityId) => entityId !== automation.entity_id
      );
@@ -1064,14 +1028,11 @@ class HaAutomationPicker extends SubscribeMixin(LitElement) {
    }
  }

-  private _duplicate = async (item: HaMdMenuItem) => {
-    const automation = ((item.parentElement as HaMdMenu)!.anchorElement as any)!
-      .automation;
-
+  private _duplicate = async (automation: AutomationItem) => {
    try {
      const config = await fetchAutomationFileConfig(
        this.hass,
-        automation.attributes.id
+        automation.attributes.id!
      );
      duplicateAutomation(config);
    } catch (err: any) {
@@ -54,7 +54,7 @@ import {
 import { configEntriesContext } from "../../../data/context";
 import { getActionType, type Action } from "../../../data/script";
 import { SubscribeMixin } from "../../../mixins/subscribe-mixin";
-import type { HomeAssistant } from "../../../types";
+import type { HomeAssistant, ValueChangedEvent } from "../../../types";
 import { documentationUrl } from "../../../util/documentation-url";
 import { showToast } from "../../../util/toast";
 import "./action/ha-automation-action";
@@ -383,7 +383,7 @@ export class HaManualAutomationEditor extends SubscribeMixin(LitElement) {
    this._sidebarElement?.focus();
  }

-  private _sidebarConfigChanged(ev: CustomEvent<{ value: SidebarConfig }>) {
+  private _sidebarConfigChanged(ev: ValueChangedEvent<SidebarConfig>) {
    ev.stopPropagation();
    if (!this._sidebarConfig) {
      return;
@@ -438,7 +438,6 @@ export class HaManualAutomationEditor extends SubscribeMixin(LitElement) {
  }

  private _saveAutomation() {
-    this.triggerCloseSidebar();
    fireEvent(this, "save-automation");
  }

@@ -4,7 +4,7 @@ import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../../../../../common/dom/fire_event";
 import { caseInsensitiveStringCompare } from "../../../../../common/string/compare";
 import "../../../../../components/ha-select";
-import "../../../../../components/ha-list-item";
+import type { HaSelectSelectEvent } from "../../../../../components/ha-select";
 import type { TagTrigger } from "../../../../../data/automation";
 import type { Tag } from "../../../../../data/tag";
 import { fetchTags } from "../../../../../data/tag";
@@ -42,16 +42,11 @@ export class HaTagTrigger extends LitElement implements TriggerElement {
        .disabled=${this.disabled || this._tags.length === 0}
        .value=${this.trigger.tag_id}
        @selected=${this._tagChanged}
-        fixedMenuPosition
-        naturalMenuWidth
+        .options=${this._tags.map((tag) => ({
+          value: tag.id,
+          label: tag.name || tag.id,
+        }))}
      >
-        ${this._tags.map(
-          (tag) => html`
-            <ha-list-item .value=${tag.id}>
-              ${tag.name || tag.id}
-            </ha-list-item>
-          `
-        )}
      </ha-select>
    `;
  }
@@ -66,18 +61,18 @@ export class HaTagTrigger extends LitElement implements TriggerElement {
    );
  }

-  private _tagChanged(ev) {
+  private _tagChanged(ev: HaSelectSelectEvent) {
    if (
-      !ev.target.value ||
+      !ev.detail.value ||
      !this._tags ||
-      this.trigger.tag_id === ev.target.value
+      this.trigger.tag_id === ev.detail.value
    ) {
      return;
    }
    fireEvent(this, "value-changed", {
      value: {
        ...this.trigger,
-        tag_id: ev.target.value,
+        tag_id: ev.detail.value,
      },
    });
  }
@@ -28,7 +28,7 @@ import {
  sortWeekdays,
 } from "../../../../../data/backup";
 import type { SupervisorUpdateConfig } from "../../../../../data/supervisor/update";
-import type { HomeAssistant } from "../../../../../types";
+import type { HomeAssistant, ValueChangedEvent } from "../../../../../types";
 import { documentationUrl } from "../../../../../util/documentation-url";
 import "./ha-backup-config-retention";

@@ -405,7 +405,7 @@ class HaBackupConfigSchedule extends LitElement {
    });
  }

-  private _retentionChanged(ev: CustomEvent<{ value: Retention }>) {
+  private _retentionChanged(ev: ValueChangedEvent<Retention>) {
    ev.stopPropagation();
    const retention = ev.detail.value;

@@ -1,17 +1,16 @@
 import { mdiClose, mdiContentCopy, mdiDownload } from "@mdi/js";
 import type { CSSResultGroup, PropertyValues } from "lit";
 import { css, html, LitElement, nothing } from "lit";
-import { customElement, property, query, state } from "lit/decorators";
+import { customElement, property, state } from "lit/decorators";
 import { isComponentLoaded } from "../../../../common/config/is_component_loaded";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import { copyToClipboard } from "../../../../common/util/copy-clipboard";
 import "../../../../components/ha-button";
-import "../../../../components/ha-dialog-header";
+import "../../../../components/ha-dialog-footer";
 import "../../../../components/ha-icon-button";
 import "../../../../components/ha-icon-button-prev";
 import "../../../../components/ha-icon-next";
-import "../../../../components/ha-md-dialog";
-import type { HaMdDialog } from "../../../../components/ha-md-dialog";
+import "../../../../components/ha-wa-dialog";
 import "../../../../components/ha-md-list";
 import "../../../../components/ha-md-list-item";
 import "../../../../components/ha-password-field";
@@ -86,14 +85,12 @@ const RECOMMENDED_CONFIG: BackupConfig = {
 class DialogBackupOnboarding extends LitElement implements HassDialog {
  @property({ attribute: false }) public hass!: HomeAssistant;

-  @state() private _opened = false;
+  @state() private _open = false;

  @state() private _step?: Step;

  @state() private _params?: BackupOnboardingDialogParams;

-  @query("ha-md-dialog") private _dialog!: HaMdDialog;
-
  @state() private _config?: BackupConfig;

  public showDialog(params: BackupOnboardingDialogParams): void {
@@ -115,21 +112,23 @@ class DialogBackupOnboarding extends LitElement implements HassDialog {
      };
    }

-    this._opened = true;
+    this._open = true;
  }

  public closeDialog() {
-    if (this._params!.cancel) {
-      this._params!.cancel();
+    this._open = false;
+    return true;
+  }
+
+  private _dialogClosed() {
+    if (this._params?.cancel) {
+      this._params.cancel();
    }
-    if (this._opened) {
-      fireEvent(this, "dialog-closed", { dialog: this.localName });
-    }
-    this._opened = false;
    this._step = undefined;
    this._config = undefined;
    this._params = undefined;
-    return true;
+    this._open = false;
+    fireEvent(this, "dialog-closed", { dialog: this.localName });
  }

  private get _firstStep(): Step {
@@ -168,7 +167,7 @@ class DialogBackupOnboarding extends LitElement implements HassDialog {
    try {
      await this._save(true);
      this._params?.submit!(true);
-      this._dialog.close();
+      this.closeDialog();
    } catch (err) {
      // eslint-disable-next-line no-console
      console.error(err);
@@ -202,7 +201,7 @@ class DialogBackupOnboarding extends LitElement implements HassDialog {
  }

  protected render() {
-    if (!this._opened || !this._params || !this._step) {
+    if (!this._params || !this._step) {
      return nothing;
    }

@@ -210,33 +209,37 @@ class DialogBackupOnboarding extends LitElement implements HassDialog {
    const isFirstStep = this._step === this._firstStep;

    return html`
-      <ha-md-dialog disable-cancel-action open @closed=${this.closeDialog}>
-        <ha-dialog-header slot="headline">
-          ${isFirstStep
-            ? html`
-                <ha-icon-button
-                  slot="navigationIcon"
-                  .label=${this.hass.localize("ui.common.close")}
-                  .path=${mdiClose}
-                  @click=${this.closeDialog}
-                ></ha-icon-button>
-              `
-            : html`
-                <ha-icon-button-prev
-                  slot="navigationIcon"
-                  @click=${this._previousStep}
-                ></ha-icon-button-prev>
-              `}
-
-          <span slot="title">${this._stepTitle}</span>
-        </ha-dialog-header>
-        <div slot="content">${this._renderStepContent()}</div>
+      <ha-wa-dialog
+        .hass=${this.hass}
+        .open=${this._open}
+        header-title=${this._stepTitle}
+        width="medium"
+        prevent-scrim-close
+        @closed=${this._dialogClosed}
+      >
+        ${isFirstStep
+          ? html`
+              <ha-icon-button
+                slot="headerNavigationIcon"
+                data-dialog="close"
+                .label=${this.hass.localize("ui.common.close")}
+                .path=${mdiClose}
+              ></ha-icon-button>
+            `
+          : html`
+              <ha-icon-button-prev
+                slot="headerNavigationIcon"
+                @click=${this._previousStep}
+              ></ha-icon-button-prev>
+            `}
+        <div>${this._renderStepContent()}</div>
        ${!FULL_DIALOG_STEPS.has(this._step)
          ? html`
-              <div slot="actions">
+              <ha-dialog-footer slot="footer">
                ${isLastStep
                  ? html`
                      <ha-button
+                        slot="primaryAction"
                        @click=${this._done}
                        .disabled=${!this._isStepValid()}
                      >
@@ -247,16 +250,17 @@ class DialogBackupOnboarding extends LitElement implements HassDialog {
                    `
                  : html`
                      <ha-button
+                        slot="primaryAction"
                        @click=${this._nextStep}
                        .disabled=${!this._isStepValid()}
                      >
                        ${this.hass.localize("ui.common.next")}
                      </ha-button>
                    `}
-              </div>
+              </ha-dialog-footer>
            `
          : nothing}
-      </ha-md-dialog>
+      </ha-wa-dialog>
    `;
  }

@@ -540,11 +544,9 @@ class DialogBackupOnboarding extends LitElement implements HassDialog {
      haStyle,
      haStyleDialog,
      css`
-        ha-md-dialog {
-          width: 90vw;
-          max-width: 560px;
-          --dialog-content-padding: 8px 24px;
-          max-height: min(605px, 100% - 48px);
+        ha-wa-dialog {
+          --dialog-content-padding: var(--ha-space-2) var(--ha-space-6);
+          --ha-dialog-max-height: min(605px, 100% - 48px);
        }
        ha-md-list {
          background: none;
@@ -557,14 +559,6 @@ class DialogBackupOnboarding extends LitElement implements HassDialog {
          margin-left: -24px;
          margin-right: -24px;
        }
-        @media all and (max-width: 450px), all and (max-height: 500px) {
-          ha-md-dialog {
-            max-width: none;
-          }
-          div[slot="content"] {
-            margin-top: 0;
-          }
-        }
        p {
          margin-top: 0;
        }
@@ -1,20 +1,17 @@
-import { mdiClose } from "@mdi/js";
 import type { UnsubscribeFunc } from "home-assistant-js-websocket";
 import type { CSSResultGroup } from "lit";
 import { css, html, LitElement, nothing } from "lit";
-import { customElement, property, query, state } from "lit/decorators";
+import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import "../../../../components/ha-button";
+import "../../../../components/ha-dialog-footer";
 import "../../../../components/ha-spinner";
-import "../../../../components/ha-dialog-header";
 import "../../../../components/ha-password-field";

 import { isComponentLoaded } from "../../../../common/config/is_component_loaded";
 import "../../../../components/ha-alert";
-import "../../../../components/ha-icon-button";
-import "../../../../components/ha-md-dialog";
-import type { HaMdDialog } from "../../../../components/ha-md-dialog";
 import "../../../../components/ha-svg-icon";
+import "../../../../components/ha-wa-dialog";
 import type { RestoreBackupParams } from "../../../../data/backup";
 import {
  fetchBackupConfig,
@@ -54,6 +51,8 @@ class DialogRestoreBackup extends LitElement implements HassDialog {

  @state() private _formData?: FormData;

+  @state() private _open = false;
+
  @state() private _backupEncryptionKey?: string;

  @state() private _userPassword?: string;
@@ -68,8 +67,6 @@ class DialogRestoreBackup extends LitElement implements HassDialog {

  @state() private _unsub?: Promise<UnsubscribeFunc>;

-  @query("ha-md-dialog") private _dialog?: HaMdDialog;
-
  public async showDialog(params: RestoreBackupDialogParams) {
    this._params = params;

@@ -94,10 +91,12 @@ class DialogRestoreBackup extends LitElement implements HassDialog {
    } else {
      this._step = STEPS[0];
    }
+
+    this._open = true;
  }

  public closeDialog() {
-    this._dialog?.close();
+    this._open = false;
    return true;
  }

@@ -112,6 +111,7 @@ class DialogRestoreBackup extends LitElement implements HassDialog {
    this._stage = undefined;
    this._step = undefined;
    this._unsubscribe();
+    this._open = false;
    fireEvent(this, "dialog-closed", { dialog: this.localName });
  }

@@ -136,17 +136,14 @@ class DialogRestoreBackup extends LitElement implements HassDialog {
    );

    return html`
-      <ha-md-dialog open @closed=${this._dialogClosed}>
-        <ha-dialog-header slot="headline">
-          <ha-icon-button
-            slot="navigationIcon"
-            .label=${this.hass.localize("ui.common.close")}
-            .path=${mdiClose}
-            @click=${this.closeDialog}
-          ></ha-icon-button>
-          <span slot="title" .title=${dialogTitle}>${dialogTitle}</span>
-        </ha-dialog-header>
-        <div slot="content" class="content">
+      <ha-wa-dialog
+        .hass=${this.hass}
+        .open=${this._open}
+        header-title=${dialogTitle}
+        width="medium"
+        @closed=${this._dialogClosed}
+      >
+        <div class="content">
          ${this._error
            ? html`<ha-alert alert-type="error">${this._error}</ha-alert>`
            : this._step === "confirm"
@@ -155,18 +152,18 @@ class DialogRestoreBackup extends LitElement implements HassDialog {
                ? this._renderEncryption()
                : this._renderProgress()}
        </div>
-        <div slot="actions">
-          ${this._error
-            ? html`
-                <ha-button @click=${this.closeDialog}>
+        ${this._error
+          ? html`
+              <ha-dialog-footer slot="footer">
+                <ha-button slot="primaryAction" @click=${this.closeDialog}>
                  ${this.hass.localize("ui.common.close")}
                </ha-button>
-              `
-            : this._step === "confirm" || this._step === "encryption"
-              ? this._renderConfirmActions()
-              : nothing}
-        </div>
-      </ha-md-dialog>
+              </ha-dialog-footer>
+            `
+          : this._step === "confirm" || this._step === "encryption"
+            ? this._renderConfirmActions()
+            : nothing}
+      </ha-wa-dialog>
    `;
  }

@@ -216,6 +213,7 @@ class DialogRestoreBackup extends LitElement implements HassDialog {
      ${this._renderEncryptionIntro()}

      <ha-password-field
+        autofocus
        @input=${this._passwordChanged}
        .label=${this.hass.localize(
          "ui.panel.config.backup.dialogs.restore.encryption.input_label"
@@ -227,14 +225,24 @@ class DialogRestoreBackup extends LitElement implements HassDialog {

  private _renderConfirmActions() {
    return html`
-      <ha-button appearance="plain" @click=${this.closeDialog}>
-        ${this.hass.localize("ui.common.cancel")}
-      </ha-button>
-      <ha-button @click=${this._restoreBackup} variant="danger">
-        ${this.hass.localize(
-          "ui.panel.config.backup.dialogs.restore.actions.restore"
-        )}
-      </ha-button>
+      <ha-dialog-footer slot="footer">
+        <ha-button
+          slot="secondaryAction"
+          appearance="plain"
+          @click=${this.closeDialog}
+        >
+          ${this.hass.localize("ui.common.cancel")}
+        </ha-button>
+        <ha-button
+          slot="primaryAction"
+          @click=${this._restoreBackup}
+          variant="danger"
+        >
+          ${this.hass.localize(
+            "ui.panel.config.backup.dialogs.restore.actions.restore"
+          )}
+        </ha-button>
+      </ha-dialog-footer>
    `;
  }

@@ -365,10 +373,6 @@ class DialogRestoreBackup extends LitElement implements HassDialog {
      haStyle,
      haStyleDialog,
      css`
-        ha-md-dialog {
-          max-width: 500px;
-          width: 100%;
-        }
        .content p {
          margin: 0 0 16px;
        }
@@ -1,15 +1,13 @@
-import { mdiClose, mdiContentCopy, mdiDownload } from "@mdi/js";
+import { mdiContentCopy, mdiDownload } from "@mdi/js";
 import type { CSSResultGroup } from "lit";
 import { LitElement, css, html, nothing } from "lit";
-import { customElement, property, query, state } from "lit/decorators";
+import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import { copyToClipboard } from "../../../../common/util/copy-clipboard";
 import "../../../../components/ha-button";
-import "../../../../components/ha-dialog-header";
+import "../../../../components/ha-dialog-footer";
 import "../../../../components/ha-icon-button";
-import "../../../../components/ha-icon-button-prev";
-import "../../../../components/ha-md-dialog";
-import type { HaMdDialog } from "../../../../components/ha-md-dialog";
+import "../../../../components/ha-wa-dialog";
 import "../../../../components/ha-md-list";
 import "../../../../components/ha-md-list-item";
 import "../../../../components/ha-password-field";
@@ -31,40 +29,40 @@ type Step = (typeof STEPS)[number];
 class DialogSetBackupEncryptionKey extends LitElement implements HassDialog {
  @property({ attribute: false }) public hass!: HomeAssistant;

-  @state() private _opened = false;
+  @state() private _open = false;

  @state() private _step?: Step;

  @state() private _params?: SetBackupEncryptionKeyDialogParams;

-  @query("ha-md-dialog") private _dialog!: HaMdDialog;
-
  @state() private _newEncryptionKey?: string;

  public showDialog(params: SetBackupEncryptionKeyDialogParams): void {
    this._params = params;
    this._step = STEPS[0];
-    this._opened = true;
+    this._open = true;
    this._newEncryptionKey = generateEncryptionKey();
  }

  public closeDialog() {
-    if (this._params!.cancel) {
-      this._params!.cancel();
+    this._open = false;
+    return true;
+  }
+
+  private _dialogClosed() {
+    if (this._params?.cancel) {
+      this._params.cancel();
    }
-    if (this._opened) {
-      fireEvent(this, "dialog-closed", { dialog: this.localName });
-    }
-    this._opened = false;
    this._step = undefined;
    this._params = undefined;
    this._newEncryptionKey = undefined;
-    return true;
+    this._open = false;
+    fireEvent(this, "dialog-closed", { dialog: this.localName });
  }

  private _done() {
    this._params?.submit!(true);
-    this._dialog.close();
+    this.closeDialog();
  }

  private _nextStep() {
@@ -76,7 +74,7 @@ class DialogSetBackupEncryptionKey extends LitElement implements HassDialog {
  }

  protected render() {
-    if (!this._opened || !this._params) {
+    if (!this._params || !this._step) {
      return nothing;
    }

@@ -88,21 +86,20 @@ class DialogSetBackupEncryptionKey extends LitElement implements HassDialog {
        : "";

    return html`
-      <ha-md-dialog disable-cancel-action open @closed=${this.closeDialog}>
-        <ha-dialog-header slot="headline">
-          <ha-icon-button
-            slot="navigationIcon"
-            .label=${this.hass.localize("ui.common.close")}
-            .path=${mdiClose}
-            @click=${this.closeDialog}
-          ></ha-icon-button>
-          <span slot="title">${dialogTitle}</span>
-        </ha-dialog-header>
-        <div slot="content">${this._renderStepContent()}</div>
-        <div slot="actions">
+      <ha-wa-dialog
+        .hass=${this.hass}
+        .open=${this._open}
+        header-title=${dialogTitle}
+        width="medium"
+        prevent-scrim-close
+        @closed=${this._dialogClosed}
+      >
+        ${this._renderStepContent()}
+        <ha-dialog-footer slot="footer">
          ${this._step === "key"
            ? html`
                <ha-button
+                  slot="primaryAction"
                  @click=${this._submit}
                  .disabled=${!this._newEncryptionKey}
                >
@@ -112,14 +109,14 @@ class DialogSetBackupEncryptionKey extends LitElement implements HassDialog {
                </ha-button>
              `
            : html`
-                <ha-button @click=${this._done}>
+                <ha-button slot="primaryAction" @click=${this._done}>
                  ${this.hass.localize(
                    "ui.panel.config.backup.dialogs.set_encryption_key.actions.done"
                  )}
                </ha-button>
              `}
-        </div>
-      </ha-md-dialog>
+        </ha-dialog-footer>
+      </ha-wa-dialog>
    `;
  }

@@ -213,10 +210,8 @@ class DialogSetBackupEncryptionKey extends LitElement implements HassDialog {
      haStyle,
      haStyleDialog,
      css`
-        ha-md-dialog {
-          width: 90vw;
-          max-width: 560px;
-          --dialog-content-padding: 8px 24px;
+        ha-wa-dialog {
+          --dialog-content-padding: var(--ha-space-2) var(--ha-space-6);
        }
        ha-md-list {
          background: none;
@@ -247,14 +242,6 @@ class DialogSetBackupEncryptionKey extends LitElement implements HassDialog {
          flex: none;
          margin: -16px;
        }
-        @media all and (max-width: 450px), all and (max-height: 500px) {
-          ha-md-dialog {
-            max-width: none;
-          }
-          div[slot="content"] {
-            margin-top: 0;
-          }
-        }
        p {
          margin-top: 0;
        }
@@ -25,7 +25,7 @@ import {
  updateBackupConfig,
 } from "../../../data/backup";
 import "../../../layouts/hass-subpage";
-import type { HomeAssistant } from "../../../types";
+import type { HomeAssistant, ValueChangedEvent } from "../../../types";
 import { showConfirmationDialog } from "../../lovelace/custom-card-helpers";
 import "./components/config/ha-backup-config-retention";
 import "./components/ha-backup-data-picker";
@@ -284,7 +284,7 @@ class HaConfigBackupDetails extends LitElement {
    }
  }

-  private _retentionChanged(ev: CustomEvent<{ value: Retention }>) {
+  private _retentionChanged(ev: ValueChangedEvent<Retention>) {
    const retention = ev.detail.value;
    this._updateAgentConfig({
      retention,
@@ -153,7 +153,7 @@ export class HaCategoryPicker extends SubscribeMixin(LitElement) {
        {
          id: ADD_NEW_ID + searchString,
          primary: this.hass.localize(
-            "ui.components.category-picker.add_new_sugestion",
+            "ui.components.category-picker.add_new_suggestion",
            {
              name: searchString,
            }
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`import "../../../../src/components/ha-alert";`