Exclude conditional elements

improve typing
refactor
2025-12-19 22:47:21 +00:00 · 2025-12-18 17:05:54 +02:00 · 2025-12-18 12:18:51 +02:00 · 2025-12-18 09:15:16 +02:00 · 2025-12-18 09:07:15 +02:00
151 changed files with 3339 additions and 3031 deletions
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -154,7 +154,7 @@ try {

 - **Use CSS custom properties**: Leverage the theme system
 - **Use spacing tokens**: Prefer `--ha-space-*` tokens over hardcoded values for consistent spacing
-  - Spacing scale: `--ha-space-1` (4px) through `--ha-space-20` (80px) in 4px increments
+  - Spacing scale: `--ha-space-0` (0px) through `--ha-space-20` (80px) in 4px increments
  - Defined in `src/resources/theme/core.globals.ts`
  - Common values: `--ha-space-2` (8px), `--ha-space-4` (16px), `--ha-space-8` (32px)
 - **Mobile-first responsive**: Design for mobile, enhance for desktop
--- a/.yarnrc.yml
+++ b/.yarnrc.yml
@@ -1,7 +1,5 @@
 compressionLevel: mixed

-npmMinimalAgeGate: "3d"
-
 defaultSemverRangePrefix: ""

 enableGlobalCache: false
--- a/build-scripts/bundle.cjs
+++ b/build-scripts/bundle.cjs
@@ -20,6 +20,8 @@ module.exports.ignorePackages = () => [];
 // Files from NPM packages that we should replace with empty file
 module.exports.emptyPackages = ({ isHassioBuild, isLandingPageBuild }) =>
  [
+    require.resolve("@vaadin/vaadin-material-styles/typography.js"),
+    require.resolve("@vaadin/vaadin-material-styles/font-icons.js"),
    // Icons in supervisor conflict with icons in HA so we don't load.
    (isHassioBuild || isLandingPageBuild) &&
      require.resolve(
--- a/build-scripts/rspack.cjs
+++ b/build-scripts/rspack.cjs
@@ -168,16 +168,12 @@ const createRspackConfig = ({
          );
        },
      }),
-      bundle.emptyPackages({ isHassioBuild, isLandingPageBuild }).length
-        ? new rspack.NormalModuleReplacementPlugin(
-            new RegExp(
-              bundle
-                .emptyPackages({ isHassioBuild, isLandingPageBuild })
-                .join("|")
-            ),
-            path.resolve(paths.root_dir, "src/util/empty.js")
-          )
-        : false,
+      new rspack.NormalModuleReplacementPlugin(
+        new RegExp(
+          bundle.emptyPackages({ isHassioBuild, isLandingPageBuild }).join("|")
+        ),
+        path.resolve(paths.root_dir, "src/util/empty.js")
+      ),
      !isProdBuild && new LogStartCompilePlugin(),
      isProdBuild &&
        new StatsWriterPlugin({
@@ -221,42 +217,6 @@ const createRspackConfig = ({
          "@lit-labs/virtualizer/polyfills/resize-observer-polyfill/ResizeObserver.js",
        "@lit-labs/observers/resize-controller":
          "@lit-labs/observers/resize-controller.js",
-        "@formatjs/intl-durationformat/should-polyfill$":
-          "@formatjs/intl-durationformat/should-polyfill.js",
-        "@formatjs/intl-durationformat/polyfill-force$":
-          "@formatjs/intl-durationformat/polyfill-force.js",
-        "@formatjs/intl-datetimeformat/should-polyfill":
-          "@formatjs/intl-datetimeformat/should-polyfill.js",
-        "@formatjs/intl-datetimeformat/polyfill-force":
-          "@formatjs/intl-datetimeformat/polyfill-force.js",
-        "@formatjs/intl-displaynames/should-polyfill":
-          "@formatjs/intl-displaynames/should-polyfill.js",
-        "@formatjs/intl-displaynames/polyfill-force":
-          "@formatjs/intl-displaynames/polyfill-force.js",
-        "@formatjs/intl-getcanonicallocales/should-polyfill":
-          "@formatjs/intl-getcanonicallocales/should-polyfill.js",
-        "@formatjs/intl-getcanonicallocales/polyfill-force":
-          "@formatjs/intl-getcanonicallocales/polyfill-force.js",
-        "@formatjs/intl-listformat/should-polyfill":
-          "@formatjs/intl-listformat/should-polyfill.js",
-        "@formatjs/intl-listformat/polyfill-force":
-          "@formatjs/intl-listformat/polyfill-force.js",
-        "@formatjs/intl-locale/should-polyfill":
-          "@formatjs/intl-locale/should-polyfill.js",
-        "@formatjs/intl-locale/polyfill-force":
-          "@formatjs/intl-locale/polyfill-force.js",
-        "@formatjs/intl-numberformat/should-polyfill":
-          "@formatjs/intl-numberformat/should-polyfill.js",
-        "@formatjs/intl-numberformat/polyfill-force":
-          "@formatjs/intl-numberformat/polyfill-force.js",
-        "@formatjs/intl-pluralrules/should-polyfill":
-          "@formatjs/intl-pluralrules/should-polyfill.js",
-        "@formatjs/intl-pluralrules/polyfill-force":
-          "@formatjs/intl-pluralrules/polyfill-force.js",
-        "@formatjs/intl-relativetimeformat/should-polyfill":
-          "@formatjs/intl-relativetimeformat/should-polyfill.js",
-        "@formatjs/intl-relativetimeformat/polyfill-force":
-          "@formatjs/intl-relativetimeformat/polyfill-force.js",
      },
    },
    output: {
--- a/cast/src/media/entrypoint.ts
+++ b/cast/src/media/entrypoint.ts
@@ -5,19 +5,17 @@ const castContext = framework.CastReceiverContext.getInstance();
 const playerManager = castContext.getPlayerManager();

 playerManager.setMessageInterceptor(
-  "LOAD" as framework.messages.MessageType.LOAD,
+  framework.messages.MessageType.LOAD,
  (loadRequestData) => {
    const media = loadRequestData.media;
    // Special handling if it came from Google Assistant
    if (media.entity) {
      media.contentId = media.entity;
-      media.streamType = "LIVE" as framework.messages.StreamType.LIVE;
+      media.streamType = framework.messages.StreamType.LIVE;
      media.contentType = "application/vnd.apple.mpegurl";
      // @ts-ignore
-      // type definition is wrong, should be "FMP4" instead of "fmp4"
-      // https://developers.google.com/cast/docs/reference/web_receiver/cast.framework.messages#.HlsVideoSegmentFormat
      media.hlsVideoSegmentFormat =
-        "FMP4" as framework.messages.HlsVideoSegmentFormat.FMP4;
+        framework.messages.HlsVideoSegmentFormat.FMP4;
    }
    return loadRequestData;
  }
--- a/cast/src/receiver/entrypoint.ts
+++ b/cast/src/receiver/entrypoint.ts
@@ -1,9 +1,10 @@
+import { framework } from "./cast_framework";
 import { CAST_NS } from "../../../src/cast/const";
 import type { HassMessage } from "../../../src/cast/receiver_messages";
 import "../../../src/resources/custom-card-support";
 import { castContext } from "./cast_context";
-import { framework } from "./cast_framework";
 import { HcMain } from "./layout/hc-main";
+import type { ReceivedMessage } from "./types";

 const lovelaceController = new HcMain();
 document.body.append(lovelaceController);
@@ -39,8 +40,7 @@ const playDummyMedia = (viewTitle?: string) => {
  loadRequestData.media.contentId =
    "https://cast.home-assistant.io/images/google-nest-hub.png";
  loadRequestData.media.contentType = "image/jpeg";
-  loadRequestData.media.streamType =
-    "NONE" as framework.messages.StreamType.NONE;
+  loadRequestData.media.streamType = framework.messages.StreamType.NONE;
  const metadata = new framework.messages.GenericMediaMetadata();
  metadata.title = viewTitle;
  loadRequestData.media.metadata = metadata;
@@ -89,30 +89,31 @@ const showMediaPlayer = () => {
 const options = new framework.CastReceiverOptions();
 options.disableIdleTimeout = true;
 options.customNamespaces = {
-  // type definition is wrong, should be "JSON" instead of "json"
-  // https://developers.google.com/cast/docs/reference/web_receiver/cast.framework.system#.MessageType
-  [CAST_NS]: "JSON" as framework.system.MessageType.JSON,
+  [CAST_NS]: framework.system.MessageType.JSON,
 };

-castContext.addCustomMessageListener(CAST_NS, (ev) => {
-  // We received a show Lovelace command, stop media from playing, hide media player and show Lovelace controller
-  if (
-    playerManager.getPlayerState() !==
-    ("IDLE" as framework.messages.PlayerState.IDLE)
-  ) {
-    playerManager.stop();
-  } else {
-    showLovelaceController();
+castContext.addCustomMessageListener(
+  CAST_NS,
+  // @ts-ignore
+  (ev: ReceivedMessage<HassMessage>) => {
+    // We received a show Lovelace command, stop media from playing, hide media player and show Lovelace controller
+    if (
+      playerManager.getPlayerState() !== framework.messages.PlayerState.IDLE
+    ) {
+      playerManager.stop();
+    } else {
+      showLovelaceController();
+    }
+    const msg = ev.data;
+    msg.senderId = ev.senderId;
+    lovelaceController.processIncomingMessage(msg);
  }
-  const msg = ev.data as HassMessage;
-  msg.senderId = ev.senderId;
-  lovelaceController.processIncomingMessage(msg);
-});
+);

 const playerManager = castContext.getPlayerManager();

 playerManager.setMessageInterceptor(
-  "LOAD" as framework.messages.MessageType.LOAD,
+  framework.messages.MessageType.LOAD,
  (loadRequestData) => {
    if (
      loadRequestData.media.contentId ===
@@ -126,26 +127,24 @@ playerManager.setMessageInterceptor(
    // Special handling if it came from Google Assistant
    if (media.entity) {
      media.contentId = media.entity;
-      media.streamType = "LIVE" as framework.messages.StreamType.LIVE;
+      media.streamType = framework.messages.StreamType.LIVE;
      media.contentType = "application/vnd.apple.mpegurl";
-      // type definition is wrong, should be "FMP4" instead of "fmp4"
-      // https://developers.google.com/cast/docs/reference/web_receiver/cast.framework.messages#.HlsVideoSegmentFormat
+      // @ts-ignore
      media.hlsVideoSegmentFormat =
-        "FMP4" as framework.messages.HlsVideoSegmentFormat.FMP4;
+        framework.messages.HlsVideoSegmentFormat.FMP4;
    }
    return loadRequestData;
  }
 );

 playerManager.addEventListener(
-  "MEDIA_STATUS" as framework.events.EventType.MEDIA_STATUS,
+  framework.events.EventType.MEDIA_STATUS,
  (event) => {
    if (
-      event.mediaStatus?.playerState ===
-        ("IDLE" as framework.messages.PlayerState.IDLE) &&
+      event.mediaStatus?.playerState === framework.messages.PlayerState.IDLE &&
      event.mediaStatus?.idleReason &&
      event.mediaStatus?.idleReason !==
-        ("INTERRUPTED" as framework.messages.IdleReason.INTERRUPTED)
+        framework.messages.IdleReason.INTERRUPTED
    ) {
      // media finished or stopped, return to default Lovelace
      showLovelaceController();
--- a/cast/src/receiver/types.ts
+++ b/cast/src/receiver/types.ts
@@ -0,0 +1,6 @@
+export interface ReceivedMessage<T> {
+  gj: boolean;
+  data: T;
+  senderId: string;
+  type: "message";
+}
--- a/gallery/src/pages/components/ha-selector.ts
+++ b/gallery/src/pages/components/ha-selector.ts
@@ -40,9 +40,6 @@ const ENTITIES = [
  getEntity("switch", "coffee", "off", {
    friendly_name: "Coffee",
  }),
-  getEntity("number", "number", 5, {
-    friendly_name: "Number",
-  }),
 ];

 const DEVICES: DeviceRegistryEntry[] = [
@@ -380,33 +377,6 @@ const SCHEMAS: {
        name: "Constant",
        selector: { constant: { value: true, label: "Yes!" } },
      },
-      choose: {
-        name: "Choose",
-        selector: {
-          choose: {
-            choices: {
-              number: {
-                selector: {
-                  number: {
-                    min: 0,
-                    max: 100,
-                    step: 0.1,
-                  },
-                },
-              },
-              entity: {
-                selector: {
-                  entity: {
-                    filter: {
-                      domain: "number",
-                    },
-                  },
-                },
-              },
-            },
-          },
-        },
-      },
    },
  },
  {
--- a/package.json
+++ b/package.json
@@ -37,15 +37,15 @@
    "@codemirror/view": "6.39.4",
    "@date-fns/tz": "1.4.1",
    "@egjs/hammerjs": "2.0.17",
-    "@formatjs/intl-datetimeformat": "7.0.1",
-    "@formatjs/intl-displaynames": "7.0.1",
-    "@formatjs/intl-durationformat": "0.8.1",
-    "@formatjs/intl-getcanonicallocales": "3.0.1",
-    "@formatjs/intl-listformat": "8.0.1",
-    "@formatjs/intl-locale": "5.0.1",
-    "@formatjs/intl-numberformat": "9.0.2",
-    "@formatjs/intl-pluralrules": "6.0.1",
-    "@formatjs/intl-relativetimeformat": "12.0.2",
+    "@formatjs/intl-datetimeformat": "6.18.2",
+    "@formatjs/intl-displaynames": "6.8.13",
+    "@formatjs/intl-durationformat": "0.7.6",
+    "@formatjs/intl-getcanonicallocales": "2.5.6",
+    "@formatjs/intl-listformat": "7.7.13",
+    "@formatjs/intl-locale": "4.2.13",
+    "@formatjs/intl-numberformat": "8.15.6",
+    "@formatjs/intl-pluralrules": "5.4.6",
+    "@formatjs/intl-relativetimeformat": "11.4.13",
    "@fullcalendar/core": "6.1.19",
    "@fullcalendar/daygrid": "6.1.19",
    "@fullcalendar/interaction": "6.1.19",
@@ -89,6 +89,8 @@
    "@thomasloven/round-slider": "0.6.0",
    "@tsparticles/engine": "3.9.1",
    "@tsparticles/preset-links": "3.2.0",
+    "@vaadin/combo-box": "24.9.6",
+    "@vaadin/vaadin-themable-mixin": "24.9.6",
    "@vibrant/color": "4.0.0",
    "@vue/web-component-wrapper": "1.3.0",
    "@webcomponents/scoped-custom-element-registry": "0.0.10",
@@ -112,7 +114,7 @@
    "hls.js": "1.6.15",
    "home-assistant-js-websocket": "9.6.0",
    "idb-keyval": "6.2.2",
-    "intl-messageformat": "11.0.1",
+    "intl-messageformat": "10.7.18",
    "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",
@@ -155,11 +157,11 @@
    "@octokit/auth-oauth-device": "8.0.3",
    "@octokit/plugin-retry": "8.0.3",
    "@octokit/rest": "22.0.1",
-    "@rsdoctor/rspack-plugin": "1.3.16",
+    "@rsdoctor/rspack-plugin": "1.3.15",
    "@rspack/core": "1.6.7",
    "@rspack/dev-server": "1.1.4",
    "@types/babel__plugin-transform-runtime": "7.9.5",
-    "@types/chromecast-caf-receiver": "6.0.25",
+    "@types/chromecast-caf-receiver": "6.0.22",
    "@types/chromecast-caf-sender": "1.0.11",
    "@types/color-name": "2.0.0",
    "@types/culori": "4.0.1",
@@ -176,7 +178,7 @@
    "@types/tar": "6.1.13",
    "@types/ua-parser-js": "0.7.39",
    "@types/webspeechapi": "0.0.29",
-    "@vitest/coverage-v8": "4.0.16",
+    "@vitest/coverage-v8": "4.0.15",
    "babel-loader": "10.0.0",
    "babel-plugin-template-html-minifier": "4.1.0",
    "browserslist-useragent-regexp": "4.1.3",
@@ -215,9 +217,9 @@
    "terser-webpack-plugin": "5.3.16",
    "ts-lit-plugin": "2.0.2",
    "typescript": "5.9.3",
-    "typescript-eslint": "8.50.0",
-    "vite-tsconfig-paths": "6.0.1",
-    "vitest": "4.0.16",
+    "typescript-eslint": "8.49.0",
+    "vite-tsconfig-paths": "5.1.4",
+    "vitest": "4.0.15",
    "webpack-stats-plugin": "1.1.3",
    "webpackbar": "7.0.0",
    "workbox-build": "patch:workbox-build@npm%3A7.1.1#~/.yarn/patches/workbox-build-npm-7.1.1-a854f3faae.patch"
--- a/src/common/util/deep-equal.ts
+++ b/src/common/util/deep-equal.ts
@@ -1,6 +1,16 @@
 // From https://github.com/epoberezkin/fast-deep-equal
 // MIT License - Copyright (c) 2017 Evgeny Poberezkin
-export const deepEqual = (a: any, b: any): boolean => {
+
+interface DeepEqualOptions {
+  /** Compare Symbol properties in addition to string keys */
+  compareSymbols?: boolean;
+}
+
+export const deepEqual = (
+  a: any,
+  b: any,
+  options?: DeepEqualOptions
+): boolean => {
  if (a === b) {
    return true;
  }
@@ -18,7 +28,7 @@ export const deepEqual = (a: any, b: any): boolean => {
        return false;
      }
      for (i = length; i-- !== 0; ) {
-        if (!deepEqual(a[i], b[i])) {
+        if (!deepEqual(a[i], b[i], options)) {
          return false;
        }
      }
@@ -35,7 +45,7 @@ export const deepEqual = (a: any, b: any): boolean => {
        }
      }
      for (i of a.entries()) {
-        if (!deepEqual(i[1], b.get(i[0]))) {
+        if (!deepEqual(i[1], b.get(i[0]), options)) {
          return false;
        }
      }
@@ -93,11 +103,28 @@ export const deepEqual = (a: any, b: any): boolean => {
    for (i = length; i-- !== 0; ) {
      const key = keys[i];

-      if (!deepEqual(a[key], b[key])) {
+      if (!deepEqual(a[key], b[key], options)) {
        return false;
      }
    }

+    // Compare Symbol properties if requested
+    if (options?.compareSymbols) {
+      const symbolsA = Object.getOwnPropertySymbols(a);
+      const symbolsB = Object.getOwnPropertySymbols(b);
+      if (symbolsA.length !== symbolsB.length) {
+        return false;
+      }
+      for (const sym of symbolsA) {
+        if (!Object.prototype.hasOwnProperty.call(b, sym)) {
+          return false;
+        }
+        if (!deepEqual(a[sym], b[sym], options)) {
+          return false;
+        }
+      }
+    }
+
    return true;
  }

--- a/src/components/device/ha-device-picker.ts
+++ b/src/components/device/ha-device-picker.ts
@@ -1,4 +1,4 @@
-import type { RenderItemFunction } from "@lit-labs/virtualizer/virtualize";
+import type { ComboBoxLitRenderer } from "@vaadin/combo-box/lit";
 import type { HassEntity } from "home-assistant-js-websocket";
 import { html, LitElement, nothing, type PropertyValues } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
@@ -162,7 +162,7 @@ export class HaDevicePicker extends LitElement {
    }
  );

-  private _rowRenderer: RenderItemFunction<DevicePickerItem> = (item) => html`
+  private _rowRenderer: ComboBoxLitRenderer<DevicePickerItem> = (item) => html`
    <ha-combo-box-item type="button">
      ${item.domain
        ? html`
--- a/src/components/device/ha-devices-picker.ts
+++ b/src/components/device/ha-devices-picker.ts
@@ -61,6 +61,7 @@ class HaDevicesPicker extends LitElement {
        (entityId) => html`
          <div>
            <ha-device-picker
+              allow-custom-entity
              .curValue=${entityId}
              .hass=${this.hass}
              .deviceFilter=${this.deviceFilter}
@@ -78,6 +79,7 @@ class HaDevicesPicker extends LitElement {
      )}
      <div>
        <ha-device-picker
+          allow-custom-entity
          .hass=${this.hass}
          .helper=${this.helper}
          .deviceFilter=${this.deviceFilter}
--- a/src/components/entity/ha-entities-picker.ts
+++ b/src/components/entity/ha-entities-picker.ts
@@ -99,6 +99,7 @@ class HaEntitiesPicker extends LitElement {
            (entityId) => html`
              <div class="entity">
                <ha-entity-picker
+                  allow-custom-entity
                  .curValue=${entityId}
                  .hass=${this.hass}
                  .includeDomains=${this.includeDomains}
@@ -128,6 +129,7 @@ class HaEntitiesPicker extends LitElement {
      </ha-sortable>
      <div>
        <ha-entity-picker
+          allow-custom-entity
          .hass=${this.hass}
          .includeDomains=${this.includeDomains}
          .excludeDomains=${this.excludeDomains}
--- a/src/components/entity/ha-entity-attribute-picker.ts
+++ b/src/components/entity/ha-entity-attribute-picker.ts
@@ -1,11 +1,16 @@
+import type { PropertyValues } from "lit";
 import { LitElement, html, nothing } from "lit";
-import { customElement, property } from "lit/decorators";
-import memoizeOne from "memoize-one";
+import { customElement, property, query, state } from "lit/decorators";
 import { ensureArray } from "../../common/array/ensure-array";
 import { fireEvent } from "../../common/dom/fire_event";
 import type { HomeAssistant, ValueChangedEvent } from "../../types";
-import "../ha-generic-picker";
-import type { PickerComboBoxItem } from "../ha-picker-combo-box";
+import "../ha-combo-box";
+import type { HaComboBox } from "../ha-combo-box";
+
+interface AttributeOption {
+  value: string;
+  label: string;
+}

@customElement("ha-entity-attribute-picker")
 class HaEntityAttributePicker extends LitElement {
@@ -37,44 +42,51 @@ class HaEntityAttributePicker extends LitElement {

  @property() public helper?: string;

-  private _getItemsMemoized = memoizeOne(
-    (
-      entityId: string | string[] | undefined,
-      hideAttributes: string[] | undefined,
-      hass: HomeAssistant
-    ): PickerComboBoxItem[] => {
-      const entityIds = entityId ? ensureArray(entityId) : [];
-      const options: PickerComboBoxItem[] = [];
-      const optionsSet = new Set<string>();
+  @state() private _opened = false;

-      for (const id of entityIds) {
-        const stateObj = hass.states[id];
+  @query("ha-combo-box", true) private _comboBox!: HaComboBox;
+
+  protected shouldUpdate(changedProps: PropertyValues) {
+    return !(!changedProps.has("_opened") && this._opened);
+  }
+
+  protected updated(changedProps: PropertyValues) {
+    if (
+      (changedProps.has("_opened") && this._opened) ||
+      changedProps.has("entityId") ||
+      changedProps.has("attribute")
+    ) {
+      const entityIds = this.entityId ? ensureArray(this.entityId) : [];
+      const entitiesOptions = entityIds.map<AttributeOption[]>((entityId) => {
+        const stateObj = this.hass.states[entityId];
        if (!stateObj) {
-          continue;
+          return [];
        }

        const attributes = Object.keys(stateObj.attributes).filter(
-          (a) => !hideAttributes?.includes(a)
+          (a) => !this.hideAttributes?.includes(a)
        );

-        for (const attribute of attributes) {
-          if (!optionsSet.has(attribute)) {
-            optionsSet.add(attribute);
-            options.push({
-              id: attribute,
-              primary: hass.formatEntityAttributeName(stateObj, attribute),
-              sorting_label: attribute,
-            });
+        return attributes.map((a) => ({
+          value: a,
+          label: this.hass.formatEntityAttributeName(stateObj, a),
+        }));
+      });
+
+      const options: AttributeOption[] = [];
+      const optionsSet = new Set<string>();
+      for (const entityOptions of entitiesOptions) {
+        for (const option of entityOptions) {
+          if (!optionsSet.has(option.value)) {
+            optionsSet.add(option.value);
+            options.push(option);
          }
        }
      }

-      return options;
+      (this._comboBox as any).filteredItems = options;
    }
-  );
-
-  private _getItems = () =>
-    this._getItemsMemoized(this.entityId, this.hideAttributes, this.hass);
+  }

  protected render() {
    if (!this.hass) {
@@ -82,9 +94,10 @@ class HaEntityAttributePicker extends LitElement {
    }

    return html`
-      <ha-generic-picker
+      <ha-combo-box
        .hass=${this.hass}
        .value=${this.value}
+        .autofocus=${this.autofocus}
        .label=${this.label ??
        this.hass.localize(
          "ui.components.entity.entity-attribute-picker.attribute"
@@ -93,22 +106,39 @@ class HaEntityAttributePicker extends LitElement {
        .required=${this.required}
        .helper=${this.helper}
        .allowCustomValue=${this.allowCustomValue}
-        .getItems=${this._getItems}
+        item-id-path="value"
+        item-value-path="value"
+        item-label-path="label"
+        @opened-changed=${this._openedChanged}
        @value-changed=${this._valueChanged}
      >
-      </ha-generic-picker>
+      </ha-combo-box>
    `;
  }

+  private get _value() {
+    return this.value || "";
+  }
+
+  private _openedChanged(ev: ValueChangedEvent<boolean>) {
+    this._opened = ev.detail.value;
+  }
+
  private _valueChanged(ev: ValueChangedEvent<string>) {
    ev.stopPropagation();
    const newValue = ev.detail.value;
-    if (newValue !== this.value) {
-      this.value = newValue;
-      fireEvent(this, "value-changed", { value: newValue });
-      fireEvent(this, "change");
+    if (newValue !== this._value) {
+      this._setValue(newValue);
    }
  }
+
+  private _setValue(value: string) {
+    this.value = value;
+    setTimeout(() => {
+      fireEvent(this, "value-changed", { value });
+      fireEvent(this, "change");
+    }, 0);
+  }
 }

 declare global {
--- a/src/components/entity/ha-entity-name-picker.ts
+++ b/src/components/entity/ha-entity-name-picker.ts
@@ -1,11 +1,15 @@
+import "@material/mwc-menu/mwc-menu-surface";
 import { mdiDragHorizontalVariant, mdiPlus } from "@mdi/js";
-import type { RenderItemFunction } from "@lit-labs/virtualizer/virtualize";
+import type { ComboBoxLitRenderer } from "@vaadin/combo-box/lit";
+import type { IFuseOptions } from "fuse.js";
+import Fuse from "fuse.js";
 import { css, html, LitElement, nothing } from "lit";
-import { customElement, property, query } from "lit/decorators";
+import { customElement, property, query, state } from "lit/decorators";
 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 type { EntityNameItem } from "../../common/entity/compute_entity_name_display";
 import { getEntityContext } from "../../common/entity/context/get_entity_context";
 import type { EntityNameType } from "../../common/translations/entity-state";
@@ -14,18 +18,20 @@ import type { HomeAssistant, ValueChangedEvent } from "../../types";
 import "../chips/ha-assist-chip";
 import "../chips/ha-chip-set";
 import "../chips/ha-input-chip";
-import "../ha-combo-box-item";
-import "../ha-generic-picker";
-import type { HaGenericPicker } from "../ha-generic-picker";
+import "../ha-combo-box";
+import type { HaComboBox } from "../ha-combo-box";
 import "../ha-input-helper-text";
-import {
-  NO_ITEMS_AVAILABLE_ID,
-  type PickerComboBoxItem,
-} from "../ha-picker-combo-box";
 import "../ha-sortable";

-const rowRenderer: RenderItemFunction<PickerComboBoxItem> = (item) => html`
-  <ha-combo-box-item type="button" compact>
+interface EntityNameOption {
+  primary: string;
+  secondary?: string;
+  field_label: string;
+  value: string;
+}
+
+const rowRenderer: ComboBoxLitRenderer<EntityNameOption> = (item) => html`
+  <ha-combo-box-item type="button">
    <span slot="headline">${item.primary}</span>
    ${item.secondary
      ? html`<span slot="supporting-text">${item.secondary}</span>`
@@ -73,7 +79,11 @@ export class HaEntityNamePicker extends LitElement {

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

-  @query("ha-generic-picker", true) private _picker?: HaGenericPicker;
+  @query(".container", true) private _container?: HTMLDivElement;
+
+  @query("ha-combo-box", true) private _comboBox!: HaComboBox;
+
+  @state() private _opened = false;

  private _editIndex?: number;

@@ -105,7 +115,7 @@ export class HaEntityNamePicker extends LitElement {
    return options;
  });

-  private _getItems = memoizeOne((entityId?: string) => {
+  private _getOptions = memoizeOne((entityId?: string) => {
    if (!entityId) {
      return [];
    }
@@ -114,7 +124,7 @@ export class HaEntityNamePicker extends LitElement {

    const items = (
      ["entity", "device", "area", "floor"] as const
-    ).map<PickerComboBoxItem>((name) => {
+    ).map<EntityNameOption>((name) => {
      const stateObj = this.hass.states[entityId];
      const isValid = types.has(name);
      const primary = this.hass.localize(
@@ -127,39 +137,25 @@ export class HaEntityNamePicker extends LitElement {
              `ui.components.entity.entity-name-picker.types.${name}_missing` as LocalizeKeys
            )) || "-";

-      const id = formatOptionValue({ type: name });
-
      return {
-        id,
        primary,
        secondary,
-        search_labels: {
-          primary,
-          secondary: secondary || null,
-          id,
-        },
-        sorting_label: primary,
+        field_label: primary,
+        value: formatOptionValue({ type: name }),
      };
    });

    return items;
  });

-  private _customNameOption = memoizeOne(
-    (text: string): PickerComboBoxItem => ({
-      id: formatOptionValue({ type: "text", text }),
-      primary: this.hass.localize(
-        "ui.components.entity.entity-name-picker.custom_name"
-      ),
-      secondary: `"${text}"`,
-      search_labels: {
-        primary: text,
-        secondary: `"${text}"`,
-        id: formatOptionValue({ type: "text", text }),
-      },
-      sorting_label: text,
-    })
-  );
+  private _customNameOption = memoizeOne((text: string) => ({
+    primary: this.hass.localize(
+      "ui.components.entity.entity-name-picker.custom_name"
+    ),
+    secondary: `"${text}"`,
+    field_label: text,
+    value: formatOptionValue({ type: "text", text }),
+  }));

  private _formatItem = (item: EntityNameItem) => {
    if (item.type === "text") {
@@ -175,80 +171,88 @@ export class HaEntityNamePicker extends LitElement {

  protected render() {
    const value = this._items;
+    const options = this._getOptions(this.entityId);
    const validTypes = this._validTypes(this.entityId);

    return html`
      ${this.label ? html`<label>${this.label}</label>` : nothing}
-      <ha-generic-picker
-        .hass=${this.hass}
-        .disabled=${this.disabled}
-        .required=${this.required && !value.length}
-        .getItems=${this._getFilteredItems}
-        .getAdditionalItems=${this._getAdditionalItems}
-        .rowRenderer=${rowRenderer}
-        .searchFn=${this._searchFn}
-        .notFoundLabel=${this.hass.localize(
-          "ui.components.entity.entity-name-picker.no_match"
-        )}
-        .value=${this._getPickerValue()}
-        allow-custom-value
-        .customValueLabel=${this.hass.localize(
-          "ui.components.entity.entity-name-picker.custom_name"
-        )}
-        @value-changed=${this._pickerValueChanged}
-      >
-        <div slot="field" class="container">
-          <ha-sortable
-            no-style
-            @item-moved=${this._moveItem}
+      <div class="container">
+        <ha-sortable
+          no-style
+          @item-moved=${this._moveItem}
+          .disabled=${this.disabled}
+          handle-selector="button.primary.action"
+          filter=".add"
+        >
+          <ha-chip-set>
+            ${repeat(
+              this._items,
+              (item) => item,
+              (item: EntityNameItem, idx) => {
+                const label = this._formatItem(item);
+                const isValid = validTypes.has(item.type);
+                return html`
+                  <ha-input-chip
+                    data-idx=${idx}
+                    @remove=${this._removeItem}
+                    @click=${this._editItem}
+                    .label=${label}
+                    .selected=${!this.disabled}
+                    .disabled=${this.disabled}
+                    class=${!isValid ? "invalid" : ""}
+                  >
+                    <ha-svg-icon
+                      slot="icon"
+                      .path=${mdiDragHorizontalVariant}
+                    ></ha-svg-icon>
+                    <span>${label}</span>
+                  </ha-input-chip>
+                `;
+              }
+            )}
+            ${this.disabled
+              ? nothing
+              : html`
+                  <ha-assist-chip
+                    @click=${this._addItem}
+                    .disabled=${this.disabled}
+                    label=${this.hass.localize(
+                      "ui.components.entity.entity-name-picker.add"
+                    )}
+                    class="add"
+                  >
+                    <ha-svg-icon slot="icon" .path=${mdiPlus}></ha-svg-icon>
+                  </ha-assist-chip>
+                `}
+          </ha-chip-set>
+        </ha-sortable>
+
+        <mwc-menu-surface
+          .open=${this._opened}
+          @closed=${this._onClosed}
+          @opened=${this._onOpened}
+          @input=${stopPropagation}
+          .anchor=${this._container}
+        >
+          <ha-combo-box
+            .hass=${this.hass}
+            .value=${""}
+            .autofocus=${this.autofocus}
            .disabled=${this.disabled}
-            handle-selector="button.primary.action"
-            filter=".add"
+            .required=${this.required && !value.length}
+            .items=${options}
+            allow-custom-value
+            item-id-path="value"
+            item-value-path="value"
+            item-label-path="field_label"
+            .renderer=${rowRenderer}
+            @opened-changed=${this._openedChanged}
+            @value-changed=${this._comboBoxValueChanged}
+            @filter-changed=${this._filterChanged}
          >
-            <ha-chip-set>
-              ${repeat(
-                this._items,
-                (item) => item,
-                (item: EntityNameItem, idx) => {
-                  const label = this._formatItem(item);
-                  const isValid = validTypes.has(item.type);
-                  return html`
-                    <ha-input-chip
-                      data-idx=${idx}
-                      @remove=${this._removeItem}
-                      @click=${this._editItem}
-                      .label=${label}
-                      .selected=${!this.disabled}
-                      .disabled=${this.disabled}
-                      class=${!isValid ? "invalid" : ""}
-                    >
-                      <ha-svg-icon
-                        slot="icon"
-                        .path=${mdiDragHorizontalVariant}
-                      ></ha-svg-icon>
-                      <span>${label}</span>
-                    </ha-input-chip>
-                  `;
-                }
-              )}
-              ${this.disabled
-                ? nothing
-                : html`
-                    <ha-assist-chip
-                      @click=${this._addItem}
-                      .disabled=${this.disabled}
-                      label=${this.hass.localize(
-                        "ui.components.entity.entity-name-picker.add"
-                      )}
-                      class="add"
-                    >
-                      <ha-svg-icon slot="icon" .path=${mdiPlus}></ha-svg-icon>
-                    </ha-assist-chip>
-                  `}
-            </ha-chip-set>
-          </ha-sortable>
-        </div>
-      </ha-generic-picker>
+          </ha-combo-box>
+        </mwc-menu-surface>
+      </div>
      ${this._renderHelper()}
    `;
  }
@@ -263,22 +267,32 @@ export class HaEntityNamePicker extends LitElement {
      : nothing;
  }

-  private async _addItem(ev: Event) {
+  private _onClosed(ev) {
    ev.stopPropagation();
+    this._opened = false;
    this._editIndex = undefined;
-    await this.updateComplete;
-    await this._picker?.open();
  }

-  private async _editItem(ev: Event) {
+  private async _onOpened(ev) {
+    if (!this._opened) {
+      return;
+    }
    ev.stopPropagation();
-    const idx = parseInt(
-      (ev.currentTarget as HTMLElement).dataset.idx || "",
-      10
-    );
+    this._opened = true;
+    await this._comboBox?.focus();
+    await this._comboBox?.open();
+  }
+
+  private async _addItem(ev) {
+    ev.stopPropagation();
+    this._opened = true;
+  }
+
+  private async _editItem(ev) {
+    ev.stopPropagation();
+    const idx = parseInt(ev.currentTarget.dataset.idx, 10);
    this._editIndex = idx;
-    await this.updateComplete;
-    await this._picker?.open();
+    this._opened = true;
  }

  private get _items(): EntityNameItem[] {
@@ -308,80 +322,78 @@ export class HaEntityNamePicker extends LitElement {
    }
  );

-  private _getPickerValue(): string | undefined {
-    if (this._editIndex != null) {
-      const item = this._items[this._editIndex];
-      return item ? formatOptionValue(item) : undefined;
+  private _openedChanged(ev: ValueChangedEvent<boolean>) {
+    const open = ev.detail.value;
+    if (open) {
+      const options = this._comboBox.items || [];
+
+      const initialItem =
+        this._editIndex != null ? this._items[this._editIndex] : undefined;
+
+      const initialValue = initialItem ? formatOptionValue(initialItem) : "";
+
+      const filteredItems = this._filterSelectedOptions(options, initialValue);
+
+      if (initialItem?.type === "text" && initialItem.text) {
+        filteredItems.push(this._customNameOption(initialItem.text));
+      }
+
+      this._comboBox.filteredItems = filteredItems;
+      this._comboBox.setInputValue(initialValue);
+    } else {
+      this._opened = false;
+      this._comboBox.setInputValue("");
    }
-    return undefined;
  }

-  private _getFilteredItems = (
-    searchString?: string,
-    _section?: string
-  ): PickerComboBoxItem[] => {
-    const items = this._getItems(this.entityId);
-    const currentItem =
-      this._editIndex != null ? this._items[this._editIndex] : undefined;
-    const currentValue = currentItem ? formatOptionValue(currentItem) : "";
+  private _filterSelectedOptions = (
+    options: EntityNameOption[],
+    current?: string
+  ) => {
+    const items = this._items;

    const excludedValues = new Set(
-      this._items
+      items
        .filter((item) => UNIQUE_TYPES.has(item.type))
        .map((item) => formatOptionValue(item))
    );

-    const filteredItems = items.filter(
-      (item) => !excludedValues.has(item.id) || item.id === currentValue
+    const filteredOptions = options.filter(
+      (option) => !excludedValues.has(option.value) || option.value === current
    );
-
-    // When editing an existing text item, include it in the base items
-    if (currentItem?.type === "text" && currentItem.text && !searchString) {
-      filteredItems.push(this._customNameOption(currentItem.text));
-    }
-
-    return filteredItems;
+    return filteredOptions;
  };

-  private _getAdditionalItems = (
-    searchString?: string
-  ): PickerComboBoxItem[] => {
-    if (!searchString) {
-      return [];
-    }
+  private _filterChanged(ev: ValueChangedEvent<string>) {
+    const input = ev.detail.value;
+    const filter = input?.toLowerCase() || "";
+    const options = this._comboBox.items || [];

    const currentItem =
      this._editIndex != null ? this._items[this._editIndex] : undefined;

-    // Don't add if it's the same as the current item being edited
-    if (
-      currentItem?.type === "text" &&
-      currentItem.text &&
-      currentItem.text === searchString
-    ) {
-      return [];
+    const currentValue = currentItem ? formatOptionValue(currentItem) : "";
+
+    let filteredItems = this._filterSelectedOptions(options, currentValue);
+
+    if (!filter) {
+      this._comboBox.filteredItems = filteredItems;
+      return;
    }

-    // Always return custom name option when there's a search string
-    // This prevents "No matching items found" from showing
-    return [this._customNameOption(searchString)];
-  };
+    const fuseOptions: IFuseOptions<EntityNameOption> = {
+      keys: ["primary", "secondary", "value"],
+      isCaseSensitive: false,
+      minMatchCharLength: Math.min(filter.length, 2),
+      threshold: 0.2,
+      ignoreDiacritics: true,
+    };

-  private _searchFn = (
-    search: string,
-    filteredItems: PickerComboBoxItem[],
-    _allItems: PickerComboBoxItem[]
-  ): PickerComboBoxItem[] => {
-    // Remove NO_ITEMS_AVAILABLE_ID if we have additional items (custom name option)
-    // This prevents "No matching items found" from showing when custom values are allowed
-    const hasAdditionalItems = this._getAdditionalItems(search).length > 0;
-    if (hasAdditionalItems) {
-      return filteredItems.filter(
-        (item) => typeof item !== "string" || item !== NO_ITEMS_AVAILABLE_ID
-      );
-    }
-    return filteredItems;
-  };
+    const fuse = new Fuse(filteredItems, fuseOptions);
+    filteredItems = fuse.search(filter).map((result) => result.item);
+    filteredItems.push(this._customNameOption(input));
+    this._comboBox.filteredItems = filteredItems;
+  }

  private async _moveItem(ev: CustomEvent) {
    ev.stopPropagation();
@@ -391,21 +403,25 @@ export class HaEntityNamePicker extends LitElement {
    const element = newValue.splice(oldIndex, 1)[0];
    newValue.splice(newIndex, 0, element);
    this._setValue(newValue);
+    await this.updateComplete;
+    this._filterChanged({ detail: { value: "" } } as ValueChangedEvent<string>);
  }

-  private async _removeItem(ev: Event) {
+  private async _removeItem(ev) {
    ev.stopPropagation();
    const value = [...this._items];
-    const idx = parseInt((ev.target as HTMLElement).dataset.idx || "", 10);
+    const idx = parseInt(ev.target.dataset.idx, 10);
    value.splice(idx, 1);
    this._setValue(value);
+    await this.updateComplete;
+    this._filterChanged({ detail: { value: "" } } as ValueChangedEvent<string>);
  }

-  private _pickerValueChanged(ev: ValueChangedEvent<string>): void {
+  private _comboBoxValueChanged(ev: ValueChangedEvent<string>): void {
    ev.stopPropagation();
    const value = ev.detail.value;

-    if (this.disabled || !value) {
+    if (this.disabled || value === "") {
      return;
    }

@@ -415,16 +431,11 @@ export class HaEntityNamePicker extends LitElement {

    if (this._editIndex != null) {
      newValue[this._editIndex] = item;
-      this._editIndex = undefined;
    } else {
      newValue.push(item);
    }

    this._setValue(newValue);
-
-    if (this._picker) {
-      this._picker.value = undefined;
-    }
  }

  private _setValue(value: EntityNameItem[]) {
@@ -486,6 +497,10 @@ export class HaEntityNamePicker extends LitElement {
      order: 1;
    }

+    mwc-menu-surface {
+      --mdc-menu-min-width: 100%;
+    }
+
    ha-chip-set {
      padding: var(--ha-space-2) var(--ha-space-2);
    }
--- a/src/components/entity/ha-entity-picker.ts
+++ b/src/components/entity/ha-entity-picker.ts
@@ -1,5 +1,5 @@
-import type { RenderItemFunction } from "@lit-labs/virtualizer/virtualize";
 import { mdiPlus, mdiShape } from "@mdi/js";
+import type { ComboBoxLitRenderer } from "@vaadin/combo-box/lit";
 import { html, LitElement, nothing, type PropertyValues } from "lit";
 import { customElement, property, query } from "lit/decorators";
 import memoizeOne from "memoize-one";
@@ -172,9 +172,9 @@ export class HaEntityPicker extends LitElement {
    return this.showEntityId || this.hass.userData?.showEntityIdPicker;
  }

-  private _rowRenderer: RenderItemFunction<EntityComboBoxItem> = (
+  private _rowRenderer: ComboBoxLitRenderer<EntityComboBoxItem> = (
    item,
-    index
+    { index }
  ) => {
    const showEntityId = this._showEntityId;

@@ -277,13 +277,12 @@ export class HaEntityPicker extends LitElement {
        .disabled=${this.disabled}
        .autofocus=${this.autofocus}
        .allowCustomValue=${this.allowCustomEntity}
-        .required=${this.required}
        .label=${this.label}
-        .placeholder=${placeholder}
        .helper=${this.helper}
-        .value=${this.addButton ? undefined : this.value}
        .searchLabel=${this.searchLabel}
        .notFoundLabel=${this._notFoundLabel}
+        .placeholder=${placeholder}
+        .value=${this.addButton ? undefined : this.value}
        .rowRenderer=${this._rowRenderer}
        .getItems=${this._getItems}
        .getAdditionalItems=${this._getAdditionalItems}
@@ -291,7 +290,6 @@ export class HaEntityPicker extends LitElement {
        .searchFn=${this._searchFn}
        .valueRenderer=${this._valueRenderer}
        .searchKeys=${entityComboBoxKeys}
-        use-top-label
        .addButtonLabel=${this.addButton
          ? this.hass.localize("ui.components.entity.entity-picker.add")
          : undefined}
--- a/src/components/entity/ha-entity-state-content-picker.ts
+++ b/src/components/entity/ha-entity-state-content-picker.ts
@@ -1,11 +1,16 @@
+import "@material/mwc-menu/mwc-menu-surface";
 import { mdiDragHorizontalVariant, mdiPlus } from "@mdi/js";
+import type { ComboBoxLitRenderer } from "@vaadin/combo-box/lit";
+import type { IFuseOptions } from "fuse.js";
+import Fuse from "fuse.js";
 import type { HassEntity } from "home-assistant-js-websocket";
 import { css, html, LitElement, nothing } from "lit";
-import { customElement, property, query } from "lit/decorators";
+import { customElement, property, query, state } from "lit/decorators";
 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 { computeDomain } from "../../common/entity/compute_domain";
 import {
  STATE_DISPLAY_SPECIAL_CONTENT,
@@ -15,13 +20,21 @@ import type { HomeAssistant, ValueChangedEvent } from "../../types";
 import "../chips/ha-assist-chip";
 import "../chips/ha-chip-set";
 import "../chips/ha-input-chip";
-import "../ha-combo-box-item";
-import "../ha-generic-picker";
-import type { HaGenericPicker } from "../ha-generic-picker";
-import "../ha-input-helper-text";
-import type { PickerComboBoxItem } from "../ha-picker-combo-box";
+import "../ha-combo-box";
+import type { HaComboBox } from "../ha-combo-box";
 import "../ha-sortable";

+interface StateContentOption {
+  primary: string;
+  value: string;
+}
+
+const rowRenderer: ComboBoxLitRenderer<StateContentOption> = (item) => html`
+  <ha-combo-box-item type="button">
+    <span slot="headline">${item.primary}</span>
+  </ha-combo-box-item>
+`;
+
 const HIDDEN_ATTRIBUTES = [
  "access_token",
  "available_modes",
@@ -98,88 +111,63 @@ export class HaStateContentPicker extends LitElement {

  @property() public helper?: string;

-  @query("ha-generic-picker", true) private _picker?: HaGenericPicker;
+  @query(".container", true) private _container?: HTMLDivElement;
+
+  @query("ha-combo-box", true) private _comboBox!: HaComboBox;
+
+  @state() private _opened = false;

  private _editIndex?: number;

-  private _getItems = memoizeOne(
+  private _options = memoizeOne(
    (entityId?: string, stateObj?: HassEntity, allowName?: boolean) => {
      const domain = entityId ? computeDomain(entityId) : undefined;
-      const items: PickerComboBoxItem[] = [
+      return [
        {
-          id: "state",
          primary: this.hass.localize(
            "ui.components.state-content-picker.state"
          ),
-          sorting_label: this.hass.localize(
-            "ui.components.state-content-picker.state"
-          ),
+          value: "state",
        },
        ...(allowName
          ? [
              {
-                id: "name",
                primary: this.hass.localize(
                  "ui.components.state-content-picker.name"
                ),
-                sorting_label: this.hass.localize(
-                  "ui.components.state-content-picker.name"
-                ),
-              } satisfies PickerComboBoxItem,
+                value: "name",
+              },
            ]
          : []),
        {
-          id: "last_changed",
          primary: this.hass.localize(
            "ui.components.state-content-picker.last_changed"
          ),
-          sorting_label: this.hass.localize(
-            "ui.components.state-content-picker.last_changed"
-          ),
+          value: "last_changed",
        },
        {
-          id: "last_updated",
          primary: this.hass.localize(
            "ui.components.state-content-picker.last_updated"
          ),
-          sorting_label: this.hass.localize(
-            "ui.components.state-content-picker.last_updated"
-          ),
+          value: "last_updated",
        },
        ...(domain
          ? STATE_DISPLAY_SPECIAL_CONTENT.filter((content) =>
              STATE_DISPLAY_SPECIAL_CONTENT_DOMAINS[domain]?.includes(content)
-            ).map(
-              (content) =>
-                ({
-                  id: content,
-                  primary: this.hass.localize(
-                    `ui.components.state-content-picker.${content}`
-                  ),
-                  sorting_label: this.hass.localize(
-                    `ui.components.state-content-picker.${content}`
-                  ),
-                }) satisfies PickerComboBoxItem
-            )
+            ).map((content) => ({
+              primary: this.hass.localize(
+                `ui.components.state-content-picker.${content}`
+              ),
+              value: content,
+            }))
          : []),
        ...Object.keys(stateObj?.attributes ?? {})
          .filter((a) => !HIDDEN_ATTRIBUTES.includes(a))
-          .map(
-            (attribute) =>
-              ({
-                id: attribute,
-                primary: this.hass.formatEntityAttributeName(
-                  stateObj!,
-                  attribute
-                ),
-                sorting_label: this.hass.formatEntityAttributeName(
-                  stateObj!,
-                  attribute
-                ),
-              }) satisfies PickerComboBoxItem
-          ),
-      ];
-      return items;
+          .map((attribute) => ({
+            primary: this.hass.formatEntityAttributeName(stateObj!, attribute),
+            value: attribute,
+          })),
+      ] satisfies StateContentOption[];
    }
  );

@@ -190,123 +178,122 @@ export class HaStateContentPicker extends LitElement {
      ? this.hass.states[this.entityId]
      : undefined;

+    const options = this._options(this.entityId, stateObj, this.allowName);
+
    return html`
      ${this.label ? html`<label>${this.label}</label>` : nothing}
-      <ha-generic-picker
-        .hass=${this.hass}
-        .disabled=${this.disabled}
-        .required=${this.required && !value.length}
-        .value=${this._getPickerValue()}
-        .getItems=${this._getFilteredItems}
-        .getAdditionalItems=${this._getAdditionalItems}
-        .notFoundLabel=${this.hass.localize("ui.components.combo-box.no_match")}
-        allow-custom-value
-        .customValueLabel=${this.hass.localize(
-          "ui.components.entity.entity-state-content-picker.custom_state"
-        )}
-        @value-changed=${this._pickerValueChanged}
-      >
-        <div slot="field" class="container">
-          <ha-sortable
-            no-style
-            @item-moved=${this._moveItem}
-            .disabled=${this.disabled}
-            handle-selector="button.primary.action"
-            filter=".add"
+      <div class="container ${this.disabled ? "disabled" : ""}">
+        <ha-sortable
+          no-style
+          @item-moved=${this._moveItem}
+          .disabled=${this.disabled}
+          handle-selector="button.primary.action"
+          filter=".add"
+        >
+          <ha-chip-set>
+            ${repeat(
+              this._value,
+              (item) => item,
+              (item: string, idx) => {
+                const label = options.find((o) => o.value === item)?.primary;
+                const isValid = !!label;
+                return html`
+                  <ha-input-chip
+                    data-idx=${idx}
+                    @remove=${this._removeItem}
+                    @click=${this._editItem}
+                    .label=${label || item}
+                    .selected=${!this.disabled}
+                    .disabled=${this.disabled}
+                    class=${!isValid ? "invalid" : ""}
+                  >
+                    <ha-svg-icon
+                      slot="icon"
+                      .path=${mdiDragHorizontalVariant}
+                    ></ha-svg-icon>
+                  </ha-input-chip>
+                `;
+              }
+            )}
+            ${this.disabled
+              ? nothing
+              : html`
+                  <ha-assist-chip
+                    @click=${this._addItem}
+                    .disabled=${this.disabled}
+                    label=${this.hass.localize(
+                      "ui.components.entity.entity-state-content-picker.add"
+                    )}
+                    class="add"
+                  >
+                    <ha-svg-icon slot="icon" .path=${mdiPlus}></ha-svg-icon>
+                  </ha-assist-chip>
+                `}
+          </ha-chip-set>
+        </ha-sortable>
+
+        <mwc-menu-surface
+          .open=${this._opened}
+          @closed=${this._onClosed}
+          @opened=${this._onOpened}
+          @input=${stopPropagation}
+          .anchor=${this._container}
+        >
+          <ha-combo-box
+            .hass=${this.hass}
+            .value=${""}
+            .autofocus=${this.autofocus}
+            .disabled=${this.disabled || !this.entityId}
+            .required=${this.required && !value.length}
+            .helper=${this.helper}
+            .items=${options}
+            allow-custom-value
+            item-id-path="value"
+            item-value-path="value"
+            item-label-path="primary"
+            .renderer=${rowRenderer}
+            @opened-changed=${this._openedChanged}
+            @value-changed=${this._comboBoxValueChanged}
+            @filter-changed=${this._filterChanged}
          >
-            <ha-chip-set>
-              ${repeat(
-                this._value,
-                (item) => item,
-                (item: string, idx) => {
-                  const label = this._getItemLabel(item, stateObj);
-                  const isValid = !!label;
-                  return html`
-                    <ha-input-chip
-                      data-idx=${idx}
-                      @remove=${this._removeItem}
-                      @click=${this._editItem}
-                      .label=${label || item}
-                      .selected=${!this.disabled}
-                      .disabled=${this.disabled}
-                      class=${!isValid ? "invalid" : ""}
-                    >
-                      <ha-svg-icon
-                        slot="icon"
-                        .path=${mdiDragHorizontalVariant}
-                      ></ha-svg-icon>
-                    </ha-input-chip>
-                  `;
-                }
-              )}
-              ${this.disabled
-                ? nothing
-                : html`
-                    <ha-assist-chip
-                      @click=${this._addItem}
-                      .disabled=${this.disabled}
-                      label=${this.hass.localize(
-                        "ui.components.entity.entity-state-content-picker.add"
-                      )}
-                      class="add"
-                    >
-                      <ha-svg-icon slot="icon" .path=${mdiPlus}></ha-svg-icon>
-                    </ha-assist-chip>
-                  `}
-            </ha-chip-set>
-          </ha-sortable>
-        </div>
-      </ha-generic-picker>
-      ${this._renderHelper()}
+          </ha-combo-box>
+        </mwc-menu-surface>
+      </div>
    `;
  }

-  private _renderHelper() {
-    return this.helper
-      ? html`
-          <ha-input-helper-text .disabled=${this.disabled}>
-            ${this.helper}
-          </ha-input-helper-text>
-        `
-      : nothing;
-  }
-
-  private async _addItem(ev: Event) {
+  private _onClosed(ev) {
    ev.stopPropagation();
+    this._opened = false;
    this._editIndex = undefined;
-    await this.updateComplete;
-    await this._picker?.open();
  }

-  private async _editItem(ev: Event) {
+  private async _onOpened(ev) {
+    if (!this._opened) {
+      return;
+    }
    ev.stopPropagation();
-    const idx = parseInt(
-      (ev.currentTarget as HTMLElement).dataset.idx || "",
-      10
-    );
+    this._opened = true;
+    await this._comboBox?.focus();
+    await this._comboBox?.open();
+  }
+
+  private async _addItem(ev) {
+    ev.stopPropagation();
+    this._opened = true;
+  }
+
+  private async _editItem(ev) {
+    ev.stopPropagation();
+    const idx = parseInt(ev.currentTarget.dataset.idx, 10);
    this._editIndex = idx;
-    await this.updateComplete;
-    await this._picker?.open();
+    this._opened = true;
  }

  private get _value() {
    return !this.value ? [] : ensureArray(this.value);
  }

-  private _getItemLabel = memoizeOne(
-    (value: string, stateObj?: HassEntity): string | undefined => {
-      const stateObjForItems = this.entityId
-        ? this.hass.states[this.entityId]
-        : stateObj;
-      const items = this._getItems(
-        this.entityId,
-        stateObjForItems,
-        this.allowName
-      );
-      return items.find((item) => item.id === value)?.primary;
-    }
-  );
-
  private _toValue = memoizeOne((value: string[]): typeof this.value => {
    if (value.length === 0) {
      return undefined;
@@ -317,87 +304,63 @@ export class HaStateContentPicker extends LitElement {
    return value;
  });

-  private _getPickerValue(): string | undefined {
-    if (this._editIndex != null) {
-      return this._value[this._editIndex];
+  private _openedChanged(ev: ValueChangedEvent<boolean>) {
+    const open = ev.detail.value;
+    if (open) {
+      const options = this._comboBox.items || [];
+
+      const initialValue =
+        this._editIndex != null ? this._value[this._editIndex] : "";
+      const filteredItems = this._filterSelectedOptions(options, initialValue);
+
+      this._comboBox.filteredItems = filteredItems;
+      this._comboBox.setInputValue(initialValue);
+    } else {
+      this._opened = false;
    }
-    return undefined;
  }

-  private _customValueOption = memoizeOne(
-    (text: string): PickerComboBoxItem => ({
-      id: text,
-      primary: this.hass.localize(
-        "ui.components.entity.entity-state-content-picker.custom_state"
-      ),
-      secondary: `"${text}"`,
-      search_labels: {
-        primary: text,
-        secondary: `"${text}"`,
-        id: text,
-      },
-      sorting_label: text,
-    })
-  );
-
-  private _getFilteredItems = (
-    searchString?: string,
-    _section?: string
-  ): PickerComboBoxItem[] => {
-    const stateObj = this.entityId
-      ? this.hass.states[this.entityId]
-      : undefined;
-    const items = this._getItems(this.entityId, stateObj, this.allowName);
-    const currentValue =
-      this._editIndex != null ? this._value[this._editIndex] : undefined;
-
+  private _filterSelectedOptions = (
+    options: StateContentOption[],
+    current?: string
+  ) => {
    const value = this._value;

-    const filteredItems = items.filter(
-      (item) => !value.includes(item.id) || item.id === currentValue
+    return options.filter(
+      (option) => !value.includes(option.value) || option.value === current
    );
-
-    // When editing an existing custom value, include it in the base items
-    if (
-      currentValue &&
-      !items.find((item) => item.id === currentValue) &&
-      !searchString
-    ) {
-      filteredItems.push(this._customValueOption(currentValue));
-    }
-
-    return filteredItems;
  };

-  private _getAdditionalItems = (
-    searchString?: string
-  ): PickerComboBoxItem[] => {
-    if (!searchString) {
-      return [];
-    }
+  private _filterChanged(ev: ValueChangedEvent<string>) {
+    const input = ev.detail.value;
+    const filter = input?.toLowerCase() || "";
+    const options = this._comboBox.items || [];

    const currentValue =
-      this._editIndex != null ? this._value[this._editIndex] : undefined;
+      this._editIndex != null ? this._value[this._editIndex] : "";

-    // Don't add if it's the same as the current item being edited
-    if (currentValue && currentValue === searchString) {
-      return [];
+    this._comboBox.filteredItems = this._filterSelectedOptions(
+      options,
+      currentValue
+    );
+
+    if (!filter) {
+      return;
    }

-    // Check if the search string matches an existing item
-    const stateObj = this.entityId
-      ? this.hass.states[this.entityId]
-      : undefined;
-    const items = this._getItems(this.entityId, stateObj, this.allowName);
-    const existingItem = items.find((item) => item.id === searchString);
+    const fuseOptions: IFuseOptions<StateContentOption> = {
+      keys: ["primary", "secondary", "value"],
+      isCaseSensitive: false,
+      minMatchCharLength: Math.min(filter.length, 2),
+      threshold: 0.2,
+      ignoreDiacritics: true,
+    };

-    // Only return custom value option if it doesn't match an existing item
-    if (!existingItem) {
-      return [this._customValueOption(searchString)];
-    }
+    const fuse = new Fuse(this._comboBox.filteredItems, fuseOptions);
+    const filteredItems = fuse.search(filter).map((result) => result.item);

-    return [];
-  };
+    this._comboBox.filteredItems = filteredItems;
+  }

  private async _moveItem(ev: CustomEvent) {
    ev.stopPropagation();
@@ -407,21 +370,25 @@ export class HaStateContentPicker extends LitElement {
    const element = newValue.splice(oldIndex, 1)[0];
    newValue.splice(newIndex, 0, element);
    this._setValue(newValue);
+    await this.updateComplete;
+    this._filterChanged({ detail: { value: "" } } as ValueChangedEvent<string>);
  }

-  private async _removeItem(ev: Event) {
+  private async _removeItem(ev) {
    ev.stopPropagation();
    const value = [...this._value];
-    const idx = parseInt((ev.target as HTMLElement).dataset.idx || "", 10);
+    const idx = parseInt(ev.target.dataset.idx, 10);
    value.splice(idx, 1);
    this._setValue(value);
+    await this.updateComplete;
+    this._filterChanged({ detail: { value: "" } } as ValueChangedEvent<string>);
  }

-  private _pickerValueChanged(ev: ValueChangedEvent<string>): void {
+  private _comboBoxValueChanged(ev: ValueChangedEvent<string>): void {
    ev.stopPropagation();
    const value = ev.detail.value;

-    if (this.disabled || !value) {
+    if (this.disabled || value === "") {
      return;
    }

@@ -429,16 +396,11 @@ export class HaStateContentPicker extends LitElement {

    if (this._editIndex != null) {
      newValue[this._editIndex] = value;
-      this._editIndex = undefined;
    } else {
      newValue.push(value);
    }

    this._setValue(newValue);
-
-    if (this._picker) {
-      this._picker.value = undefined;
-    }
  }

  private _setValue(value: string[]) {
@@ -480,7 +442,7 @@ export class HaStateContentPicker extends LitElement {
        height 180ms ease-in-out,
        background-color 180ms ease-in-out;
    }
-    :host([disabled]) .container:after {
+    .container.disabled:after {
      background-color: var(
        --mdc-text-field-disabled-line-color,
        rgba(0, 0, 0, 0.42)
@@ -500,6 +462,10 @@ export class HaStateContentPicker extends LitElement {
      order: 1;
    }

+    mwc-menu-surface {
+      --mdc-menu-min-width: 100%;
+    }
+
    ha-chip-set {
      padding: var(--ha-space-2) var(--ha-space-2);
    }
@@ -520,11 +486,6 @@ export class HaStateContentPicker extends LitElement {
    .sortable-drag {
      cursor: grabbing;
    }
-
-    ha-input-helper-text {
-      display: block;
-      margin: var(--ha-space-2) 0 0;
-    }
  `;
 }

--- a/src/components/entity/ha-entity-state-picker.ts
+++ b/src/components/entity/ha-entity-state-picker.ts
@@ -1,22 +1,27 @@
+import type { PropertyValues } from "lit";
 import { LitElement, html, nothing } from "lit";
-import { customElement, property } from "lit/decorators";
-import memoizeOne from "memoize-one";
+import { customElement, property, query, state } from "lit/decorators";
 import { ensureArray } from "../../common/array/ensure-array";
 import { fireEvent } from "../../common/dom/fire_event";
 import { getStates } from "../../common/entity/get_states";
 import type { HomeAssistant, ValueChangedEvent } from "../../types";
-import "../ha-generic-picker";
-import type { PickerComboBoxItem } from "../ha-picker-combo-box";
+import "../ha-combo-box";
+import type { HaComboBox } from "../ha-combo-box";
+
+interface StateOption {
+  value: string;
+  label: string;
+}

@customElement("ha-entity-state-picker")
-export class HaEntityStatePicker extends LitElement {
+class HaEntityStatePicker extends LitElement {
  @property({ attribute: false }) public hass!: HomeAssistant;

  @property({ attribute: false }) public entityId?: string | string[];

  @property() public attribute?: string;

-  @property({ attribute: false }) public extraOptions?: PickerComboBoxItem[];
+  @property({ attribute: false }) public extraOptions?: any[];

  // eslint-disable-next-line lit/no-native-attributes
  @property({ type: Boolean }) public autofocus = false;
@@ -37,76 +42,59 @@ export class HaEntityStatePicker extends LitElement {

  @property() public helper?: string;

-  private _getItems = memoizeOne(
-    (
-      hass: HomeAssistant,
-      entityId: string | string[] | undefined,
-      attribute: string | undefined,
-      hideStates: string[] | undefined,
-      extraOptions: PickerComboBoxItem[] | undefined
-    ): PickerComboBoxItem[] => {
-      const entityIds = entityId ? ensureArray(entityId) : [];
+  @state() private _opened = false;

-      const entitiesOptions = entityIds.map<PickerComboBoxItem[]>(
-        (entityIdItem) => {
-          const stateObj = hass.states[entityIdItem] || {
-            entity_id: entityIdItem,
-            attributes: {},
-          };
+  @query("ha-combo-box", true) private _comboBox!: HaComboBox;

-          const states = getStates(hass, stateObj, attribute).filter(
-            (s) => !hideStates?.includes(s)
-          );
+  protected shouldUpdate(changedProps: PropertyValues) {
+    return !(!changedProps.has("_opened") && this._opened);
+  }

-          return states
-            .map((s) => {
-              const primary = attribute
-                ? hass.formatEntityAttributeValue(stateObj, attribute, s)
-                : hass.formatEntityState(stateObj, s);
-              return {
-                id: s,
-                primary,
-                sorting_label: primary,
-              };
-            })
-            .filter((option) => option.id && option.primary);
-        }
-      );
+  protected updated(changedProps: PropertyValues) {
+    if (
+      (changedProps.has("_opened") && this._opened) ||
+      changedProps.has("entityId") ||
+      changedProps.has("attribute") ||
+      changedProps.has("extraOptions")
+    ) {
+      const entityIds = this.entityId ? ensureArray(this.entityId) : [];

-      const options: PickerComboBoxItem[] = [];
+      const entitiesOptions = entityIds.map<StateOption[]>((entityId) => {
+        const stateObj = this.hass.states[entityId] || {
+          entity_id: entityId,
+          attributes: {},
+        };
+
+        const states = getStates(this.hass, stateObj, this.attribute).filter(
+          (s) => !this.hideStates?.includes(s)
+        );
+
+        return states.map((s) => ({
+          value: s,
+          label: this.attribute
+            ? this.hass.formatEntityAttributeValue(stateObj, this.attribute, s)
+            : this.hass.formatEntityState(stateObj, s),
+        }));
+      });
+
+      const options: StateOption[] = [];
      const optionsSet = new Set<string>();
      for (const entityOptions of entitiesOptions) {
        for (const option of entityOptions) {
-          if (!optionsSet.has(option.id)) {
-            optionsSet.add(option.id);
+          if (!optionsSet.has(option.value)) {
+            optionsSet.add(option.value);
            options.push(option);
          }
        }
      }

-      if (extraOptions) {
-        // Filter out any extraOptions with empty primary or id fields
-        const validExtraOptions = extraOptions.filter(
-          (option) => option.id && option.primary
-        );
-        options.unshift(...validExtraOptions);
+      if (this.extraOptions) {
+        options.unshift(...this.extraOptions);
      }

-      return options;
+      (this._comboBox as any).filteredItems = options;
    }
-  );
-
-  private _getFilteredItems = (
-    _searchString?: string,
-    _section?: string
-  ): PickerComboBoxItem[] =>
-    this._getItems(
-      this.hass,
-      this.entityId,
-      this.attribute,
-      this.hideStates,
-      this.extraOptions
-    );
+  }

  protected render() {
    if (!this.hass) {
@@ -114,39 +102,48 @@ export class HaEntityStatePicker extends LitElement {
    }

    return html`
-      <ha-generic-picker
+      <ha-combo-box
        .hass=${this.hass}
-        .allowCustomValue=${this.allowCustomValue}
-        .disabled=${this.disabled || !this.entityId}
+        .value=${this._value}
        .autofocus=${this.autofocus}
-        .required=${this.required}
        .label=${this.label ??
        this.hass.localize("ui.components.entity.entity-state-picker.state")}
+        .disabled=${this.disabled || !this.entityId}
+        .required=${this.required}
        .helper=${this.helper}
-        .value=${this.value}
-        .getItems=${this._getFilteredItems}
-        .notFoundLabel=${this.hass.localize("ui.components.combo-box.no_match")}
-        .customValueLabel=${this.hass.localize(
-          "ui.components.entity.entity-state-picker.add_custom_state"
-        )}
+        .allowCustomValue=${this.allowCustomValue}
+        item-id-path="value"
+        item-value-path="value"
+        item-label-path="label"
+        @opened-changed=${this._openedChanged}
        @value-changed=${this._valueChanged}
      >
-      </ha-generic-picker>
+      </ha-combo-box>
    `;
  }

+  private get _value() {
+    return this.value || "";
+  }
+
+  private _openedChanged(ev: ValueChangedEvent<boolean>) {
+    this._opened = ev.detail.value;
+  }
+
  private _valueChanged(ev: ValueChangedEvent<string>) {
    ev.stopPropagation();
    const newValue = ev.detail.value;
-    if (newValue !== this.value) {
+    if (newValue !== this._value) {
      this._setValue(newValue);
    }
  }

-  private _setValue(value: string | undefined) {
+  private _setValue(value: string) {
    this.value = value;
-    fireEvent(this, "value-changed", { value });
-    fireEvent(this, "change");
+    setTimeout(() => {
+      fireEvent(this, "value-changed", { value });
+      fireEvent(this, "change");
+    }, 0);
  }
 }

--- a/src/components/entity/ha-statistic-picker.ts
+++ b/src/components/entity/ha-statistic-picker.ts
@@ -1,5 +1,5 @@
-import type { RenderItemFunction } from "@lit-labs/virtualizer/virtualize";
 import { mdiChartLine, mdiHelpCircle, mdiShape } from "@mdi/js";
+import type { ComboBoxLitRenderer } from "@vaadin/combo-box/lit";
 import type { HassEntity } from "home-assistant-js-websocket";
 import { html, LitElement, nothing, type PropertyValues } from "lit";
 import { customElement, property, query } from "lit/decorators";
@@ -424,9 +424,9 @@ export class HaStatisticPicker extends LitElement {
    };
  }

-  private _rowRenderer: RenderItemFunction<StatisticComboBoxItem> = (
+  private _rowRenderer: ComboBoxLitRenderer<StatisticComboBoxItem> = (
    item,
-    index
+    { index }
  ) => {
    const showEntityId = this.hass.userData?.showEntityIdPicker;
    return html`
@@ -471,14 +471,14 @@ export class HaStatisticPicker extends LitElement {
        .hass=${this.hass}
        .autofocus=${this.autofocus}
        .allowCustomValue=${this.allowCustomEntity}
-        .disabled=${this.disabled}
        .label=${this.label}
-        .placeholder=${placeholder}
-        .value=${this.value}
+        .disabled=${this.disabled}
        .notFoundLabel=${this._notFoundLabel}
        .emptyLabel=${this.hass.localize(
          "ui.components.statistic-picker.no_statistics"
        )}
+        .placeholder=${placeholder}
+        .value=${this.value}
        .rowRenderer=${this._rowRenderer}
        .getItems=${this._getItems}
        .getAdditionalItems=${this._getAdditionalItems}
--- a/src/components/ha-addon-picker.ts
+++ b/src/components/ha-addon-picker.ts
@@ -1,29 +1,29 @@
-import type { RenderItemFunction } from "@lit-labs/virtualizer/virtualize";
+import type { ComboBoxLitRenderer } from "@vaadin/combo-box/lit";
 import { html, LitElement, nothing } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import { isComponentLoaded } from "../common/config/is_component_loaded";
 import { fireEvent } from "../common/dom/fire_event";
+import { stringCompare } from "../common/string/compare";
+import type { HassioAddonInfo } from "../data/hassio/addon";
 import { fetchHassioAddonsInfo } from "../data/hassio/addon";
 import type { HomeAssistant, ValueChangedEvent } from "../types";
 import "./ha-alert";
+import "./ha-combo-box";
+import type { HaComboBox } from "./ha-combo-box";
 import "./ha-combo-box-item";
-import "./ha-generic-picker";
-import type { HaGenericPicker } from "./ha-generic-picker";
-import type { PickerComboBoxItem } from "./ha-picker-combo-box";

-const SEARCH_KEYS = [
-  { name: "primary", weight: 10 },
-  { name: "secondary", weight: 8 },
-  { name: "search_labels.description", weight: 6 },
-  { name: "search_labels.repository", weight: 5 },
-];
-
-const rowRenderer: RenderItemFunction<PickerComboBoxItem> = (item) => html`
+const rowRenderer: ComboBoxLitRenderer<HassioAddonInfo> = (item) => html`
  <ha-combo-box-item type="button">
-    <span slot="headline">${item.primary}</span>
-    <span slot="supporting-text">${item.secondary}</span>
+    <span slot="headline">${item.name}</span>
+    <span slot="supporting-text">${item.slug}</span>
    ${item.icon
-      ? html` <img alt="" slot="start" .src=${item.icon} /> `
+      ? html`
+          <img
+            alt=""
+            slot="start"
+            .src="/api/hassio/addons/${item.slug}/icon"
+          />
+        `
      : nothing}
  </ha-combo-box-item>
 `;
@@ -38,22 +38,22 @@ class HaAddonPicker extends LitElement {

  @property() public helper?: string;

-  @state() private _addons?: PickerComboBoxItem[];
+  @state() private _addons?: HassioAddonInfo[];

  @property({ type: Boolean }) public disabled = false;

  @property({ type: Boolean }) public required = false;

-  @query("ha-generic-picker") private _genericPicker!: HaGenericPicker;
+  @query("ha-combo-box") private _comboBox!: HaComboBox;

  @state() private _error?: string;

  public open() {
-    this._genericPicker?.open();
+    this._comboBox?.open();
  }

  public focus() {
-    this._genericPicker?.focus();
+    this._comboBox?.focus();
  }

  protected firstUpdated() {
@@ -61,34 +61,29 @@ class HaAddonPicker extends LitElement {
  }

  protected render() {
-    const label =
-      this.label === undefined && this.hass
-        ? this.hass.localize("ui.components.addon-picker.addon")
-        : this.label;
-
    if (this._error) {
      return html`<ha-alert alert-type="error">${this._error}</ha-alert>`;
    }
    if (!this._addons) {
      return nothing;
    }
-
    return html`
-      <ha-generic-picker
+      <ha-combo-box
        .hass=${this.hass}
-        .autofocus=${this.autofocus}
-        .label=${label}
-        .valueRenderer=${this._valueRenderer}
-        .helper=${this.helper}
-        .disabled=${this.disabled}
+        .label=${this.label === undefined && this.hass
+          ? this.hass.localize("ui.components.addon-picker.addon")
+          : this.label}
+        .value=${this._value}
        .required=${this.required}
-        .value=${this.value}
-        .getItems=${this._getItems}
-        .searchKeys=${SEARCH_KEYS}
-        .rowRenderer=${rowRenderer}
+        .disabled=${this.disabled}
+        .helper=${this.helper}
+        .renderer=${rowRenderer}
+        .items=${this._addons}
+        item-value-path="slug"
+        item-id-path="slug"
+        item-label-path="name"
        @value-changed=${this._addonChanged}
-      >
-      </ha-generic-picker>
+      ></ha-combo-box>
    `;
  }

@@ -98,19 +93,9 @@ class HaAddonPicker extends LitElement {
        const addonsInfo = await fetchHassioAddonsInfo(this.hass);
        this._addons = addonsInfo.addons
          .filter((addon) => addon.version)
-          .map((addon) => ({
-            id: addon.slug,
-            primary: addon.name,
-            secondary: addon.slug,
-            icon: addon.icon
-              ? `/api/hassio/addons/${addon.slug}/icon`
-              : undefined,
-            search_labels: {
-              description: addon.description || null,
-              repository: addon.repository || null,
-            },
-            sorting_label: [addon.name, addon.slug].filter(Boolean).join("_"),
-          }));
+          .sort((a, b) =>
+            stringCompare(a.name, b.name, this.hass.locale.language)
+          );
      } else {
        this._error = this.hass.localize(
          "ui.components.addon-picker.error.no_supervisor"
@@ -123,8 +108,6 @@ class HaAddonPicker extends LitElement {
    }
  }

-  private _getItems = () => this._addons!;
-
  private get _value() {
    return this.value || "";
  }
@@ -145,17 +128,6 @@ class HaAddonPicker extends LitElement {
      fireEvent(this, "change");
    }, 0);
  }
-
-  private _valueRenderer = (itemId: string) => {
-    const item = this._addons!.find((addon) => addon.id === itemId);
-    return html`${item?.icon
-        ? html`<img
-            slot="start"
-            alt=${item.primary ?? "Unknown"}
-            .src=${item.icon}
-          />`
-        : nothing}<span slot="headline">${item?.primary || "Unknown"}</span>`;
-  };
 }

 declare global {
--- a/src/components/ha-area-picker.ts
+++ b/src/components/ha-area-picker.ts
@@ -51,6 +51,9 @@ export class HaAreaPicker extends LitElement {
  @property({ type: Boolean, attribute: "no-add" })
  public noAdd = false;

+  @property({ type: Boolean, attribute: "show-label" })
+  public showLabel = false;
+
  /**
   * Show only areas with entities from specific domains.
   * @type {Array}
@@ -363,19 +366,16 @@ export class HaAreaPicker extends LitElement {
  };

  protected render(): TemplateResult {
-    const baseLabel =
-      this.label ?? this.hass.localize("ui.components.area-picker.area");
+    const placeholder =
+      this.placeholder ?? this.hass.localize("ui.components.area-picker.area");
    const valueRenderer = this._computeValueRenderer(this.hass.areas);

-    // Only show label if there's no floor
-    let label: string | undefined = baseLabel;
-    if (this.value && baseLabel) {
+    let showLabel = this.showLabel;
+    if (this.value) {
      const area = this.hass.areas[this.value];
      if (area) {
        const { floor } = getAreaContext(area, this.hass.floors);
-        if (floor) {
-          label = undefined;
-        }
+        showLabel = !floor && this.showLabel;
      }
    }

@@ -383,12 +383,14 @@ export class HaAreaPicker extends LitElement {
      <ha-generic-picker
        .hass=${this.hass}
        .autofocus=${this.autofocus}
-        .label=${label}
+        .label=${this.label}
        .helper=${this.helper}
        .notFoundLabel=${this._notFoundLabel}
        .emptyLabel=${this.hass.localize("ui.components.area-picker.no_areas")}
        .disabled=${this.disabled}
        .required=${this.required}
+        .placeholder=${placeholder}
+        .showLabel=${showLabel}
        .value=${this.value}
        .getItems=${this._getItems}
        .getAdditionalItems=${this._getAdditionalItems}
--- a/src/components/ha-automation-row.ts
+++ b/src/components/ha-automation-row.ts
@@ -175,7 +175,7 @@ export class HaAutomationRow extends LitElement {
    ::slotted([slot="header"]) {
      flex: 1;
      overflow-wrap: anywhere;
-      margin: 0 var(--ha-space-3);
+      margin: var(--ha-space-0) var(--ha-space-3);
    }
    .icons {
      display: flex;
--- a/src/components/ha-bottom-sheet.ts
+++ b/src/components/ha-bottom-sheet.ts
@@ -241,7 +241,7 @@ export class HaBottomSheet extends ScrollableFadeMixin(LitElement) {
        }
        slot[name="footer"] {
          display: block;
-          padding: 0;
+          padding: var(--ha-space-0);
        }
        ::slotted([slot="footer"]) {
          display: flex;
--- a/src/components/ha-card.ts
+++ b/src/components/ha-card.ts
@@ -46,14 +46,14 @@ export class HaCard extends LitElement {
      line-height: var(--ha-line-height-expanded);
      padding: var(--ha-space-3) var(--ha-space-4) var(--ha-space-4);
      display: block;
-      margin-block-start: 0;
-      margin-block-end: 0;
+      margin-block-start: var(--ha-space-0);
+      margin-block-end: var(--ha-space-0);
      font-weight: var(--ha-font-weight-normal);
    }

    :host ::slotted(.card-content:not(:first-child)),
    slot:not(:first-child)::slotted(.card-content) {
-      padding-top: 0;
+      padding-top: var(--ha-space-0);
      margin-top: calc(var(--ha-space-2) * -1);
    }

--- a/src/components/ha-color-picker.ts
+++ b/src/components/ha-color-picker.ts
@@ -1,23 +1,25 @@
 import { mdiInvertColorsOff, mdiPalette } from "@mdi/js";
-import { html, LitElement } from "lit";
-import { customElement, property } from "lit/decorators";
+import { css, html, LitElement, nothing } from "lit";
+import { customElement, property, query } from "lit/decorators";
 import { styleMap } from "lit/directives/style-map";
 import { computeCssColor, THEME_COLORS } from "../common/color/compute-color";
 import { fireEvent } from "../common/dom/fire_event";
+import { stopPropagation } from "../common/dom/stop_propagation";
 import type { LocalizeKeys } from "../common/translations/localize";
 import type { HomeAssistant } from "../types";
-import "./ha-generic-picker";
-import type { PickerComboBoxItem } from "./ha-picker-combo-box";
-import type { PickerValueRenderer } from "./ha-picker-field";
+import "./ha-list-item";
+import "./ha-md-divider";
+import "./ha-select";
+import type { HaSelect } from "./ha-select";

@customElement("ha-color-picker")
 export class HaColorPicker extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
  @property() public label?: string;

  @property() public helper?: string;

+  @property({ attribute: false }) public hass!: HomeAssistant;
+
  @property() public value?: string;

  @property({ type: String, attribute: "default_color" })
@@ -31,178 +33,137 @@ export class HaColorPicker extends LitElement {

  @property({ type: Boolean }) public disabled = false;

-  @property({ type: Boolean }) public required = false;
+  @query("ha-select") private _select?: HaSelect;

-  render() {
-    const effectiveValue = this.value ?? this.defaultColor ?? "";
-
-    return html`
-      <ha-generic-picker
-        .hass=${this.hass}
-        .disabled=${this.disabled}
-        .required=${this.required}
-        .hideClearIcon=${!this.value && !!this.defaultColor}
-        .label=${this.label}
-        .helper=${this.helper}
-        .value=${effectiveValue}
-        .getItems=${this._getItems}
-        .rowRenderer=${this._rowRenderer}
-        .valueRenderer=${this._valueRenderer}
-        @value-changed=${this._valueChanged}
-      >
-      </ha-generic-picker>
-    `;
+  connectedCallback(): void {
+    super.connectedCallback();
+    // Refresh layout options when the field is connected to the DOM to ensure current value displayed
+    this._select?.layoutOptions();
  }

-  private _getItems = () =>
-    this._getColors(
-      this.includeNone,
-      this.includeState,
-      this.defaultColor,
-      this.value
-    );
-
-  private _getColors = (
-    includeNone: boolean,
-    includeState: boolean,
-    defaultColor: string | undefined,
-    currentValue: string | undefined
-  ): PickerComboBoxItem[] => {
-    const items: PickerComboBoxItem[] = [];
-
-    const defaultSuffix = this.hass.localize(
-      "ui.components.color-picker.default"
-    );
-
-    const addDefaultSuffix = (label: string, isDefault: boolean) =>
-      isDefault && defaultSuffix ? `${label} (${defaultSuffix})` : label;
-
-    if (includeNone) {
-      const noneLabel =
-        this.hass.localize("ui.components.color-picker.none") || "None";
-      items.push({
-        id: "none",
-        primary: addDefaultSuffix(noneLabel, defaultColor === "none"),
-        icon_path: mdiInvertColorsOff,
-        sorting_label: noneLabel,
-      });
-    }
-
-    if (includeState) {
-      const stateLabel =
-        this.hass.localize("ui.components.color-picker.state") || "State";
-      items.push({
-        id: "state",
-        primary: addDefaultSuffix(stateLabel, defaultColor === "state"),
-        icon_path: mdiPalette,
-        sorting_label: stateLabel,
-      });
-    }
-
-    Array.from(THEME_COLORS).forEach((color) => {
-      const themeLabel =
-        this.hass.localize(
-          `ui.components.color-picker.colors.${color}` as LocalizeKeys
-        ) || color;
-      items.push({
-        id: color,
-        primary: addDefaultSuffix(themeLabel, defaultColor === color),
-        sorting_label: themeLabel,
-      });
+  private _valueSelected(ev) {
+    ev.stopPropagation();
+    if (!this.isConnected) return;
+    const value = ev.target.value;
+    this.value = value === this.defaultColor ? undefined : value;
+    fireEvent(this, "value-changed", {
+      value: this.value,
    });
+  }

-    const isSpecial =
-      currentValue === "none" ||
-      currentValue === "state" ||
-      THEME_COLORS.has(currentValue || "");
+  render() {
+    const value = this.value || this.defaultColor || "";

-    const hasValue = currentValue && currentValue.length > 0;
-
-    if (hasValue && !isSpecial) {
-      items.push({
-        id: currentValue!,
-        primary: currentValue!,
-        sorting_label: currentValue!,
-      });
-    }
-
-    return items;
-  };
-
-  private _rowRenderer: (
-    item: PickerComboBoxItem,
-    index?: number
-  ) => ReturnType<typeof html> = (item) => html`
-    <ha-combo-box-item type="button" compact>
-      ${item.id === "none"
-        ? html`<ha-svg-icon
-            slot="start"
-            .path=${mdiInvertColorsOff}
-          ></ha-svg-icon>`
-        : item.id === "state"
-          ? html`<ha-svg-icon slot="start" .path=${mdiPalette}></ha-svg-icon>`
-          : html`<span slot="start">
-              ${this._renderColorCircle(item.id)}
-            </span>`}
-      <span slot="headline">${item.primary}</span>
-    </ha-combo-box-item>
-  `;
-
-  private _valueRenderer: PickerValueRenderer = (value: string) => {
-    if (value === "none") {
-      return html`
-        <ha-svg-icon slot="start" .path=${mdiInvertColorsOff}></ha-svg-icon>
-        <span slot="headline">
-          ${this.hass.localize("ui.components.color-picker.none")}
-        </span>
-      `;
-    }
-    if (value === "state") {
-      return html`
-        <ha-svg-icon slot="start" .path=${mdiPalette}></ha-svg-icon>
-        <span slot="headline">
-          ${this.hass.localize("ui.components.color-picker.state")}
-        </span>
-      `;
-    }
+    const isCustom = !(
+      THEME_COLORS.has(value) ||
+      value === "none" ||
+      value === "state"
+    );

    return html`
-      <span slot="start">${this._renderColorCircle(value)}</span>
-      <span slot="headline">
-        ${this.hass.localize(
-          `ui.components.color-picker.colors.${value}` as LocalizeKeys
-        ) || value}
-      </span>
+      <ha-select
+        .icon=${Boolean(value)}
+        .label=${this.label}
+        .value=${value}
+        .helper=${this.helper}
+        .disabled=${this.disabled}
+        @closed=${stopPropagation}
+        @selected=${this._valueSelected}
+        fixedMenuPosition
+        naturalMenuWidth
+        .clearable=${!this.defaultColor}
+      >
+        ${value
+          ? html`
+              <span slot="icon">
+                ${value === "none"
+                  ? html`
+                      <ha-svg-icon path=${mdiInvertColorsOff}></ha-svg-icon>
+                    `
+                  : value === "state"
+                    ? html`<ha-svg-icon path=${mdiPalette}></ha-svg-icon>`
+                    : this._renderColorCircle(value || "grey")}
+              </span>
+            `
+          : nothing}
+        ${this.includeNone
+          ? html`
+              <ha-list-item value="none" graphic="icon">
+                ${this.hass.localize("ui.components.color-picker.none")}
+                ${this.defaultColor === "none"
+                  ? ` (${this.hass.localize("ui.components.color-picker.default")})`
+                  : nothing}
+                <ha-svg-icon
+                  slot="graphic"
+                  path=${mdiInvertColorsOff}
+                ></ha-svg-icon>
+              </ha-list-item>
+            `
+          : nothing}
+        ${this.includeState
+          ? html`
+              <ha-list-item value="state" graphic="icon">
+                ${this.hass.localize("ui.components.color-picker.state")}
+                ${this.defaultColor === "state"
+                  ? ` (${this.hass.localize("ui.components.color-picker.default")})`
+                  : nothing}
+                <ha-svg-icon slot="graphic" path=${mdiPalette}></ha-svg-icon>
+              </ha-list-item>
+            `
+          : nothing}
+        ${this.includeState || this.includeNone
+          ? html`<ha-md-divider role="separator" tabindex="-1"></ha-md-divider>`
+          : nothing}
+        ${Array.from(THEME_COLORS).map(
+          (color) => html`
+            <ha-list-item .value=${color} graphic="icon">
+              ${this.hass.localize(
+                `ui.components.color-picker.colors.${color}` as LocalizeKeys
+              ) || color}
+              ${this.defaultColor === color
+                ? ` (${this.hass.localize("ui.components.color-picker.default")})`
+                : nothing}
+              <span slot="graphic">${this._renderColorCircle(color)}</span>
+            </ha-list-item>
+          `
+        )}
+        ${isCustom
+          ? html`
+              <ha-list-item .value=${value} graphic="icon">
+                ${value}
+                <span slot="graphic">${this._renderColorCircle(value)}</span>
+              </ha-list-item>
+            `
+          : nothing}
+      </ha-select>
    `;
-  };
+  }

  private _renderColorCircle(color: string) {
    return html`
      <span
+        class="circle-color"
        style=${styleMap({
          "--circle-color": computeCssColor(color),
-          display: "block",
-          "background-color": "var(--circle-color, var(--divider-color))",
-          border: "1px solid var(--outline-color)",
-          "border-radius": "var(--ha-border-radius-pill)",
-          width: "20px",
-          height: "20px",
-          "box-sizing": "border-box",
        })}
      ></span>
    `;
  }

-  private _valueChanged(ev: CustomEvent<{ value?: string }>) {
-    ev.stopPropagation();
-    const selected = ev.detail.value;
-    const normalized =
-      selected && selected === this.defaultColor
-        ? undefined
-        : (selected ?? undefined);
-    this.value = normalized;
-    fireEvent(this, "value-changed", { value: this.value });
-  }
+  static styles = css`
+    .circle-color {
+      display: block;
+      background-color: var(--circle-color, var(--divider-color));
+      border: 1px solid var(--outline-color);
+      border-radius: var(--ha-border-radius-pill);
+      width: 20px;
+      height: 20px;
+      box-sizing: border-box;
+    }
+    ha-select {
+      width: 100%;
+    }
+  `;
 }

 declare global {
--- a/src/components/ha-combo-box.ts
+++ b/src/components/ha-combo-box.ts
@@ -0,0 +1,433 @@
+import { mdiClose, mdiMenuDown, mdiMenuUp } from "@mdi/js";
+import type { ComboBoxLitRenderer } from "@vaadin/combo-box/lit";
+import { comboBoxRenderer } from "@vaadin/combo-box/lit";
+import "@vaadin/combo-box/theme/material/vaadin-combo-box-light";
+import type {
+  ComboBoxDataProvider,
+  ComboBoxLight,
+  ComboBoxLightFilterChangedEvent,
+  ComboBoxLightOpenedChangedEvent,
+  ComboBoxLightValueChangedEvent,
+} from "@vaadin/combo-box/vaadin-combo-box-light";
+import { registerStyles } from "@vaadin/vaadin-themable-mixin/register-styles";
+import type { TemplateResult } from "lit";
+import { css, html, LitElement } from "lit";
+import { customElement, property, query, state } from "lit/decorators";
+import { ifDefined } from "lit/directives/if-defined";
+import { fireEvent } from "../common/dom/fire_event";
+import type { HomeAssistant } from "../types";
+import "./ha-combo-box-item";
+import "./ha-combo-box-textfield";
+import "./ha-icon-button";
+import "./ha-input-helper-text";
+import "./ha-textfield";
+import type { HaTextField } from "./ha-textfield";
+
+registerStyles(
+  "vaadin-combo-box-item",
+  css`
+    :host {
+      padding: 0 !important;
+    }
+    :host([focused]:not([disabled])) {
+      background-color: rgba(var(--rgb-primary-text-color, 0, 0, 0), 0.12);
+    }
+    :host([selected]:not([disabled])) {
+      background-color: transparent;
+      color: var(--mdc-theme-primary);
+      --mdc-ripple-color: var(--mdc-theme-primary);
+      --mdc-theme-text-primary-on-background: var(--mdc-theme-primary);
+    }
+    :host([selected]:not([disabled])):before {
+      background-color: var(--mdc-theme-primary);
+      opacity: 0.12;
+      content: "";
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 100%;
+      height: 100%;
+    }
+    :host([selected][focused]:not([disabled])):before {
+      opacity: 0.24;
+    }
+    :host(:hover:not([disabled])) {
+      background-color: transparent;
+    }
+    [part="content"] {
+      width: 100%;
+    }
+    [part="checkmark"] {
+      display: none;
+    }
+  `
+);
+
+@customElement("ha-combo-box")
+export class HaComboBox extends LitElement {
+  @property({ attribute: false }) public hass?: HomeAssistant;
+
+  @property() public label?: string;
+
+  @property() public value?: string;
+
+  @property() public placeholder?: string;
+
+  @property({ attribute: false }) public validationMessage?: string;
+
+  @property() public helper?: string;
+
+  @property({ attribute: "error-message" }) public errorMessage?: string;
+
+  @property({ type: Boolean }) public invalid = false;
+
+  @property({ type: Boolean }) public icon = false;
+
+  @property({ attribute: false }) public items?: any[];
+
+  @property({ attribute: false }) public filteredItems?: any[];
+
+  @property({ attribute: false })
+  public dataProvider?: ComboBoxDataProvider<any>;
+
+  @property({ attribute: "allow-custom-value", type: Boolean })
+  public allowCustomValue = false;
+
+  @property({ attribute: "item-value-path" }) public itemValuePath = "value";
+
+  @property({ attribute: "item-label-path" }) public itemLabelPath = "label";
+
+  @property({ attribute: "item-id-path" }) public itemIdPath?: string;
+
+  @property({ attribute: false }) public renderer?: ComboBoxLitRenderer<any>;
+
+  @property({ type: Boolean }) public disabled = false;
+
+  @property({ type: Boolean }) public required = false;
+
+  @property({ type: Boolean, reflect: true }) public opened = false;
+
+  @property({ type: Boolean, attribute: "hide-clear-icon" })
+  public hideClearIcon = false;
+
+  @property({ type: Boolean, attribute: "clear-initial-value" })
+  public clearInitialValue = false;
+
+  @query("vaadin-combo-box-light", true) private _comboBox!: ComboBoxLight;
+
+  @query("ha-combo-box-textfield", true) private _inputElement!: HaTextField;
+
+  @state({ type: Boolean }) private _forceBlankValue = false;
+
+  private _overlayMutationObserver?: MutationObserver;
+
+  private _bodyMutationObserver?: MutationObserver;
+
+  public async open() {
+    await this.updateComplete;
+    this._comboBox?.open();
+  }
+
+  public async focus() {
+    await this.updateComplete;
+    await this._inputElement?.updateComplete;
+    this._inputElement?.focus();
+  }
+
+  public disconnectedCallback() {
+    super.disconnectedCallback();
+    if (this._overlayMutationObserver) {
+      this._overlayMutationObserver.disconnect();
+      this._overlayMutationObserver = undefined;
+    }
+    if (this._bodyMutationObserver) {
+      this._bodyMutationObserver.disconnect();
+      this._bodyMutationObserver = undefined;
+    }
+  }
+
+  public get selectedItem() {
+    return this._comboBox.selectedItem;
+  }
+
+  public setInputValue(value: string) {
+    this._comboBox.value = value;
+  }
+
+  public setTextFieldValue(value: string) {
+    this._inputElement.value = value;
+  }
+
+  protected render(): TemplateResult {
+    return html`
+      <!-- @ts-ignore Tag definition is not included in theme folder -->
+      <vaadin-combo-box-light
+        .itemValuePath=${this.itemValuePath}
+        .itemIdPath=${this.itemIdPath}
+        .itemLabelPath=${this.itemLabelPath}
+        .items=${this.items}
+        .value=${this.value || ""}
+        .filteredItems=${this.filteredItems}
+        .dataProvider=${this.dataProvider}
+        .allowCustomValue=${this.allowCustomValue}
+        .disabled=${this.disabled}
+        .required=${this.required}
+        ${comboBoxRenderer(this.renderer || this._defaultRowRenderer)}
+        @opened-changed=${this._openedChanged}
+        @filter-changed=${this._filterChanged}
+        @value-changed=${this._valueChanged}
+        attr-for-value="value"
+      >
+        <ha-combo-box-textfield
+          label=${ifDefined(this.label)}
+          placeholder=${ifDefined(this.placeholder)}
+          ?disabled=${this.disabled}
+          ?required=${this.required}
+          validationMessage=${ifDefined(this.validationMessage)}
+          .errorMessage=${this.errorMessage}
+          class="input"
+          autocapitalize="none"
+          autocomplete="off"
+          .autocorrect=${false}
+          input-spellcheck="false"
+          .suffix=${html`<div
+            style="width: 28px;"
+            role="none presentation"
+          ></div>`}
+          .icon=${this.icon}
+          .invalid=${this.invalid}
+          .forceBlankValue=${this._forceBlankValue}
+        >
+          <slot name="icon" slot="leadingIcon"></slot>
+        </ha-combo-box-textfield>
+        ${this.value && !this.hideClearIcon
+          ? html`<ha-svg-icon
+              role="button"
+              tabindex="-1"
+              aria-label=${ifDefined(this.hass?.localize("ui.common.clear"))}
+              class=${`clear-button ${this.label ? "" : "no-label"}`}
+              .path=${mdiClose}
+              ?disabled=${this.disabled}
+              @click=${this._clearValue}
+            ></ha-svg-icon>`
+          : ""}
+        <ha-svg-icon
+          role="button"
+          tabindex="-1"
+          aria-label=${ifDefined(this.label)}
+          aria-expanded=${this.opened ? "true" : "false"}
+          class=${`toggle-button ${this.label ? "" : "no-label"}`}
+          .path=${this.opened ? mdiMenuUp : mdiMenuDown}
+          ?disabled=${this.disabled}
+          @click=${this._toggleOpen}
+        ></ha-svg-icon>
+      </vaadin-combo-box-light>
+      ${this._renderHelper()}
+    `;
+  }
+
+  private _renderHelper() {
+    return this.helper
+      ? html`<ha-input-helper-text .disabled=${this.disabled}
+          >${this.helper}</ha-input-helper-text
+        >`
+      : "";
+  }
+
+  private _defaultRowRenderer: ComboBoxLitRenderer<
+    string | Record<string, any>
+  > = (item) => html`
+    <ha-combo-box-item type="button">
+      ${this.itemLabelPath ? item[this.itemLabelPath] : item}
+    </ha-combo-box-item>
+  `;
+
+  private _clearValue(ev: Event) {
+    ev.stopPropagation();
+    fireEvent(this, "value-changed", { value: undefined });
+  }
+
+  private _toggleOpen(ev: Event) {
+    if (this.opened) {
+      this._comboBox?.close();
+      ev.stopPropagation();
+    } else {
+      this._comboBox?.inputElement.focus();
+    }
+  }
+
+  private _openedChanged(ev: ComboBoxLightOpenedChangedEvent) {
+    ev.stopPropagation();
+    const opened = ev.detail.value;
+    // delay this so we can handle click event for toggle button before setting _opened
+    setTimeout(() => {
+      this.opened = opened;
+      fireEvent(this, "opened-changed", { value: ev.detail.value });
+    }, 0);
+
+    if (this.clearInitialValue) {
+      this.setTextFieldValue("");
+      if (opened) {
+        // Wait 100ms to be sure vaddin-combo-box-light already tried to set the value
+        setTimeout(() => {
+          this._forceBlankValue = false;
+        }, 100);
+      } else {
+        this._forceBlankValue = true;
+      }
+    }
+
+    if (opened) {
+      const overlay = document.querySelector<HTMLElement>(
+        "vaadin-combo-box-overlay"
+      );
+
+      if (overlay) {
+        this._removeInert(overlay);
+      }
+      this._observeBody();
+    } else {
+      this._bodyMutationObserver?.disconnect();
+      this._bodyMutationObserver = undefined;
+    }
+  }
+
+  private _observeBody() {
+    if ("MutationObserver" in window && !this._bodyMutationObserver) {
+      this._bodyMutationObserver = new MutationObserver((mutations) => {
+        mutations.forEach((mutation) => {
+          mutation.addedNodes.forEach((node) => {
+            if (node.nodeName === "VAADIN-COMBO-BOX-OVERLAY") {
+              this._removeInert(node as HTMLElement);
+            }
+          });
+          mutation.removedNodes.forEach((node) => {
+            if (node.nodeName === "VAADIN-COMBO-BOX-OVERLAY") {
+              this._overlayMutationObserver?.disconnect();
+              this._overlayMutationObserver = undefined;
+            }
+          });
+        });
+      });
+
+      this._bodyMutationObserver.observe(document.body, {
+        childList: true,
+      });
+    }
+  }
+
+  private _removeInert(overlay: HTMLElement) {
+    if (overlay.inert) {
+      overlay.inert = false;
+      this._overlayMutationObserver?.disconnect();
+      this._overlayMutationObserver = undefined;
+      return;
+    }
+    if ("MutationObserver" in window && !this._overlayMutationObserver) {
+      this._overlayMutationObserver = new MutationObserver((mutations) => {
+        mutations.forEach((mutation) => {
+          if (mutation.attributeName === "inert") {
+            const target = mutation.target as HTMLElement;
+            if (target.inert) {
+              this._overlayMutationObserver?.disconnect();
+              this._overlayMutationObserver = undefined;
+              target.inert = false;
+            }
+          }
+        });
+      });
+
+      this._overlayMutationObserver.observe(overlay, {
+        attributes: true,
+      });
+    }
+  }
+
+  private _filterChanged(ev: ComboBoxLightFilterChangedEvent) {
+    ev.stopPropagation();
+    fireEvent(this, "filter-changed", { value: ev.detail.value });
+  }
+
+  private _valueChanged(ev: ComboBoxLightValueChangedEvent) {
+    ev.stopPropagation();
+    if (!this.allowCustomValue) {
+      // @ts-ignore
+      this._comboBox._closeOnBlurIsPrevented = true;
+    }
+    if (!this.opened) {
+      return;
+    }
+    const newValue = ev.detail.value;
+    if (newValue !== this.value) {
+      fireEvent(this, "value-changed", { value: newValue || undefined });
+    }
+  }
+
+  static styles = css`
+    :host {
+      display: block;
+      width: 100%;
+    }
+    vaadin-combo-box-light {
+      position: relative;
+    }
+    ha-combo-box-textfield {
+      width: 100%;
+    }
+    ha-combo-box-textfield > ha-icon-button {
+      --mdc-icon-button-size: 24px;
+      padding: 2px;
+      color: var(--secondary-text-color);
+    }
+    ha-svg-icon {
+      color: var(--input-dropdown-icon-color);
+      position: absolute;
+      cursor: pointer;
+    }
+    .toggle-button {
+      right: 12px;
+      top: -10px;
+      inset-inline-start: initial;
+      inset-inline-end: 12px;
+      direction: var(--direction);
+    }
+    :host([opened]) .toggle-button {
+      color: var(--primary-color);
+    }
+    .toggle-button[disabled],
+    .clear-button[disabled] {
+      color: var(--disabled-text-color);
+      pointer-events: none;
+    }
+    .toggle-button.no-label {
+      top: -3px;
+    }
+    .clear-button {
+      --mdc-icon-size: 20px;
+      top: -7px;
+      right: 36px;
+      inset-inline-start: initial;
+      inset-inline-end: 36px;
+      direction: var(--direction);
+    }
+    .clear-button.no-label {
+      top: 0;
+    }
+    ha-input-helper-text {
+      margin-top: 4px;
+    }
+  `;
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-combo-box": HaComboBox;
+  }
+}
+
+declare global {
+  interface HASSDomEvents {
+    "filter-changed": { value: string };
+    "opened-changed": { value: boolean };
+  }
+}
--- a/src/components/ha-config-entry-picker.ts
+++ b/src/components/ha-config-entry-picker.ts
@@ -57,9 +57,10 @@ class HaConfigEntryPicker extends LitElement {
    return html`
      <ha-generic-picker
        .hass=${this.hass}
-        .label=${this.label === undefined && this.hass
+        .placeholder=${this.label === undefined && this.hass
          ? this.hass.localize("ui.components.config-entry-picker.config_entry")
          : this.label}
+        show-label
        .value=${this.value}
        .required=${this.required}
        .disabled=${this.disabled}
--- a/src/components/ha-dialog.ts
+++ b/src/components/ha-dialog.ts
@@ -101,13 +101,14 @@ export class HaDialog extends DialogBase {
      }
      .mdc-dialog__container {
        align-items: var(--vertical-align-dialog, center);
-        padding: var(--dialog-container-padding, 0);
+        padding: var(--dialog-container-padding, var(--ha-space-0));
      }
      .mdc-dialog__title {
-        padding: var(--ha-space-4) var(--ha-space-4) 0 var(--ha-space-4);
+        padding: var(--ha-space-4) var(--ha-space-4) var(--ha-space-0)
+          var(--ha-space-4);
      }
      .mdc-dialog__title:has(span) {
-        padding: var(--ha-space-3) var(--ha-space-3) 0;
+        padding: var(--ha-space-3) var(--ha-space-3) var(--ha-space-0);
      }
      .mdc-dialog__title::before {
        content: unset;
@@ -135,7 +136,7 @@ export class HaDialog extends DialogBase {
          --ha-dialog-surface-background,
          var(--mdc-theme-surface, #fff)
        );
-        padding: var(--dialog-surface-padding, 0);
+        padding: var(--dialog-surface-padding, var(--ha-space-0));
      }
      :host([flexContent]) .mdc-dialog .mdc-dialog__content {
        display: flex;
@@ -167,7 +168,7 @@ export class HaDialog extends DialogBase {
      }
      .dialog-actions {
        inset-inline-start: initial !important;
-        inset-inline-end: 0 !important;
+        inset-inline-end: var(--ha-space-0) !important;
        direction: var(--direction);
      }
    `,
--- a/src/components/ha-floor-picker.ts
+++ b/src/components/ha-floor-picker.ts
@@ -1,5 +1,5 @@
-import type { RenderItemFunction } from "@lit-labs/virtualizer/virtualize";
 import { mdiPlus, mdiTextureBox } from "@mdi/js";
+import type { ComboBoxLitRenderer } from "@vaadin/combo-box/lit";
 import type { HassEntity } from "home-assistant-js-websocket";
 import type { TemplateResult } from "lit";
 import { LitElement, html } from "lit";
@@ -303,7 +303,7 @@ export class HaFloorPicker extends LitElement {
    }
  );

-  private _rowRenderer: RenderItemFunction<FloorComboBoxItem> = (item) => html`
+  private _rowRenderer: ComboBoxLitRenderer<FloorComboBoxItem> = (item) => html`
    <ha-combo-box-item type="button" compact>
      ${item.icon_path
        ? html`
@@ -389,14 +389,14 @@ export class HaFloorPicker extends LitElement {
      <ha-generic-picker
        .hass=${this.hass}
        .autofocus=${this.autofocus}
-        .disabled=${this.disabled}
        .label=${this.label}
        .helper=${this.helper}
-        .placeholder=${placeholder}
+        .disabled=${this.disabled}
        .notFoundLabel=${this._notFoundLabel}
        .emptyLabel=${this.hass.localize(
          "ui.components.floor-picker.no_floors"
        )}
+        .placeholder=${placeholder}
        .value=${this.value}
        .getItems=${this._getItems}
        .getAdditionalItems=${this._getAdditionalItems}
--- a/src/components/ha-generic-picker.ts
+++ b/src/components/ha-generic-picker.ts
@@ -7,10 +7,8 @@ import { ifDefined } from "lit/directives/if-defined";
 import memoizeOne from "memoize-one";
 import { tinykeys } from "tinykeys";
 import { fireEvent } from "../common/dom/fire_event";
-import { PickerMixin } from "../mixins/picker-mixin";
 import type { FuseWeightedKey } from "../resources/fuseMultiTerm";
 import type { HomeAssistant } from "../types";
-import { isIosApp } from "../util/is_ios";
 import "./ha-bottom-sheet";
 import "./ha-button";
 import "./ha-combo-box-item";
@@ -22,18 +20,39 @@ import type {
  PickerComboBoxSearchFn,
 } from "./ha-picker-combo-box";
 import "./ha-picker-field";
+import type { PickerValueRenderer } from "./ha-picker-field";
 import "./ha-svg-icon";

@customElement("ha-generic-picker")
-export class HaGenericPicker extends PickerMixin(LitElement) {
+export class HaGenericPicker extends LitElement {
  @property({ attribute: false }) public hass?: HomeAssistant;

+  @property({ type: Boolean }) public disabled = false;
+
+  @property({ type: Boolean }) public required = false;
+
  @property({ type: Boolean, attribute: "allow-custom-value" })
  public allowCustomValue;

+  @property() public value?: string;
+
+  @property() public icon?: string;
+
+  @property() public label?: string;
+
+  @property() public helper?: string;
+
+  @property() public placeholder?: string;
+
  @property({ type: String, attribute: "search-label" })
  public searchLabel?: string;

+  @property({ attribute: "hide-clear-icon", type: Boolean })
+  public hideClearIcon = false;
+
+  @property({ attribute: "show-label", type: Boolean })
+  public showLabel = false;
+
  /** To prevent lags, getItems needs to be memoized */
  @property({ attribute: false })
  public getItems!: (
@@ -47,6 +66,9 @@ export class HaGenericPicker extends PickerMixin(LitElement) {
  @property({ attribute: false })
  public rowRenderer?: RenderItemFunction<PickerComboBoxItem>;

+  @property({ attribute: false })
+  public valueRenderer?: PickerValueRenderer;
+
  @property({ attribute: false })
  public searchFn?: PickerComboBoxSearchFn<PickerComboBoxItem>;

@@ -96,11 +118,7 @@ export class HaGenericPicker extends PickerMixin(LitElement) {

  @property({ attribute: "selected-section" }) public selectedSection?: string;

-  @property({ type: Boolean, attribute: "use-top-label" })
-  public useTopLabel = false;
-
-  @property({ attribute: "custom-value-label" })
-  public customValueLabel?: string;
+  @property({ attribute: "unknown-item-text" }) public unknownItemText?: string;

  @query(".container") private _containerElement?: HTMLDivElement;

@@ -131,13 +149,11 @@ export class HaGenericPicker extends PickerMixin(LitElement) {
  private _unsubscribeTinyKeys?: () => void;

  protected render() {
-    // Only show label if it's not a top label and there is a value.
-    const label = this.useTopLabel && this.value ? undefined : this.label;
-
-    return html`<div class="container">
-        ${this.useTopLabel && this.label
-          ? html`<label ?disabled=${this.disabled}>${this.label}</label>`
-          : nothing}
+    return html`
+      ${this.label
+        ? html`<label ?disabled=${this.disabled}>${this.label}</label>`
+        : nothing}
+      <div class="container">
        <div id="picker">
          <slot name="field">
            ${this.addButtonLabel && !this.value
@@ -157,20 +173,14 @@ export class HaGenericPicker extends PickerMixin(LitElement) {
                  type="button"
                  class=${this._opened ? "opened" : ""}
                  compact
-                  .unknown=${this._unknownValue(
-                    this.allowCustomValue,
-                    this.value,
-                    this.getItems()
-                  )}
+                  .unknown=${this._unknownValue(this.value, this.getItems())}
                  .unknownItemText=${this.unknownItemText}
                  aria-label=${ifDefined(this.label)}
                  @click=${this.open}
                  @clear=${this._clear}
                  .icon=${this.icon}
-                  .image=${this.image}
-                  .label=${label}
+                  .showLabel=${this.showLabel}
                  .placeholder=${this.placeholder}
-                  .helper=${this.helper}
                  .value=${this.value}
                  .valueRenderer=${this.valueRenderer}
                  .required=${this.required}
@@ -178,7 +188,6 @@ export class HaGenericPicker extends PickerMixin(LitElement) {
                  .invalid=${this.invalid}
                  .hideClearIcon=${this.hideClearIcon}
                >
-                  <slot name="start"></slot>
                </ha-picker-field>`}
          </slot>
        </div>
@@ -217,7 +226,8 @@ export class HaGenericPicker extends PickerMixin(LitElement) {
              </ha-bottom-sheet>`
            : nothing}
      </div>
-      ${this._renderHelper()}`;
+      ${this._renderHelper()}
+    `;
  }

  private _renderComboBox(dialogMode = false) {
@@ -226,7 +236,6 @@ export class HaGenericPicker extends PickerMixin(LitElement) {
    }
    return html`
      <ha-picker-combo-box
-        id="combo-box"
        .hass=${this.hass}
        .allowCustomValue=${this.allowCustomValue}
        .label=${this.searchLabel}
@@ -243,24 +252,13 @@ export class HaGenericPicker extends PickerMixin(LitElement) {
        .sectionTitleFunction=${this.sectionTitleFunction}
        .selectedSection=${this.selectedSection}
        .searchKeys=${this.searchKeys}
-        .customValueLabel=${this.customValueLabel}
      ></ha-picker-combo-box>
    `;
  }

  private _unknownValue = memoizeOne(
-    (
-      allowCustomValue: boolean,
-      value?: string,
-      items?: (PickerComboBoxItem | string)[]
-    ) => {
-      if (
-        allowCustomValue ||
-        value === undefined ||
-        value === null ||
-        value === "" ||
-        !items
-      ) {
+    (value?: string, items?: (PickerComboBoxItem | string)[]) => {
+      if (value === undefined || value === null || value === "" || !items) {
        return false;
      }

@@ -286,15 +284,6 @@ export class HaGenericPicker extends PickerMixin(LitElement) {
  private _dialogOpened = () => {
    this._opened = true;
    requestAnimationFrame(() => {
-      if (this.hass && isIosApp(this.hass)) {
-        this.hass.auth.external!.fireMessage({
-          type: "focus_element",
-          payload: {
-            element_id: "combo-box",
-          },
-        });
-        return;
-      }
      this._comboBox?.focus();
    });
  };
@@ -321,7 +310,7 @@ export class HaGenericPicker extends PickerMixin(LitElement) {
    this._newValue = value;
  }

-  private _clear(e: CustomEvent) {
+  private _clear(e) {
    e.stopPropagation();
    this._setValue(undefined);
  }
@@ -393,7 +382,7 @@ export class HaGenericPicker extends PickerMixin(LitElement) {
        }

        wa-popover {
-          --wa-space-l: 0;
+          --wa-space-l: var(--ha-space-0);
        }

        wa-popover::part(body) {
@@ -418,7 +407,7 @@ export class HaGenericPicker extends PickerMixin(LitElement) {
          --ha-bottom-sheet-height: calc(100dvh - var(--ha-space-12));
          --ha-bottom-sheet-max-height: var(--ha-bottom-sheet-height);
          --ha-bottom-sheet-max-width: 600px;
-          --ha-bottom-sheet-padding: 0;
+          --ha-bottom-sheet-padding: var(--ha-space-0);
          --ha-bottom-sheet-surface-background: var(--card-background-color);
          --ha-bottom-sheet-border-radius: var(--ha-border-radius-2xl);
        }
--- a/src/components/ha-icon-picker.ts
+++ b/src/components/ha-icon-picker.ts
@@ -113,6 +113,7 @@ export class HaIconPicker extends LitElement {
      <ha-generic-picker
        .hass=${this.hass}
        allow-custom-value
+        show-label
        .getItems=${this._getIconPickerItems}
        .helper=${this.helper}
        .disabled=${this.disabled}
@@ -121,7 +122,7 @@ export class HaIconPicker extends LitElement {
        .invalid=${this.invalid}
        .rowRenderer=${rowRenderer}
        .icon=${this._icon}
-        .label=${this.label}
+        .placeholder=${this.label}
        .value=${this._value}
        .searchFn=${this._filterIcons}
        .notFoundLabel=${this.hass?.localize(
@@ -130,7 +131,6 @@ export class HaIconPicker extends LitElement {
        popover-placement="bottom-start"
        @value-changed=${this._valueChanged}
      >
-        <slot name="start"></slot>
      </ha-generic-picker>
    `;
  }
--- a/src/components/ha-labels-picker.ts
+++ b/src/components/ha-labels-picker.ts
@@ -231,6 +231,7 @@ export class HaLabelsPicker extends SubscribeMixin(LitElement) {

  static styles = css`
    ha-chip-set {
+      margin-bottom: 8px;
      background-color: var(--mdc-text-field-fill-color);
      border-bottom: 1px solid var(--ha-color-border-neutral-normal);
      border-top-right-radius: var(--ha-border-radius-sm);
--- a/src/components/ha-language-picker.ts
+++ b/src/components/ha-language-picker.ts
@@ -116,11 +116,6 @@ export class HaLanguagePicker extends LitElement {
    > `;

  protected render() {
-    const label =
-      this.label ??
-      (this.hass?.localize("ui.components.language-picker.language") ||
-        "Language");
-
    const value =
      this.value ??
      (this.required && !this.disabled ? this._getItems()[0].id : this.value);
@@ -134,7 +129,10 @@ export class HaLanguagePicker extends LitElement {
        .emptyLabel=${this.hass?.localize(
          "ui.components.language-picker.no_languages"
        ) || "No languages available"}
-        .label=${label}
+        .placeholder=${this.label ??
+        (this.hass?.localize("ui.components.language-picker.language") ||
+          "Language")}
+        show-label
        .value=${value}
        .valueRenderer=${this._valueRenderer}
        .disabled=${this.disabled}
--- a/src/components/ha-md-dialog.ts
+++ b/src/components/ha-md-dialog.ts
@@ -175,10 +175,10 @@ export class HaMdDialog extends Dialog {
        }

        .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);
+          margin-top: var(--safe-area-inset-top, var(--ha-space-0));
+          margin-bottom: var(--safe-area-inset-bottom, var(--ha-space-0));
+          margin-left: var(--safe-area-inset-left, var(--ha-space-0));
+          margin-right: var(--safe-area-inset-right, var(--ha-space-0));
        }
      }

--- a/src/components/ha-navigation-picker.ts
+++ b/src/components/ha-navigation-picker.ts
@@ -1,17 +1,55 @@
-import { html, LitElement, nothing } from "lit";
-import { customElement, property, state } from "lit/decorators";
+import type { ComboBoxLitRenderer } from "@vaadin/combo-box/lit";
+import type { PropertyValues, TemplateResult } from "lit";
+import { css, html, LitElement, nothing } from "lit";
+import { customElement, property, query, state } from "lit/decorators";
 import { fireEvent } from "../common/dom/fire_event";
 import { titleCase } from "../common/string/title-case";
 import { fetchConfig } from "../data/lovelace/config/types";
+import type { LovelaceViewRawConfig } from "../data/lovelace/config/view";
 import { getPanelIcon, getPanelTitle } from "../data/panel";
-import type { HomeAssistant, ValueChangedEvent } from "../types";
-import "./ha-generic-picker";
+import type { HomeAssistant, PanelInfo, ValueChangedEvent } from "../types";
+import "./ha-combo-box";
+import type { HaComboBox } from "./ha-combo-box";
+import "./ha-combo-box-item";
 import "./ha-icon";
-import type { PickerComboBoxItem } from "./ha-picker-combo-box";
+
+interface NavigationItem {
+  path: string;
+  icon: string;
+  title: string;
+}
+
+const DEFAULT_ITEMS: NavigationItem[] = [];
+
+const rowRenderer: ComboBoxLitRenderer<NavigationItem> = (item) => html`
+  <ha-combo-box-item type="button">
+    <ha-icon .icon=${item.icon} slot="start"></ha-icon>
+    <span slot="headline">${item.title || item.path}</span>
+    ${item.title
+      ? html`<span slot="supporting-text">${item.path}</span>`
+      : nothing}
+  </ha-combo-box-item>
+`;
+
+const createViewNavigationItem = (
+  prefix: string,
+  view: LovelaceViewRawConfig,
+  index: number
+) => ({
+  path: `/${prefix}/${view.path ?? index}`,
+  icon: view.icon ?? "mdi:view-compact",
+  title: view.title ?? (view.path ? titleCase(view.path) : `${index}`),
+});
+
+const createPanelNavigationItem = (hass: HomeAssistant, panel: PanelInfo) => ({
+  path: `/${panel.url_path}`,
+  icon: getPanelIcon(panel) || "mdi:view-dashboard",
+  title: getPanelTitle(hass, panel) || "",
+});

@customElement("ha-navigation-picker")
 export class HaNavigationPicker extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
+  @property({ attribute: false }) public hass?: HomeAssistant;

  @property() public label?: string;

@@ -23,51 +61,46 @@ export class HaNavigationPicker extends LitElement {

  @property({ type: Boolean }) public required = false;

-  @state() private _loading = true;
+  @state() private _opened = false;

-  protected firstUpdated() {
-    this._loadNavigationItems();
-  }
+  private navigationItemsLoaded = false;

-  private _navigationItems: PickerComboBoxItem[] = [];
+  private navigationItems: NavigationItem[] = DEFAULT_ITEMS;

-  protected render() {
+  @query("ha-combo-box", true) private comboBox!: HaComboBox;
+
+  protected render(): TemplateResult {
    return html`
-      <ha-generic-picker
+      <ha-combo-box
        .hass=${this.hass}
-        .value=${this._loading ? undefined : this.value}
+        item-value-path="path"
+        item-label-path="path"
+        .value=${this._value}
        allow-custom-value
-        .placeholder=${this.label}
+        .filteredItems=${this.navigationItems}
+        .label=${this.label}
        .helper=${this.helper}
-        .disabled=${this._loading || this.disabled}
+        .disabled=${this.disabled}
        .required=${this.required}
-        .getItems=${this._getItems}
-        .valueRenderer=${this._valueRenderer}
-        .customValueLabel=${this.hass.localize(
-          "ui.components.navigation-picker.add_custom_path"
-        )}
+        .renderer=${rowRenderer}
+        @opened-changed=${this._openedChanged}
        @value-changed=${this._valueChanged}
+        @filter-changed=${this._filterChanged}
      >
-      </ha-generic-picker>
+      </ha-combo-box>
    `;
  }

-  private _valueRenderer = (itemId: string) => {
-    const item = this._navigationItems.find((navItem) => navItem.id === itemId);
-    return html`
-      ${item?.icon
-        ? html`<ha-icon slot="start" .icon=${item.icon}></ha-icon>`
-        : nothing}
-      <span slot="headline">${item?.primary || itemId}</span>
-      ${item?.primary
-        ? html`<span slot="supporting-text">${itemId}</span>`
-        : nothing}
-    `;
-  };
-
-  private _getItems = () => this._navigationItems;
+  private async _openedChanged(ev: ValueChangedEvent<boolean>) {
+    this._opened = ev.detail.value;
+    if (this._opened && !this.navigationItemsLoaded) {
+      this._loadNavigationItems();
+    }
+  }

  private async _loadNavigationItems() {
+    this.navigationItemsLoaded = true;
+
    const panels = Object.entries(this.hass!.panels).map(([id, panel]) => ({
      id,
      ...panel,
@@ -91,47 +124,27 @@ export class HaNavigationPicker extends LitElement {

    const panelViewConfig = new Map(viewConfigs);

-    this._navigationItems = [];
+    this.navigationItems = [];

    for (const panel of panels) {
-      const path = `/${panel.url_path}`;
-      const panelTitle = getPanelTitle(this.hass, panel);
-      const primary = panelTitle || path;
-      this._navigationItems.push({
-        id: path,
-        primary,
-        secondary: panelTitle ? path : undefined,
-        icon: getPanelIcon(panel) || "mdi:view-dashboard",
-        sorting_label: [
-          primary.startsWith("/") ? `zzz${primary}` : primary,
-          path,
-        ]
-          .filter(Boolean)
-          .join("_"),
-      });
+      this.navigationItems.push(createPanelNavigationItem(this.hass!, panel));

      const config = panelViewConfig.get(panel.id);

      if (!config || !("views" in config)) continue;

-      config.views.forEach((view, index) => {
-        const viewPath = `/${panel.url_path}/${view.path ?? index}`;
-        const viewPrimary =
-          view.title ?? (view.path ? titleCase(view.path) : `${index}`);
-        this._navigationItems.push({
-          id: viewPath,
-          secondary: viewPath,
-          icon: view.icon ?? "mdi:view-compact",
-          primary: viewPrimary,
-          sorting_label: [
-            viewPrimary.startsWith("/") ? `zzz${viewPrimary}` : viewPrimary,
-            viewPath,
-          ].join("_"),
-        });
-      });
+      config.views.forEach((view, index) =>
+        this.navigationItems.push(
+          createViewNavigationItem(panel.url_path, view, index)
+        )
+      );
    }

-    this._loading = false;
+    this.comboBox.filteredItems = this.navigationItems;
+  }
+
+  protected shouldUpdate(changedProps: PropertyValues) {
+    return !this._opened || changedProps.has("_opened");
  }

  private _valueChanged(ev: ValueChangedEvent<string>) {
@@ -139,18 +152,61 @@ export class HaNavigationPicker extends LitElement {
    this._setValue(ev.detail.value);
  }

-  private _setValue(value = "") {
+  private _setValue(value: string) {
    this.value = value;
    fireEvent(
      this,
      "value-changed",
-      { value: this.value },
+      { value: this._value },
      {
        bubbles: false,
        composed: false,
      }
    );
  }
+
+  private _filterChanged(ev: CustomEvent): void {
+    const filterString = ev.detail.value.toLowerCase();
+    const characterCount = filterString.length;
+    if (characterCount >= 2) {
+      const filteredItems: NavigationItem[] = [];
+
+      this.navigationItems.forEach((item) => {
+        if (
+          item.path.toLowerCase().includes(filterString) ||
+          item.title.toLowerCase().includes(filterString)
+        ) {
+          filteredItems.push(item);
+        }
+      });
+
+      if (filteredItems.length > 0) {
+        this.comboBox.filteredItems = filteredItems;
+      } else {
+        this.comboBox.filteredItems = [];
+      }
+    } else {
+      this.comboBox.filteredItems = this.navigationItems;
+    }
+  }
+
+  private get _value() {
+    return this.value || "";
+  }
+
+  static styles = css`
+    ha-icon,
+    ha-svg-icon {
+      color: var(--primary-text-color);
+      position: relative;
+      bottom: 0px;
+    }
+    *[slot="prefix"] {
+      margin-right: 8px;
+      margin-inline-end: 8px;
+      margin-inline-start: initial;
+    }
+  `;
 }

 declare global {
--- a/src/components/ha-picker-combo-box.ts
+++ b/src/components/ha-picker-combo-box.ts
@@ -1,6 +1,6 @@
 import type { LitVirtualizer } from "@lit-labs/virtualizer";
 import type { RenderItemFunction } from "@lit-labs/virtualizer/virtualize";
-import { mdiMagnify, mdiMinusBoxOutline, mdiPlus } from "@mdi/js";
+import { mdiMagnify, mdiMinusBoxOutline } from "@mdi/js";
 import Fuse from "fuse.js";
 import { css, html, LitElement, nothing } from "lit";
 import {
@@ -53,8 +53,7 @@ export interface PickerComboBoxItem {
  icon_path?: string;
  icon?: string;
 }
-
-export const NO_ITEMS_AVAILABLE_ID = "___no_items_available___";
+const NO_ITEMS_AVAILABLE_ID = "___no_items_available___";

 const DEFAULT_ROW_RENDERER: RenderItemFunction<PickerComboBoxItem> = (
  item
@@ -92,9 +91,6 @@ export class HaPickerComboBox extends ScrollableFadeMixin(LitElement) {
  @property({ type: Boolean, attribute: "allow-custom-value" })
  public allowCustomValue;

-  @property({ attribute: "custom-value-label" })
-  public customValueLabel?: string;
-
  @property() public label?: string;

  @property() public value?: string;
@@ -191,15 +187,10 @@ export class HaPickerComboBox extends ScrollableFadeMixin(LitElement) {
  }

  protected render() {
-    const searchLabel =
-      this.label ??
-      (this.allowCustomValue
-        ? (this.hass?.localize("ui.components.combo-box.search_or_custom") ??
-          "Search | Add custom value")
-        : (this.hass?.localize("ui.common.search") ?? "Search"));
-
    return html`<ha-textfield
-        .label=${searchLabel}
+        .label=${this.label ??
+        this.hass?.localize("ui.common.search") ??
+        "Search"}
        @input=${this._filterChanged}
      ></ha-textfield>
      ${this._renderSectionButtons()}
@@ -447,23 +438,13 @@ export class HaPickerComboBox extends ScrollableFadeMixin(LitElement) {
        );
      }

-      if (this.allowCustomValue && searchString) {
-        filteredItems.push({
-          id: searchString,
-          primary:
-            this.customValueLabel ??
-            this.hass?.localize("ui.components.combo-box.add_custom_item") ??
-            "Add custom item",
-          secondary: `"${searchString}"`,
-          icon_path: mdiPlus,
-        });
-      }
-
      this._items = filteredItems as PickerComboBoxItem[];
    }

    this._selectedItemIndex = -1;
-    this._valuePinned = true;
+    if (this._virtualizerElement) {
+      this._virtualizerElement.scrollTo(0, 0);
+    }
  };

  private _toggleSection(ev: Event) {
@@ -658,7 +639,7 @@ export class HaPickerComboBox extends ScrollableFadeMixin(LitElement) {
    typeof item === "string" ? item : item?.id;

  private _getInitialSelectedIndex() {
-    if (!this._virtualizerElement || this._search || !this.value) {
+    if (!this._virtualizerElement || !this.value) {
      return 0;
    }

--- a/src/components/ha-picker-field.ts
+++ b/src/components/ha-picker-field.ts
@@ -9,15 +9,13 @@ import {
  type TemplateResult,
 } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
-import { ifDefined } from "lit/directives/if-defined";
 import { fireEvent } from "../common/dom/fire_event";
 import { localizeContext } from "../data/context";
-import { PickerMixin } from "../mixins/picker-mixin";
 import type { HomeAssistant } from "../types";
 import "./ha-combo-box-item";
 import type { HaComboBoxItem } from "./ha-combo-box-item";
-import "./ha-icon";
 import "./ha-icon-button";
+import "./ha-icon";

 declare global {
  interface HASSDomEvents {
@@ -28,7 +26,32 @@ declare global {
 export type PickerValueRenderer = (value: string) => TemplateResult<1>;

@customElement("ha-picker-field")
-export class HaPickerField extends PickerMixin(LitElement) {
+export class HaPickerField extends LitElement {
+  @property({ type: Boolean }) public disabled = false;
+
+  @property({ type: Boolean }) public required = false;
+
+  @property() public value?: string;
+
+  @property() public icon?: string;
+
+  @property() public helper?: string;
+
+  @property() public placeholder?: string;
+
+  @property({ type: Boolean, reflect: true }) public unknown = false;
+
+  @property({ attribute: "unknown-item-text" }) public unknownItemText?: string;
+
+  @property({ attribute: "hide-clear-icon", type: Boolean })
+  public hideClearIcon = false;
+
+  @property({ attribute: "show-label", type: Boolean })
+  public showLabel = false;
+
+  @property({ attribute: false })
+  public valueRenderer?: PickerValueRenderer;
+
  @property({ type: Boolean, reflect: true }) public invalid = false;

  @query("ha-combo-box-item", true) public item!: HaComboBoxItem;
@@ -43,48 +66,31 @@ export class HaPickerField extends PickerMixin(LitElement) {
  }

  protected render() {
-    const hasValue = !!this.value;
+    const hasValue = !!this.value?.length;

    const showClearIcon =
      !!this.value && !this.required && !this.disabled && !this.hideClearIcon;

-    const placeholderText = this.placeholder ?? this.label;
-
    const overlineLabel =
-      this.label && hasValue
-        ? html`<span slot="overline"
-            >${this.label}${this.required ? " *" : ""}</span
-          >`
+      this.showLabel && hasValue && this.placeholder
+        ? html`<span slot="overline">${this.placeholder}</span>`
        : nothing;

    const headlineContent = hasValue
      ? this.valueRenderer
        ? this.valueRenderer(this.value ?? "")
        : html`<span slot="headline">${this.value}</span>`
-      : placeholderText
+      : this.placeholder
        ? html`<span slot="headline" class="placeholder">
-            ${placeholderText}${this.required ? " *" : ""}
+            ${this.placeholder}
          </span>`
        : nothing;

    return html`
-      <ha-combo-box-item
-        aria-label=${ifDefined(this.label || this.placeholder)}
-        .disabled=${this.disabled}
-        type="button"
-        compact
-      >
-        ${this.image
-          ? html`<img
-              alt=${this.label ?? ""}
-              slot="start"
-              .src=${this.image}
-              crossorigin="anonymous"
-              referrerpolicy="no-referrer"
-            />`
-          : this.icon
-            ? html`<ha-icon slot="start" .icon=${this.icon}></ha-icon>`
-            : html`<slot name="start"></slot>`}
+      <ha-combo-box-item .disabled=${this.disabled} type="button" compact>
+        ${this.icon
+          ? html`<ha-icon slot="start" .icon=${this.icon}></ha-icon>`
+          : nothing}
        ${overlineLabel}${headlineContent}
        ${this.unknown
          ? html`<div slot="supporting-text" class="unknown">
@@ -111,7 +117,7 @@ export class HaPickerField extends PickerMixin(LitElement) {
    `;
  }

-  private _clear(e: CustomEvent) {
+  private _clear(e) {
    e.stopPropagation();
    fireEvent(this, "clear");
  }
@@ -194,10 +200,7 @@ export class HaPickerField extends PickerMixin(LitElement) {

        .placeholder {
          color: var(--secondary-text-color);
-        }
-
-        :host([invalid]) .placeholder {
-          color: var(--mdc-theme-error, var(--error-color, #b00020));
+          padding: 0 8px;
        }

        .unknown {
--- a/src/components/ha-selector/ha-selector-addon.ts
+++ b/src/components/ha-selector/ha-selector-addon.ts
@@ -28,6 +28,7 @@ export class HaAddonSelector extends LitElement {
      .helper=${this.helper}
      .disabled=${this.disabled}
      .required=${this.required}
+      allow-custom-entity
    ></ha-addon-picker>`;
  }

--- a/src/components/ha-selector/ha-selector-choose.ts
+++ b/src/components/ha-selector/ha-selector-choose.ts
@@ -1,202 +0,0 @@
-import type { PropertyValues } from "lit";
-import { css, html, LitElement, nothing } from "lit";
-import { customElement, property, state } from "lit/decorators";
-import memoizeOne from "memoize-one";
-import { fireEvent } from "../../common/dom/fire_event";
-import { isTemplate } from "../../common/string/has-template";
-import type { ChooseSelector, Selector } from "../../data/selector";
-import type { HomeAssistant } from "../../types";
-import "../ha-button-toggle-group";
-import "./ha-selector";
-
-@customElement("ha-selector-choose")
-export class HaChooseSelector extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
-  @property({ attribute: false }) public selector!: ChooseSelector;
-
-  @property() public value?: any;
-
-  @property() public label?: string;
-
-  @property() public helper?: string;
-
-  @property({ attribute: false })
-  public localizeValue?: (key: string) => string;
-
-  @property({ type: Boolean }) public disabled = false;
-
-  @property({ type: Boolean }) public required = true;
-
-  @state() public _activeChoice?: string;
-
-  protected willUpdate(changedProperties: PropertyValues): void {
-    if (
-      changedProperties.has("selector") &&
-      (!this._activeChoice ||
-        !(this._activeChoice in this.selector.choose.choices))
-    ) {
-      this._setActiveChoice();
-    }
-  }
-
-  protected render() {
-    if (!this._activeChoice) {
-      return nothing;
-    }
-
-    const selector = this._selector(this._activeChoice);
-    const value = this._value(this._activeChoice);
-
-    return html`<div class="multi-header">
-        <span>${this.label}${this.required ? "*" : ""}</span>
-        <ha-button-toggle-group
-          size="small"
-          .buttons=${this._toggleButtons(
-            this.selector.choose.choices,
-            this.selector.choose.translation_key
-          )}
-          .active=${this._activeChoice}
-          @value-changed=${this._choiceChanged}
-        ></ha-button-toggle-group>
-      </div>
-      <ha-selector
-        .hass=${this.hass}
-        .selector=${selector}
-        .value=${value}
-        .disabled=${this.disabled}
-        .required=${this.required}
-        @value-changed=${this._handleValueChanged}
-        .helper=${this.helper}
-      ></ha-selector>`;
-  }
-
-  private _toggleButtons = memoizeOne(
-    (choices: ChooseSelector["choose"]["choices"], translationKey?: string) =>
-      Object.keys(choices).map((choice) => ({
-        label:
-          this.localizeValue && translationKey
-            ? this.localizeValue(`${translationKey}.choices.${choice}`)
-            : choice,
-        value: choice,
-      }))
-  );
-
-  private _choiceChanged(ev) {
-    ev.stopPropagation();
-    const value =
-      typeof this.value === "object"
-        ? this.value
-        : {
-            [this._activeChoice!]: this.value,
-          };
-    this._activeChoice = ev.detail?.value || ev.target.value;
-    fireEvent(this, "value-changed", {
-      value: {
-        ...value,
-        active_choice: this._activeChoice,
-      },
-    });
-  }
-
-  private _handleValueChanged(ev: CustomEvent) {
-    ev.stopPropagation();
-    const value = typeof this.value === "object" ? this.value : {};
-    fireEvent(this, "value-changed", {
-      value: {
-        ...value,
-        [this._activeChoice!]: ev.detail.value,
-        active_choice: this._activeChoice,
-      },
-    });
-  }
-
-  private _selector(choice?: string): Selector {
-    const choices = this.selector.choose.choices;
-
-    choice = choice || this.value?.active_choice;
-
-    if (choice && choice in choices) {
-      return choices[choice].selector;
-    }
-
-    return choices[Object.keys(choices)[0]].selector;
-  }
-
-  private _value(choice?: string): any {
-    if (!this.value) {
-      return undefined;
-    }
-    return typeof this.value === "object"
-      ? this.value[choice || this.value.active_choice]
-      : this.value;
-  }
-
-  private _setActiveChoice() {
-    if (this.value) {
-      if (typeof this.value === "object") {
-        if (this.value.active_choice in this.selector.choose.choices) {
-          this._activeChoice = this.value.active_choice;
-          return;
-        }
-      } else {
-        const typeofValue = typeof this.value;
-        const selectorTypes = Object.values(this.selector.choose.choices).map(
-          (choice) => Object.keys(choice.selector)[0]
-        );
-        if (typeofValue === "number" && selectorTypes.includes("number")) {
-          this._activeChoice = Object.keys(this.selector.choose.choices)[
-            selectorTypes.indexOf("number")
-          ];
-          return;
-        }
-        if (
-          typeofValue === "string" &&
-          isTemplate(this.value) &&
-          selectorTypes.includes("template")
-        ) {
-          this._activeChoice = Object.keys(this.selector.choose.choices)[
-            selectorTypes.indexOf("template")
-          ];
-          return;
-        }
-        if (
-          typeofValue === "string" &&
-          this.value.includes(".") &&
-          selectorTypes.includes("entity")
-        ) {
-          this._activeChoice = Object.keys(this.selector.choose.choices)[
-            selectorTypes.indexOf("entity")
-          ];
-          return;
-        }
-        if (typeofValue === "string" && selectorTypes.includes("text")) {
-          this._activeChoice = Object.keys(this.selector.choose.choices)[
-            selectorTypes.indexOf("text")
-          ];
-          return;
-        }
-      }
-    }
-    this._activeChoice = Object.keys(this.selector.choose.choices)[0];
-  }
-
-  static styles = css`
-    .multi-header {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      margin-bottom: var(--ha-space-2);
-    }
-    ha-button-toggle-group {
-      display: block;
-      justify-self: end;
-    }
-  `;
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-selector-choose": HaChooseSelector;
-  }
-}
--- a/src/components/ha-selector/ha-selector-config-entry.ts
+++ b/src/components/ha-selector/ha-selector-config-entry.ts
@@ -29,6 +29,7 @@ export class HaConfigEntrySelector extends LitElement {
      .disabled=${this.disabled}
      .required=${this.required}
      .integration=${this.selector.config_entry?.integration}
+      allow-custom-entity
    ></ha-config-entry-picker>`;
  }

--- a/src/components/ha-selector/ha-selector-device.ts
+++ b/src/components/ha-selector/ha-selector-device.ts
@@ -107,6 +107,7 @@ export class HaDeviceSelector extends LitElement {
          .placeholder=${this.placeholder}
          .disabled=${this.disabled}
          .required=${this.required}
+          allow-custom-entity
        ></ha-device-picker>
      `;
    }
--- a/src/components/ha-selector/ha-selector-entity.ts
+++ b/src/components/ha-selector/ha-selector-entity.ts
@@ -66,14 +66,15 @@ export class HaEntitySelector extends LitElement {
        .hass=${this.hass}
        .value=${this.value}
        .label=${this.label}
-        .placeholder=${this.placeholder}
        .helper=${this.helper}
        .includeEntities=${this.selector.entity?.include_entities}
        .excludeEntities=${this.selector.entity?.exclude_entities}
        .entityFilter=${this._filterEntities}
        .createDomains=${this._createDomains}
+        .placeholder=${this.placeholder}
        .disabled=${this.disabled}
        .required=${this.required}
+        allow-custom-entity
      ></ha-entity-picker>`;
    }

@@ -82,13 +83,13 @@ export class HaEntitySelector extends LitElement {
        .hass=${this.hass}
        .value=${this.value}
        .label=${this.label}
-        .placeholder=${this.placeholder}
        .helper=${this.helper}
        .includeEntities=${this.selector.entity.include_entities}
        .excludeEntities=${this.selector.entity.exclude_entities}
        .reorder=${this.selector.entity.reorder ?? false}
        .entityFilter=${this._filterEntities}
        .createDomains=${this._createDomains}
+        .placeholder=${this.placeholder}
        .disabled=${this.disabled}
        .required=${this.required}
      ></ha-entities-picker>
--- a/src/components/ha-selector/ha-selector-icon.ts
+++ b/src/components/ha-selector/ha-selector-icon.ts
@@ -52,7 +52,7 @@ export class HaIconSelector extends LitElement {
        ${!placeholder && stateObj
          ? html`
              <ha-state-icon
-                slot="start"
+                slot="fallback"
                .hass=${this.hass}
                .stateObj=${stateObj}
              ></ha-state-icon>
--- a/src/components/ha-selector/ha-selector-select.ts
+++ b/src/components/ha-selector/ha-selector-select.ts
@@ -1,8 +1,7 @@
 import { mdiDragHorizontalVariant } from "@mdi/js";
 import { LitElement, css, html, nothing } from "lit";
-import { customElement, property } from "lit/decorators";
+import { customElement, property, query } from "lit/decorators";
 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";
@@ -12,8 +11,9 @@ import type { HomeAssistant } from "../../types";
 import "../chips/ha-chip-set";
 import "../chips/ha-input-chip";
 import "../ha-checkbox";
+import "../ha-combo-box";
+import type { HaComboBox } from "../ha-combo-box";
 import "../ha-formfield";
-import "../ha-generic-picker";
 import "../ha-input-helper-text";
 import "../ha-list-item";
 import "../ha-radio";
@@ -40,6 +40,8 @@ export class HaSelectSelector extends LitElement {

  @property({ type: Boolean }) public required = true;

+  @query("ha-combo-box", true) private comboBox!: HaComboBox;
+
  private _itemMoved(ev: CustomEvent): void {
    ev.stopPropagation();
    const { oldIndex, newIndex } = ev.detail;
@@ -57,8 +59,15 @@ export class HaSelectSelector extends LitElement {
    });
  }

+  private _filter = "";
+
  protected render() {
-    const options = this._getOptions(this.selector);
+    const options =
+      this.selector.select?.options?.map((option) =>
+        typeof option === "object"
+          ? (option as SelectOption)
+          : ({ value: option, label: option } as SelectOption)
+      ) || [];

    const translationKey = this.selector.select?.translation_key;

@@ -156,6 +165,10 @@ export class HaSelectSelector extends LitElement {
      const value =
        !this.value || this.value === "" ? [] : ensureArray(this.value);

+      const optionItems = options.filter(
+        (option) => !option.disabled && !value?.includes(option.value)
+      );
+
      return html`
        ${value?.length
          ? html`
@@ -199,33 +212,50 @@ export class HaSelectSelector extends LitElement {
            `
          : nothing}

-        <ha-generic-picker
+        <ha-combo-box
+          item-value-path="value"
+          item-label-path="label"
          .hass=${this.hass}
+          .label=${this.label}
          .helper=${this.helper}
          .disabled=${this.disabled}
          .required=${this.required && !value.length}
          .value=${""}
-          .addButtonLabel=${this.label}
-          .getItems=${this._getItems(options, value, true)}
+          .items=${optionItems}
          .allowCustomValue=${this.selector.select.custom_value ?? false}
+          @filter-changed=${this._filterChanged}
          @value-changed=${this._comboBoxValueChanged}
-        ></ha-generic-picker>
+          @opened-changed=${this._openedChanged}
+        ></ha-combo-box>
      `;
    }

    if (this.selector.select?.custom_value) {
+      if (
+        this.value !== undefined &&
+        !Array.isArray(this.value) &&
+        !options.find((option) => option.value === this.value)
+      ) {
+        options.unshift({ value: this.value, label: this.value });
+      }
+
+      const optionItems = options.filter((option) => !option.disabled);
+
      return html`
-        <ha-generic-picker
+        <ha-combo-box
+          item-value-path="value"
+          item-label-path="label"
          .hass=${this.hass}
          .label=${this.label}
          .helper=${this.helper}
          .disabled=${this.disabled}
          .required=${this.required}
-          .getItems=${this._getItems(options)}
-          .value=${this.value as string | undefined}
+          .items=${optionItems}
+          .value=${this.value}
+          @filter-changed=${this._filterChanged}
          @value-changed=${this._comboBoxValueChanged}
-          allow-custom-value
-        ></ha-generic-picker>
+          @opened-changed=${this._openedChanged}
+        ></ha-combo-box>
      `;
    }

@@ -244,7 +274,7 @@ export class HaSelectSelector extends LitElement {
      >
        ${options.map(
          (item: SelectOption) => html`
-            <ha-list-item .value=${item.value} .disabled=${!!item.disabled}
+            <ha-list-item .value=${item.value} .disabled=${item.disabled}
              >${item.label}</ha-list-item
            >
          `
@@ -261,30 +291,6 @@ export class HaSelectSelector extends LitElement {
      : "";
  }

-  private _getOptions = memoizeOne(
-    (selector: SelectSelector) =>
-      selector.select?.options?.map((option) =>
-        typeof option === "object"
-          ? (option as SelectOption)
-          : ({ value: option, label: option } as SelectOption)
-      ) || []
-  );
-
-  private _getItems = memoizeOne(
-    (options: SelectOption[], value?: string[], multiple = false) => {
-      const filteredOptions = options.filter((option) =>
-        !option.disabled && !multiple ? true : !value?.includes(option.value)
-      );
-
-      return () =>
-        filteredOptions.map((option) => ({
-          id: option.value,
-          primary: option.label,
-          sorting_label: option.label,
-        }));
-    }
-  );
-
  private get _mode(): "list" | "dropdown" | "box" {
    return (
      this.selector.select?.mode ||
@@ -349,6 +355,8 @@ export class HaSelectSelector extends LitElement {
    fireEvent(this, "value-changed", {
      value,
    });
+    await this.updateComplete;
+    this._filterChanged();
  }

  private _comboBoxValueChanged(ev: CustomEvent): void {
@@ -366,17 +374,49 @@ export class HaSelectSelector extends LitElement {
      return;
    }

-    const currentValue = !this.value ? [] : ensureArray(this.value);
+    const currentValue =
+      !this.value || this.value === "" ? [] : ensureArray(this.value);

    if (newValue !== undefined && currentValue.includes(newValue)) {
      return;
    }

+    setTimeout(() => {
+      this._filterChanged();
+      this.comboBox.setInputValue("");
+    }, 0);
+
    fireEvent(this, "value-changed", {
      value: [...currentValue, newValue],
    });
  }

+  private _openedChanged(ev?: CustomEvent): void {
+    if (ev?.detail.value) {
+      this._filterChanged();
+    }
+  }
+
+  private _filterChanged(ev?: CustomEvent): void {
+    this._filter = ev?.detail.value || "";
+
+    const filteredItems = this.comboBox.items?.filter((item) => {
+      const label = item.label || item.value;
+      return label.toLowerCase().includes(this._filter?.toLowerCase());
+    });
+
+    if (
+      this._filter &&
+      this.selector.select?.custom_value &&
+      filteredItems &&
+      !filteredItems.some((item) => (item.label || item.value) === this._filter)
+    ) {
+      filteredItems.unshift({ label: this._filter, value: this._filter });
+    }
+
+    this.comboBox.filteredItems = filteredItems;
+  }
+
  static styles = css`
    :host {
      position: relative;
--- a/src/components/ha-selector/ha-selector.ts
+++ b/src/components/ha-selector/ha-selector.ts
@@ -18,7 +18,6 @@ const LOAD_ELEMENTS = {
  attribute: () => import("./ha-selector-attribute"),
  assist_pipeline: () => import("./ha-selector-assist-pipeline"),
  boolean: () => import("./ha-selector-boolean"),
-  choose: () => import("./ha-selector-choose"),
  color_rgb: () => import("./ha-selector-color-rgb"),
  condition: () => import("./ha-selector-condition"),
  config_entry: () => import("./ha-selector-config-entry"),
--- a/src/components/ha-service-control.ts
+++ b/src/components/ha-service-control.ts
@@ -726,7 +726,6 @@ export class HaServiceControl extends LitElement {
              : undefined}
            .placeholder=${dataField.default}
            .localizeValue=${this._localizeValueCallback}
-            .required=${dataField.required}
          ></ha-selector>
        </ha-settings-row>`
      : "";
--- a/src/components/ha-service-picker.ts
+++ b/src/components/ha-service-picker.ts
@@ -1,5 +1,5 @@
-import type { RenderItemFunction } from "@lit-labs/virtualizer/virtualize";
 import { mdiRoomService } from "@mdi/js";
+import type { ComboBoxLitRenderer } from "@vaadin/combo-box/lit";
 import { html, LitElement, nothing, type TemplateResult } from "lit";
 import { customElement, property, query } from "lit/decorators";
 import memoizeOne from "memoize-one";
@@ -56,9 +56,9 @@ class HaServicePicker extends LitElement {
    getServiceIcons(this.hass);
  }

-  private _rowRenderer: RenderItemFunction<ServiceComboBoxItem> = (
+  private _rowRenderer: ComboBoxLitRenderer<ServiceComboBoxItem> = (
    item,
-    index
+    { index }
  ) => html`
    <ha-combo-box-item type="button" .borderTop=${index !== 0}>
      <ha-service-icon
@@ -135,6 +135,7 @@ class HaServicePicker extends LitElement {
      <ha-generic-picker
        .hass=${this.hass}
        .autofocus=${this.autofocus}
+        allow-custom-value
        .notFoundLabel=${this.hass.localize(
          "ui.components.service-picker.no_match"
        )}
--- a/src/components/ha-sidebar.ts
+++ b/src/components/ha-sidebar.ts
@@ -681,7 +681,7 @@ class HaSidebar extends SubscribeMixin(LitElement) {
    tooltip.style.display = "block";
    tooltip.style.position = "fixed";
    tooltip.style.top = `${top}px`;
-    tooltip.style.left = `calc(${item.offsetLeft + item.clientWidth + 8}px + var(--safe-area-inset-left, 0px))`;
+    tooltip.style.left = `calc(${item.offsetLeft + item.clientWidth + 8}px + var(--safe-area-inset-left, var(--ha-space-0)))`;
  }

  private _hideTooltip() {
@@ -720,10 +720,14 @@ class HaSidebar extends SubscribeMixin(LitElement) {
          background-color: var(--sidebar-background-color);
          width: 100%;
          box-sizing: border-box;
-          padding-bottom: calc(14px + var(--safe-area-inset-bottom, 0px));
+          padding-bottom: calc(
+            14px + var(--safe-area-inset-bottom, var(--ha-space-0))
+          );
        }
        .menu {
-          height: calc(var(--header-height) + var(--safe-area-inset-top, 0px));
+          height: calc(
+            var(--header-height) + var(--safe-area-inset-top, var(--ha-space-0))
+          );
          box-sizing: border-box;
          display: flex;
          padding: 0 var(--ha-space-1);
@@ -742,16 +746,16 @@ class HaSidebar extends SubscribeMixin(LitElement) {
          font-size: var(--ha-font-size-xl);
          align-items: center;
          padding-left: calc(
-            var(--ha-space-1) + var(--safe-area-inset-left, 0px)
+            var(--ha-space-1) + var(--safe-area-inset-left, var(--ha-space-0))
          );
          padding-inline-start: calc(
-            var(--ha-space-1) + var(--safe-area-inset-left, 0px)
+            var(--ha-space-1) + var(--safe-area-inset-left, var(--ha-space-0))
          );
          padding-inline-end: initial;
-          padding-top: var(--safe-area-inset-top, 0px);
+          padding-top: var(--safe-area-inset-top, var(--ha-space-0));
        }
        :host([expanded]) .menu {
-          width: calc(256px + var(--safe-area-inset-left, 0px));
+          width: calc(256px + var(--safe-area-inset-left, var(--ha-space-0)));
        }
        :host([narrow][expanded]) .menu {
          width: 100%;
@@ -767,8 +771,8 @@ class HaSidebar extends SubscribeMixin(LitElement) {
          display: none;
        }
        :host([narrow]) .title {
-          margin: 0;
-          padding: 0 var(--ha-space-4);
+          margin: var(--ha-space-0);
+          padding: var(--ha-space-0) var(--ha-space-4);
        }
        :host([expanded]) .title {
          display: initial;
@@ -780,13 +784,16 @@ class HaSidebar extends SubscribeMixin(LitElement) {
        ha-fade-in,
        ha-md-list {
          height: calc(
-            100% - var(--header-height) - var(--safe-area-inset-top, 0px) -
+            100% - var(--header-height) - var(
+                --safe-area-inset-top,
+                var(--ha-space-0)
+              ) -
              132px
          );
        }

        ha-fade-in {
-          padding: var(--ha-space-1) 0;
+          padding: var(--ha-space-1) var(--ha-space-0);
          box-sizing: border-box;
          display: flex;
          justify-content: center;
@@ -796,7 +803,7 @@ class HaSidebar extends SubscribeMixin(LitElement) {
        ha-md-list {
          overflow-x: hidden;
          background: none;
-          margin-left: var(--safe-area-inset-left, 0px);
+          margin-left: var(--safe-area-inset-left, var(--ha-space-0));
        }

        ha-md-list-item {
@@ -818,7 +825,7 @@ class HaSidebar extends SubscribeMixin(LitElement) {
          width: 248px;
        }
        :host([narrow][expanded]) ha-md-list-item {
-          width: calc(240px - var(--safe-area-inset-left, 0px));
+          width: calc(240px - var(--safe-area-inset-left, var(--ha-space-0)));
        }

        ha-md-list-item.selected {
@@ -891,7 +898,7 @@ class HaSidebar extends SubscribeMixin(LitElement) {
          border-radius: var(--ha-border-radius-md);
          font-size: 0.65em;
          line-height: var(--ha-line-height-expanded);
-          padding: 0 var(--ha-space-1);
+          padding: var(--ha-space-0) var(--ha-space-1);
        }

        ha-md-list-item.user {
--- a/src/components/ha-target-picker.ts
+++ b/src/components/ha-target-picker.ts
@@ -988,7 +988,7 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) {
                style=${styleMap({
                  width: "var(--ha-space-12)",
                  position: "absolute",
-                  top: "0",
+                  top: "var(--ha-space-0)",
                  left: rtl ? undefined : "var(--ha-space-1)",
                  right: rtl ? "var(--ha-space-1)" : undefined,
                  transform: rtl ? "scaleX(-1)" : "",
@@ -1092,7 +1092,7 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) {
        z-index: 2;
      }
      .mdc-chip-set {
-        padding: var(--ha-space-1) 0;
+        padding: var(--ha-space-1) var(--ha-space-0);
        gap: var(--ha-space-2);
      }

--- a/src/components/ha-wa-dialog.ts
+++ b/src/components/ha-wa-dialog.ts
@@ -235,12 +235,6 @@ export class HaWaDialog extends ScrollableFadeMixin(LitElement) {
          );
          max-width: var(--ha-dialog-max-width, var(--safe-width));
        }
-        @media (prefers-reduced-motion: reduce) {
-          wa-dialog {
-            --show-duration: 0ms;
-            --hide-duration: 0ms;
-          }
-        }

        :host([width="small"]) wa-dialog {
          --width: min(var(--ha-dialog-width-sm, 320px), var(--full-width));
@@ -266,15 +260,15 @@ export class HaWaDialog extends ScrollableFadeMixin(LitElement) {
          /* Used to offset the dialog from the safe areas when space is limited */
          transform: translate(
            calc(
-              var(--safe-area-offset-left, 0px) - var(
+              var(--safe-area-offset-left, var(--ha-space-0)) - var(
                  --safe-area-offset-right,
-                  0px
+                  var(--ha-space-0)
                )
            ),
            calc(
-              var(--safe-area-offset-top, 0px) - var(
+              var(--safe-area-offset-top, var(--ha-space-0)) - var(
                  --safe-area-offset-bottom,
-                  0px
+                  var(--ha-space-0)
                )
            )
          );
@@ -285,7 +279,7 @@ export class HaWaDialog extends ScrollableFadeMixin(LitElement) {

        @media all and (max-width: 450px), all and (max-height: 500px) {
          :host([type="standard"]) {
-            --ha-dialog-border-radius: 0;
+            --ha-dialog-border-radius: var(--ha-space-0);

            wa-dialog {
              /* Make the container fill the whole screen width and not the safe width */
@@ -372,7 +366,7 @@ export class HaWaDialog extends ScrollableFadeMixin(LitElement) {
        }

        wa-dialog::part(footer) {
-          padding: 0;
+          padding: var(--ha-space-0);
        }

        ::slotted([slot="footer"]) {
--- a/src/components/target-picker/ha-target-picker-item-group.ts
+++ b/src/components/target-picker/ha-target-picker-item-group.ts
@@ -89,7 +89,7 @@ export class HaTargetPickerItemGroup extends LitElement {
  static styles = css`
    :host {
      display: block;
-      --expansion-panel-content-padding: 0;
+      --expansion-panel-content-padding: var(--ha-space-0);
    }
    ha-expansion-panel::part(summary) {
      background-color: var(--ha-color-fill-neutral-quiet-resting);
@@ -101,7 +101,7 @@ export class HaTargetPickerItemGroup extends LitElement {
      min-height: unset;
    }
    ha-md-list {
-      padding: 0;
+      padding: var(--ha-space-0);
    }
  `;
 }
--- a/src/components/target-picker/ha-target-picker-item-row.ts
+++ b/src/components/target-picker/ha-target-picker-item-row.ts
@@ -605,8 +605,8 @@ export class HaTargetPickerItemRow extends LitElement {
    buttonLinkStyle,
    css`
      :host {
-        --md-list-item-top-space: 0;
-        --md-list-item-bottom-space: 0;
+        --md-list-item-top-space: var(--ha-space-0);
+        --md-list-item-bottom-space: var(--ha-space-0);
        --md-list-item-leading-space: var(--ha-space-2);
        --md-list-item-trailing-space: var(--ha-space-2);
        --md-list-item-two-line-container-height: 56px;
--- a/src/components/target-picker/ha-target-picker-value-chip.ts
+++ b/src/components/target-picker/ha-target-picker-value-chip.ts
@@ -278,8 +278,8 @@ export class HaTargetPickerValueChip extends LitElement {
      direction: var(--direction);
    }
    .expand-btn {
-      margin-right: 0;
-      margin-inline-end: 0;
+      margin-right: var(--ha-space-0);
+      margin-inline-end: var(--ha-space-0);
      margin-inline-start: initial;
    }
    .mdc-chip.area:not(.add),
--- a/src/components/user/ha-user-picker.ts
+++ b/src/components/user/ha-user-picker.ts
@@ -1,4 +1,4 @@
-import type { RenderItemFunction } from "@lit-labs/virtualizer/virtualize";
+import type { ComboBoxLitRenderer } from "@vaadin/combo-box/lit";
 import type { TemplateResult } from "lit";
 import { html, LitElement, nothing } from "lit";
 import { customElement, property } from "lit/decorators";
@@ -73,7 +73,7 @@ class HaUserPicker extends LitElement {
    `;
  };

-  private _rowRenderer: RenderItemFunction<UserComboBoxItem> = (item) => {
+  private _rowRenderer: ComboBoxLitRenderer<UserComboBoxItem> = (item) => {
    const user = item.user;
    if (!user) {
      return html`<ha-combo-box-item type="button" compact>
@@ -132,9 +132,9 @@ class HaUserPicker extends LitElement {
        .hass=${this.hass}
        .autofocus=${this.autofocus}
        .label=${this.label}
+        .notFoundLabel=${this._notFoundLabel}
        .placeholder=${placeholder}
        .value=${this.value}
-        .notFoundLabel=${this._notFoundLabel}
        .getItems=${this._getItems}
        .valueRenderer=${this._valueRenderer}
        .rowRenderer=${this._rowRenderer}
--- a/src/data/selector.ts
+++ b/src/data/selector.ts
@@ -27,7 +27,6 @@ export type Selector =
  | AttributeSelector
  | BooleanSelector
  | ButtonToggleSelector
-  | ChooseSelector
  | ColorRGBSelector
  | ColorTempSelector
  | ConditionSelector
@@ -117,13 +116,6 @@ export interface ButtonToggleSelector {
  } | null;
 }

-export interface ChooseSelector {
-  choose: {
-    choices: Record<string, { selector: Selector }>;
-    translation_key?: string;
-  };
-}
-
 export interface ColorRGBSelector {
  color_rgb: {} | null;
 }
--- a/src/dialogs/more-info/components/ha-more-info-control-select-container.ts
+++ b/src/dialogs/more-info/components/ha-more-info-control-select-container.ts
@@ -37,8 +37,8 @@ export class HaMoreInfoControlSelectContainer extends LitElement {
      overflow: auto;
      -ms-overflow-style: none; /* IE and Edge */
      scrollbar-width: none; /* Firefox */
-      margin: -2px calc(var(--ha-space-6) * -1);
-      padding: 2px var(--ha-space-6);
+      margin: -2px -24px;
+      padding: 2px 24px;
    }
    .controls-scroll::-webkit-scrollbar {
      display: none;
--- a/src/dialogs/more-info/components/ha-more-info-state-header.ts
+++ b/src/dialogs/more-info/components/ha-more-info-state-header.ts
@@ -84,8 +84,8 @@ export class HaMoreInfoStateHeader extends LitElement {
      font-weight: var(--ha-font-weight-medium);
      line-height: var(--ha-line-height-normal);
      letter-spacing: 0.1px;
-      padding: var(--ha-space-1) 0;
-      margin-bottom: var(--ha-space-5);
+      padding: 4px 0;
+      margin-bottom: 20px;
      cursor: pointer;
      user-select: none;
      -webkit-user-select: none;
--- a/src/dialogs/more-info/components/lights/dialog-light-color-favorite.ts
+++ b/src/dialogs/more-info/components/lights/dialog-light-color-favorite.ts
@@ -268,14 +268,14 @@ class DialogLightColorFavorite extends LitElement {
          flex-direction: column;
          align-items: center;
          justify-content: center;
-          padding: var(--ha-space-6);
+          padding: 24px;
          flex: 1;
        }
        .modes {
          display: flex;
          flex-direction: row;
          justify-content: flex-end;
-          padding: 0 var(--ha-space-6);
+          padding: 0 24px;
        }
        .wheel {
          width: 30px;
--- a/src/dialogs/more-info/components/lights/ha-more-info-light-favorite-colors.ts
+++ b/src/dialogs/more-info/components/lights/ha-more-info-light-favorite-colors.ts
@@ -254,14 +254,14 @@ export class HaMoreInfoLightFavoriteColors extends LitElement {
      display: flex;
      align-items: center;
      justify-content: center;
-      margin: calc(var(--ha-space-2) * -1);
+      margin: -8px;
      flex-wrap: wrap;
      max-width: 250px;
      user-select: none;
    }

    .container > * {
-      margin: var(--ha-space-2);
+      margin: 8px;
    }

    .color {
--- a/src/dialogs/more-info/components/lights/light-color-rgb-picker.ts
+++ b/src/dialogs/more-info/components/lights/light-color-rgb-picker.ts
@@ -515,7 +515,7 @@ class LightRgbColorPicker extends LitElement {
        hr {
          border-color: var(--divider-color);
          border-bottom: none;
-          margin: var(--ha-space-4) 0;
+          margin: 16px 0;
        }
      `,
    ];
--- a/src/dialogs/more-info/components/more-info-control-style.ts
+++ b/src/dialogs/more-info/components/more-info-control-style.ts
@@ -15,22 +15,22 @@ export const moreInfoControlStyle = css`
  }

  .controls:not(:last-child) {
-    margin-bottom: var(--ha-space-6);
+    margin-bottom: 24px;
  }

  .controls > *:not(:last-child) {
-    margin-bottom: var(--ha-space-6);
+    margin-bottom: 24px;
  }

  .buttons {
    display: flex;
    align-items: center;
    justify-content: center;
-    margin-bottom: var(--ha-space-3);
+    margin-bottom: 12px;
  }

  .buttons > * {
-    margin: var(--ha-space-2);
+    margin: 8px;
  }

  ha-attributes {
@@ -38,6 +38,6 @@ export const moreInfoControlStyle = css`
    width: 100%;
  }
  ha-more-info-control-select-container + ha-attributes:not([empty]) {
-    margin-top: var(--ha-space-4);
+    margin-top: 16px;
  }
 `;
--- a/src/dialogs/more-info/components/siren/ha-more-info-siren-advanced-controls.ts
+++ b/src/dialogs/more-info/components/siren/ha-more-info-siren-advanced-controls.ts
@@ -209,7 +209,7 @@ class MoreInfoSirenAdvancedControls extends LitElement {
          flex-direction: row;
          justify-content: center;
          gap: var(--ha-space-4);
-          margin-top: var(--ha-space-4);
+          margin-top: 16px;
        }
        ha-control-button {
          --control-button-border-radius: var(--ha-border-radius-xl);
--- a/src/dialogs/more-info/components/voice/ha-more-info-view-voice-assistants.ts
+++ b/src/dialogs/more-info/components/voice/ha-more-info-view-voice-assistants.ts
@@ -48,7 +48,7 @@ class MoreInfoViewVoiceAssistants extends LitElement {
          flex-direction: column;
          align-items: center;
          justify-content: center;
-          padding: var(--ha-space-6);
+          padding: 24px;
          flex: 1;
        }
      `,
--- a/src/dialogs/more-info/const.ts
+++ b/src/dialogs/more-info/const.ts
@@ -88,6 +88,7 @@ export const DOMAINS_HIDE_DEFAULT_MORE_INFO = [
  "select",
  "text",
  "update",
+  "event",
 ];

 /** Domains that should have the history hidden in the more info dialog. */
--- a/src/dialogs/more-info/controls/more-info-automation.ts
+++ b/src/dialogs/more-info/controls/more-info-automation.ts
@@ -52,7 +52,7 @@ class MoreInfoAutomation extends LitElement {
      justify-content: space-between;
    }
    .actions {
-      margin: var(--ha-space-2) 0;
+      margin: 8px 0;
      display: flex;
      flex-wrap: wrap;
      justify-content: center;
@@ -60,7 +60,7 @@ class MoreInfoAutomation extends LitElement {
    hr {
      border-color: var(--divider-color);
      border-bottom: none;
-      margin: var(--ha-space-4) 0;
+      margin: 16px 0;
    }
  `;
 }
--- a/src/dialogs/more-info/controls/more-info-camera.ts
+++ b/src/dialogs/more-info/controls/more-info-camera.ts
@@ -106,7 +106,7 @@ class MoreInfoCamera extends LitElement {
      flex-wrap: wrap;
      justify-content: flex-end;
      box-sizing: border-box;
-      padding: var(--ha-space-4);
+      padding: 16px;
      z-index: 1;
      gap: var(--ha-space-2);
    }
--- a/src/dialogs/more-info/controls/more-info-climate.ts
+++ b/src/dialogs/more-info/controls/more-info-climate.ts
@@ -511,7 +511,7 @@ class MoreInfoClimate extends LitElement {
          align-items: center;
          justify-content: center;
          text-align: center;
-          margin-bottom: var(--ha-space-10);
+          margin-bottom: 40px;
        }

        .current div {
@@ -534,7 +534,7 @@ class MoreInfoClimate extends LitElement {
          font-size: var(--ha-font-size-m);
          line-height: var(--ha-line-height-condensed);
          letter-spacing: 0.4px;
-          margin-bottom: var(--ha-space-1);
+          margin-bottom: 4px;
        }

        .current .value {
@@ -545,7 +545,7 @@ class MoreInfoClimate extends LitElement {
        }
        ha-select {
          width: 100%;
-          margin-top: var(--ha-space-2);
+          margin-top: 8px;
        }

        .container-humidity .single-row {
@@ -561,7 +561,7 @@ class MoreInfoClimate extends LitElement {
        }

        .single-row {
-          padding: var(--ha-space-2) 0;
+          padding: 8px 0;
        }
      `,
    ];
--- a/src/dialogs/more-info/controls/more-info-configurator.ts
+++ b/src/dialogs/more-info/controls/more-info-configurator.ts
@@ -87,7 +87,7 @@ export class MoreInfoConfigurator extends LitElement {
      flex-direction: column;
    }
    p {
-      margin: var(--ha-space-2) 0;
+      margin: 8px 0;
    }

    a {
--- a/src/dialogs/more-info/controls/more-info-counter.ts
+++ b/src/dialogs/more-info/controls/more-info-counter.ts
@@ -62,7 +62,7 @@ class MoreInfoCounter extends LitElement {

  static styles = css`
    .actions {
-      margin: var(--ha-space-2) 0;
+      margin: 8px 0;
      display: flex;
      flex-wrap: wrap;
      justify-content: center;
--- a/src/dialogs/more-info/controls/more-info-cover.ts
+++ b/src/dialogs/more-info/controls/more-info-cover.ts
@@ -194,7 +194,7 @@ class MoreInfoCover extends LitElement {
          align-items: center;
        }
        .main-control > * {
-          margin: 0 var(--ha-space-2);
+          margin: 0 8px;
        }
      `,
    ];
--- a/src/dialogs/more-info/controls/more-info-datetime.ts
+++ b/src/dialogs/more-info/controls/more-info-datetime.ts
@@ -72,8 +72,8 @@ class MoreInfoDatetime extends LitElement {
      justify-content: flex-end;
    }
    ha-date-input + ha-time-input {
-      margin-left: var(--ha-space-1);
-      margin-inline-start: var(--ha-space-1);
+      margin-left: 4px;
+      margin-inline-start: 4px;
      margin-inline-end: initial;
    }
  `;
--- a/src/dialogs/more-info/controls/more-info-group.ts
+++ b/src/dialogs/more-info/controls/more-info-group.ts
@@ -100,7 +100,7 @@ class MoreInfoGroup extends LitElement {
      css`
        state-card-content {
          display: block;
-          margin-top: var(--ha-space-2);
+          margin-top: 8px;
        }
      `,
    ];
--- a/src/dialogs/more-info/controls/more-info-humidifier.ts
+++ b/src/dialogs/more-info/controls/more-info-humidifier.ts
@@ -217,7 +217,7 @@ class MoreInfoHumidifier extends LitElement {
          align-items: center;
          justify-content: center;
          text-align: center;
-          margin-bottom: var(--ha-space-10);
+          margin-bottom: 40px;
        }
        .current div {
          display: flex;
@@ -237,7 +237,7 @@ class MoreInfoHumidifier extends LitElement {
          font-size: var(--ha-font-size-m);
          line-height: var(--ha-line-height-condensed);
          letter-spacing: 0.4px;
-          margin-bottom: var(--ha-space-1);
+          margin-bottom: 4px;
        }
        .current .value {
          font-size: var(--ha-font-size-xl);
--- a/src/dialogs/more-info/controls/more-info-input_datetime.ts
+++ b/src/dialogs/more-info/controls/more-info-input_datetime.ts
@@ -84,8 +84,8 @@ class MoreInfoInputDatetime extends LitElement {
      justify-content: flex-end;
    }
    ha-date-input + ha-time-input {
-      margin-left: var(--ha-space-1);
-      margin-inline-start: var(--ha-space-1);
+      margin-left: 4px;
+      margin-inline-start: 4px;
      margin-inline-end: initial;
    }
  `;
--- a/src/dialogs/more-info/controls/more-info-lock.ts
+++ b/src/dialogs/more-info/controls/more-info-lock.ts
@@ -192,7 +192,7 @@ class MoreInfoLock extends LitElement {
          margin: 0 auto;
        }
        ha-control-button-group + ha-attributes:not([empty]) {
-          margin-top: var(--ha-space-4);
+          margin-top: 16px;
        }
        @keyframes pulse {
          0% {
--- a/src/dialogs/more-info/controls/more-info-media_player.ts
+++ b/src/dialogs/more-info/controls/more-info-media_player.ts
@@ -528,11 +528,11 @@ class MoreInfoMediaPlayer extends LitElement {
      display: flex;
      align-items: center;
      gap: var(--ha-space-3);
-      margin-left: var(--ha-space-2);
+      margin-left: 8px;
    }

    .volume ha-svg-icon {
-      padding: var(--ha-space-1);
+      padding: 4px;
      height: 16px;
      width: 16px;
    }
@@ -545,17 +545,17 @@ class MoreInfoMediaPlayer extends LitElement {
    .badge {
      position: absolute;
      top: -10px;
-      left: var(--ha-space-4);
+      left: 16px;
      display: flex;
      justify-content: center;
      align-items: center;
      height: 16px;
-      min-width: var(--ha-space-2);
+      min-width: 8px;
      border-radius: var(--ha-border-radius-md);
      font-weight: var(--ha-font-weight-normal);
      font-size: var(--ha-font-size-xs);
      background-color: var(--primary-color);
-      padding: 0 var(--ha-space-1);
+      padding: 0 4px;
      color: var(--text-primary-color);
    }

@@ -572,13 +572,13 @@ class MoreInfoMediaPlayer extends LitElement {
      display: flex;
      flex-direction: column;
      justify-content: space-between;
-      margin: var(--ha-space-2) 0 var(--ha-space-2) var(--ha-space-2);
+      margin: 8px 0 8px 8px;
    }

    .media-title {
      font-size: var(--ha-font-size-xl);
      font-weight: var(--ha-font-weight-bold);
-      margin-bottom: var(--ha-space-1);
+      margin-bottom: 4px;
    }

    .media-artist {
--- a/src/dialogs/more-info/controls/more-info-person.ts
+++ b/src/dialogs/more-info/controls/more-info-person.ts
@@ -72,12 +72,12 @@ class MoreInfoPerson extends LitElement {
      justify-content: space-between;
    }
    .actions {
-      margin: var(--ha-space-2) 0;
+      margin: 8px 0;
      text-align: right;
    }
    ha-map {
-      margin-top: var(--ha-space-4);
-      margin-bottom: var(--ha-space-4);
+      margin-top: 16px;
+      margin-bottom: 16px;
    }
  `;
 }
--- a/src/dialogs/more-info/controls/more-info-script.ts
+++ b/src/dialogs/more-info/controls/more-info-script.ts
@@ -227,24 +227,24 @@ class MoreInfoScript extends LitElement {
      visibility: hidden;
      color: var(--secondary-text-color);
      text-align: center;
-      margin-bottom: var(--ha-space-4);
+      margin-bottom: 16px;
      height: 21px;
    }
    .queue.has-queue {
      visibility: visible;
    }
    .fields {
-      padding: var(--ha-space-4);
+      padding: 16px;
      border: 1px solid var(--divider-color);
      border-radius: var(--ha-border-radius-md);
-      margin-bottom: var(--ha-space-4);
+      margin-bottom: 16px;
    }
    .fields .title {
      font-weight: var(--ha-font-weight-bold);
    }
    ha-control-button ha-svg-icon {
      z-index: -1;
-      margin-right: var(--ha-space-1);
+      margin-right: 4px;
    }
    ha-service-control {
      --service-control-padding: 0;
@@ -252,7 +252,7 @@ class MoreInfoScript extends LitElement {
    }
    ha-markdown {
      text-align: center;
-      padding: 0 var(--ha-space-4);
+      padding: 0 16px;
    }
  `;
 }
--- a/src/dialogs/more-info/controls/more-info-sun.ts
+++ b/src/dialogs/more-info/controls/more-info-sun.ts
@@ -83,7 +83,7 @@ class MoreInfoSun extends LitElement {
    hr {
      border-color: var(--divider-color);
      border-bottom: none;
-      margin: var(--ha-space-4) 0;
+      margin: 16px 0;
    }
  `;
 }
--- a/src/dialogs/more-info/controls/more-info-timer.ts
+++ b/src/dialogs/more-info/controls/more-info-timer.ts
@@ -80,7 +80,7 @@ class MoreInfoTimer extends LitElement {

  static styles = css`
    .actions {
-      margin: var(--ha-space-2) 0;
+      margin: 8px 0;
      display: flex;
      flex-wrap: wrap;
      justify-content: center;
--- a/src/dialogs/more-info/controls/more-info-update.ts
+++ b/src/dialogs/more-info/controls/more-info-update.ts
@@ -448,14 +448,14 @@ class MoreInfoUpdate extends LitElement {
    hr {
      border-color: var(--divider-color);
      border-bottom: none;
-      margin: var(--ha-space-4) 0;
+      margin: 16px 0;
    }
    ha-expansion-panel {
-      margin: var(--ha-space-4) 0;
+      margin: 16px 0;
    }

    .summary {
-      margin-bottom: var(--ha-space-4);
+      margin-bottom: 16px;
    }

    .row {
@@ -473,10 +473,8 @@ class MoreInfoUpdate extends LitElement {
      );
      position: sticky;
      bottom: 0;
-      margin: 0 calc(var(--ha-space-6) * -1) 0 calc(var(--ha-space-6) * -1);
-      margin-bottom: calc(
-        -1 * max(var(--safe-area-inset-bottom), var(--ha-space-6))
-      );
+      margin: 0 -24px 0 -24px;
+      margin-bottom: calc(-1 * max(var(--safe-area-inset-bottom), 24px));
      box-sizing: border-box;
      display: flex;
      flex-direction: column;
@@ -488,8 +486,8 @@ class MoreInfoUpdate extends LitElement {
    ha-md-list {
      width: 100%;
      box-sizing: border-box;
-      margin-bottom: calc(var(--ha-space-4) * -1);
-      margin-top: calc(var(--ha-space-1) * -1);
+      margin-bottom: -16px;
+      margin-top: -4px;
      --md-sys-color-surface: var(
        --ha-dialog-surface-background,
        var(--mdc-theme-surface, #fff)
@@ -497,8 +495,8 @@ class MoreInfoUpdate extends LitElement {
    }

    ha-md-list-item {
-      --md-list-item-leading-space: var(--ha-space-6);
-      --md-list-item-trailing-space: var(--ha-space-6);
+      --md-list-item-leading-space: 24px;
+      --md-list-item-trailing-space: 24px;
    }

    .actions {
@@ -508,7 +506,7 @@ class MoreInfoUpdate extends LitElement {
      flex-wrap: wrap;
      justify-content: flex-end;
      box-sizing: border-box;
-      padding: var(--ha-space-4);
+      padding: 16px;
      z-index: 1;
      gap: var(--ha-space-2);
    }
@@ -522,12 +520,12 @@ class MoreInfoUpdate extends LitElement {
      align-items: center;
    }
    mwc-linear-progress {
-      margin-bottom: calc(var(--ha-space-2) * -1);
-      margin-top: var(--ha-space-1);
+      margin-bottom: -8px;
+      margin-top: 4px;
    }
    ha-markdown {
      direction: ltr;
-      padding-bottom: var(--ha-space-4);
+      padding-bottom: 16px;
      box-sizing: border-box;
    }
    ha-markdown.hidden {
@@ -536,7 +534,7 @@ class MoreInfoUpdate extends LitElement {
    .loader {
      height: 80px;
      box-sizing: border-box;
-      padding-bottom: var(--ha-space-4);
+      padding-bottom: 16px;
    }
  `;
 }
--- a/src/dialogs/more-info/controls/more-info-valve.ts
+++ b/src/dialogs/more-info/controls/more-info-valve.ts
@@ -173,7 +173,7 @@ class MoreInfoValve extends LitElement {
          align-items: center;
        }
        .main-control > * {
-          margin: 0 var(--ha-space-2);
+          margin: 0 8px;
        }
      `,
    ];
--- a/src/dialogs/more-info/controls/more-info-water_heater.ts
+++ b/src/dialogs/more-info/controls/more-info-water_heater.ts
@@ -214,7 +214,7 @@ class MoreInfoWaterHeater extends LitElement {
          align-items: center;
          justify-content: center;
          text-align: center;
-          margin-bottom: var(--ha-space-10);
+          margin-bottom: 40px;
        }

        .current div {
@@ -237,7 +237,7 @@ class MoreInfoWaterHeater extends LitElement {
          font-size: var(--ha-font-size-m);
          line-height: var(--ha-line-height-condensed);
          letter-spacing: 0.4px;
-          margin-bottom: var(--ha-space-1);
+          margin-bottom: 4px;
        }

        .current .value {
--- a/src/dialogs/more-info/controls/more-info-weather.ts
+++ b/src/dialogs/more-info/controls/more-info-weather.ts
@@ -440,13 +440,13 @@ class MoreInfoWeather extends LitElement {
      css`
        ha-svg-icon {
          color: var(--state-icon-color);
-          margin-left: var(--ha-space-2);
-          margin-inline-start: var(--ha-space-2);
+          margin-left: 8px;
+          margin-inline-start: 8px;
          margin-inline-end: initial;
        }

        .section {
-          margin: var(--ha-space-4) 0 var(--ha-space-2) 0;
+          margin: 16px 0 8px 0;
          font-size: 1.2em;
        }

@@ -470,14 +470,14 @@ class MoreInfoWeather extends LitElement {

        .main {
          flex: 1;
-          margin-left: var(--ha-space-6);
-          margin-inline-start: var(--ha-space-6);
+          margin-left: 24px;
+          margin-inline-start: 24px;
          margin-inline-end: initial;
        }

        .attribution {
          text-align: center;
-          margin-top: var(--ha-space-4);
+          margin-top: 16px;
        }

        .time-ago,
@@ -500,15 +500,15 @@ class MoreInfoWeather extends LitElement {
          flex-wrap: nowrap;
          justify-content: space-between;
          align-items: center;
-          margin-bottom: var(--ha-space-4);
+          margin-bottom: 16px;
        }

        .icon-image {
          display: flex;
          align-items: center;
          min-width: 64px;
-          margin-right: var(--ha-space-4);
-          margin-inline-end: var(--ha-space-4);
+          margin-right: 16px;
+          margin-inline-end: 16px;
          margin-inline-start: initial;
        }

@@ -534,7 +534,7 @@ class MoreInfoWeather extends LitElement {

        .temp-attribute .temp {
          position: relative;
-          margin-right: var(--ha-space-6);
+          margin-right: 24px;
          direction: ltr;
        }

@@ -557,8 +557,8 @@ class MoreInfoWeather extends LitElement {

        .name-state {
          overflow: hidden;
-          padding-right: var(--ha-space-3);
-          padding-inline-end: var(--ha-space-3);
+          padding-right: 12px;
+          padding-inline-end: 12px;
          padding-inline-start: initial;
          width: 100%;
        }
@@ -572,7 +572,7 @@ class MoreInfoWeather extends LitElement {
        .forecast {
          display: flex;
          justify-content: space-around;
-          padding: var(--ha-space-4);
+          padding: 16px;
          padding-bottom: 0px;
          overflow-x: auto;
          scrollbar-color: var(--scrollbar-thumb-color) transparent;
@@ -634,8 +634,8 @@ class MoreInfoWeather extends LitElement {
        }

        .forecast-image-icon {
-          padding-top: var(--ha-space-1);
-          padding-bottom: var(--ha-space-1);
+          padding-top: 4px;
+          padding-bottom: 4px;
          display: flex;
          justify-content: center;
        }
--- a/src/dialogs/more-info/ha-more-info-dialog.ts
+++ b/src/dialogs/more-info/ha-more-info-dialog.ts
@@ -802,7 +802,8 @@ export class MoreInfoDialog extends ScrollableFadeMixin(LitElement) {
          display: flex;
          flex-direction: column;
          align-items: flex-start;
-          margin: 0 0 calc(var(--ha-space-2) * -1) 0;
+          margin: var(--ha-space-0) var(--ha-space-0)
+            calc(var(--ha-space-2) * -1) var(--ha-space-0);
        }

        .title p {
--- a/src/dialogs/more-info/ha-more-info-history-and-logbook.ts
+++ b/src/dialogs/more-info/ha-more-info-history-and-logbook.ts
@@ -58,7 +58,7 @@ export class MoreInfoHistoryAndLogbook extends LitElement {
      display: block;
    }
    ha-more-info-history + ha-more-info-logbook {
-      margin-top: var(--ha-space-4);
+      margin-top: 16px;
    }
  `;
 }
--- a/src/dialogs/more-info/ha-more-info-history.ts
+++ b/src/dialogs/more-info/ha-more-info-history.ts
@@ -264,7 +264,7 @@ export class MoreInfoHistory extends LitElement {
        flex-direction: row;
        justify-content: space-between;
        align-items: center;
-        margin-bottom: var(--ha-space-2);
+        margin-bottom: 8px;
      }
      .header > a,
      a:visited {
--- a/src/dialogs/more-info/ha-more-info-info.ts
+++ b/src/dialogs/more-info/ha-more-info-info.ts
@@ -130,8 +130,8 @@ export class MoreInfoInfo extends LitElement {
      display: flex;
      flex-direction: column;
      flex: 1;
-      padding: var(--ha-space-6);
-      padding-bottom: max(var(--safe-area-inset-bottom), var(--ha-space-6));
+      padding: 24px;
+      padding-bottom: max(var(--safe-area-inset-bottom), 24px);
    }

    [data-domain="camera"] .content {
@@ -153,7 +153,7 @@ export class MoreInfoInfo extends LitElement {
    ha-more-info-history,
    ha-more-info-logbook:not(:last-child) {
      display: block;
-      margin-bottom: var(--ha-space-4);
+      margin-bottom: 16px;
    }

    ha-alert {
--- a/src/dialogs/more-info/ha-more-info-logbook.ts
+++ b/src/dialogs/more-info/ha-more-info-logbook.ts
@@ -82,7 +82,7 @@ export class MoreInfoLogbook extends LitElement {
          flex-direction: row;
          justify-content: space-between;
          align-items: center;
-          margin-bottom: var(--ha-space-2);
+          margin-bottom: 8px;
        }
        .header > a,
        a:visited {
--- a/src/dialogs/more-info/ha-more-info-settings.ts
+++ b/src/dialogs/more-info/ha-more-info-settings.ts
@@ -83,8 +83,7 @@ export class HaMoreInfoSettings extends LitElement {
    return [
      css`
        .content {
-          padding: var(--ha-space-2) var(--ha-space-6) var(--ha-space-6)
-            var(--ha-space-6);
+          padding: 8px 24px 24px 24px;
        }
      `,
    ];
--- a/src/dialogs/more-info/more-info-content.ts
+++ b/src/dialogs/more-info/more-info-content.ts
@@ -119,7 +119,7 @@ class MoreInfoContent extends LitElement {
    hui-section {
      width: 100%;
      display: block;
-      margin-top: var(--ha-space-4);
+      margin-top: 16px;
    }
  `;
 }
--- a/src/dialogs/quick-bar/ha-quick-bar.ts
+++ b/src/dialogs/quick-bar/ha-quick-bar.ts
@@ -1120,7 +1120,7 @@ export class QuickBar extends LitElement {
        }

        .nothing-found {
-          padding: var(--ha-space-4) 0;
+          padding: var(--ha-space-4) var(--ha-space-0);
          text-align: center;
        }

--- a/src/dialogs/voice-assistant-setup/cloud/cloud-step-signin.ts
+++ b/src/dialogs/voice-assistant-setup/cloud/cloud-step-signin.ts
@@ -137,7 +137,7 @@ export class CloudStepSignin extends LitElement {
            ),
          });
          if (totpCode !== null && totpCode !== "") {
-            await doLogin(username, totpCode.trim());
+            await doLogin(username, totpCode);
            return;
          }
        }
--- a/src/external_app/external_messaging.ts
+++ b/src/external_app/external_messaging.ts
@@ -176,13 +176,6 @@ interface EMOutgoingMessageAddEntityTo extends EMMessage {
  };
 }

-interface EMOutgoingMessageFocusElement extends EMMessage {
-  type: "focus_element";
-  payload: {
-    element_id: string;
-  };
-}
-
 type EMOutgoingMessageWithoutAnswer =
  | EMMessageResultError
  | EMMessageResultSuccess
@@ -204,8 +197,7 @@ type EMOutgoingMessageWithoutAnswer =
  | EMOutgoingMessageThreadStoreInPlatformKeychain
  | EMOutgoingMessageImprovScan
  | EMOutgoingMessageImprovConfigureDevice
-  | EMOutgoingMessageAddEntityTo
-  | EMOutgoingMessageFocusElement;
+  | EMOutgoingMessageAddEntityTo;

 export interface EMIncomingMessageRestart {
  id: number;
--- a/src/mixins/picker-mixin.ts
+++ b/src/mixins/picker-mixin.ts
@@ -1,38 +0,0 @@
-import type { ReactiveElement } from "lit";
-import { property } from "lit/decorators";
-import type { Constructor } from "../types";
-import type { PickerValueRenderer } from "../components/ha-picker-field";
-
-export const PickerMixin = <T extends Constructor<ReactiveElement>>(
-  superClass: T
-) => {
-  class PickerFieldClass extends superClass {
-    @property({ type: Boolean }) public disabled = false;
-
-    @property({ type: Boolean }) public required = false;
-
-    @property() public icon?: string;
-
-    @property() public image?: string;
-
-    @property() public label?: string;
-
-    @property() public placeholder?: string;
-
-    @property() public helper?: string;
-
-    @property() public value?: string;
-
-    @property({ type: Boolean, reflect: true }) public unknown = false;
-
-    @property({ attribute: "unknown-item-text" })
-    public unknownItemText?: string;
-
-    @property({ attribute: "hide-clear-icon", type: Boolean })
-    public hideClearIcon = false;
-
-    @property({ attribute: false })
-    public valueRenderer?: PickerValueRenderer;
-  }
-  return PickerFieldClass;
-};
--- a/src/mixins/scrollable-fade-mixin.ts
+++ b/src/mixins/scrollable-fade-mixin.ts
@@ -123,8 +123,8 @@ export const ScrollableFadeMixin = <T extends Constructor<LitElement>>(
          .fade-top,
          .fade-bottom {
            position: absolute;
-            left: 0;
-            right: 0;
+            left: var(--ha-space-0);
+            right: var(--ha-space-0);
            height: var(--ha-space-4);
            pointer-events: none;
            transition: opacity 180ms ease-in-out;
@@ -137,10 +137,10 @@ export const ScrollableFadeMixin = <T extends Constructor<LitElement>>(
            opacity: 0;
          }
          .fade-top {
-            top: 0;
+            top: var(--ha-space-0);
          }
          .fade-bottom {
-            bottom: 0;
+            bottom: var(--ha-space-0);
            transform: rotate(180deg);
          }

--- a/src/panels/config/application_credentials/dialog-add-application-credential.ts
+++ b/src/panels/config/application_credentials/dialog-add-application-credential.ts
@@ -5,15 +5,13 @@ import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../../../common/dom/fire_event";
 import "../../../components/ha-alert";
 import "../../../components/ha-button";
-import "../../../components/ha-dialog-footer";
+import "../../../components/ha-combo-box";
+import { createCloseHeading } from "../../../components/ha-dialog";
 import "../../../components/ha-fade-in";
-import "../../../components/ha-generic-picker";
 import "../../../components/ha-markdown";
 import "../../../components/ha-password-field";
-import type { PickerComboBoxItem } from "../../../components/ha-picker-combo-box";
 import "../../../components/ha-spinner";
 import "../../../components/ha-textfield";
-import "../../../components/ha-wa-dialog";
 import type {
  ApplicationCredential,
  ApplicationCredentialsConfig,
@@ -61,10 +59,6 @@ export class DialogAddApplicationCredential extends LitElement {

  @state() private _config?: ApplicationCredentialsConfig;

-  @state() private _open = false;
-
-  @state() private _invalid = false;
-
  public showDialog(params: AddApplicationCredentialDialogParams) {
    this._params = params;
    this._domain = params.selectedDomain;
@@ -75,7 +69,6 @@ export class DialogAddApplicationCredential extends LitElement {
    this._clientSecret = "";
    this._error = undefined;
    this._loading = false;
-    this._open = true;
    this._fetchConfig();
  }

@@ -97,16 +90,16 @@ export class DialogAddApplicationCredential extends LitElement {
      ? domainToName(this.hass.localize, this._domain!)
      : "";
    return html`
-      <ha-wa-dialog
-        .hass=${this.hass}
-        .open=${this._open}
+      <ha-dialog
+        open
        @closed=${this._abortDialog}
-        .preventScrimClose=${!!this._domain ||
-        !!this._name ||
-        !!this._clientId ||
-        !!this._clientSecret}
-        .headerTitle=${this.hass.localize(
-          "ui.panel.config.application_credentials.editor.caption"
+        scrimClickAction
+        escapeKeyAction
+        .heading=${createCloseHeading(
+          this.hass,
+          this.hass.localize(
+            "ui.panel.config.application_credentials.editor.caption"
+          )
        )}
      >
        ${!this._config
@@ -172,23 +165,20 @@ export class DialogAddApplicationCredential extends LitElement {
                  : nothing}
                ${this._params.selectedDomain
                  ? nothing
-                  : html`<ha-generic-picker
+                  : html`<ha-combo-box
                      name="domain"
                      .hass=${this.hass}
                      .label=${this.hass.localize(
                        "ui.panel.config.application_credentials.editor.domain"
                      )}
                      .value=${this._domain}
-                      .invalid=${this._invalid && !this._domain}
-                      .getItems=${this._getDomainItems}
+                      .items=${this._domains}
+                      item-id-path="id"
+                      item-value-path="id"
+                      item-label-path="name"
                      required
-                      .disabled=${!this._domains}
-                      .valueRenderer=${this._domainRenderer}
                      @value-changed=${this._handleDomainPicked}
-                      .errorMessage=${this.hass.localize(
-                        "ui.common.error_required"
-                      )}
-                    ></ha-generic-picker>`}
+                    ></ha-combo-box>`}
                ${this._description
                  ? html`<ha-markdown
                      breaks
@@ -202,10 +192,9 @@ export class DialogAddApplicationCredential extends LitElement {
                    "ui.panel.config.application_credentials.editor.name"
                  )}
                  .value=${this._name}
-                  .invalid=${this._invalid && !this._name}
                  required
                  @input=${this._handleValueChanged}
-                  .errorMessage=${this.hass.localize(
+                  .validationMessage=${this.hass.localize(
                    "ui.common.error_required"
                  )}
                  dialogInitialFocus
@@ -217,10 +206,9 @@ export class DialogAddApplicationCredential extends LitElement {
                    "ui.panel.config.application_credentials.editor.client_id"
                  )}
                  .value=${this._clientId}
-                  .invalid=${this._invalid && !this._clientId}
                  required
                  @input=${this._handleValueChanged}
-                  .errorMessage=${this.hass.localize(
+                  .validationMessage=${this.hass.localize(
                    "ui.common.error_required"
                  )}
                  dialogInitialFocus
@@ -235,10 +223,9 @@ export class DialogAddApplicationCredential extends LitElement {
                  )}
                  name="clientSecret"
                  .value=${this._clientSecret}
-                  .invalid=${this._invalid && !this._clientSecret}
                  required
                  @input=${this._handleValueChanged}
-                  .errorMessage=${this.hass.localize(
+                  .validationMessage=${this.hass.localize(
                    "ui.common.error_required"
                  )}
                  .helper=${this.hass.localize(
@@ -248,33 +235,30 @@ export class DialogAddApplicationCredential extends LitElement {
                ></ha-password-field>
              </div>

-              <ha-dialog-footer slot="footer">
-                <ha-button
-                  appearance="plain"
-                  slot="secondaryAction"
-                  @click=${this._closeDialog}
-                  .disabled=${this._loading}
-                >
-                  ${this.hass.localize("ui.common.cancel")}
-                </ha-button>
-                <ha-button
-                  slot="primaryAction"
-                  @click=${this._addApplicationCredential}
-                  .loading=${this._loading}
-                >
-                  ${this.hass.localize(
-                    "ui.panel.config.application_credentials.editor.add"
-                  )}
-                </ha-button>
-              </ha-dialog-footer>`}
-      </ha-wa-dialog>
+              <ha-button
+                appearance="plain"
+                slot="secondaryAction"
+                @click=${this._abortDialog}
+                .disabled=${this._loading}
+              >
+                ${this.hass.localize("ui.common.cancel")}
+              </ha-button>
+              <ha-button
+                slot="primaryAction"
+                .disabled=${!this._domain ||
+                !this._clientId ||
+                !this._clientSecret}
+                @click=${this._addApplicationCredential}
+                .loading=${this._loading}
+              >
+                ${this.hass.localize(
+                  "ui.panel.config.application_credentials.editor.add"
+                )}
+              </ha-button>`}
+      </ha-dialog>
    `;
  }

-  private _closeDialog() {
-    this._open = false;
-  }
-
  public closeDialog() {
    this._params = undefined;
    this._domains = undefined;
@@ -319,16 +303,9 @@ export class DialogAddApplicationCredential extends LitElement {

  private async _addApplicationCredential(ev) {
    ev.preventDefault();
-    if (
-      !this._domain ||
-      !this._name ||
-      !this._clientId ||
-      !this._clientSecret
-    ) {
-      this._invalid = true;
+    if (!this._domain || !this._clientId || !this._clientSecret) {
      return;
    }
-    this._invalid = false;

    this._loading = true;
    this._error = "";
@@ -351,20 +328,6 @@ export class DialogAddApplicationCredential extends LitElement {
    this.closeDialog();
  }

-  private _getDomainItems = (): PickerComboBoxItem[] =>
-    this._domains?.map((domain) => ({
-      id: domain.id,
-      primary: domain.name,
-      sorting_label: domain.name,
-    })) ?? [];
-
-  private _domainRenderer = (domainId: string) => {
-    const domain = this._domains?.find((d) => d.id === domainId);
-    return html`<span slot="headline"
-      >${domain ? domain.name : domainId}</span
-    >`;
-  };
-
  static get styles(): CSSResultGroup {
    return [
      haStyleDialog,
@@ -375,12 +338,15 @@ export class DialogAddApplicationCredential extends LitElement {
        }
        .row {
          display: flex;
-          padding: var(--ha-space-2) 0;
+          padding: 8px 0;
+        }
+        ha-combo-box {
+          display: block;
+          margin-bottom: 24px;
        }
        ha-textfield {
          display: block;
-          margin-top: var(--ha-space-4);
-          margin-bottom: var(--ha-space-4);
+          margin-bottom: 24px;
        }
        a {
          text-decoration: none;
@@ -389,8 +355,7 @@ export class DialogAddApplicationCredential extends LitElement {
          --mdc-icon-size: 16px;
        }
        ha-markdown {
-          margin-top: var(--ha-space-4);
-          margin-bottom: var(--ha-space-4);
+          margin-bottom: 16px;
        }
        ha-fade-in {
          display: flex;
--- a/src/panels/config/areas/dialog-floor-registry-detail.ts
+++ b/src/panels/config/areas/dialog-floor-registry-detail.ts
@@ -11,13 +11,12 @@ import "../../../components/ha-alert";
 import "../../../components/ha-aliases-editor";
 import "../../../components/ha-area-picker";
 import "../../../components/ha-button";
-import "../../../components/ha-dialog-footer";
-import "../../../components/ha-floor-icon";
+import { createCloseHeading } from "../../../components/ha-dialog";
 import "../../../components/ha-icon-picker";
+import "../../../components/ha-picture-upload";
 import "../../../components/ha-settings-row";
 import "../../../components/ha-svg-icon";
 import "../../../components/ha-textfield";
-import "../../../components/ha-wa-dialog";
 import { updateAreaRegistryEntry } from "../../../data/area_registry";
 import type {
  FloorRegistryEntry,
@@ -50,8 +49,6 @@ class DialogFloorDetail extends LitElement {

  @state() private _removedAreas = new Set<string>();

-  @state() private _open = false;
-
  public showDialog(params: FloorRegistryDetailDialogParams): void {
    this._params = params;
    this._error = undefined;
@@ -63,14 +60,9 @@ class DialogFloorDetail extends LitElement {
    this._level = this._params.entry?.level ?? null;
    this._addedAreas.clear();
    this._removedAreas.clear();
-    this._open = true;
  }

  public closeDialog(): void {
-    this._open = false;
-  }
-
-  private _dialogClosed(): void {
    this._error = "";
    this._params = undefined;
    this._addedAreas.clear();
@@ -104,15 +96,18 @@ class DialogFloorDetail extends LitElement {
      return nothing;
    }
    const entry = this._params.entry;
+    const nameInvalid = !this._isNameValid();

    return html`
-      <ha-wa-dialog
-        .hass=${this.hass}
-        .open=${this._open}
-        header-title=${entry
-          ? this.hass.localize("ui.panel.config.floors.editor.update_floor")
-          : this.hass.localize("ui.panel.config.floors.editor.create_floor")}
-        @closed=${this._dialogClosed}
+      <ha-dialog
+        open
+        @closed=${this.closeDialog}
+        .heading=${createCloseHeading(
+          this.hass,
+          entry
+            ? this.hass.localize("ui.panel.config.floors.editor.update_floor")
+            : this.hass.localize("ui.panel.config.floors.editor.create_floor")
+        )}
      >
        <div>
          ${this._error
@@ -133,7 +128,6 @@ class DialogFloorDetail extends LitElement {
              : nothing}

            <ha-textfield
-              autofocus
              .value=${this._name}
              @input=${this._nameChanged}
              .label=${this.hass.localize("ui.panel.config.floors.editor.name")}
@@ -141,6 +135,7 @@ class DialogFloorDetail extends LitElement {
                "ui.panel.config.floors.editor.name_required"
              )}
              required
+              dialogInitialFocus
            ></ha-textfield>

            <ha-textfield
@@ -165,7 +160,7 @@ class DialogFloorDetail extends LitElement {
              ${!this._icon
                ? html`
                    <ha-floor-icon
-                      slot="start"
+                      slot="fallback"
                      .floor=${{ level: this._level }}
                    ></ha-floor-icon>
                  `
@@ -235,25 +230,23 @@ class DialogFloorDetail extends LitElement {
            ></ha-aliases-editor>
          </div>
        </div>
-        <ha-dialog-footer slot="footer">
-          <ha-button
-            appearance="plain"
-            slot="secondaryAction"
-            @click=${this.closeDialog}
-          >
-            ${this.hass.localize("ui.common.cancel")}
-          </ha-button>
-          <ha-button
-            slot="primaryAction"
-            @click=${this._updateEntry}
-            .disabled=${!!this._submitting}
-          >
-            ${entry
-              ? this.hass.localize("ui.common.save")
-              : this.hass.localize("ui.common.create")}
-          </ha-button>
-        </ha-dialog-footer>
-      </ha-wa-dialog>
+        <ha-button
+          appearance="plain"
+          slot="secondaryAction"
+          @click=${this.closeDialog}
+        >
+          ${this.hass.localize("ui.common.cancel")}
+        </ha-button>
+        <ha-button
+          slot="primaryAction"
+          @click=${this._updateEntry}
+          .disabled=${nameInvalid || !!this._submitting}
+        >
+          ${entry
+            ? this.hass.localize("ui.common.save")
+            : this.hass.localize("ui.common.create")}
+        </ha-button>
+      </ha-dialog>
    `;
  }

@@ -292,6 +285,10 @@ class DialogFloorDetail extends LitElement {
    this._addedAreas = new Set(this._addedAreas);
  }

+  private _isNameValid() {
+    return this._name.trim() !== "";
+  }
+
  private _nameChanged(ev) {
    this._error = undefined;
    this._name = ev.target.value;
@@ -308,16 +305,7 @@ class DialogFloorDetail extends LitElement {
  }

  private async _updateEntry() {
-    if (this._name.trim() === "") {
-      this._error = this.hass.localize(
-        "ui.panel.config.floors.editor.name_required"
-      );
-      return;
-    }
-    this._error = undefined;
-
    this._submitting = true;
-
    const create = !this._params!.entry;
    try {
      const values: FloorRegistryEntryMutableParams = {
@@ -356,13 +344,13 @@ class DialogFloorDetail extends LitElement {
      css`
        ha-textfield {
          display: block;
-          margin-bottom: var(--ha-space-4);
+          margin-bottom: 16px;
        }
        ha-floor-icon {
          color: var(--secondary-text-color);
        }
        ha-chip-set {
-          margin-bottom: var(--ha-space-2);
+          margin-bottom: 8px;
        }
      `,
    ];
--- a/src/panels/config/automation/add-automation-element-dialog.ts
+++ b/src/panels/config/automation/add-automation-element-dialog.ts
@@ -2016,12 +2016,12 @@ class DialogAddAutomationElement
          --ha-bottom-sheet-height: calc(100dvh - var(--ha-space-12));
          --ha-bottom-sheet-max-height: var(--ha-bottom-sheet-height);
          --ha-bottom-sheet-max-width: 888px;
-          --ha-bottom-sheet-padding: 0;
+          --ha-bottom-sheet-padding: var(--ha-space-0);
          --ha-bottom-sheet-surface-background: var(--card-background-color);
        }

        ha-wa-dialog {
-          --dialog-content-padding: 0;
+          --dialog-content-padding: var(--ha-space-0);
          --ha-dialog-min-height: min(
            800px,
            calc(
@@ -2045,7 +2045,7 @@ class DialogAddAutomationElement

        search-input {
          display: block;
-          margin: 0 var(--ha-space-4);
+          margin: var(--ha-space-0) var(--ha-space-4);
        }

        ha-button-toggle-group {
@@ -2079,7 +2079,7 @@ class DialogAddAutomationElement
        .groups {
          overflow: auto;
          flex: 4;
-          margin-inline-end: 0;
+          margin-inline-end: var(--ha-space-0);
        }

        ha-automation-add-from-target.hidden {
--- a/src/panels/config/automation/add-automation-element/ha-automation-add-items.ts
+++ b/src/panels/config/automation/add-automation-element/ha-automation-add-items.ts
@@ -213,8 +213,8 @@ export class HaAutomationAddItems extends LitElement {
      background-color: var(--ha-color-surface-default);
      align-items: center;
      color: var(--ha-color-text-secondary);
-      padding: 0;
-      margin: 0 var(--ha-space-4)
+      padding: var(--ha-space-0);
+      margin: var(--ha-space-0) var(--ha-space-4)
        max(var(--safe-area-inset-bottom), var(--ha-space-3));
      line-height: var(--ha-line-height-expanded);
      justify-content: center;
@@ -233,7 +233,7 @@ export class HaAutomationAddItems extends LitElement {
      --md-list-item-supporting-text-font: var(--ha-font-family-body);
      --ha-md-list-item-gap: var(--ha-space-3);
      gap: var(--ha-space-2);
-      padding: 0 var(--ha-space-4);
+      padding: var(--ha-space-0) var(--ha-space-4);
    }
    .items ha-md-list ha-md-list-item {
      border-radius: var(--ha-border-radius-lg);
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Petar Petrov	bb36e4aa42	Exclude conditional elements	2025-12-18 17:05:54 +02:00
Petar Petrov	5c9e052030	improve typing	2025-12-18 12:18:51 +02:00
Petar Petrov	392a87f33a	refactor	2025-12-18 09:15:16 +02:00
Petar Petrov	72cd243ee3	Picture elements position by click	2025-12-18 09:07:15 +02:00