Merge branch 'rc' into dev

Bumped version to 20251029.0
Add legend to energy pie chart (#27697 )
2025-10-31 14:39:38 +00:00 · 2025-10-29 16:20:58 +01:00 · 2025-10-29 16:19:23 +01:00 · 2025-10-29 14:50:57 +00:00 · 2025-10-29 14:21:34 +00:00 · 2025-10-29 13:41:45 +00:00
187 changed files with 5127 additions and 2824 deletions
--- a/.github/workflows/cast_deployment.yaml
+++ b/.github/workflows/cast_deployment.yaml
@@ -26,7 +26,7 @@ jobs:
          ref: dev

      - name: Setup Node
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
        with:
          node-version-file: ".nvmrc"
          cache: yarn
@@ -61,7 +61,7 @@ jobs:
          ref: master

      - name: Setup Node
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
        with:
          node-version-file: ".nvmrc"
          cache: yarn
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -26,7 +26,7 @@ jobs:
      - name: Check out files from GitHub
        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
      - name: Setup Node
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
        with:
          node-version-file: ".nvmrc"
          cache: yarn
@@ -60,7 +60,7 @@ jobs:
      - name: Check out files from GitHub
        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
      - name: Setup Node
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
        with:
          node-version-file: ".nvmrc"
          cache: yarn
@@ -78,7 +78,7 @@ jobs:
      - name: Check out files from GitHub
        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
      - name: Setup Node
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
        with:
          node-version-file: ".nvmrc"
          cache: yarn
@@ -89,7 +89,7 @@ jobs:
        env:
          IS_TEST: "true"
      - name: Upload bundle stats
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
        with:
          name: frontend-bundle-stats
          path: build/stats/*.json
@@ -102,7 +102,7 @@ jobs:
      - name: Check out files from GitHub
        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
      - name: Setup Node
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
        with:
          node-version-file: ".nvmrc"
          cache: yarn
@@ -113,7 +113,7 @@ jobs:
        env:
          IS_TEST: "true"
      - name: Upload bundle stats
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
        with:
          name: supervisor-bundle-stats
          path: build/stats/*.json
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -36,14 +36,14 @@ jobs:

      # Initializes the CodeQL tools for scanning.
      - name: Initialize CodeQL
-        uses: github/codeql-action/init@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8
+        uses: github/codeql-action/init@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
        with:
          languages: ${{ matrix.language }}

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

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

      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8
+        uses: github/codeql-action/analyze@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
--- a/.github/workflows/demo_deployment.yaml
+++ b/.github/workflows/demo_deployment.yaml
@@ -27,7 +27,7 @@ jobs:
          ref: dev

      - name: Setup Node
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
        with:
          node-version-file: ".nvmrc"
          cache: yarn
@@ -62,7 +62,7 @@ jobs:
          ref: master

      - name: Setup Node
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
        with:
          node-version-file: ".nvmrc"
          cache: yarn
--- a/.github/workflows/design_deployment.yaml
+++ b/.github/workflows/design_deployment.yaml
@@ -19,7 +19,7 @@ jobs:
        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0

      - name: Setup Node
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
        with:
          node-version-file: ".nvmrc"
          cache: yarn
--- a/.github/workflows/design_preview.yaml
+++ b/.github/workflows/design_preview.yaml
@@ -24,7 +24,7 @@ jobs:
        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0

      - name: Setup Node
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
        with:
          node-version-file: ".nvmrc"
          cache: yarn
--- a/.github/workflows/nightly.yaml
+++ b/.github/workflows/nightly.yaml
@@ -28,7 +28,7 @@ jobs:
          python-version: ${{ env.PYTHON_VERSION }}

      - name: Setup Node
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
        with:
          node-version-file: ".nvmrc"
          cache: yarn
@@ -57,14 +57,14 @@ jobs:
        run: tar -czvf translations.tar.gz translations

      - name: Upload build artifacts
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
        with:
          name: wheels
          path: dist/home_assistant_frontend*.whl
          if-no-files-found: error

      - name: Upload translations
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
        with:
          name: translations
          path: translations.tar.gz
--- a/.github/workflows/relative-ci.yaml
+++ b/.github/workflows/relative-ci.yaml
@@ -17,7 +17,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Send bundle stats and build information to RelativeCI
-        uses: relative-ci/agent-action@1707825cbfcc7452b2913d273414705415ae64d4 # v3.0.1
+        uses: relative-ci/agent-action@8504826a02078b05756e4c07e380023cc2c4274a # v3.1.0
        with:
          key: ${{ secrets[format('RELATIVE_CI_KEY_{0}_{1}', matrix.bundle, matrix.build)] }}
          token: ${{ github.token }}
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -34,7 +34,7 @@ jobs:
        uses: home-assistant/actions/helpers/verify-version@master

      - name: Setup Node
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
        with:
          node-version-file: ".nvmrc"
          cache: yarn
@@ -75,7 +75,7 @@ jobs:

      # home-assistant/wheels doesn't support SHA pinning
      - name: Build wheels
-        uses: home-assistant/wheels@2025.09.1
+        uses: home-assistant/wheels@2025.10.0
        with:
          abi: cp313
          tag: musllinux_1_2
@@ -93,7 +93,7 @@ jobs:
      - name: Checkout the repository
        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
      - name: Setup Node
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
        with:
          node-version-file: ".nvmrc"
          cache: yarn
@@ -122,7 +122,7 @@ jobs:
      - name: Checkout the repository
        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
      - name: Setup Node
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
        with:
          node-version-file: ".nvmrc"
          cache: yarn
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-22.20.0
+22.21.1
--- a/gallery/src/pages/components/ha-dialogs.markdown
+++ b/gallery/src/pages/components/ha-dialogs.markdown
@@ -5,14 +5,14 @@ subtitle: Dialogs provide important prompts in a user flow.

 # Material Design 3

-Our dialogs are based on the latest version of Material Design. Please note that we have made some well-considered adjustments to these guideliness. Specs and guidelines can be found on its [website](https://m3.material.io/components/dialogs/overview).
+Our dialogs are based on the latest version of Material Design. Please note that we have made some well-considered adjustments to these guidelines. Specs and guidelines can be found on its [website](https://m3.material.io/components/dialogs/overview).

 # Guidelines

 ## Design

- Dialogs have a max width of 560px. Alert and confirmation dialogs got a fixed width of 320px. If you need more width, consider a dedicated page instead.
- The close X-icon is on the top left, on all screen sizes. Except for alert and confirmation dialogs, they only have buttons and no X-icon. This is different compared to the Material guideliness.
+- Dialogs have a max width of 560px. Alert and confirmation dialogs have a fixed width of 320px. If you need more width, consider a dedicated page instead.
+- The close X-icon is on the top left, on all screen sizes. Except for alert and confirmation dialogs, they only have buttons and no X-icon. This is different compared to the Material guidelines.
 - Dialogs can't be closed with ESC or clicked outside of the dialog when there is a form that the user needs to fill out. Instead it will animate "no" by a little shake.
 - Extra icon buttons are on the top right, for example help, settings and expand dialog. More than 2 icon buttons, they will be in an overflow menu.
 - The submit button is grouped with a cancel button at the bottom right, on all screen sizes. Fullscreen mobile dialogs have them sticky at the bottom.
@@ -26,7 +26,7 @@ Our dialogs are based on the latest version of Material Design. Please note that

 - A best practice is to always use a title, even if it is optional by Material guidelines.
 - People mainly read the title and a button. Put the most important information in those two.
- Try to avoid user generated content in the title, this could make the title unreadable long.
+- Try to avoid user generated content in the title, this could make the title unreadably long.
 - If users become unsure, they read the description. Make sure this explains what will happen.
 - Strive for minimalism.

--- a/package.json
+++ b/package.json
@@ -28,13 +28,13 @@
  "dependencies": {
    "@babel/runtime": "7.28.4",
    "@braintree/sanitize-url": "7.1.1",
-    "@codemirror/autocomplete": "6.19.0",
-    "@codemirror/commands": "6.9.0",
+    "@codemirror/autocomplete": "6.19.1",
+    "@codemirror/commands": "6.10.0",
    "@codemirror/language": "6.11.3",
    "@codemirror/legacy-modes": "6.5.2",
    "@codemirror/search": "6.5.11",
    "@codemirror/state": "6.5.2",
-    "@codemirror/view": "6.38.5",
+    "@codemirror/view": "6.38.6",
    "@date-fns/tz": "1.4.1",
    "@egjs/hammerjs": "2.0.17",
    "@formatjs/intl-datetimeformat": "6.18.2",
@@ -52,8 +52,8 @@
    "@fullcalendar/list": "6.1.19",
    "@fullcalendar/luxon3": "6.1.19",
    "@fullcalendar/timegrid": "6.1.19",
-    "@home-assistant/webawesome": "3.0.0-beta.6.ha.4",
-    "@lezer/highlight": "1.2.1",
+    "@home-assistant/webawesome": "3.0.0-beta.6.ha.6",
+    "@lezer/highlight": "1.2.3",
    "@lit-labs/motion": "1.0.9",
    "@lit-labs/observers": "2.0.6",
    "@lit-labs/virtualizer": "2.1.1",
@@ -122,7 +122,7 @@
    "lit": "3.3.1",
    "lit-html": "3.3.1",
    "luxon": "3.7.2",
-    "marked": "16.4.0",
+    "marked": "16.4.1",
    "memoize-one": "6.0.0",
    "node-vibrant": "4.0.3",
    "object-hash": "3.0.0",
@@ -148,16 +148,16 @@
    "xss": "1.0.15"
  },
  "devDependencies": {
-    "@babel/core": "7.28.4",
+    "@babel/core": "7.28.5",
    "@babel/helper-define-polyfill-provider": "0.6.5",
-    "@babel/plugin-transform-runtime": "7.28.3",
-    "@babel/preset-env": "7.28.3",
+    "@babel/plugin-transform-runtime": "7.28.5",
+    "@babel/preset-env": "7.28.5",
    "@bundle-stats/plugin-webpack-filter": "4.21.5",
-    "@lokalise/node-api": "15.3.0",
+    "@lokalise/node-api": "15.3.1",
    "@octokit/auth-oauth-device": "8.0.2",
    "@octokit/plugin-retry": "8.0.2",
    "@octokit/rest": "22.0.0",
-    "@rsdoctor/rspack-plugin": "1.3.2",
+    "@rsdoctor/rspack-plugin": "1.3.4",
    "@rspack/core": "1.5.8",
    "@rspack/dev-server": "1.1.4",
    "@types/babel__plugin-transform-runtime": "7.9.5",
@@ -173,24 +173,24 @@
    "@types/lodash.merge": "4.6.9",
    "@types/luxon": "3.7.1",
    "@types/mocha": "10.0.10",
-    "@types/qrcode": "1.5.5",
-    "@types/sortablejs": "1.15.8",
+    "@types/qrcode": "1.5.6",
+    "@types/sortablejs": "1.15.9",
    "@types/tar": "6.1.13",
    "@types/ua-parser-js": "0.7.39",
    "@types/webspeechapi": "0.0.29",
-    "@vitest/coverage-v8": "3.2.4",
+    "@vitest/coverage-v8": "4.0.3",
    "babel-loader": "10.0.0",
    "babel-plugin-template-html-minifier": "4.1.0",
    "browserslist-useragent-regexp": "4.1.3",
    "del": "8.0.1",
-    "eslint": "9.37.0",
+    "eslint": "9.38.0",
    "eslint-config-airbnb-base": "15.0.0",
    "eslint-config-prettier": "10.1.8",
    "eslint-import-resolver-webpack": "0.13.10",
    "eslint-plugin-import": "2.32.0",
    "eslint-plugin-lit": "2.1.1",
    "eslint-plugin-lit-a11y": "5.1.1",
-    "eslint-plugin-unused-imports": "4.2.0",
+    "eslint-plugin-unused-imports": "4.3.0",
    "eslint-plugin-wc": "3.0.2",
    "fancy-log": "2.0.0",
    "fs-extra": "11.3.2",
@@ -201,9 +201,9 @@
    "gulp-rename": "2.1.0",
    "html-minifier-terser": "7.2.0",
    "husky": "9.1.7",
-    "jsdom": "27.0.0",
+    "jsdom": "27.0.1",
    "jszip": "3.10.1",
-    "lint-staged": "16.2.4",
+    "lint-staged": "16.2.6",
    "lit-analyzer": "2.0.3",
    "lodash.merge": "4.6.2",
    "lodash.template": "4.5.0",
@@ -217,9 +217,9 @@
    "terser-webpack-plugin": "5.3.14",
    "ts-lit-plugin": "2.0.2",
    "typescript": "5.9.3",
-    "typescript-eslint": "8.46.0",
+    "typescript-eslint": "8.46.2",
    "vite-tsconfig-paths": "5.1.4",
-    "vitest": "3.2.4",
+    "vitest": "4.0.3",
    "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"
@@ -235,5 +235,8 @@
    "tslib": "2.8.1",
    "@material/mwc-list@^0.27.0": "patch:@material/mwc-list@npm%3A0.27.0#~/.yarn/patches/@material-mwc-list-npm-0.27.0-5344fc9de4.patch"
  },
-  "packageManager": "yarn@4.10.3"
+  "packageManager": "yarn@4.10.3",
+  "volta": {
+    "node": "22.21.1"
+  }
 }
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

 [project]
 name         = "home-assistant-frontend"
-version      = "20250924.0"
+version      = "20251029.0"
 license      = "Apache-2.0"
 license-files = ["LICENSE*"]
 description  = "The Home Assistant frontend"
--- a/src/common/util/swipe-gesture-recognizer.ts
+++ b/src/common/util/swipe-gesture-recognizer.ts
@@ -0,0 +1,116 @@
+export interface SwipeGestureResult {
+  velocity: number;
+  delta: number;
+  isSwipe: boolean;
+  isDownwardSwipe: boolean;
+}
+
+export interface SwipeGestureConfig {
+  velocitySwipeThreshold?: number;
+  movementTimeThreshold?: number;
+}
+
+const VELOCITY_SWIPE_THRESHOLD = 0.5; // px/ms
+const MOVEMENT_TIME_THRESHOLD = 100; // ms
+
+/**
+ * Recognizes swipe gestures and calculates velocity for touch interactions.
+ * Tracks touch movement and provides velocity-based and position-based gesture detection.
+ */
+export class SwipeGestureRecognizer {
+  private _startY = 0;
+
+  private _delta = 0;
+
+  private _startTime = 0;
+
+  private _lastY = 0;
+
+  private _lastTime = 0;
+
+  private _velocityThreshold: number;
+
+  private _movementTimeThreshold: number;
+
+  constructor(config: SwipeGestureConfig = {}) {
+    this._velocityThreshold =
+      config.velocitySwipeThreshold ?? VELOCITY_SWIPE_THRESHOLD; // px/ms
+    this._movementTimeThreshold =
+      config.movementTimeThreshold ?? MOVEMENT_TIME_THRESHOLD; // ms
+  }
+
+  /**
+   * Initialize gesture tracking with starting touch position
+   */
+  public start(clientY: number): void {
+    const now = Date.now();
+    this._startY = clientY;
+    this._startTime = now;
+    this._lastY = clientY;
+    this._lastTime = now;
+    this._delta = 0;
+  }
+
+  /**
+   * Update gesture state during movement
+   * Returns the current delta (negative when dragging down)
+   */
+  public move(clientY: number): number {
+    const now = Date.now();
+    this._delta = this._startY - clientY;
+    this._lastY = clientY;
+    this._lastTime = now;
+    return this._delta;
+  }
+
+  /**
+   * Calculate final gesture result when touch ends
+   */
+  public end(): SwipeGestureResult {
+    const velocity = this.getVelocity();
+    const hasSignificantVelocity = Math.abs(velocity) > this._velocityThreshold;
+
+    return {
+      velocity,
+      delta: this._delta,
+      isSwipe: hasSignificantVelocity,
+      isDownwardSwipe: velocity > 0,
+    };
+  }
+
+  /**
+   * Get current drag delta (negative when dragging down)
+   */
+  public getDelta(): number {
+    return this._delta;
+  }
+
+  /**
+   * Calculate velocity based on recent movement
+   * Returns 0 if no recent movement detected
+   * Positive velocity means downward swipe
+   */
+  public getVelocity(): number {
+    const now = Date.now();
+    const timeSinceLastMove = now - this._lastTime;
+
+    // Only consider velocity if the last movement was recent
+    if (timeSinceLastMove >= this._movementTimeThreshold) {
+      return 0;
+    }
+
+    const timeDelta = this._lastTime - this._startTime;
+    return timeDelta > 0 ? (this._lastY - this._startY) / timeDelta : 0;
+  }
+
+  /**
+   * Reset all tracking state
+   */
+  public reset(): void {
+    this._startY = 0;
+    this._delta = 0;
+    this._startTime = 0;
+    this._lastY = 0;
+    this._lastTime = 0;
+  }
+}
--- a/src/components/buttons/ha-call-service-button.ts
+++ b/src/components/buttons/ha-call-service-button.ts
@@ -6,6 +6,7 @@ import { showConfirmationDialog } from "../../dialogs/generic/show-dialog-box";
 import "./ha-progress-button";
 import type { HomeAssistant } from "../../types";
 import { fireEvent } from "../../common/dom/fire_event";
+import type { Appearance } from "../ha-button";

@customElement("ha-call-service-button")
 class HaCallServiceButton extends LitElement {
@@ -25,12 +26,14 @@ class HaCallServiceButton extends LitElement {

  @property() public confirmation?;

+  @property() public appearance: Appearance = "plain";
+
  public render(): TemplateResult {
    return html`
      <ha-progress-button
        .progress=${this.progress}
        .disabled=${this.disabled}
-        appearance="plain"
+        .appearance=${this.appearance}
        @click=${this._buttonTapped}
        tabindex="0"
      >
--- a/src/components/chart/ha-chart-base.ts
+++ b/src/components/chart/ha-chart-base.ts
@@ -35,6 +35,7 @@ export const MIN_TIME_BETWEEN_UPDATES = 60 * 5 * 1000;
 const LEGEND_OVERFLOW_LIMIT = 10;
 const LEGEND_OVERFLOW_LIMIT_MOBILE = 6;
 const DOUBLE_TAP_TIME = 300;
+const RESIZE_ANIMATION_DURATION = 250;

 export type CustomLegendOption = ECOption["legend"] & {
  type: "custom";
@@ -88,9 +89,19 @@ export class HaChartBase extends LitElement {

  private _lastTapTime?: number;

+  private _shouldResizeChart = false;
+
  // @ts-ignore
  private _resizeController = new ResizeController(this, {
-    callback: () => this.chart?.resize(),
+    callback: () => {
+      if (this.chart) {
+        if (!this.chart.getZr().animation.isFinished()) {
+          this._shouldResizeChart = true;
+        } else {
+          this.chart.resize();
+        }
+      }
+    },
  });

  private _loading = false;
@@ -195,6 +206,15 @@ export class HaChartBase extends LitElement {
    }
    if (changedProps.has("options")) {
      chartOptions = { ...chartOptions, ...this._createOptions() };
+      if (
+        this._compareCustomLegendOptions(
+          changedProps.get("options"),
+          this.options
+        )
+      ) {
+        // custom legend changes may require a resize to layout properly
+        this._shouldResizeChart = true;
+      }
    } else if (this._isTouchDevice && changedProps.has("_isZoomed")) {
      chartOptions.dataZoom = this._getDataZoomConfig();
    }
@@ -286,7 +306,7 @@ export class HaChartBase extends LitElement {
          itemStyle = {
            color: dataset?.color as string,
            ...(dataset?.itemStyle as { borderColor?: string }),
-            itemStyle,
+            ...itemStyle,
          };
          const color = itemStyle?.color as string;
          const borderColor = itemStyle?.borderColor as string;
@@ -366,6 +386,7 @@ export class HaChartBase extends LitElement {
      if (!this.options?.dataZoom) {
        this.chart.getZr().on("dblclick", this._handleClickZoom);
      }
+      this.chart.on("finished", this._handleChartRenderFinished);
      if (this._isTouchDevice) {
        this.chart.getZr().on("click", (e: ECElementEvent) => {
          if (!e.zrByTouch) {
@@ -497,6 +518,7 @@ export class HaChartBase extends LitElement {
        );
      }
    });
+    this.requestUpdate("_hiddenDatasets");
  }

  private _getDataZoomConfig(): DataZoomComponentOption | undefined {
@@ -945,6 +967,33 @@ export class HaChartBase extends LitElement {
    });
  }

+  private _handleChartRenderFinished = () => {
+    if (this._shouldResizeChart) {
+      this.chart?.resize({
+        animation: this._reducedMotion
+          ? undefined
+          : { duration: RESIZE_ANIMATION_DURATION },
+      });
+      this._shouldResizeChart = false;
+    }
+  };
+
+  private _compareCustomLegendOptions(
+    oldOptions: ECOption | undefined,
+    newOptions: ECOption | undefined
+  ): boolean {
+    const oldLegends = ensureArray(
+      oldOptions?.legend || []
+    ) as LegendComponentOption[];
+    const newLegends = ensureArray(
+      newOptions?.legend || []
+    ) as LegendComponentOption[];
+    return (
+      oldLegends.some((l) => l.show && l.type === "custom") !==
+      newLegends.some((l) => l.show && l.type === "custom")
+    );
+  }
+
  static styles = css`
    :host {
      display: block;
--- a/src/components/chips/ha-filter-chip.ts
+++ b/src/components/chips/ha-filter-chip.ts
@@ -1,9 +1,9 @@
+import { styles as elevatedStyles } from "@material/web/chips/internal/elevated-styles";
 import { FilterChip } from "@material/web/chips/internal/filter-chip";
 import { styles } from "@material/web/chips/internal/filter-styles";
 import { styles as selectableStyles } from "@material/web/chips/internal/selectable-styles";
 import { styles as sharedStyles } from "@material/web/chips/internal/shared-styles";
 import { styles as trailingIconStyles } from "@material/web/chips/internal/trailing-icon-styles";
-import { styles as elevatedStyles } from "@material/web/chips/internal/elevated-styles";
 import { css, html } from "lit";
 import { customElement, property } from "lit/decorators";

@@ -30,6 +30,7 @@ export class HaFilterChip extends FilterChip {
          var(--rgb-primary-text-color),
          0.15
        );
+        border-radius: var(--ha-border-radius-md);
      }
    `,
  ];
--- a/src/components/data-table/dialog-data-table-settings.ts
+++ b/src/components/data-table/dialog-data-table-settings.ts
@@ -1,4 +1,4 @@
-import { mdiDrag, mdiEye, mdiEyeOff } from "@mdi/js";
+import { mdiDragHorizontalVariant, mdiEye, mdiEyeOff } from "@mdi/js";
 import type { CSSResultGroup } from "lit";
 import { LitElement, css, html, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
@@ -129,7 +129,7 @@ export class DialogDataTableSettings extends LitElement {
                  ${canMove && isVisible
                    ? html`<ha-svg-icon
                        class="handle"
-                        .path=${mdiDrag}
+                        .path=${mdiDragHorizontalVariant}
                        slot="graphic"
                      ></ha-svg-icon>`
                    : nothing}
--- a/src/components/entity/const.ts
+++ b/src/components/entity/const.ts
@@ -0,0 +1 @@
+export const ANY_STATE_VALUE = "__ANY_STATE_IGNORE_ATTRIBUTES__";
--- a/src/components/entity/ha-entities-picker.ts
+++ b/src/components/entity/ha-entities-picker.ts
@@ -1,13 +1,13 @@
-import { mdiDrag } from "@mdi/js";
+import { mdiDragHorizontalVariant } from "@mdi/js";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { fireEvent } from "../../common/dom/fire_event";
 import { isValidEntityId } from "../../common/entity/valid_entity_id";
+import type { HaEntityPickerEntityFilterFunc } from "../../data/entity";
 import type { HomeAssistant, ValueChangedEvent } from "../../types";
 import "../ha-sortable";
 import "./ha-entity-picker";
-import type { HaEntityPickerEntityFilterFunc } from "../../data/entity";

@customElement("ha-entities-picker")
 class HaEntitiesPicker extends LitElement {
@@ -118,7 +118,7 @@ class HaEntitiesPicker extends LitElement {
                  ? html`
                      <ha-svg-icon
                        class="entity-handle"
-                        .path=${mdiDrag}
+                        .path=${mdiDragHorizontalVariant}
                      ></ha-svg-icon>
                    `
                  : nothing}
@@ -147,6 +147,7 @@ class HaEntitiesPicker extends LitElement {
          .createDomains=${this.createDomains}
          .required=${this.required && !currentEntities.length}
          @value-changed=${this._addEntity}
+          add-button
        ></ha-entity-picker>
      </div>
    `;
--- a/src/components/entity/ha-entity-name-picker.ts
+++ b/src/components/entity/ha-entity-name-picker.ts
@@ -1,5 +1,5 @@
 import "@material/mwc-menu/mwc-menu-surface";
-import { mdiDrag, mdiPlus } from "@mdi/js";
+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";
@@ -20,6 +20,7 @@ import "../chips/ha-chip-set";
 import "../chips/ha-input-chip";
 import "../ha-combo-box";
 import type { HaComboBox } from "../ha-combo-box";
+import "../ha-input-helper-text";
 import "../ha-sortable";

 interface EntityNameOption {
@@ -86,8 +87,8 @@ export class HaEntityNamePicker extends LitElement {

  private _editIndex?: number;

-  private _validOptions = memoizeOne((entityId?: string) => {
-    const options = new Set<string>();
+  private _validTypes = memoizeOne((entityId?: string) => {
+    const options = new Set<string>(["text"]);
    if (!entityId) {
      return options;
    }
@@ -119,22 +120,22 @@ export class HaEntityNamePicker extends LitElement {
      return [];
    }

-    const options = this._validOptions(entityId);
+    const types = this._validTypes(entityId);

    const items = (
      ["entity", "device", "area", "floor"] as const
    ).map<EntityNameOption>((name) => {
      const stateObj = this.hass.states[entityId];
-      const isValid = options.has(name);
+      const isValid = types.has(name);
      const primary = this.hass.localize(
        `ui.components.entity.entity-name-picker.types.${name}`
      );
      const secondary =
-        stateObj && isValid
+        (stateObj && isValid
          ? this.hass.formatEntityName(stateObj, { type: name })
          : this.hass.localize(
              `ui.components.entity.entity-name-picker.types.${name}_missing` as LocalizeKeys
-            ) || "-";
+            )) || "-";

      return {
        primary,
@@ -169,9 +170,9 @@ export class HaEntityNamePicker extends LitElement {
  };

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

    return html`
      ${this.label ? html`<label>${this.label}</label>` : nothing}
@@ -185,12 +186,11 @@ export class HaEntityNamePicker extends LitElement {
        >
          <ha-chip-set>
            ${repeat(
-              this._value,
+              this._items,
              (item) => item,
              (item: EntityNameItem, idx) => {
                const label = this._formatItem(item);
-                const isValid =
-                  item.type === "text" || validOptions.has(item.type);
+                const isValid = validTypes.has(item.type);
                return html`
                  <ha-input-chip
                    data-idx=${idx}
@@ -201,7 +201,10 @@ export class HaEntityNamePicker extends LitElement {
                    .disabled=${this.disabled}
                    class=${!isValid ? "invalid" : ""}
                  >
-                    <ha-svg-icon slot="icon" .path=${mdiDrag}></ha-svg-icon>
+                    <ha-svg-icon
+                      slot="icon"
+                      .path=${mdiDragHorizontalVariant}
+                    ></ha-svg-icon>
                    <span>${label}</span>
                  </ha-input-chip>
                `;
@@ -235,9 +238,8 @@ export class HaEntityNamePicker extends LitElement {
            .hass=${this.hass}
            .value=${""}
            .autofocus=${this.autofocus}
-            .disabled=${this.disabled || !this.entityId}
+            .disabled=${this.disabled}
            .required=${this.required && !value.length}
-            .helper=${this.helper}
            .items=${options}
            allow-custom-value
            item-id-path="value"
@@ -251,9 +253,20 @@ export class HaEntityNamePicker extends LitElement {
          </ha-combo-box>
        </mwc-menu-surface>
      </div>
+      ${this._renderHelper()}
    `;
  }

+  private _renderHelper() {
+    return this.helper
+      ? html`
+          <ha-input-helper-text .disabled=${this.disabled}>
+            ${this.helper}
+          </ha-input-helper-text>
+        `
+      : nothing;
+  }
+
  private _onClosed(ev) {
    ev.stopPropagation();
    this._opened = false;
@@ -282,13 +295,16 @@ export class HaEntityNamePicker extends LitElement {
    this._opened = true;
  }

-  private get _value(): EntityNameItem[] {
+  private get _items(): EntityNameItem[] {
    return this._toItems(this.value);
  }

  private _toItems = memoizeOne((value?: typeof this.value) => {
    if (typeof value === "string") {
-      return [{ type: "text", text: value } as const];
+      if (value === "") {
+        return [];
+      }
+      return [{ type: "text", text: value } satisfies EntityNameItem];
    }
    return value ? ensureArray(value) : [];
  });
@@ -296,7 +312,7 @@ export class HaEntityNamePicker extends LitElement {
  private _toValue = memoizeOne(
    (items: EntityNameItem[]): typeof this.value => {
      if (items.length === 0) {
-        return [];
+        return undefined;
      }
      if (items.length === 1) {
        const item = items[0];
@@ -312,19 +328,21 @@ export class HaEntityNamePicker extends LitElement {
      const options = this._comboBox.items || [];

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

      const initialValue = initialItem ? formatOptionValue(initialItem) : "";

      const filteredItems = this._filterSelectedOptions(options, initialValue);

-      if (initialItem && initialItem.type === "text" && initialItem.text) {
+      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("");
    }
  }

@@ -332,15 +350,16 @@ export class HaEntityNamePicker extends LitElement {
    options: EntityNameOption[],
    current?: string
  ) => {
-    const value = this._value;
+    const items = this._items;

-    const types = value.map((item) => item.type) as string[];
+    const excludedValues = new Set(
+      items
+        .filter((item) => UNIQUE_TYPES.has(item.type))
+        .map((item) => formatOptionValue(item))
+    );

    const filteredOptions = options.filter(
-      (option) =>
-        !UNIQUE_TYPES.has(option.value) ||
-        !types.includes(option.value) ||
-        option.value === current
+      (option) => !excludedValues.has(option.value) || option.value === current
    );
    return filteredOptions;
  };
@@ -351,16 +370,14 @@ export class HaEntityNamePicker extends LitElement {
    const options = this._comboBox.items || [];

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

    const currentValue = currentItem ? formatOptionValue(currentItem) : "";

-    this._comboBox.filteredItems = this._filterSelectedOptions(
-      options,
-      currentValue
-    );
+    let filteredItems = this._filterSelectedOptions(options, currentValue);

    if (!filter) {
+      this._comboBox.filteredItems = filteredItems;
      return;
    }

@@ -372,9 +389,8 @@ export class HaEntityNamePicker extends LitElement {
      ignoreDiacritics: true,
    };

-    const fuse = new Fuse(this._comboBox.filteredItems, fuseOptions);
-    const filteredItems = fuse.search(filter).map((result) => result.item);
-
+    const fuse = new Fuse(filteredItems, fuseOptions);
+    filteredItems = fuse.search(filter).map((result) => result.item);
    filteredItems.push(this._customNameOption(input));
    this._comboBox.filteredItems = filteredItems;
  }
@@ -382,7 +398,7 @@ export class HaEntityNamePicker extends LitElement {
  private async _moveItem(ev: CustomEvent) {
    ev.stopPropagation();
    const { oldIndex, newIndex } = ev.detail;
-    const value = this._value;
+    const value = this._items;
    const newValue = value.concat();
    const element = newValue.splice(oldIndex, 1)[0];
    newValue.splice(newIndex, 0, element);
@@ -393,7 +409,7 @@ export class HaEntityNamePicker extends LitElement {

  private async _removeItem(ev) {
    ev.stopPropagation();
-    const value = [...this._value];
+    const value = [...this._items];
    const idx = parseInt(ev.target.dataset.idx, 10);
    value.splice(idx, 1);
    this._setValue(value);
@@ -411,7 +427,7 @@ export class HaEntityNamePicker extends LitElement {

    const item: EntityNameItem = parseOptionValue(value);

-    const newValue = [...this._value];
+    const newValue = [...this._items];

    if (this._editIndex != null) {
      newValue[this._editIndex] = item;
@@ -505,6 +521,11 @@ export class HaEntityNamePicker 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-picker.ts
+++ b/src/components/entity/ha-entity-picker.ts
@@ -113,6 +113,9 @@ export class HaEntityPicker extends LitElement {
  @property({ attribute: "hide-clear-icon", type: Boolean })
  public hideClearIcon = false;

+  @property({ attribute: "add-button", type: Boolean })
+  public addButton = false;
+
  @query("ha-generic-picker") private _picker?: HaGenericPicker;

  protected firstUpdated(changedProperties: PropertyValues): void {
@@ -281,7 +284,7 @@ export class HaEntityPicker extends LitElement {
        .searchLabel=${this.searchLabel}
        .notFoundLabel=${notFoundLabel}
        .placeholder=${placeholder}
-        .value=${this.value}
+        .value=${this.addButton ? undefined : this.value}
        .rowRenderer=${this._rowRenderer}
        .getItems=${this._getItems}
        .getAdditionalItems=${this._getAdditionalItems}
@@ -289,6 +292,9 @@ export class HaEntityPicker extends LitElement {
        .searchFn=${this._searchFn}
        .valueRenderer=${this._valueRenderer}
        @value-changed=${this._valueChanged}
+        .addButtonLabel=${this.addButton
+          ? this.hass.localize("ui.components.entity.entity-picker.add")
+          : undefined}
      >
      </ha-generic-picker>
    `;
--- a/src/components/entity/ha-entity-state-content-picker.ts
+++ b/src/components/entity/ha-entity-state-content-picker.ts
@@ -1,23 +1,39 @@
-import { mdiDrag } from "@mdi/js";
+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 type { PropertyValues } from "lit";
-import { LitElement, css, html, nothing } from "lit";
+import { css, html, LitElement, nothing } from "lit";
 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,
  STATE_DISPLAY_SPECIAL_CONTENT_DOMAINS,
 } from "../../state-display/state-display";
 import type { HomeAssistant, ValueChangedEvent } from "../../types";
-import "../ha-combo-box";
-import "../ha-sortable";
-import "../chips/ha-input-chip";
+import "../chips/ha-assist-chip";
 import "../chips/ha-chip-set";
+import "../chips/ha-input-chip";
+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",
@@ -74,7 +90,7 @@ const HIDDEN_ATTRIBUTES = [
 ];

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

  @property({ attribute: false }) public entityId?: string;
@@ -95,26 +111,28 @@ class HaEntityStatePicker extends LitElement {

  @property() public helper?: string;

-  @state() private _opened = false;
+  @query(".container", true) private _container?: HTMLDivElement;

  @query("ha-combo-box", true) private _comboBox!: HaComboBox;

-  protected shouldUpdate(changedProps: PropertyValues) {
-    return !(!changedProps.has("_opened") && this._opened);
-  }
+  @state() private _opened = false;

-  private options = memoizeOne(
+  private _editIndex?: number;
+
+  private _options = memoizeOne(
    (entityId?: string, stateObj?: HassEntity, allowName?: boolean) => {
      const domain = entityId ? computeDomain(entityId) : undefined;
      return [
        {
-          label: this.hass.localize("ui.components.state-content-picker.state"),
+          primary: this.hass.localize(
+            "ui.components.state-content-picker.state"
+          ),
          value: "state",
        },
        ...(allowName
          ? [
              {
-                label: this.hass.localize(
+                primary: this.hass.localize(
                  "ui.components.state-content-picker.name"
                ),
                value: "name",
@@ -122,13 +140,13 @@ class HaEntityStatePicker extends LitElement {
            ]
          : []),
        {
-          label: this.hass.localize(
+          primary: this.hass.localize(
            "ui.components.state-content-picker.last_changed"
          ),
          value: "last_changed",
        },
        {
-          label: this.hass.localize(
+          primary: this.hass.localize(
            "ui.components.state-content-picker.last_updated"
          ),
          value: "last_updated",
@@ -137,7 +155,7 @@ class HaEntityStatePicker extends LitElement {
          ? STATE_DISPLAY_SPECIAL_CONTENT.filter((content) =>
              STATE_DISPLAY_SPECIAL_CONTENT_DOMAINS[domain]?.includes(content)
            ).map((content) => ({
-              label: this.hass.localize(
+              primary: this.hass.localize(
                `ui.components.state-content-picker.${content}`
              ),
              value: content,
@@ -146,105 +164,201 @@ class HaEntityStatePicker extends LitElement {
        ...Object.keys(stateObj?.attributes ?? {})
          .filter((a) => !HIDDEN_ATTRIBUTES.includes(a))
          .map((attribute) => ({
+            primary: this.hass.formatEntityAttributeName(stateObj!, attribute),
            value: attribute,
-            label: this.hass.formatEntityAttributeName(stateObj!, attribute),
          })),
-      ];
+      ] satisfies StateContentOption[];
    }
  );

-  private _filter = "";
-
  protected render() {
-    if (!this.hass) {
-      return nothing;
-    }
-
    const value = this._value;

    const stateObj = this.entityId
      ? this.hass.states[this.entityId]
      : undefined;

-    const options = this.options(this.entityId, stateObj, this.allowName);
-    const optionItems = options.filter(
-      (option) => !this._value.includes(option.value)
-    );
+    const options = this._options(this.entityId, stateObj, this.allowName);

    return html`
-      ${value?.length
-        ? html`
-            <ha-sortable
-              no-style
-              @item-moved=${this._moveItem}
-              .disabled=${this.disabled}
-              handle-selector="button.primary.action"
-            >
-              <ha-chip-set>
-                ${repeat(
-                  this._value,
-                  (item) => item,
-                  (item, idx) => {
-                    const label =
-                      options.find((option) => option.value === item)?.label ||
-                      item;
-                    return html`
-                      <ha-input-chip
-                        .idx=${idx}
-                        @remove=${this._removeItem}
-                        .label=${label}
-                        selected
-                      >
-                        <ha-svg-icon slot="icon" .path=${mdiDrag}></ha-svg-icon>
-                        ${label}
-                      </ha-input-chip>
-                    `;
-                  }
-                )}
-              </ha-chip-set>
-            </ha-sortable>
-          `
-        : nothing}
+      ${this.label ? html`<label>${this.label}</label>` : nothing}
+      <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>

-      <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=${""}
-        .items=${optionItems}
-        allow-custom-value
-        @filter-changed=${this._filterChanged}
-        @value-changed=${this._comboBoxValueChanged}
-        @opened-changed=${this._openedChanged}
-      ></ha-combo-box>
+        <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-combo-box>
+        </mwc-menu-surface>
+      </div>
    `;
  }

+  private _onClosed(ev) {
+    ev.stopPropagation();
+    this._opened = false;
+    this._editIndex = undefined;
+  }
+
+  private async _onOpened(ev) {
+    if (!this._opened) {
+      return;
+    }
+    ev.stopPropagation();
+    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;
+    this._opened = true;
+  }
+
  private get _value() {
    return !this.value ? [] : ensureArray(this.value);
  }

+  private _toValue = memoizeOne((value: string[]): typeof this.value => {
+    if (value.length === 0) {
+      return undefined;
+    }
+    if (value.length === 1) {
+      return value[0];
+    }
+    return value;
+  });
+
  private _openedChanged(ev: ValueChangedEvent<boolean>) {
-    this._opened = ev.detail.value;
-    this._comboBox.filteredItems = this._comboBox.items;
+    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;
+    }
  }

-  private _filterChanged(ev?: CustomEvent): void {
-    this._filter = ev?.detail.value || "";
+  private _filterSelectedOptions = (
+    options: StateContentOption[],
+    current?: string
+  ) => {
+    const value = this._value;

-    const filteredItems = this._comboBox.items?.filter((item) => {
-      const label = item.label || item.value;
-      return label.toLowerCase().includes(this._filter?.toLowerCase());
-    });
+    return options.filter(
+      (option) => !value.includes(option.value) || option.value === current
+    );
+  };

-    if (this._filter) {
-      filteredItems?.unshift({ label: this._filter, value: this._filter });
+  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] : "";
+
+    this._comboBox.filteredItems = this._filterSelectedOptions(
+      options,
+      currentValue
+    );
+
+    if (!filter) {
+      return;
    }

+    const fuseOptions: IFuseOptions<StateContentOption> = {
+      keys: ["primary", "secondary", "value"],
+      isCaseSensitive: false,
+      minMatchCharLength: Math.min(filter.length, 2),
+      threshold: 0.2,
+      ignoreDiacritics: true,
+    };
+
+    const fuse = new Fuse(this._comboBox.filteredItems, fuseOptions);
+    const filteredItems = fuse.search(filter).map((result) => result.item);
+
    this._comboBox.filteredItems = filteredItems;
  }

@@ -257,43 +371,40 @@ class HaEntityStatePicker extends LitElement {
    newValue.splice(newIndex, 0, element);
    this._setValue(newValue);
    await this.updateComplete;
-    this._filterChanged();
+    this._filterChanged({ detail: { value: "" } } as ValueChangedEvent<string>);
  }

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

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

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

-    const currentValue = this._value;
+    const newValue = [...this._value];

-    if (currentValue.includes(newValue)) {
-      return;
+    if (this._editIndex != null) {
+      newValue[this._editIndex] = value;
+    } else {
+      newValue.push(value);
    }

-    setTimeout(() => {
-      this._filterChanged();
-      this._comboBox.setInputValue("");
-    }, 0);
-
-    this._setValue([...currentValue, newValue]);
+    this._setValue(newValue);
  }

  private _setValue(value: string[]) {
-    const newValue =
-      value.length === 0 ? undefined : value.length === 1 ? value[0] : value;
+    const newValue = this._toValue(value);
    this.value = newValue;
    fireEvent(this, "value-changed", {
      value: newValue,
@@ -303,10 +414,64 @@ class HaEntityStatePicker extends LitElement {
  static styles = css`
    :host {
      position: relative;
+      width: 100%;
+    }
+
+    .container {
+      position: relative;
+      background-color: var(--mdc-text-field-fill-color, whitesmoke);
+      border-radius: var(--ha-border-radius-sm);
+      border-end-end-radius: var(--ha-border-radius-square);
+      border-end-start-radius: var(--ha-border-radius-square);
+    }
+    .container:after {
+      display: block;
+      content: "";
+      position: absolute;
+      pointer-events: none;
+      bottom: 0;
+      left: 0;
+      right: 0;
+      height: 1px;
+      width: 100%;
+      background-color: var(
+        --mdc-text-field-idle-line-color,
+        rgba(0, 0, 0, 0.42)
+      );
+      transform:
+        height 180ms ease-in-out,
+        background-color 180ms ease-in-out;
+    }
+    .container.disabled:after {
+      background-color: var(
+        --mdc-text-field-disabled-line-color,
+        rgba(0, 0, 0, 0.42)
+      );
+    }
+    .container:focus-within:after {
+      height: 2px;
+      background-color: var(--mdc-theme-primary);
+    }
+
+    label {
+      display: block;
+      margin: 0 0 var(--ha-space-2);
+    }
+
+    .add {
+      order: 1;
+    }
+
+    mwc-menu-surface {
+      --mdc-menu-min-width: 100%;
    }

    ha-chip-set {
-      padding: 8px 0;
+      padding: var(--ha-space-2) var(--ha-space-2);
+    }
+
+    .invalid {
+      text-decoration: line-through;
    }

    .sortable-fallback {
@@ -326,6 +491,6 @@ class HaEntityStatePicker extends LitElement {

 declare global {
  interface HTMLElementTagNameMap {
-    "ha-entity-state-content-picker": HaEntityStatePicker;
+    "ha-entity-state-content-picker": HaStateContentPicker;
  }
 }
--- a/src/components/entity/ha-entity-states-picker.ts
+++ b/src/components/entity/ha-entity-states-picker.ts
@@ -4,6 +4,7 @@ import { customElement, property } from "lit/decorators";
 import { keyed } from "lit/directives/keyed";
 import { repeat } from "lit/directives/repeat";
 import { fireEvent } from "../../common/dom/fire_event";
+import { ANY_STATE_VALUE } from "./const";
 import { ensureArray } from "../../common/array/ensure-array";
 import type { HomeAssistant } from "../../types";
 import "./ha-entity-state-picker";
@@ -57,6 +58,7 @@ export class HaEntityStatesPicker extends LitElement {

    const value = this.value || [];
    const hide = [...(this.hideStates || []), ...value];
+    const hideValue = value.includes(ANY_STATE_VALUE);

    return html`
      ${repeat(
@@ -84,7 +86,7 @@ export class HaEntityStatesPicker extends LitElement {
        `
      )}
      <div>
-        ${this.disabled && value.length
+        ${(this.disabled && value.length) || hideValue
          ? nothing
          : keyed(
              value.length,
--- a/src/components/ha-analytics.ts
+++ b/src/components/ha-analytics.ts
@@ -46,7 +46,7 @@ export class HaAnalytics extends LitElement {
        </span>
        <ha-switch
          @change=${this._handleRowClick}
-          .checked=${baseEnabled}
+          .checked=${!!baseEnabled}
          .preference=${"base"}
          .disabled=${loading}
          name="base"
@@ -70,7 +70,7 @@ export class HaAnalytics extends LitElement {
              <ha-switch
                .id="switch-${preference}"
                @change=${this._handleRowClick}
-                .checked=${this.analytics?.preferences[preference]}
+                .checked=${!!this.analytics?.preferences[preference]}
                .preference=${preference}
                name=${preference}
              >
@@ -102,7 +102,7 @@ export class HaAnalytics extends LitElement {
        </span>
        <ha-switch
          @change=${this._handleRowClick}
-          .checked=${this.analytics?.preferences.diagnostics}
+          .checked=${!!this.analytics?.preferences.diagnostics}
          .preference=${"diagnostics"}
          .disabled=${loading}
          name="diagnostics"
--- a/src/components/ha-areas-floors-display-editor.ts
+++ b/src/components/ha-areas-floors-display-editor.ts
@@ -1,4 +1,4 @@
-import { mdiDrag, mdiTextureBox } from "@mdi/js";
+import { mdiDragHorizontalVariant, mdiTextureBox } from "@mdi/js";
 import type { TemplateResult } from "lit";
 import { LitElement, css, html, nothing } from "lit";
 import { customElement, property } from "lit/decorators";
@@ -105,7 +105,7 @@ export class HaAreasFloorsDisplayEditor extends LitElement {
                      <ha-svg-icon
                        class="handle"
                        slot="icons"
-                        .path=${mdiDrag}
+                        .path=${mdiDragHorizontalVariant}
                      ></ha-svg-icon>
                    `}
                <ha-items-display-editor
--- a/src/components/ha-automation-row.ts
+++ b/src/components/ha-automation-row.ts
@@ -118,7 +118,7 @@ export class HaAutomationRow extends LitElement {
    }
    .row {
      display: flex;
-      padding: 0 8px;
+      padding: var(--ha-space-0) var(--ha-space-2);
      min-height: 48px;
      align-items: center;
      cursor: pointer;
@@ -134,12 +134,12 @@ export class HaAutomationRow extends LitElement {
    .expand-button {
      transition: transform 150ms cubic-bezier(0.4, 0, 0.2, 1);
      color: var(--ha-color-on-neutral-quiet);
-      margin-left: -8px;
+      margin-left: calc(var(--ha-space-2) * -1);
    }
    :host([building-block]) .leading-icon-wrapper {
      background-color: var(--ha-color-fill-neutral-loud-resting);
      border-radius: var(--ha-border-radius-md);
-      padding: 4px;
+      padding: var(--ha-space-1);
      display: flex;
      justify-content: center;
      align-items: center;
@@ -149,7 +149,7 @@ export class HaAutomationRow extends LitElement {
      color: var(--ha-color-on-neutral-quiet);
    }
    :host([building-block]) ::slotted([slot="leading-icon"]) {
-      --mdc-icon-size: 20px;
+      --mdc-icon-size: var(--ha-space-5);
      color: var(--white-color);
      transform: rotate(-45deg);
    }
@@ -170,7 +170,7 @@ export class HaAutomationRow extends LitElement {
    ::slotted([slot="header"]) {
      flex: 1;
      overflow-wrap: anywhere;
-      margin: 0 12px;
+      margin: var(--ha-space-0) var(--ha-space-3);
    }
    :host([sort-selected]) .row {
      outline: solid;
--- a/src/components/ha-bottom-sheet.ts
+++ b/src/components/ha-bottom-sheet.ts
@@ -1,6 +1,8 @@
 import "@home-assistant/webawesome/dist/components/drawer/drawer";
 import { css, html, LitElement, type PropertyValues } from "lit";
-import { customElement, property, state } from "lit/decorators";
+import { customElement, property, query, state } from "lit/decorators";
+import { SwipeGestureRecognizer } from "../common/util/swipe-gesture-recognizer";
+import { haStyleScrollbar } from "../resources/styles";

 export const BOTTOM_SHEET_ANIMATION_DURATION_MS = 300;

@@ -13,6 +15,12 @@ export class HaBottomSheet extends LitElement {

  @state() private _drawerOpen = false;

+  @query("#drawer") private _drawer!: HTMLElement;
+
+  private _gestureRecognizer = new SwipeGestureRecognizer();
+
+  private _isDragging = false;
+
  private _handleAfterHide() {
    this.open = false;
    const ev = new Event("closed", {
@@ -32,54 +40,186 @@ export class HaBottomSheet extends LitElement {
  render() {
    return html`
      <wa-drawer
+        id="drawer"
        placement="bottom"
        .open=${this._drawerOpen}
        @wa-after-hide=${this._handleAfterHide}
        without-header
+        @touchstart=${this._handleTouchStart}
      >
-        <slot></slot>
+        <slot name="header"></slot>
+        <div id="body" class="body ha-scrollbar">
+          <slot></slot>
+        </div>
      </wa-drawer>
    `;
  }

-  static styles = css`
-    wa-drawer {
-      --wa-color-surface-raised: transparent;
-      --spacing: 0;
-      --size: var(--ha-bottom-sheet-height, auto);
-      --show-duration: ${BOTTOM_SHEET_ANIMATION_DURATION_MS}ms;
-      --hide-duration: ${BOTTOM_SHEET_ANIMATION_DURATION_MS}ms;
-    }
-    wa-drawer::part(dialog) {
-      max-height: var(--ha-bottom-sheet-max-height, 90vh);
-      align-items: center;
-    }
-    wa-drawer::part(body) {
-      max-width: var(--ha-bottom-sheet-max-width);
-      width: 100%;
-      border-top-left-radius: var(
-        --ha-bottom-sheet-border-radius,
-        var(--ha-dialog-border-radius, var(--ha-border-radius-2xl))
-      );
-      border-top-right-radius: var(
-        --ha-bottom-sheet-border-radius,
-        var(--ha-dialog-border-radius, var(--ha-border-radius-2xl))
-      );
-      background-color: var(
-        --ha-bottom-sheet-surface-background,
-        var(--ha-dialog-surface-background, var(--mdc-theme-surface, #fff)),
-      );
-      padding: var(
-        --ha-bottom-sheet-padding,
-        0 var(--safe-area-inset-right) var(--safe-area-inset-bottom)
-          var(--safe-area-inset-left)
-      );
+  private _handleTouchStart = (ev: TouchEvent) => {
+    // Check if any element inside drawer in the composed path has scrollTop > 0
+    for (const path of ev.composedPath()) {
+      const el = path as HTMLElement;
+      if (el === this._drawer) {
+        break;
+      }
+      if (el.scrollTop > 0) {
+        return;
+      }
    }

-    :host([flexcontent]) wa-drawer::part(body) {
-      display: flex;
+    this._startResizing(ev.touches[0].clientY);
+  };
+
+  private _startResizing(clientY: number) {
+    // register event listeners for drag handling
+    document.addEventListener("touchmove", this._handleTouchMove, {
+      passive: false,
+    });
+    document.addEventListener("touchend", this._handleTouchEnd);
+    document.addEventListener("touchcancel", this._handleTouchEnd);
+
+    this._gestureRecognizer.start(clientY);
+  }
+
+  private _handleTouchMove = (ev: TouchEvent) => {
+    const currentY = ev.touches[0].clientY;
+    const delta = this._gestureRecognizer.move(currentY);
+
+    if (delta < 0) {
+      ev.preventDefault();
+      this._isDragging = true;
+      requestAnimationFrame(() => {
+        if (this._isDragging) {
+          this.style.setProperty(
+            "--dialog-transform",
+            `translateY(${delta * -1}px)`
+          );
+        }
+      });
    }
-  `;
+  };
+
+  private _animateSnapBack() {
+    // Add transition for smooth animation
+    this.style.setProperty(
+      "--dialog-transition",
+      `transform ${BOTTOM_SHEET_ANIMATION_DURATION_MS}ms ease-out`
+    );
+
+    // Reset transform to snap back
+    this.style.removeProperty("--dialog-transform");
+
+    // Remove transition after animation completes
+    setTimeout(() => {
+      this.style.removeProperty("--dialog-transition");
+    }, BOTTOM_SHEET_ANIMATION_DURATION_MS);
+  }
+
+  private _handleTouchEnd = () => {
+    this._unregisterResizeHandlers();
+
+    this._isDragging = false;
+
+    const result = this._gestureRecognizer.end();
+
+    // If velocity exceeds threshold, use velocity direction to determine action
+    if (result.isSwipe) {
+      if (result.isDownwardSwipe) {
+        // Downward swipe - close the bottom sheet
+        this._drawerOpen = false;
+      } else {
+        // Upward swipe - keep open and animate back
+        this._animateSnapBack();
+      }
+      return;
+    }
+
+    // If velocity is below threshold, use position-based logic
+    // Get the drawer height to calculate 50% threshold
+    const drawerBody = this._drawer.shadowRoot?.querySelector(
+      '[part="body"]'
+    ) as HTMLElement;
+    const drawerHeight = drawerBody?.offsetHeight || 0;
+
+    // delta is negative when dragging down
+    // Close if dragged down past 50% of the drawer height
+    if (
+      drawerHeight > 0 &&
+      result.delta < 0 &&
+      Math.abs(result.delta) > drawerHeight * 0.5
+    ) {
+      this._drawerOpen = false;
+    } else {
+      this._animateSnapBack();
+    }
+  };
+
+  private _unregisterResizeHandlers = () => {
+    document.removeEventListener("touchmove", this._handleTouchMove);
+    document.removeEventListener("touchend", this._handleTouchEnd);
+    document.removeEventListener("touchcancel", this._handleTouchEnd);
+  };
+
+  disconnectedCallback() {
+    super.disconnectedCallback();
+    this._unregisterResizeHandlers();
+    this._isDragging = false;
+  }
+
+  static styles = [
+    haStyleScrollbar,
+    css`
+      wa-drawer {
+        --wa-color-surface-raised: transparent;
+        --spacing: 0;
+        --size: var(--ha-bottom-sheet-height, auto);
+        --show-duration: ${BOTTOM_SHEET_ANIMATION_DURATION_MS}ms;
+        --hide-duration: ${BOTTOM_SHEET_ANIMATION_DURATION_MS}ms;
+      }
+      wa-drawer::part(dialog) {
+        max-height: var(--ha-bottom-sheet-max-height, 90vh);
+        align-items: center;
+        transform: var(--dialog-transform);
+        transition: var(--dialog-transition);
+      }
+      wa-drawer::part(body) {
+        max-width: var(--ha-bottom-sheet-max-width);
+        width: 100%;
+        border-top-left-radius: var(
+          --ha-bottom-sheet-border-radius,
+          var(--ha-dialog-border-radius, var(--ha-border-radius-2xl))
+        );
+        border-top-right-radius: var(
+          --ha-bottom-sheet-border-radius,
+          var(--ha-dialog-border-radius, var(--ha-border-radius-2xl))
+        );
+        background-color: var(
+          --ha-bottom-sheet-surface-background,
+          var(--ha-dialog-surface-background, var(--mdc-theme-surface, #fff)),
+        );
+        padding: var(
+          --ha-bottom-sheet-padding,
+          0 var(--safe-area-inset-right) var(--safe-area-inset-bottom)
+            var(--safe-area-inset-left)
+        );
+      }
+      :host([flexcontent]) wa-drawer::part(body) {
+        display: flex;
+        flex-direction: column;
+      }
+      :host([flexcontent]) .body {
+        flex: 1;
+        max-width: 100%;
+        display: flex;
+        flex-direction: column;
+        padding: var(
+          --ha-bottom-sheet-padding,
+          0 var(--safe-area-inset-right) var(--safe-area-inset-bottom)
+            var(--safe-area-inset-left)
+        );
+      }
+    `,
+  ];
 }

 declare global {
--- a/src/components/ha-button-toggle-group.ts
+++ b/src/components/ha-button-toggle-group.ts
@@ -31,6 +31,9 @@ export class HaButtonToggleGroup extends LitElement {
  @property({ type: Boolean, reflect: true, attribute: "no-wrap" })
  public nowrap = false;

+  @property({ type: Boolean, reflect: true, attribute: "full-width" })
+  public fullWidth = false;
+
  @property() public variant:
    | "brand"
    | "neutral"
@@ -38,6 +41,13 @@ export class HaButtonToggleGroup extends LitElement {
    | "warning"
    | "danger" = "brand";

+  @property({ attribute: "active-variant" }) public activeVariant?:
+    | "brand"
+    | "neutral"
+    | "success"
+    | "warning"
+    | "danger";
+
  protected render(): TemplateResult {
    return html`
      <wa-button-group childSelector="ha-button">
@@ -46,7 +56,9 @@ export class HaButtonToggleGroup extends LitElement {
            html`<ha-button
              iconTag="ha-svg-icon"
              class="icon"
-              .variant=${this.variant}
+              .variant=${this.active !== button.value || !this.activeVariant
+                ? this.variant
+                : this.activeVariant}
              .size=${this.size}
              .value=${button.value}
              @click=${this._handleClick}
@@ -78,6 +90,19 @@ export class HaButtonToggleGroup extends LitElement {
    :host([no-wrap]) wa-button-group::part(base) {
      flex-wrap: nowrap;
    }
+
+    wa-button-group {
+      padding: var(--ha-button-toggle-group-padding);
+    }
+
+    :host([full-width]) wa-button-group,
+    :host([full-width]) wa-button-group::part(base) {
+      width: 100%;
+    }
+
+    :host([full-width]) ha-button {
+      flex: 1;
+    }
  `;
 }

--- a/src/components/ha-card.ts
+++ b/src/components/ha-card.ts
@@ -44,26 +44,26 @@ export class HaCard extends LitElement {
      font-size: var(--ha-card-header-font-size, var(--ha-font-size-2xl));
      letter-spacing: -0.012em;
      line-height: var(--ha-line-height-expanded);
-      padding: 12px 16px 16px;
+      padding: var(--ha-space-3) var(--ha-space-4) var(--ha-space-4);
      display: block;
-      margin-block-start: 0px;
-      margin-block-end: 0px;
+      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: 0px;
-      margin-top: -8px;
+      padding-top: var(--ha-space-0);
+      margin-top: calc(var(--ha-space-2) * -1);
    }

    :host ::slotted(.card-content) {
-      padding: 16px;
+      padding: var(--ha-space-4);
    }

    :host ::slotted(.card-actions) {
      border-top: 1px solid var(--divider-color, #e8e8e8);
-      padding: 8px;
+      padding: var(--ha-space-2);
    }
  `;

--- a/src/components/ha-code-editor.ts
+++ b/src/components/ha-code-editor.ts
@@ -239,6 +239,7 @@ export class HaCodeEditor extends ReactiveElement {
      this._loadedCodeMirror.crosshairCursor(),
      this._loadedCodeMirror.highlightSelectionMatches(),
      this._loadedCodeMirror.highlightActiveLine(),
+      this._loadedCodeMirror.dropCursor(),
      this._loadedCodeMirror.indentationMarkers({
        thickness: 0,
        activeThickness: 1,
--- a/src/components/ha-dialog-header.ts
+++ b/src/components/ha-dialog-header.ts
@@ -6,6 +6,9 @@ export class HaDialogHeader extends LitElement {
  @property({ type: String, attribute: "subtitle-position" })
  public subtitlePosition: "above" | "below" = "below";

+  @property({ type: Boolean, reflect: true, attribute: "show-border" })
+  public showBorder = false;
+
  protected render() {
    const titleSlot = html`<div class="header-title">
      <slot name="title"></slot>
@@ -49,12 +52,16 @@ export class HaDialogHeader extends LitElement {
          display: flex;
          flex-direction: row;
          align-items: center;
-          padding: 4px;
+          padding: 0 var(--ha-space-1);
          box-sizing: border-box;
        }
        .header-content {
          flex: 1;
-          padding: 10px 4px;
+          padding: 10px var(--ha-space-1);
+          display: flex;
+          flex-direction: column;
+          justify-content: center;
+          min-height: var(--ha-space-12);
          min-width: 0;
          overflow: hidden;
          text-overflow: ellipsis;
@@ -63,7 +70,7 @@ export class HaDialogHeader extends LitElement {
        .header-title {
          height: var(
            --ha-dialog-header-title-height,
-            calc(var(--ha-font-size-xl) + 4px)
+            calc(var(--ha-font-size-xl) + var(--ha-space-1))
          );
          font-size: var(--ha-font-size-xl);
          line-height: var(--ha-line-height-condensed);
@@ -76,19 +83,19 @@ export class HaDialogHeader extends LitElement {
        }
        @media all and (min-width: 450px) and (min-height: 500px) {
          .header-bar {
-            padding: 16px;
+            padding: 0 var(--ha-space-2);
          }
        }
        .header-navigation-icon {
          flex: none;
-          min-width: 8px;
+          min-width: var(--ha-space-2);
          height: 100%;
          display: flex;
          flex-direction: row;
        }
        .header-action-items {
          flex: none;
-          min-width: 8px;
+          min-width: var(--ha-space-2);
          height: 100%;
          display: flex;
          flex-direction: row;
--- a/src/components/ha-filter-devices.ts
+++ b/src/components/ha-filter-devices.ts
@@ -248,7 +248,7 @@ export class HaFilterDevices extends LitElement {
        }
        search-input-outlined {
          display: block;
-          padding: 0 8px;
+          padding: var(--ha-space-1) var(--ha-space-2) 0;
        }
      `,
    ];
--- a/src/components/ha-filter-domains.ts
+++ b/src/components/ha-filter-domains.ts
@@ -199,7 +199,7 @@ export class HaFilterDomains extends LitElement {
        }
        search-input-outlined {
          display: block;
-          padding: 0 8px;
+          padding: var(--ha-space-1) var(--ha-space-2) 0;
        }
      `,
    ];
--- a/src/components/ha-filter-entities.ts
+++ b/src/components/ha-filter-entities.ts
@@ -264,7 +264,7 @@ export class HaFilterEntities extends LitElement {
        }
        search-input-outlined {
          display: block;
-          padding: 0 8px;
+          padding: var(--ha-space-1) var(--ha-space-2) 0;
        }
      `,
    ];
--- a/src/components/ha-filter-integrations.ts
+++ b/src/components/ha-filter-integrations.ts
@@ -217,7 +217,7 @@ export class HaFilterIntegrations extends LitElement {
        }
        search-input-outlined {
          display: block;
-          padding: 0 8px;
+          padding: var(--ha-space-1) var(--ha-space-2) 0;
        }
      `,
    ];
--- a/src/components/ha-filter-labels.ts
+++ b/src/components/ha-filter-labels.ts
@@ -256,7 +256,7 @@ export class HaFilterLabels extends SubscribeMixin(LitElement) {
        }
        search-input-outlined {
          display: block;
-          padding: 0 8px;
+          padding: var(--ha-space-1) var(--ha-space-2) 0;
        }
      `,
    ];
--- a/src/components/ha-generic-picker.ts
+++ b/src/components/ha-generic-picker.ts
@@ -1,10 +1,14 @@
-import type { ComboBoxLitRenderer } from "@vaadin/combo-box/lit";
-import type { ComboBoxLightOpenedChangedEvent } from "@vaadin/combo-box/vaadin-combo-box-light";
+import "@home-assistant/webawesome/dist/components/popover/popover";
+import type { RenderItemFunction } from "@lit-labs/virtualizer/virtualize";
+import { mdiPlaylistPlus } from "@mdi/js";
 import { css, html, LitElement, nothing, type CSSResultGroup } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import { ifDefined } from "lit/directives/if-defined";
+import { tinykeys } from "tinykeys";
 import { fireEvent } from "../common/dom/fire_event";
 import type { HomeAssistant } from "../types";
+import "./ha-bottom-sheet";
+import "./ha-button";
 import "./ha-combo-box-item";
 import "./ha-icon-button";
 import "./ha-input-helper-text";
@@ -15,12 +19,12 @@ import type {
  PickerComboBoxSearchFn,
 } from "./ha-picker-combo-box";
 import "./ha-picker-field";
-import type { HaPickerField, PickerValueRenderer } from "./ha-picker-field";
+import type { PickerValueRenderer } from "./ha-picker-field";
 import "./ha-svg-icon";

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

  // eslint-disable-next-line lit/no-native-attributes
  @property({ type: Boolean }) public autofocus = false;
@@ -53,7 +57,7 @@ export class HaGenericPicker extends LitElement {
  public getAdditionalItems?: (searchString?: string) => PickerComboBoxItem[];

  @property({ attribute: false })
-  public rowRenderer?: ComboBoxLitRenderer<PickerComboBoxItem>;
+  public rowRenderer?: RenderItemFunction<PickerComboBoxItem>;

  @property({ attribute: false })
  public valueRenderer?: PickerValueRenderer;
@@ -64,59 +68,142 @@ export class HaGenericPicker extends LitElement {
  @property({ attribute: "not-found-label", type: String })
  public notFoundLabel?: string;

-  @query("ha-picker-field") private _field?: HaPickerField;
+  @property({ attribute: "popover-placement" })
+  public popoverPlacement:
+    | "bottom"
+    | "top"
+    | "left"
+    | "right"
+    | "top-start"
+    | "top-end"
+    | "right-start"
+    | "right-end"
+    | "bottom-start"
+    | "bottom-end"
+    | "left-start"
+    | "left-end" = "bottom-start";
+
+  /** If set picker shows an add button instead of textbox when value isn't set */
+  @property({ attribute: "add-button-label" }) public addButtonLabel?: string;
+
+  @query(".container") private _containerElement?: HTMLDivElement;

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

  @state() private _opened = false;

+  @state() private _pickerWrapperOpen = false;
+
+  @state() private _popoverWidth = 0;
+
+  @state() private _openedNarrow = false;
+
+  private _narrow = false;
+
+  // helper to set new value after closing picker, to avoid flicker
+  private _newValue?: string;
+
+  private _unsubscribeTinyKeys?: () => void;
+
  protected render() {
    return html`
      ${this.label
        ? html`<label ?disabled=${this.disabled}>${this.label}</label>`
        : nothing}
      <div class="container">
-        ${!this._opened
+        <div id="picker">
+          <slot name="field">
+            ${this.addButtonLabel && !this.value
+              ? html`<ha-button
+                  size="small"
+                  appearance="filled"
+                  @click=${this.open}
+                  .disabled=${this.disabled}
+                >
+                  <ha-svg-icon
+                    .path=${mdiPlaylistPlus}
+                    slot="start"
+                  ></ha-svg-icon>
+                  ${this.addButtonLabel}
+                </ha-button>`
+              : html`<ha-picker-field
+                  type="button"
+                  class=${this._opened ? "opened" : ""}
+                  compact
+                  aria-label=${ifDefined(this.label)}
+                  @click=${this.open}
+                  @clear=${this._clear}
+                  .placeholder=${this.placeholder}
+                  .value=${this.value}
+                  .required=${this.required}
+                  .disabled=${this.disabled}
+                  .hideClearIcon=${this.hideClearIcon}
+                  .valueRenderer=${this.valueRenderer}
+                >
+                </ha-picker-field>`}
+          </slot>
+        </div>
+        ${!this._openedNarrow && (this._pickerWrapperOpen || this._opened)
          ? html`
-              <ha-picker-field
-                id="picker"
-                type="button"
-                compact
-                aria-label=${ifDefined(this.label)}
-                @click=${this.open}
-                @clear=${this._clear}
-                .placeholder=${this.placeholder}
-                .value=${this.value}
-                .required=${this.required}
-                .disabled=${this.disabled}
-                .hideClearIcon=${this.hideClearIcon}
-                .valueRenderer=${this.valueRenderer}
+              <wa-popover
+                .open=${this._pickerWrapperOpen}
+                style="--body-width: ${this._popoverWidth}px;"
+                without-arrow
+                distance="-4"
+                .placement=${this.popoverPlacement}
+                for="picker"
+                auto-size="vertical"
+                auto-size-padding="16"
+                @wa-after-show=${this._dialogOpened}
+                @wa-after-hide=${this._hidePicker}
+                trap-focus
+                role="dialog"
+                aria-modal="true"
+                aria-label=${this.label || "Select option"}
              >
-              </ha-picker-field>
+                ${this._renderComboBox()}
+              </wa-popover>
            `
-          : html`
-              <ha-picker-combo-box
-                .hass=${this.hass}
-                .autofocus=${this.autofocus}
-                .allowCustomValue=${this.allowCustomValue}
-                .label=${this.searchLabel ??
-                this.hass.localize("ui.common.search")}
-                .value=${this.value}
-                hide-clear-icon
-                @opened-changed=${this._openedChanged}
-                @value-changed=${this._valueChanged}
-                .rowRenderer=${this.rowRenderer}
-                .notFoundLabel=${this.notFoundLabel}
-                .getItems=${this.getItems}
-                .getAdditionalItems=${this.getAdditionalItems}
-                .searchFn=${this.searchFn}
-              ></ha-picker-combo-box>
-            `}
+          : this._pickerWrapperOpen || this._opened
+            ? html`<ha-bottom-sheet
+                flexcontent
+                .open=${this._pickerWrapperOpen}
+                @wa-after-show=${this._dialogOpened}
+                @closed=${this._hidePicker}
+                role="dialog"
+                aria-modal="true"
+                aria-label=${this.label || "Select option"}
+              >
+                ${this._renderComboBox(true)}
+              </ha-bottom-sheet>`
+            : nothing}
      </div>
      ${this._renderHelper()}
    `;
  }

+  private _renderComboBox(dialogMode = false) {
+    if (!this._opened) {
+      return nothing;
+    }
+    return html`
+      <ha-picker-combo-box
+        .hass=${this.hass}
+        .allowCustomValue=${this.allowCustomValue}
+        .label=${this.searchLabel ??
+        (this.hass?.localize("ui.common.search") || "Search")}
+        .value=${this.value}
+        @value-changed=${this._valueChanged}
+        .rowRenderer=${this.rowRenderer}
+        .notFoundLabel=${this.notFoundLabel}
+        .getItems=${this.getItems}
+        .getAdditionalItems=${this.getAdditionalItems}
+        .searchFn=${this.searchFn}
+        .mode=${dialogMode ? "dialog" : "popover"}
+      ></ha-picker-combo-box>
+    `;
+  }
+
  private _renderHelper() {
    return this.helper
      ? html`<ha-input-helper-text .disabled=${this.disabled}
@@ -125,13 +212,33 @@ export class HaGenericPicker extends LitElement {
      : nothing;
  }

+  private _dialogOpened = () => {
+    this._opened = true;
+    requestAnimationFrame(() => {
+      this._comboBox?.focus();
+    });
+  };
+
+  private _hidePicker(ev) {
+    ev.stopPropagation();
+    if (this._newValue) {
+      fireEvent(this, "value-changed", { value: this._newValue });
+      this._newValue = undefined;
+    }
+
+    this._opened = false;
+    this._pickerWrapperOpen = false;
+    this._unsubscribeTinyKeys?.();
+  }
+
  private _valueChanged(ev: CustomEvent) {
    ev.stopPropagation();
    const value = ev.detail.value;
    if (!value) {
      return;
    }
-    fireEvent(this, "value-changed", { value });
+    this._pickerWrapperOpen = false;
+    this._newValue = value;
  }

  private _clear(e) {
@@ -144,25 +251,45 @@ export class HaGenericPicker extends LitElement {
    fireEvent(this, "value-changed", { value });
  }

-  public async open() {
+  public async open(ev?: Event) {
+    ev?.stopPropagation();
    if (this.disabled) {
      return;
    }
-    this._opened = true;
-    await this.updateComplete;
-    this._comboBox?.focus();
-    this._comboBox?.open();
+    this._openedNarrow = this._narrow;
+    this._popoverWidth = this._containerElement?.offsetWidth || 250;
+    this._pickerWrapperOpen = true;
+    this._unsubscribeTinyKeys = tinykeys(this, {
+      Escape: this._handleEscClose,
+    });
  }

-  private async _openedChanged(ev: ComboBoxLightOpenedChangedEvent) {
-    const opened = ev.detail.value;
-    if (this._opened && !opened) {
-      this._opened = false;
-      await this.updateComplete;
-      this._field?.focus();
-    }
+  connectedCallback() {
+    super.connectedCallback();
+    this._handleResize();
+    window.addEventListener("resize", this._handleResize);
  }

+  public disconnectedCallback() {
+    super.disconnectedCallback();
+    window.removeEventListener("resize", this._handleResize);
+    this._unsubscribeTinyKeys?.();
+  }
+
+  private _handleResize = () => {
+    this._narrow =
+      window.matchMedia("(max-width: 870px)").matches ||
+      window.matchMedia("(max-height: 500px)").matches;
+
+    if (!this._openedNarrow && this._pickerWrapperOpen) {
+      this._popoverWidth = this._containerElement?.offsetWidth || 250;
+    }
+  };
+
+  private _handleEscClose = (ev: KeyboardEvent) => {
+    ev.stopPropagation();
+  };
+
  static get styles(): CSSResultGroup {
    return [
      css`
@@ -179,7 +306,45 @@ export class HaGenericPicker extends LitElement {
        }
        ha-input-helper-text {
          display: block;
-          margin: 8px 0 0;
+          margin: var(--ha-space-2) 0 0;
+        }
+
+        wa-popover {
+          --wa-space-l: var(--ha-space-0);
+        }
+
+        wa-popover::part(body) {
+          width: max(var(--body-width), 250px);
+          max-width: max(var(--body-width), 250px);
+          max-height: 500px;
+          height: 70vh;
+          overflow: hidden;
+        }
+
+        @media (max-height: 1000px) {
+          wa-popover::part(body) {
+            max-height: 400px;
+          }
+        }
+
+        @media (max-height: 1000px) {
+          wa-popover::part(body) {
+            max-height: 400px;
+          }
+        }
+
+        ha-bottom-sheet {
+          --ha-bottom-sheet-height: 90vh;
+          --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: var(--ha-space-0);
+          --ha-bottom-sheet-surface-background: var(--card-background-color);
+          --ha-bottom-sheet-border-radius: var(--ha-border-radius-2xl);
+        }
+
+        ha-picker-field.opened {
+          --mdc-text-field-idle-line-color: var(--primary-color);
        }
      `,
    ];
--- a/src/components/ha-items-display-editor.ts
+++ b/src/components/ha-items-display-editor.ts
@@ -1,5 +1,5 @@
 import { ResizeController } from "@lit-labs/observers/resize-controller";
-import { mdiDrag, mdiEye, mdiEyeOff } from "@mdi/js";
+import { mdiDragHorizontalVariant, mdiEye, mdiEyeOff } from "@mdi/js";
 import type { TemplateResult } from "lit";
 import { LitElement, css, html, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
@@ -178,7 +178,7 @@ export class HaItemDisplayEditor extends LitElement {
                            ? this._dragHandleKeydown
                            : undefined}
                          class="handle"
-                          .path=${mdiDrag}
+                          .path=${mdiDragHorizontalVariant}
                          slot="end"
                        ></ha-svg-icon>
                      `
--- a/src/components/ha-label-picker.ts
+++ b/src/components/ha-label-picker.ts
@@ -2,7 +2,13 @@ import { mdiLabel, mdiPlus } from "@mdi/js";
 import type { HassEntity, UnsubscribeFunc } from "home-assistant-js-websocket";
 import type { TemplateResult } from "lit";
 import { LitElement, html } from "lit";
-import { customElement, property, query, state } from "lit/decorators";
+import {
+  customElement,
+  property,
+  query,
+  queryAssignedElements,
+  state,
+} from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { fireEvent } from "../common/dom/fire_event";
 import type { LabelRegistryEntry } from "../data/label_registry";
@@ -84,6 +90,9 @@ export class HaLabelPicker extends SubscribeMixin(LitElement) {

  @state() private _labels?: LabelRegistryEntry[];

+  @queryAssignedElements({ flatten: true })
+  private _slotNodes?: NodeListOf<HTMLElement>;
+
  @query("ha-generic-picker") private _picker?: HaGenericPicker;

  public async open() {
@@ -211,12 +220,14 @@ export class HaLabelPicker extends SubscribeMixin(LitElement) {

    return html`
      <ha-generic-picker
+        .disabled=${this.disabled}
        .hass=${this.hass}
        .autofocus=${this.autofocus}
        .label=${this.label}
        .notFoundLabel=${this.hass.localize(
          "ui.components.label-picker.no_match"
        )}
+        .addButtonLabel=${this.hass.localize("ui.components.label-picker.add")}
        .placeholder=${placeholder}
        .value=${this.value}
        .getItems=${this._getItems}
@@ -224,6 +235,7 @@ export class HaLabelPicker extends SubscribeMixin(LitElement) {
        .valueRenderer=${valueRenderer}
        @value-changed=${this._valueChanged}
      >
+        <slot .slot=${this._slotNodes?.length ? "field" : undefined}></slot>
      </ha-generic-picker>
    `;
  }
--- a/src/components/ha-labels-picker.ts
+++ b/src/components/ha-labels-picker.ts
@@ -1,3 +1,4 @@
+import { mdiPlaylistPlus } from "@mdi/js";
 import type { HassEntity, UnsubscribeFunc } from "home-assistant-js-websocket";
 import type { TemplateResult } from "lit";
 import { LitElement, css, html, nothing } from "lit";
@@ -123,36 +124,6 @@ export class HaLabelsPicker extends SubscribeMixin(LitElement) {
    );
    return html`
      ${this.label ? html`<label>${this.label}</label>` : nothing}
-      ${labels?.length
-        ? html`<ha-chip-set>
-            ${repeat(
-              labels,
-              (label) => label?.label_id,
-              (label) => {
-                const color = label?.color
-                  ? computeCssColor(label.color)
-                  : undefined;
-                return html`
-                  <ha-input-chip
-                    .item=${label}
-                    @remove=${this._removeItem}
-                    @click=${this._openDetail}
-                    .label=${label?.name}
-                    selected
-                    style=${color ? `--color: ${color}` : ""}
-                  >
-                    ${label?.icon
-                      ? html`<ha-icon
-                          slot="icon"
-                          .icon=${label.icon}
-                        ></ha-icon>`
-                      : nothing}
-                  </ha-input-chip>
-                `;
-              }
-            )}
-          </ha-chip-set>`
-        : nothing}
      <ha-label-picker
        .hass=${this.hass}
        .helper=${this.helper}
@@ -162,6 +133,47 @@ export class HaLabelsPicker extends SubscribeMixin(LitElement) {
        .excludeLabels=${this.value}
        @value-changed=${this._labelChanged}
      >
+        <ha-chip-set>
+          ${labels?.length
+            ? repeat(
+                labels,
+                (label) => label?.label_id,
+                (label) => {
+                  const color = label?.color
+                    ? computeCssColor(label.color)
+                    : undefined;
+                  return html`
+                    <ha-input-chip
+                      .item=${label}
+                      @remove=${this._removeItem}
+                      @click=${this._openDetail}
+                      .disabled=${this.disabled}
+                      .label=${label?.name}
+                      selected
+                      style=${color ? `--color: ${color}` : ""}
+                    >
+                      ${label?.icon
+                        ? html`<ha-icon
+                            slot="icon"
+                            .icon=${label.icon}
+                          ></ha-icon>`
+                        : nothing}
+                    </ha-input-chip>
+                  `;
+                }
+              )
+            : nothing}
+          <ha-button
+            id="picker"
+            size="small"
+            appearance="filled"
+            @click=${this._openPicker}
+            .disabled=${this.disabled}
+          >
+            <ha-svg-icon .path=${mdiPlaylistPlus} slot="start"></ha-svg-icon>
+            ${this.hass.localize("ui.components.label-picker.add")}
+          </ha-button>
+        </ha-chip-set>
      </ha-label-picker>
    `;
  }
@@ -203,9 +215,25 @@ export class HaLabelsPicker extends SubscribeMixin(LitElement) {
    }, 0);
  }

+  private _openPicker(ev: Event) {
+    ev.stopPropagation();
+    this.labelPicker.open();
+  }
+
  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);
+      border-top-left-radius: var(--ha-border-radius-sm);
+      padding: var(--ha-space-3);
+    }
+    .placeholder {
+      color: var(--mdc-text-field-label-ink-color);
+      display: flex;
+      align-items: center;
+      height: var(--ha-space-8);
    }
    ha-input-chip {
      --md-input-chip-selected-container-color: var(--color, var(--grey-color));
--- a/src/components/ha-language-picker.ts
+++ b/src/components/ha-language-picker.ts
@@ -1,56 +1,58 @@
 import type { PropertyValues } from "lit";
 import { css, html, LitElement } from "lit";
-import { customElement, property, query, state } from "lit/decorators";
+import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { fireEvent } from "../common/dom/fire_event";
-import { stopPropagation } from "../common/dom/stop_propagation";
 import { formatLanguageCode } from "../common/language/format_language";
 import { caseInsensitiveStringCompare } from "../common/string/compare";
 import type { FrontendLocaleData } from "../data/translation";
 import { translationMetadata } from "../resources/translations-metadata";
-import type { HomeAssistant } from "../types";
+import type { HomeAssistant, ValueChangedEvent } from "../types";
+import "./ha-generic-picker";
 import "./ha-list-item";
+import type { PickerComboBoxItem } from "./ha-picker-combo-box";
 import "./ha-select";
-import type { HaSelect } from "./ha-select";

 export const getLanguageOptions = (
  languages: string[],
  nativeName: boolean,
  noSort: boolean,
  locale?: FrontendLocaleData
-) => {
-  let options: { label: string; value: string }[] = [];
+): PickerComboBoxItem[] => {
+  let options: PickerComboBoxItem[] = [];

  if (nativeName) {
    const translations = translationMetadata.translations;
    options = languages.map((lang) => {
-      let label = translations[lang]?.nativeName;
-      if (!label) {
+      let primary = translations[lang]?.nativeName;
+      if (!primary) {
        try {
          // this will not work if Intl.DisplayNames is polyfilled, it will return in the language of the user
-          label = new Intl.DisplayNames(lang, {
+          primary = new Intl.DisplayNames(lang, {
            type: "language",
            fallback: "code",
          }).of(lang)!;
        } catch (_err) {
-          label = lang;
+          primary = lang;
        }
      }
      return {
-        value: lang,
-        label,
+        id: lang,
+        primary,
+        search_labels: [primary],
      };
    });
  } else if (locale) {
    options = languages.map((lang) => ({
-      value: lang,
-      label: formatLanguageCode(lang, locale),
+      id: lang,
+      primary: formatLanguageCode(lang, locale),
+      search_labels: [formatLanguageCode(lang, locale)],
    }));
  }

  if (!noSort && locale) {
    options.sort((a, b) =>
-      caseInsensitiveStringCompare(a.label, b.label, locale.language)
+      caseInsensitiveStringCompare(a.primary, b.primary, locale.language)
    );
  }
  return options;
@@ -80,115 +82,69 @@ export class HaLanguagePicker extends LitElement {

  @state() _defaultLanguages: string[] = [];

-  @query("ha-select") private _select!: HaSelect;
-
  protected firstUpdated(changedProps: PropertyValues) {
    super.firstUpdated(changedProps);
    this._computeDefaultLanguageOptions();
  }

-  protected updated(changedProperties: PropertyValues) {
-    super.updated(changedProperties);
-
-    const localeChanged =
-      changedProperties.has("hass") &&
-      this.hass &&
-      changedProperties.get("hass") &&
-      changedProperties.get("hass").locale.language !==
-        this.hass.locale.language;
-    if (
-      changedProperties.has("languages") ||
-      changedProperties.has("value") ||
-      localeChanged
-    ) {
-      this._select.layoutOptions();
-      if (!this.disabled && this._select.value !== this.value) {
-        fireEvent(this, "value-changed", { value: this._select.value });
-      }
-      if (!this.value) {
-        return;
-      }
-      const languageOptions = this._getLanguagesOptions(
-        this.languages ?? this._defaultLanguages,
-        this.nativeName,
-        this.noSort,
-        this.hass?.locale
-      );
-      const selectedItemIndex = languageOptions.findIndex(
-        (option) => option.value === this.value
-      );
-      if (selectedItemIndex === -1) {
-        this.value = undefined;
-      }
-      if (localeChanged) {
-        this._select.select(selectedItemIndex);
-      }
-    }
-  }
-
  private _getLanguagesOptions = memoizeOne(getLanguageOptions);

  private _computeDefaultLanguageOptions() {
    this._defaultLanguages = Object.keys(translationMetadata.translations);
  }

-  protected render() {
-    const languageOptions = this._getLanguagesOptions(
+  private _getItems = () =>
+    this._getLanguagesOptions(
      this.languages ?? this._defaultLanguages,
      this.nativeName,
      this.noSort,
      this.hass?.locale
    );

+  private _valueRenderer = (value) => {
+    const language = this._getItems().find(
+      (lang) => lang.id === value
+    )?.primary;
+    return html`<span slot="headline">${language ?? value}</span> `;
+  };
+
+  protected render() {
    const value =
      this.value ??
-      (this.required && !this.disabled
-        ? languageOptions[0]?.value
-        : this.value);
+      (this.required && !this.disabled ? this._getItems()[0].id : this.value);

    return html`
-      <ha-select
-        .label=${this.label ??
+      <ha-generic-picker
+        .hass=${this.hass}
+        .autofocus=${this.autofocus}
+        popover-placement="bottom-end"
+        .notFoundLabel=${this.hass?.localize(
+          "ui.components.language-picker.no_match"
+        )}
+        .placeholder=${this.label ??
        (this.hass?.localize("ui.components.language-picker.language") ||
          "Language")}
-        .value=${value || ""}
-        .required=${this.required}
+        .value=${value}
+        .valueRenderer=${this._valueRenderer}
        .disabled=${this.disabled}
-        @selected=${this._changed}
-        @closed=${stopPropagation}
-        fixedMenuPosition
-        naturalMenuWidth
-        .inlineArrow=${this.inlineArrow}
-      >
-        ${languageOptions.length === 0
-          ? html`<ha-list-item value=""
-              >${this.hass?.localize(
-                "ui.components.language-picker.no_languages"
-              ) || "No languages"}</ha-list-item
-            >`
-          : languageOptions.map(
-              (option) => html`
-                <ha-list-item .value=${option.value}
-                  >${option.label}</ha-list-item
-                >
-              `
-            )}
-      </ha-select>
+        .getItems=${this._getItems}
+        @value-changed=${this._changed}
+        hide-clear-icon
+      ></ha-generic-picker>
    `;
  }

  static styles = css`
-    ha-select {
+    ha-generic-picker {
      width: 100%;
+      min-width: 200px;
+      display: block;
    }
  `;

-  private _changed(ev): void {
-    const target = ev.target as HaSelect;
-    if (this.disabled || target.value === "" || target.value === this.value) {
-      return;
-    }
-    this.value = target.value;
+  private _changed(ev: ValueChangedEvent<string>): void {
+    ev.stopPropagation();
+    this.value = ev.detail.value;
    fireEvent(this, "value-changed", { value: this.value });
  }
 }
--- a/src/components/ha-markdown.ts
+++ b/src/components/ha-markdown.ts
@@ -50,7 +50,7 @@ export class HaMarkdown extends LitElement {
    }
    ha-alert {
      display: block;
-      margin: 4px 0;
+      margin: var(--ha-space-1) 0;
    }
    a {
      color: var(--primary-color);
@@ -75,7 +75,7 @@ export class HaMarkdown extends LitElement {
      padding: 0;
    }
    pre {
-      padding: 16px;
+      padding: var(--ha-space-4);
      overflow: auto;
      line-height: var(--ha-line-height-condensed);
      font-family: var(--ha-font-family-code);
@@ -95,7 +95,7 @@ export class HaMarkdown extends LitElement {
    hr {
      border-color: var(--divider-color);
      border-bottom: none;
-      margin: 16px 0;
+      margin: var(--ha-space-4) 0;
    }
  ` as CSSResultGroup;
 }
--- a/src/components/ha-picker-combo-box.ts
+++ b/src/components/ha-picker-combo-box.ts
@@ -1,19 +1,28 @@
+import type { LitVirtualizer } from "@lit-labs/virtualizer";
+import type { RenderItemFunction } from "@lit-labs/virtualizer/virtualize";
 import { mdiMagnify } from "@mdi/js";
-import type { ComboBoxLitRenderer } from "@vaadin/combo-box/lit";
 import Fuse from "fuse.js";
-import type { PropertyValues, TemplateResult } from "lit";
-import { html, LitElement, nothing } from "lit";
-import { customElement, property, query, state } from "lit/decorators";
+import { css, html, LitElement, nothing } from "lit";
+import {
+  customElement,
+  eventOptions,
+  property,
+  query,
+  state,
+} from "lit/decorators";
 import memoizeOne from "memoize-one";
+import { tinykeys } from "tinykeys";
 import { fireEvent } from "../common/dom/fire_event";
 import { caseInsensitiveStringCompare } from "../common/string/compare";
 import type { LocalizeFunc } from "../common/translations/localize";
 import { HaFuse } from "../resources/fuse";
-import type { HomeAssistant, ValueChangedEvent } from "../types";
-import "./ha-combo-box";
-import type { HaComboBox } from "./ha-combo-box";
+import { haStyleScrollbar } from "../resources/styles";
+import { loadVirtualizer } from "../resources/virtualizer";
+import type { HomeAssistant } from "../types";
 import "./ha-combo-box-item";
 import "./ha-icon";
+import "./ha-textfield";
+import type { HaTextField } from "./ha-textfield";

 export interface PickerComboBoxItem {
  id: string;
@@ -33,10 +42,13 @@ export interface PickerComboBoxItemWithLabel extends PickerComboBoxItem {

 const NO_MATCHING_ITEMS_FOUND_ID = "___no_matching_items_found___";

-const DEFAULT_ROW_RENDERER: ComboBoxLitRenderer<PickerComboBoxItem> = (
+const DEFAULT_ROW_RENDERER: RenderItemFunction<PickerComboBoxItem> = (
  item
 ) => html`
-  <ha-combo-box-item type="button" compact>
+  <ha-combo-box-item
+    .type=${item.id === NO_MATCHING_ITEMS_FOUND_ID ? "text" : "button"}
+    compact
+  >
    ${item.icon
      ? html`<ha-icon slot="start" .icon=${item.icon}></ha-icon>`
      : item.icon_path
@@ -57,7 +69,7 @@ export type PickerComboBoxSearchFn<T extends PickerComboBoxItem> = (

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

  // eslint-disable-next-line lit/no-native-attributes
  @property({ type: Boolean }) public autofocus = false;
@@ -73,7 +85,7 @@ export class HaPickerComboBox extends LitElement {

  @property() public value?: string;

-  @property() public helper?: string;
+  @state() private _listScrolled = false;

  @property({ attribute: false, type: Array })
  public getItems?: () => PickerComboBoxItem[];
@@ -82,10 +94,7 @@ export class HaPickerComboBox extends LitElement {
  public getAdditionalItems?: (searchString?: string) => PickerComboBoxItem[];

  @property({ attribute: false })
-  public rowRenderer?: ComboBoxLitRenderer<PickerComboBoxItem>;
-
-  @property({ attribute: "hide-clear-icon", type: Boolean })
-  public hideClearIcon = false;
+  public rowRenderer?: RenderItemFunction<PickerComboBoxItem>;

  @property({ attribute: "not-found-label", type: String })
  public notFoundLabel?: string;
@@ -93,33 +102,77 @@ export class HaPickerComboBox extends LitElement {
  @property({ attribute: false })
  public searchFn?: PickerComboBoxSearchFn<PickerComboBoxItem>;

-  @state() private _opened = false;
+  @property({ reflect: true }) public mode: "popover" | "dialog" = "popover";

-  @query("ha-combo-box", true) public comboBox!: HaComboBox;
+  @query("lit-virtualizer") private _virtualizerElement?: LitVirtualizer;

-  public async open() {
-    await this.updateComplete;
-    await this.comboBox?.open();
+  @query("ha-textfield") private _searchFieldElement?: HaTextField;
+
+  @state() private _items: PickerComboBoxItemWithLabel[] = [];
+
+  private _allItems: PickerComboBoxItemWithLabel[] = [];
+
+  private _selectedItemIndex = -1;
+
+  static shadowRootOptions = {
+    ...LitElement.shadowRootOptions,
+    delegatesFocus: true,
+  };
+
+  private _removeKeyboardShortcuts?: () => void;
+
+  protected firstUpdated() {
+    this._registerKeyboardShortcuts();
  }

-  public async focus() {
-    await this.updateComplete;
-    await this.comboBox?.focus();
+  public willUpdate() {
+    if (!this.hasUpdated) {
+      loadVirtualizer();
+      this._allItems = this._getItems();
+      this._items = this._allItems;
+    }
  }

-  private _initialItems = false;
+  disconnectedCallback() {
+    super.disconnectedCallback();
+    this._removeKeyboardShortcuts?.();
+  }

-  private _items: PickerComboBoxItemWithLabel[] = [];
+  protected render() {
+    return html`<ha-textfield
+        .label=${this.label ??
+        this.hass?.localize("ui.common.search") ??
+        "Search"}
+        @input=${this._filterChanged}
+      ></ha-textfield>
+      <lit-virtualizer
+        @scroll=${this._onScrollList}
+        tabindex="0"
+        scroller
+        .items=${this._items}
+        .renderItem=${this._renderItem}
+        style="min-height: 36px;"
+        class=${this._listScrolled ? "scrolled" : ""}
+        @focus=${this._focusList}
+      >
+      </lit-virtualizer> `;
+  }

  private _defaultNotFoundItem = memoizeOne(
    (
      label: this["notFoundLabel"],
-      localize: LocalizeFunc
+      localize?: LocalizeFunc
    ): PickerComboBoxItemWithLabel => ({
      id: NO_MATCHING_ITEMS_FOUND_ID,
-      primary: label || localize("ui.components.combo-box.no_match"),
+      primary:
+        label ||
+        (localize && localize("ui.components.combo-box.no_match")) ||
+        "No matching items found",
      icon_path: mdiMagnify,
-      a11y_label: label || localize("ui.components.combo-box.no_match"),
+      a11y_label:
+        label ||
+        (localize && localize("ui.components.combo-box.no_match")) ||
+        "No matching items found",
    })
  );

@@ -144,13 +197,13 @@ export class HaPickerComboBox extends LitElement {
        caseInsensitiveStringCompare(
          entityA.sorting_label!,
          entityB.sorting_label!,
-          this.hass.locale.language
+          this.hass?.locale.language ?? navigator.language
        )
      );

    if (!sortedItems.length) {
      sortedItems.push(
-        this._defaultNotFoundItem(this.notFoundLabel, this.hass.localize)
+        this._defaultNotFoundItem(this.notFoundLabel, this.hass?.localize)
      );
    }

@@ -159,99 +212,73 @@ export class HaPickerComboBox extends LitElement {
    return sortedItems;
  };

-  protected shouldUpdate(changedProps: PropertyValues) {
-    if (
-      changedProps.has("value") ||
-      changedProps.has("label") ||
-      changedProps.has("disabled")
-    ) {
-      return true;
-    }
-    return !(!changedProps.has("_opened") && this._opened);
-  }
+  private _renderItem = (item: PickerComboBoxItem, index: number) => {
+    const renderer = this.rowRenderer || DEFAULT_ROW_RENDERER;
+    return html`<div
+      id=${`list-item-${index}`}
+      class="combo-box-row ${this._value === item.id ? "current-value" : ""}"
+      .value=${item.id}
+      .index=${index}
+      @click=${this._valueSelected}
+    >
+      ${item.id === NO_MATCHING_ITEMS_FOUND_ID
+        ? DEFAULT_ROW_RENDERER(item, index)
+        : renderer(item, index)}
+    </div>`;
+  };

-  public willUpdate(changedProps: PropertyValues) {
-    if (changedProps.has("_opened") && this._opened) {
-      this._items = this._getItems();
-      if (this._initialItems) {
-        this.comboBox.filteredItems = this._items;
-      }
-      this._initialItems = true;
-    }
-  }
-
-  protected render(): TemplateResult {
-    return html`
-      <ha-combo-box
-        item-id-path="id"
-        item-value-path="id"
-        item-label-path="a11y_label"
-        clear-initial-value
-        .hass=${this.hass}
-        .value=${this._value}
-        .label=${this.label}
-        .helper=${this.helper}
-        .allowCustomValue=${this.allowCustomValue}
-        .filteredItems=${this._items}
-        .renderer=${this.rowRenderer || DEFAULT_ROW_RENDERER}
-        .required=${this.required}
-        .disabled=${this.disabled}
-        .hideClearIcon=${this.hideClearIcon}
-        @opened-changed=${this._openedChanged}
-        @value-changed=${this._valueChanged}
-        @filter-changed=${this._filterChanged}
-      >
-      </ha-combo-box>
-    `;
+  @eventOptions({ passive: true })
+  private _onScrollList(ev) {
+    const top = ev.target.scrollTop ?? 0;
+    this._listScrolled = top > 0;
  }

  private get _value() {
    return this.value || "";
  }

-  private _openedChanged(ev: ValueChangedEvent<boolean>) {
+  private _valueSelected = (ev: Event) => {
    ev.stopPropagation();
-    if (ev.detail.value !== this._opened) {
-      this._opened = ev.detail.value;
-      fireEvent(this, "opened-changed", { value: this._opened });
-    }
-  }
-
-  private _valueChanged(ev: ValueChangedEvent<string | undefined>) {
-    ev.stopPropagation();
-    // Clear the input field to prevent showing the old value next time
-    this.comboBox.setTextFieldValue("");
-    const newValue = ev.detail.value?.trim();
+    const value = (ev.currentTarget as any).value as string;
+    const newValue = value?.trim();

    if (newValue === NO_MATCHING_ITEMS_FOUND_ID) {
      return;
    }

-    if (newValue !== this._value) {
-      this._setValue(newValue);
-    }
-  }
+    fireEvent(this, "value-changed", { value: newValue });
+  };

  private _fuseIndex = memoizeOne((states: PickerComboBoxItem[]) =>
    Fuse.createIndex(["search_labels"], states)
  );

-  private _filterChanged(ev: CustomEvent): void {
-    if (!this._opened) return;
+  private _filterChanged = (ev: Event) => {
+    const textfield = ev.target as HaTextField;
+    const searchString = textfield.value.trim();

-    const target = ev.target as HaComboBox;
-    const searchString = ev.detail.value.trim() as string;
+    if (!searchString) {
+      this._items = this._allItems;
+      return;
+    }

-    const index = this._fuseIndex(this._items);
-    const fuse = new HaFuse(this._items, { shouldSort: false }, index);
+    const index = this._fuseIndex(this._allItems);
+    const fuse = new HaFuse(
+      this._allItems,
+      {
+        shouldSort: false,
+        minMatchCharLength: Math.min(searchString.length, 2),
+      },
+      index
+    );

    const results = fuse.multiTermsSearch(searchString);
-    let filteredItems = this._items as PickerComboBoxItem[];
+    let filteredItems = this._allItems as PickerComboBoxItem[];
    if (results) {
      const items = results.map((result) => result.item);
      if (items.length === 0) {
        items.push(
-          this._defaultNotFoundItem(this.notFoundLabel, this.hass.localize)
+          this._defaultNotFoundItem(this.notFoundLabel, this.hass?.localize)
        );
      }
      const additionalItems = this._getAdditionalItems(searchString);
@@ -260,17 +287,279 @@ export class HaPickerComboBox extends LitElement {
    }

    if (this.searchFn) {
-      filteredItems = this.searchFn(searchString, filteredItems, this._items);
+      filteredItems = this.searchFn(
+        searchString,
+        filteredItems,
+        this._allItems
+      );
    }

-    target.filteredItems = filteredItems;
+    this._items = filteredItems as PickerComboBoxItemWithLabel[];
+    this._selectedItemIndex = -1;
+    if (this._virtualizerElement) {
+      this._virtualizerElement.scrollTo(0, 0);
+    }
+  };
+
+  private _registerKeyboardShortcuts() {
+    this._removeKeyboardShortcuts = tinykeys(this, {
+      ArrowUp: this._selectPreviousItem,
+      ArrowDown: this._selectNextItem,
+      Home: this._selectFirstItem,
+      End: this._selectLastItem,
+      Enter: this._pickSelectedItem,
+    });
  }

-  private _setValue(value: string | undefined) {
-    setTimeout(() => {
-      fireEvent(this, "value-changed", { value });
-    }, 0);
+  private _focusList() {
+    if (this._selectedItemIndex === -1) {
+      this._selectNextItem();
+    }
  }
+
+  private _selectNextItem = (ev?: KeyboardEvent) => {
+    ev?.stopPropagation();
+    ev?.preventDefault();
+    if (!this._virtualizerElement) {
+      return;
+    }
+
+    this._searchFieldElement?.focus();
+
+    const items = this._virtualizerElement.items as PickerComboBoxItem[];
+
+    const maxItems = items.length - 1;
+
+    if (maxItems === -1) {
+      this._resetSelectedItem();
+      return;
+    }
+
+    const nextIndex =
+      maxItems === this._selectedItemIndex
+        ? this._selectedItemIndex
+        : this._selectedItemIndex + 1;
+
+    if (!items[nextIndex]) {
+      return;
+    }
+
+    if (items[nextIndex].id === NO_MATCHING_ITEMS_FOUND_ID) {
+      // Skip titles, padding and empty search
+      if (nextIndex === maxItems) {
+        return;
+      }
+      this._selectedItemIndex = nextIndex + 1;
+    } else {
+      this._selectedItemIndex = nextIndex;
+    }
+
+    this._scrollToSelectedItem();
+  };
+
+  private _selectPreviousItem = (ev: KeyboardEvent) => {
+    ev.stopPropagation();
+    ev.preventDefault();
+    if (!this._virtualizerElement) {
+      return;
+    }
+
+    if (this._selectedItemIndex > 0) {
+      const nextIndex = this._selectedItemIndex - 1;
+
+      const items = this._virtualizerElement.items as PickerComboBoxItem[];
+
+      if (!items[nextIndex]) {
+        return;
+      }
+
+      if (items[nextIndex]?.id === NO_MATCHING_ITEMS_FOUND_ID) {
+        // Skip titles, padding and empty search
+        if (nextIndex === 0) {
+          return;
+        }
+        this._selectedItemIndex = nextIndex - 1;
+      } else {
+        this._selectedItemIndex = nextIndex;
+      }
+
+      this._scrollToSelectedItem();
+    }
+  };
+
+  private _selectFirstItem = (ev: KeyboardEvent) => {
+    ev.stopPropagation();
+    if (!this._virtualizerElement || !this._virtualizerElement.items.length) {
+      return;
+    }
+
+    const nextIndex = 0;
+
+    if (
+      (this._virtualizerElement.items[nextIndex] as PickerComboBoxItem)?.id ===
+      NO_MATCHING_ITEMS_FOUND_ID
+    ) {
+      return;
+    }
+
+    if (typeof this._virtualizerElement.items[nextIndex] === "string") {
+      this._selectedItemIndex = nextIndex + 1;
+    } else {
+      this._selectedItemIndex = nextIndex;
+    }
+
+    this._scrollToSelectedItem();
+  };
+
+  private _selectLastItem = (ev: KeyboardEvent) => {
+    ev.stopPropagation();
+    if (!this._virtualizerElement || !this._virtualizerElement.items.length) {
+      return;
+    }
+
+    const nextIndex = this._virtualizerElement.items.length - 1;
+
+    if (
+      (this._virtualizerElement.items[nextIndex] as PickerComboBoxItem)?.id ===
+      NO_MATCHING_ITEMS_FOUND_ID
+    ) {
+      return;
+    }
+
+    if (typeof this._virtualizerElement.items[nextIndex] === "string") {
+      this._selectedItemIndex = nextIndex - 1;
+    } else {
+      this._selectedItemIndex = nextIndex;
+    }
+
+    this._scrollToSelectedItem();
+  };
+
+  private _scrollToSelectedItem = () => {
+    this._virtualizerElement
+      ?.querySelector(".selected")
+      ?.classList.remove("selected");
+
+    this._virtualizerElement?.scrollToIndex(this._selectedItemIndex, "end");
+
+    requestAnimationFrame(() => {
+      this._virtualizerElement
+        ?.querySelector(`#list-item-${this._selectedItemIndex}`)
+        ?.classList.add("selected");
+    });
+  };
+
+  private _pickSelectedItem = (ev: KeyboardEvent) => {
+    ev.stopPropagation();
+    const firstItem = this._virtualizerElement?.items[0] as PickerComboBoxItem;
+
+    if (
+      this._virtualizerElement?.items.length === 1 &&
+      firstItem.id !== NO_MATCHING_ITEMS_FOUND_ID
+    ) {
+      fireEvent(this, "value-changed", {
+        value: firstItem.id,
+      });
+    }
+
+    if (this._selectedItemIndex === -1) {
+      return;
+    }
+
+    // if filter button is focused
+    ev.preventDefault();
+
+    const item = this._virtualizerElement?.items[
+      this._selectedItemIndex
+    ] as PickerComboBoxItem;
+    if (item && item.id !== NO_MATCHING_ITEMS_FOUND_ID) {
+      fireEvent(this, "value-changed", { value: item.id });
+    }
+  };
+
+  private _resetSelectedItem() {
+    this._virtualizerElement
+      ?.querySelector(".selected")
+      ?.classList.remove("selected");
+    this._selectedItemIndex = -1;
+  }
+
+  static styles = [
+    haStyleScrollbar,
+    css`
+      :host {
+        display: flex;
+        flex-direction: column;
+        padding-top: var(--ha-space-3);
+        flex: 1;
+      }
+
+      ha-textfield {
+        padding: 0 var(--ha-space-3);
+        margin-bottom: var(--ha-space-3);
+      }
+
+      :host([mode="dialog"]) ha-textfield {
+        padding: 0 var(--ha-space-4);
+      }
+
+      ha-combo-box-item {
+        width: 100%;
+      }
+
+      ha-combo-box-item.selected {
+        background-color: var(--ha-color-fill-neutral-quiet-hover);
+      }
+
+      @media (prefers-color-scheme: dark) {
+        ha-combo-box-item.selected {
+          background-color: var(--ha-color-fill-neutral-normal-hover);
+        }
+      }
+
+      lit-virtualizer {
+        flex: 1;
+      }
+
+      lit-virtualizer:focus-visible {
+        outline: none;
+      }
+
+      lit-virtualizer.scrolled {
+        border-top: 1px solid var(--ha-color-border-neutral-quiet);
+      }
+
+      .bottom-padding {
+        height: max(var(--safe-area-inset-bottom, 0px), var(--ha-space-8));
+        width: 100%;
+      }
+
+      .empty {
+        text-align: center;
+      }
+
+      .combo-box-row {
+        display: flex;
+        width: 100%;
+        align-items: center;
+        box-sizing: border-box;
+        min-height: 36px;
+      }
+      .combo-box-row.current-value {
+        background-color: var(--ha-color-fill-primary-quiet-resting);
+      }
+
+      .combo-box-row.selected {
+        background-color: var(--ha-color-fill-neutral-quiet-hover);
+      }
+
+      @media (prefers-color-scheme: dark) {
+        .combo-box-row.selected {
+          background-color: var(--ha-color-fill-neutral-normal-hover);
+        }
+      }
+    `,
+  ];
 }

 declare global {
--- a/src/components/ha-select.ts
+++ b/src/components/ha-select.ts
@@ -137,7 +137,7 @@ export class HaSelect extends SelectBase {
        height: var(--ha-select-height, 56px);
      }
      .mdc-select--filled .mdc-floating-label {
-        inset-inline-start: 12px;
+        inset-inline-start: var(--ha-space-4);
        inset-inline-end: initial;
        direction: var(--direction);
      }
@@ -147,7 +147,7 @@ export class HaSelect extends SelectBase {
        direction: var(--direction);
      }
      .mdc-select .mdc-select__anchor {
-        padding-inline-start: 12px;
+        padding-inline-start: var(--ha-space-4);
        padding-inline-end: 0px;
        direction: var(--direction);
      }
@@ -158,7 +158,10 @@ export class HaSelect extends SelectBase {
        padding-inline-end: var(--select-selected-text-padding-end, 0px);
      }
      :host([clearable]) .mdc-select__selected-text-container {
-        padding-inline-end: var(--select-selected-text-padding-end, 12px);
+        padding-inline-end: var(
+          --select-selected-text-padding-end,
+          var(--ha-space-4)
+        );
      }
      ha-icon-button {
        position: absolute;
--- a/src/components/ha-selector/ha-selector-background.ts
+++ b/src/components/ha-selector/ha-selector-background.ts
@@ -1,122 +0,0 @@
-import { css, html, LitElement } from "lit";
-import { customElement, property, state } from "lit/decorators";
-import { fireEvent } from "../../common/dom/fire_event";
-import type { BackgroundSelector } from "../../data/selector";
-import type { HomeAssistant } from "../../types";
-import "../ha-picture-upload";
-import "../ha-alert";
-import type { HaPictureUpload } from "../ha-picture-upload";
-import { URL_PREFIX } from "../../data/image_upload";
-
-@customElement("ha-selector-background")
-export class HaBackgroundSelector extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
-  @property() public value?: any;
-
-  @property({ attribute: false }) public selector!: BackgroundSelector;
-
-  @property({ type: Boolean }) public disabled = false;
-
-  @property({ type: Boolean }) public required = true;
-
-  @state() private yamlBackground = false;
-
-  protected updated(changedProps) {
-    super.updated(changedProps);
-
-    if (changedProps.has("value")) {
-      this.yamlBackground = !!this.value && !this.value.startsWith(URL_PREFIX);
-    }
-  }
-
-  protected render() {
-    return html`
-      <div>
-        ${this.yamlBackground
-          ? html`
-              <div class="value">
-                <img
-                  src=${this.value}
-                  alt=${this.hass.localize(
-                    "ui.components.picture-upload.current_image_alt"
-                  )}
-                />
-              </div>
-              <ha-alert alert-type="info">
-                ${this.hass.localize(
-                  `ui.components.selectors.background.yaml_info`
-                )}
-                <ha-button slot="action" @click=${this._clearValue}>
-                  ${this.hass.localize(
-                    `ui.components.picture-upload.clear_picture`
-                  )}
-                </ha-button>
-              </ha-alert>
-            `
-          : html`
-              <ha-picture-upload
-                .hass=${this.hass}
-                .value=${this.value?.startsWith(URL_PREFIX) ? this.value : null}
-                .original=${!!this.selector.background?.original}
-                .cropOptions=${this.selector.background?.crop}
-                select-media
-                @change=${this._pictureChanged}
-              ></ha-picture-upload>
-            `}
-      </div>
-    `;
-  }
-
-  private _pictureChanged(ev) {
-    const value = (ev.target as HaPictureUpload).value;
-
-    fireEvent(this, "value-changed", { value: value ?? undefined });
-  }
-
-  private _clearValue() {
-    fireEvent(this, "value-changed", { value: undefined });
-  }
-
-  static styles = css`
-    :host {
-      display: block;
-      position: relative;
-    }
-    ha-picture-upload {
-      background-color: var(--primary-background-color);
-      border-radius: var(--file-upload-image-border-radius);
-    }
-    div {
-      display: flex;
-      flex-direction: column;
-    }
-    ha-button {
-      white-space: nowrap;
-      --mdc-theme-primary: var(--primary-color);
-    }
-    .value {
-      width: 100%;
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-    }
-    img {
-      max-width: 100%;
-      max-height: 200px;
-      margin-bottom: 4px;
-      border-radius: var(--file-upload-image-border-radius);
-      transition: opacity 0.3s;
-      opacity: var(--picture-opacity, 1);
-    }
-    img:hover {
-      opacity: 1;
-    }
-  `;
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-selector-background": HaBackgroundSelector;
-  }
-}
--- a/src/components/ha-selector/ha-selector-device.ts
+++ b/src/components/ha-selector/ha-selector-device.ts
@@ -36,6 +36,8 @@ export class HaDeviceSelector extends LitElement {

  @property() public helper?: string;

+  @property() public placeholder?: string;
+
  @property({ type: Boolean }) public disabled = false;

  @property({ type: Boolean }) public required = true;
@@ -102,6 +104,7 @@ export class HaDeviceSelector extends LitElement {
          .entityFilter=${this.selector.device?.entity
            ? this._filterEntities
            : undefined}
+          .placeholder=${this.placeholder}
          .disabled=${this.disabled}
          .required=${this.required}
          allow-custom-entity
--- a/src/components/ha-selector/ha-selector-entity.ts
+++ b/src/components/ha-selector/ha-selector-entity.ts
@@ -29,6 +29,8 @@ export class HaEntitySelector extends LitElement {

  @property() public helper?: string;

+  @property() public placeholder?: any;
+
  @property({ type: Boolean }) public disabled = false;

  @property({ type: Boolean }) public required = true;
@@ -69,6 +71,7 @@ export class HaEntitySelector extends LitElement {
        .excludeEntities=${this.selector.entity?.exclude_entities}
        .entityFilter=${this._filterEntities}
        .createDomains=${this._createDomains}
+        .placeholder=${this.placeholder}
        .disabled=${this.disabled}
        .required=${this.required}
        allow-custom-entity
@@ -86,6 +89,7 @@ export class HaEntitySelector extends LitElement {
        .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-image.ts
+++ b/src/components/ha-selector/ha-selector-image.ts
@@ -1,152 +0,0 @@
-import { css, html, LitElement } from "lit";
-import { customElement, property, state } from "lit/decorators";
-import { fireEvent } from "../../common/dom/fire_event";
-import type { ImageSelector } from "../../data/selector";
-import type { HomeAssistant } from "../../types";
-import "../ha-icon-button";
-import "../ha-textarea";
-import "../ha-textfield";
-import "../ha-picture-upload";
-import "../ha-radio";
-import "../ha-formfield";
-import type { HaPictureUpload } from "../ha-picture-upload";
-import { URL_PREFIX } from "../../data/image_upload";
-
-@customElement("ha-selector-image")
-export class HaImageSelector extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
-  @property() public value?: any;
-
-  @property() public name?: string;
-
-  @property() public label?: string;
-
-  @property() public placeholder?: string;
-
-  @property() public helper?: string;
-
-  @property({ attribute: false }) public selector!: ImageSelector;
-
-  @property({ type: Boolean }) public disabled = false;
-
-  @property({ type: Boolean }) public required = true;
-
-  @state() private showUpload = false;
-
-  protected firstUpdated(changedProps): void {
-    super.firstUpdated(changedProps);
-
-    if (!this.value || this.value.startsWith(URL_PREFIX)) {
-      this.showUpload = true;
-    }
-  }
-
-  protected render() {
-    return html`
-      <div>
-        <label>
-          ${this.hass.localize(
-            "ui.components.selectors.image.select_image_with_label",
-            {
-              label:
-                this.label ||
-                this.hass.localize("ui.components.selectors.image.image"),
-            }
-          )}
-          <ha-formfield
-            .label=${this.hass.localize("ui.components.selectors.image.upload")}
-          >
-            <ha-radio
-              name="mode"
-              value="upload"
-              .checked=${this.showUpload}
-              @change=${this._radioGroupPicked}
-            ></ha-radio>
-          </ha-formfield>
-          <ha-formfield
-            .label=${this.hass.localize("ui.components.selectors.image.url")}
-          >
-            <ha-radio
-              name="mode"
-              value="url"
-              .checked=${!this.showUpload}
-              @change=${this._radioGroupPicked}
-            ></ha-radio>
-          </ha-formfield>
-        </label>
-        ${!this.showUpload
-          ? html`
-              <ha-textfield
-                .name=${this.name}
-                .value=${this.value || ""}
-                .placeholder=${this.placeholder || ""}
-                .helper=${this.helper}
-                helperPersistent
-                .disabled=${this.disabled}
-                @input=${this._handleChange}
-                .label=${this.label || ""}
-                .required=${this.required}
-              ></ha-textfield>
-            `
-          : html`
-              <ha-picture-upload
-                .hass=${this.hass}
-                .value=${this.value?.startsWith(URL_PREFIX) ? this.value : null}
-                .original=${this.selector.image?.original}
-                .cropOptions=${this.selector.image?.crop}
-                select-media
-                @change=${this._pictureChanged}
-              ></ha-picture-upload>
-            `}
-      </div>
-    `;
-  }
-
-  private _radioGroupPicked(ev): void {
-    this.showUpload = ev.target.value === "upload";
-  }
-
-  private _pictureChanged(ev) {
-    const value = (ev.target as HaPictureUpload).value;
-
-    fireEvent(this, "value-changed", { value: value ?? undefined });
-  }
-
-  private _handleChange(ev) {
-    let value = ev.target.value;
-    if (this.value === value) {
-      return;
-    }
-    if (value === "" && !this.required) {
-      value = undefined;
-    }
-
-    fireEvent(this, "value-changed", { value });
-  }
-
-  static styles = css`
-    :host {
-      display: block;
-      position: relative;
-    }
-    div {
-      display: flex;
-      flex-direction: column;
-    }
-    label {
-      display: flex;
-      flex-direction: column;
-    }
-    ha-textarea,
-    ha-textfield {
-      width: 100%;
-    }
-  `;
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-selector-image": HaImageSelector;
-  }
-}
--- a/src/components/ha-selector/ha-selector-object.ts
+++ b/src/components/ha-selector/ha-selector-object.ts
@@ -1,4 +1,9 @@
-import { mdiClose, mdiDelete, mdiDrag, mdiPencil } from "@mdi/js";
+import {
+  mdiClose,
+  mdiDelete,
+  mdiDragHorizontalVariant,
+  mdiPencil,
+} from "@mdi/js";
 import { css, html, LitElement, nothing, type PropertyValues } from "lit";
 import { customElement, property, query } from "lit/decorators";
 import memoizeOne from "memoize-one";
@@ -47,9 +52,10 @@ export class HaObjectSelector extends LitElement {
    const translationKey = this.selector.object?.translation_key;

    if (this.localizeValue && translationKey) {
-      const label = this.localizeValue(
-        `${translationKey}.fields.${schema.name}`
-      );
+      const label =
+        this.localizeValue(`${translationKey}.fields.${schema.name}.name`) ||
+        // Fallback for backward compatibility
+        this.localizeValue(`${translationKey}.fields.${schema.name}`);
      if (label) {
        return label;
      }
@@ -57,6 +63,20 @@ export class HaObjectSelector extends LitElement {
    return this.selector.object?.fields?.[schema.name]?.label || schema.name;
  };

+  private _computeHelper = (schema: HaFormSchema): string => {
+    const translationKey = this.selector.object?.translation_key;
+
+    if (this.localizeValue && translationKey) {
+      const helper = this.localizeValue(
+        `${translationKey}.fields.${schema.name}.description`
+      );
+      if (helper) {
+        return helper;
+      }
+    }
+    return this.selector.object?.fields?.[schema.name]?.description || "";
+  };
+
  private _renderItem(item: any, index: number) {
    const labelField =
      this.selector.object!.label_field ||
@@ -92,7 +112,7 @@ export class HaObjectSelector extends LitElement {
          ? html`
              <ha-svg-icon
                class="handle"
-                .path=${mdiDrag}
+                .path=${mdiDragHorizontalVariant}
                slot="start"
              ></ha-svg-icon>
            `
@@ -209,6 +229,7 @@ export class HaObjectSelector extends LitElement {
      schema: this._schema(this.selector),
      data: {},
      computeLabel: this._computeLabel,
+      computeHelper: this._computeHelper,
      submitText: this.hass.localize("ui.common.add"),
    });

--- a/src/components/ha-selector/ha-selector-select.ts
+++ b/src/components/ha-selector/ha-selector-select.ts
@@ -1,4 +1,4 @@
-import { mdiDrag } from "@mdi/js";
+import { mdiDragHorizontalVariant } from "@mdi/js";
 import { LitElement, css, html, nothing } from "lit";
 import { customElement, property, query } from "lit/decorators";
 import { repeat } from "lit/directives/repeat";
@@ -197,7 +197,7 @@ export class HaSelectSelector extends LitElement {
                            ? html`
                                <ha-svg-icon
                                  slot="icon"
-                                  .path=${mdiDrag}
+                                  .path=${mdiDragHorizontalVariant}
                                ></ha-svg-icon>
                              `
                            : nothing}
--- a/src/components/ha-selector/ha-selector-ui-state-content.ts
+++ b/src/components/ha-selector/ha-selector-ui-state-content.ts
@@ -36,7 +36,7 @@ export class HaSelectorUiStateContent extends SubscribeMixin(LitElement) {
        .helper=${this.helper}
        .disabled=${this.disabled}
        .required=${this.required}
-        .allowName=${this.selector.ui_state_content?.allow_name}
+        .allowName=${this.selector.ui_state_content?.allow_name || false}
      ></ha-entity-state-content-picker>
    `;
  }
--- a/src/components/ha-selector/ha-selector.ts
+++ b/src/components/ha-selector/ha-selector.ts
@@ -34,8 +34,6 @@ const LOAD_ELEMENTS = {
  file: () => import("./ha-selector-file"),
  floor: () => import("./ha-selector-floor"),
  label: () => import("./ha-selector-label"),
-  image: () => import("./ha-selector-image"),
-  background: () => import("./ha-selector-background"),
  language: () => import("./ha-selector-language"),
  navigation: () => import("./ha-selector-navigation"),
  number: () => import("./ha-selector-number"),
--- a/src/components/ha-service-picker.ts
+++ b/src/components/ha-service-picker.ts
@@ -53,7 +53,7 @@ class HaServicePicker extends LitElement {
    item,
    { index }
  ) => html`
-    <ha-combo-box-item type="button" border-top .borderTop=${index !== 0}>
+    <ha-combo-box-item type="button" .borderTop=${index !== 0}>
      <ha-service-icon
        slot="start"
        .hass=${this.hass}
@@ -76,34 +76,42 @@ class HaServicePicker extends LitElement {
    </ha-combo-box-item>
  `;

-  private _valueRenderer: PickerValueRenderer = (value) => {
-    const serviceId = value;
-    const [domain, service] = serviceId.split(".");
+  private _valueRenderer = memoizeOne(
+    (
+      localize: LocalizeFunc,
+      services: HomeAssistant["services"]
+    ): PickerValueRenderer =>
+      (value) => {
+        const serviceId = value;
+        const [domain, service] = serviceId.split(".");

-    if (!this.hass.services[domain]?.[service]) {
-      return html`
-        <ha-svg-icon slot="start" .path=${mdiRoomService}></ha-svg-icon>
-        <span slot="headline">${value}</span>
-      `;
-    }
+        if (!services[domain]?.[service]) {
+          return html`
+            <ha-svg-icon slot="start" .path=${mdiRoomService}></ha-svg-icon>
+            <span slot="headline">${value}</span>
+          `;
+        }

-    const serviceName =
-      this.hass.localize(`component.${domain}.services.${service}.name`) ||
-      this.hass.services[domain][service].name ||
-      service;
+        const serviceName =
+          localize(`component.${domain}.services.${service}.name`) ||
+          services[domain][service].name ||
+          service;

-    return html`
-      <ha-service-icon
-        slot="start"
-        .hass=${this.hass}
-        .service=${serviceId}
-      ></ha-service-icon>
-      <span slot="headline">${serviceName}</span>
-      ${this.showServiceId
-        ? html`<span slot="supporting-text" class="code">${serviceId}</span>`
-        : nothing}
-    `;
-  };
+        return html`
+          <ha-service-icon
+            slot="start"
+            .hass=${this.hass}
+            .service=${serviceId}
+          ></ha-service-icon>
+          <span slot="headline">${serviceName}</span>
+          ${this.showServiceId
+            ? html`<span slot="supporting-text" class="code"
+                >${serviceId}</span
+              >`
+            : nothing}
+        `;
+      }
+  );

  protected render(): TemplateResult {
    const placeholder =
@@ -123,7 +131,10 @@ class HaServicePicker extends LitElement {
        .value=${this.value}
        .getItems=${this._getItems}
        .rowRenderer=${this._rowRenderer}
-        .valueRenderer=${this._valueRenderer}
+        .valueRenderer=${this._valueRenderer(
+          this.hass.localize,
+          this.hass.services
+        )}
        @value-changed=${this._valueChanged}
      >
      </ha-generic-picker>
@@ -162,7 +173,9 @@ class HaServicePicker extends LitElement {
            const description =
              this.hass.localize(
                `component.${domain}.services.${service}.description`
-              ) || services[domain][service].description;
+              ) ||
+              services[domain][service].description ||
+              "";

            items.push({
              id: serviceId,
--- a/src/components/ha-sidebar.ts
+++ b/src/components/ha-sidebar.ts
@@ -29,6 +29,7 @@ import memoizeOne from "memoize-one";
 import { fireEvent } from "../common/dom/fire_event";
 import { toggleAttribute } from "../common/dom/toggle_attribute";
 import { stringCompare } from "../common/string/compare";
+import { computeRTL } from "../common/util/compute_rtl";
 import { throttle } from "../common/util/throttle";
 import { subscribeFrontendUserData } from "../data/frontend";
 import type { ActionHandlerDetail } from "../data/lovelace/action_handler";
@@ -536,11 +537,17 @@ class HaSidebar extends SubscribeMixin(LitElement) {
  }

  private _renderUserItem(selectedPanel: string) {
+    const isRTL = computeRTL(this.hass);
+
    return html`
      <ha-md-list-item
        href="/profile"
        type="link"
-        class="user ${selectedPanel === "profile" ? " selected" : ""}"
+        class=${classMap({
+          user: true,
+          selected: selectedPanel === "profile",
+          rtl: isRTL,
+        })}
        @mouseenter=${this._itemMouseEnter}
        @mouseleave=${this._itemMouseLeave}
      >
@@ -666,7 +673,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() {
@@ -705,13 +712,17 @@ 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 4px;
+          padding: 0 var(--ha-space-1);
          border-bottom: 1px solid transparent;
          white-space: nowrap;
          font-weight: var(--ha-font-weight-normal);
@@ -726,13 +737,17 @@ class HaSidebar extends SubscribeMixin(LitElement) {
          );
          font-size: var(--ha-font-size-xl);
          align-items: center;
-          padding-left: calc(4px + var(--safe-area-inset-left, 0px));
-          padding-inline-start: calc(4px + var(--safe-area-inset-left, 0px));
+          padding-left: calc(
+            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, 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%;
@@ -748,8 +763,8 @@ class HaSidebar extends SubscribeMixin(LitElement) {
          display: none;
        }
        :host([narrow]) .title {
-          margin: 0;
-          padding: 0 16px;
+          margin: var(--ha-space-0);
+          padding: var(--ha-space-0) var(--ha-space-4);
        }
        :host([expanded]) .title {
          display: initial;
@@ -761,13 +776,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: 4px 0;
+          padding: var(--ha-space-1) var(--ha-space-0);
          box-sizing: border-box;
          display: flex;
          justify-content: center;
@@ -777,29 +795,29 @@ 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 {
          flex-shrink: 0;
          box-sizing: border-box;
-          margin: 4px;
+          margin: var(--ha-space-1);
          border-radius: var(--ha-border-radius-sm);
-          --md-list-item-one-line-container-height: 40px;
+          --md-list-item-one-line-container-height: var(--ha-space-10);
          --md-list-item-top-space: 0;
          --md-list-item-bottom-space: 0;
-          width: 48px;
+          width: var(--ha-space-12);
          position: relative;
          --md-list-item-label-text-color: var(--sidebar-text-color);
-          --md-list-item-leading-space: 12px;
-          --md-list-item-trailing-space: 12px;
-          --md-list-item-leading-icon-size: 24px;
+          --md-list-item-leading-space: var(--ha-space-3);
+          --md-list-item-trailing-space: var(--ha-space-3);
+          --md-list-item-leading-icon-size: var(--ha-space-6);
        }
        :host([expanded]) ha-md-list-item {
          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 {
@@ -823,7 +841,7 @@ class HaSidebar extends SubscribeMixin(LitElement) {

        ha-icon[slot="start"],
        ha-svg-icon[slot="start"] {
-          width: 24px;
+          width: var(--ha-space-6);
          flex-shrink: 0;
          color: var(--sidebar-icon-color);
        }
@@ -856,7 +874,7 @@ class HaSidebar extends SubscribeMixin(LitElement) {
          display: flex;
          justify-content: center;
          align-items: center;
-          min-width: 8px;
+          min-width: var(--ha-space-2);
          border-radius: var(--ha-border-radius-xl);
          font-weight: var(--ha-font-weight-normal);
          line-height: normal;
@@ -867,22 +885,26 @@ class HaSidebar extends SubscribeMixin(LitElement) {

        ha-svg-icon + .badge {
          position: absolute;
-          top: 4px;
+          top: var(--ha-space-1);
          left: 26px;
          border-radius: var(--ha-border-radius-md);
          font-size: 0.65em;
          line-height: var(--ha-line-height-expanded);
-          padding: 0 4px;
+          padding: var(--ha-space-0) var(--ha-space-1);
        }

        ha-md-list-item.user {
-          --md-list-item-leading-icon-size: 40px;
-          --md-list-item-leading-space: 4px;
+          --md-list-item-leading-icon-size: var(--ha-space-10);
+          --md-list-item-leading-space: var(--ha-space-1);
+        }
+
+        ha-md-list-item.user.rtl {
+          --md-list-item-leading-space: var(--ha-space-3);
        }

        ha-user-badge {
          flex-shrink: 0;
-          margin-right: -8px;
+          margin-right: calc(var(--ha-space-2) * -1);
        }

        .spacer {
@@ -894,7 +916,7 @@ class HaSidebar extends SubscribeMixin(LitElement) {
          color: var(--sidebar-text-color);
          font-size: var(--ha-font-size-m);
          font-weight: var(--ha-font-weight-medium);
-          padding: 16px;
+          padding: var(--ha-space-4);
          white-space: nowrap;
        }

@@ -906,7 +928,7 @@ class HaSidebar extends SubscribeMixin(LitElement) {
          white-space: nowrap;
          color: var(--sidebar-background-color);
          background-color: var(--sidebar-text-color);
-          padding: 4px;
+          padding: var(--ha-space-1);
          font-weight: var(--ha-font-weight-medium);
        }

--- a/src/components/ha-slider.ts
+++ b/src/components/ha-slider.ts
@@ -59,12 +59,33 @@ export class HaSlider extends Slider {
          background-color: var(--ha-slider-thumb-color, var(--primary-color));
        }

+        #thumb:after {
+          content: "";
+          border-radius: 50%;
+          position: absolute;
+          width: calc(var(--thumb-width) * 2 + 8px);
+          height: calc(var(--thumb-height) * 2 + 8px);
+          left: calc(-50% - 4px);
+          top: calc(-50% - 4px);
+          cursor: pointer;
+        }
+
        #slider:focus-visible:not(.disabled) #thumb,
        #slider:focus-visible:not(.disabled) #thumb-min,
        #slider:focus-visible:not(.disabled) #thumb-max {
          outline: var(--wa-focus-ring);
        }

+        #track:after {
+          content: "";
+          position: absolute;
+          top: calc(-50% - 4px);
+          left: 0;
+          width: 100%;
+          height: calc(var(--track-size) * 2 + 8px);
+          cursor: pointer;
+        }
+
        #indicator {
          background-color: var(
            --ha-slider-indicator-color,
--- a/src/components/ha-target-picker.ts
+++ b/src/components/ha-target-picker.ts
@@ -36,8 +36,6 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) {

  @property({ attribute: false }) public value?: HassServiceTarget;

-  @property() public label?: string;
-
  @property() public helper?: string;

  @property({ type: Boolean, reflect: true }) public compact = false;
@@ -76,7 +74,7 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) {

  @state() private _narrow = false;

-  @state() private _pickerFilters: TargetTypeFloorless[] = [];
+  @state() private _pickerFilter?: TargetTypeFloorless;

  @state() private _pickerWrapperOpen = false;

@@ -101,7 +99,7 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) {
            (floor_id) => html`
              <ha-target-picker-value-chip
                .hass=${this.hass}
-                .type=${"floor"}
+                type="floor"
                .itemId=${floor_id}
                @remove-target-item=${this._handleRemove}
                @expand-target-item=${this._handleExpand}
@@ -114,7 +112,7 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) {
            (area_id) => html`
              <ha-target-picker-value-chip
                .hass=${this.hass}
-                .type=${"area"}
+                type="area"
                .itemId=${area_id}
                @remove-target-item=${this._handleRemove}
                @expand-target-item=${this._handleExpand}
@@ -127,7 +125,7 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) {
            (device_id) => html`
              <ha-target-picker-value-chip
                .hass=${this.hass}
-                .type=${"device"}
+                type="device"
                .itemId=${device_id}
                @remove-target-item=${this._handleRemove}
                @expand-target-item=${this._handleExpand}
@@ -140,7 +138,7 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) {
            (entity_id) => html`
              <ha-target-picker-value-chip
                .hass=${this.hass}
-                .type=${"entity"}
+                type="entity"
                .itemId=${entity_id}
                @remove-target-item=${this._handleRemove}
                @expand-target-item=${this._handleExpand}
@@ -153,7 +151,7 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) {
            (label_id) => html`
              <ha-target-picker-value-chip
                .hass=${this.hass}
-                .type=${"label"}
+                type="label"
                .itemId=${label_id}
                @remove-target-item=${this._handleRemove}
                @expand-target-item=${this._handleExpand}
@@ -173,7 +171,6 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) {
              type="entity"
              .hass=${this.hass}
              .items=${{ entity: ensureArray(this.value?.entity_id) }}
-              .collapsed=${this.compact}
              .deviceFilter=${this.deviceFilter}
              .entityFilter=${this.entityFilter}
              .includeDomains=${this.includeDomains}
@@ -189,7 +186,6 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) {
              type="device"
              .hass=${this.hass}
              .items=${{ device: ensureArray(this.value?.device_id) }}
-              .collapsed=${this.compact}
              .deviceFilter=${this.deviceFilter}
              .entityFilter=${this.entityFilter}
              .includeDomains=${this.includeDomains}
@@ -208,7 +204,6 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) {
                floor: ensureArray(this.value?.floor_id),
                area: ensureArray(this.value?.area_id),
              }}
-              .collapsed=${this.compact}
              .deviceFilter=${this.deviceFilter}
              .entityFilter=${this.entityFilter}
              .includeDomains=${this.includeDomains}
@@ -224,7 +219,6 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) {
              type="label"
              .hass=${this.hass}
              .items=${{ label: ensureArray(this.value?.label_id) }}
-              .collapsed=${this.compact}
              .deviceFilter=${this.deviceFilter}
              .entityFilter=${this.entityFilter}
              .includeDomains=${this.includeDomains}
@@ -277,6 +271,12 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) {
                auto-size-padding="16"
                @wa-after-show=${this._showSelector}
                @wa-after-hide=${this._hidePicker}
+                trap-focus
+                role="dialog"
+                aria-modal="true"
+                aria-label=${this.hass.localize(
+                  "ui.components.target-picker.add_target"
+                )}
              >
                ${this._renderTargetSelector()}
              </wa-popover>
@@ -287,6 +287,11 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) {
                .open=${this._pickerWrapperOpen}
                @wa-after-show=${this._showSelector}
                @closed=${this._hidePicker}
+                role="dialog"
+                aria-modal="true"
+                aria-label=${this.hass.localize(
+                  "ui.components.target-picker.add_target"
+                )}
              >
                ${this._renderTargetSelector(true)}
              </ha-bottom-sheet>`
@@ -330,12 +335,16 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) {
    });
  };

-  private _handleUpdatePickerFilters(ev: CustomEvent<TargetTypeFloorless[]>) {
-    this._updatePickerFilters(ev.detail);
+  private _handleUpdatePickerFilter(
+    ev: CustomEvent<TargetTypeFloorless | undefined>
+  ) {
+    this._updatePickerFilter(
+      typeof ev.detail === "string" ? ev.detail : undefined
+    );
  }

-  private _updatePickerFilters = (filters: TargetTypeFloorless[]) => {
-    this._pickerFilters = filters;
+  private _updatePickerFilter = (filter?: TargetTypeFloorless) => {
+    this._pickerFilter = filter;
  };

  private _hidePicker() {
@@ -355,8 +364,8 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) {
    return html`
      <ha-target-picker-selector
        .hass=${this.hass}
-        @filter-types-changed=${this._handleUpdatePickerFilters}
-        .filterTypes=${this._pickerFilters}
+        @filter-type-changed=${this._handleUpdatePickerFilter}
+        .filterType=${this._pickerFilter}
        @target-picked=${this._handleTargetPicked}
        @create-domain-picked=${this._handleCreateDomain}
        .targetValue=${this.value}
@@ -394,6 +403,12 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) {
          }
        : { [typeId]: id },
    });
+
+    this.shadowRoot
+      ?.querySelector(
+        `ha-target-picker-item-group[type='${this._newTarget?.type}']`
+      )
+      ?.removeAttribute("collapsed");
  }

  private _handleTargetPicked = async (
--- a/src/components/ha-wa-dialog.ts
+++ b/src/components/ha-wa-dialog.ts
@@ -1,12 +1,18 @@
-import { css, html, LitElement, nothing } from "lit";
-import { customElement, property, state } from "lit/decorators";
 import "@home-assistant/webawesome/dist/components/dialog/dialog";
 import { mdiClose } from "@mdi/js";
-import "./ha-dialog-header";
-import "./ha-icon-button";
-import type { HomeAssistant } from "../types";
+import { css, html, LitElement, nothing } from "lit";
+import {
+  customElement,
+  eventOptions,
+  property,
+  query,
+  state,
+} from "lit/decorators";
 import { fireEvent } from "../common/dom/fire_event";
 import { haStyleScrollbar } from "../resources/styles";
+import type { HomeAssistant } from "../types";
+import "./ha-dialog-header";
+import "./ha-icon-button";

 export type DialogWidth = "small" | "medium" | "large" | "full";

@@ -90,6 +96,11 @@ export class HaWaDialog extends LitElement {
  @state()
  private _open = false;

+  @query(".body") public bodyContainer!: HTMLDivElement;
+
+  @state()
+  private _bodyScrolled = false;
+
  protected updated(
    changedProperties: Map<string | number | symbol, unknown>
  ): void {
@@ -107,10 +118,14 @@ export class HaWaDialog extends LitElement {
        .lightDismiss=${!this.preventScrimClose}
        without-header
        @wa-show=${this._handleShow}
+        @wa-after-show=${this._handleAfterShow}
        @wa-after-hide=${this._handleAfterHide}
      >
        <slot name="header">
-          <ha-dialog-header .subtitlePosition=${this.headerSubtitlePosition}>
+          <ha-dialog-header
+            .subtitlePosition=${this.headerSubtitlePosition}
+            .showBorder=${this._bodyScrolled}
+          >
            <slot name="headerNavigationIcon" slot="navigationIcon">
              <ha-icon-button
                data-dialog="close"
@@ -129,7 +144,7 @@ export class HaWaDialog extends LitElement {
            <slot name="headerActionItems" slot="actionItems"></slot>
          </ha-dialog-header>
        </slot>
-        <div class="body ha-scrollbar">
+        <div class="body ha-scrollbar" @scroll=${this._handleBodyScroll}>
          <slot></slot>
        </div>
        <slot name="footer" slot="footer"></slot>
@@ -146,6 +161,10 @@ export class HaWaDialog extends LitElement {
    (this.querySelector("[autofocus]") as HTMLElement | null)?.focus();
  };

+  private _handleAfterShow = () => {
+    fireEvent(this, "after-show");
+  };
+
  private _handleAfterHide = () => {
    this._open = false;
    fireEvent(this, "closed");
@@ -156,6 +175,11 @@ export class HaWaDialog extends LitElement {
    this._open = false;
  }

+  @eventOptions({ passive: true })
+  private _handleBodyScroll(ev: Event) {
+    this._bodyScrolled = (ev.target as HTMLDivElement).scrollTop > 0;
+  }
+
  static styles = [
    haStyleScrollbar,
    css`
@@ -172,7 +196,7 @@ export class HaWaDialog extends LitElement {
            )
          )
        );
-        --width: var(--ha-dialog-width-md, min(580px, var(--full-width)));
+        --width: min(var(--ha-dialog-width-md, 580px), var(--full-width));
        --spacing: var(--dialog-content-padding, var(--ha-space-6));
        --show-duration: var(--ha-dialog-show-duration, 200ms);
        --hide-duration: var(--ha-dialog-hide-duration, 200ms);
@@ -193,11 +217,11 @@ export class HaWaDialog extends LitElement {
      }

      :host([width="small"]) wa-dialog {
-        --width: var(--ha-dialog-width-sm, min(320px, var(--full-width)));
+        --width: min(var(--ha-dialog-width-sm, 320px), var(--full-width));
      }

      :host([width="large"]) wa-dialog {
-        --width: var(--ha-dialog-width-lg, min(720px, var(--full-width)));
+        --width: min(var(--ha-dialog-width-lg, 720px), var(--full-width));
      }

      :host([width="full"]) wa-dialog {
@@ -211,6 +235,7 @@ export class HaWaDialog extends LitElement {
          --ha-dialog-max-height,
          calc(100% - var(--ha-space-20))
        );
+        min-height: var(--ha-dialog-min-height);
        position: var(--dialog-surface-position, relative);
        margin-top: var(--dialog-surface-margin-top, auto);
        display: flex;
@@ -247,10 +272,7 @@ export class HaWaDialog extends LitElement {
      .header-title {
        margin: 0;
        margin-bottom: 0;
-        color: var(
-          --ha-dialog-header-title-color,
-          var(--ha-color-on-surface-default, var(--primary-text-color))
-        );
+        color: var(--ha-dialog-header-title-color, var(--primary-text-color));
        font-size: var(
          --ha-dialog-header-title-font-size,
          var(--ha-font-size-2xl)
@@ -287,6 +309,7 @@ export class HaWaDialog extends LitElement {
      }
      :host([flexcontent]) .body {
        max-width: 100%;
+        flex: 1;
        display: flex;
        flex-direction: column;
      }
@@ -315,6 +338,7 @@ declare global {

  interface HASSDomEvents {
    opened: undefined;
+    "after-show": undefined;
    closed: undefined;
  }
 }
--- a/src/components/media-player/ha-media-player-browse.ts
+++ b/src/components/media-player/ha-media-player-browse.ts
@@ -15,6 +15,7 @@ import { classMap } from "lit/directives/class-map";
 import { styleMap } from "lit/directives/style-map";
 import { until } from "lit/directives/until";
 import { fireEvent } from "../../common/dom/fire_event";
+import { slugify } from "../../common/string/slugify";
 import { debounce } from "../../common/util/debounce";
 import { isUnavailableState } from "../../data/entity";
 import type {
@@ -693,10 +694,12 @@ export class HaMediaPlayerBrowse extends LitElement {
                `
              : ""}
          </div>
-          <ha-tooltip .for="grid-${child.title}" distance="-4">
+          <ha-tooltip .for="grid-${slugify(child.title)}" distance="-4">
            ${child.title}
          </ha-tooltip>
-          <div .id="grid-${child.title}" class="title">${child.title}</div>
+          <div .id="grid-${slugify(child.title)}" class="title">
+            ${child.title}
+          </div>
        </ha-card>
      </div>
    `;
--- a/src/components/target-picker/dialog/dialog-target-details.ts
+++ b/src/components/target-picker/dialog/dialog-target-details.ts
@@ -1,17 +1,15 @@
-import { mdiClose } from "@mdi/js";
-import { css, html, LitElement, nothing } from "lit";
-import { customElement, property, query, state } from "lit/decorators";
+import { html, LitElement, nothing } from "lit";
+import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../../../common/dom/fire_event";
 import type { HassDialog } from "../../../dialogs/make-dialog-manager";
 import type { HomeAssistant } from "../../../types";
 import "../../ha-dialog-header";
 import "../../ha-icon-button";
 import "../../ha-icon-next";
-import "../../ha-md-dialog";
-import type { HaMdDialog } from "../../ha-md-dialog";
 import "../../ha-md-list";
 import "../../ha-md-list-item";
 import "../../ha-svg-icon";
+import "../../ha-wa-dialog";
 import "../ha-target-picker-item-row";
 import type { TargetDetailsDialogParams } from "./show-dialog-target-details";

@@ -21,14 +19,15 @@ class DialogTargetDetails extends LitElement implements HassDialog {

  @state() private _params?: TargetDetailsDialogParams;

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

  public showDialog(params: TargetDetailsDialogParams): void {
    this._params = params;
+    this._opened = true;
  }

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

@@ -43,58 +42,31 @@ class DialogTargetDetails extends LitElement implements HassDialog {
    }

    return html`
-      <ha-md-dialog open @closed=${this._dialogClosed}>
-        <ha-dialog-header slot="headline">
-          <ha-icon-button
-            slot="navigationIcon"
-            @click=${this.closeDialog}
-            .label=${this.hass.localize("ui.common.close")}
-            .path=${mdiClose}
-          ></ha-icon-button>
-          <span slot="title"
-            >${this.hass.localize(
-              "ui.components.target-picker.target_details"
-            )}</span
-          >
-          <span slot="subtitle"
-            >${this.hass.localize(
-              `ui.components.target-picker.type.${this._params.type}`
-            )}:
-            ${this._params.title}</span
-          >
-        </ha-dialog-header>
-        <div slot="content">
-          <ha-target-picker-item-row
-            .hass=${this.hass}
-            .type=${this._params.type}
-            .itemId=${this._params.itemId}
-            .deviceFilter=${this._params.deviceFilter}
-            .entityFilter=${this._params.entityFilter}
-            .includeDomains=${this._params.includeDomains}
-            .includeDeviceClasses=${this._params.includeDeviceClasses}
-            expand
-          ></ha-target-picker-item-row>
-        </div>
-      </ha-md-dialog>
+      <ha-wa-dialog
+        .hass=${this.hass}
+        .open=${this._opened}
+        header-title=${this.hass.localize(
+          "ui.components.target-picker.target_details"
+        )}
+        header-subtitle=${`${this.hass.localize(
+          `ui.components.target-picker.type.${this._params.type}`
+        )}:
+            ${this._params.title}`}
+        @closed=${this._dialogClosed}
+      >
+        <ha-target-picker-item-row
+          .hass=${this.hass}
+          .type=${this._params.type}
+          .itemId=${this._params.itemId}
+          .deviceFilter=${this._params.deviceFilter}
+          .entityFilter=${this._params.entityFilter}
+          .includeDomains=${this._params.includeDomains}
+          .includeDeviceClasses=${this._params.includeDeviceClasses}
+          expand
+        ></ha-target-picker-item-row>
+      </ha-wa-dialog>
    `;
  }
-
-  static styles = css`
-    ha-md-dialog {
-      min-width: 400px;
-      max-height: 90%;
-      --dialog-content-padding: var(--ha-space-2) var(--ha-space-6)
-        max(var(--safe-area-inset-bottom, var(--ha-space-0)), var(--ha-space-8));
-    }
-
-    @media all and (max-width: 600px), all and (max-height: 500px) {
-      ha-md-dialog {
-        --md-dialog-container-shape: var(--ha-space-0);
-        min-width: 100%;
-        min-height: 100%;
-      }
-    }
-  `;
 }

 declare global {
--- a/src/components/target-picker/ha-target-picker-item-group.ts
+++ b/src/components/target-picker/ha-target-picker-item-group.ts
@@ -18,7 +18,7 @@ export class HaTargetPickerItemGroup extends LitElement {
    Record<TargetType, string[]>
  >;

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

  @property({ attribute: false })
  public deviceFilter?: HaDevicePickerDeviceFilterFunc;
@@ -50,7 +50,11 @@ export class HaTargetPickerItemGroup extends LitElement {
      }
    });

-    return html`<ha-expansion-panel .expanded=${!this.collapsed} left-chevron>
+    return html`<ha-expansion-panel
+      .expanded=${!this.collapsed}
+      left-chevron
+      @expanded-changed=${this._expandedChanged}
+    >
      <div slot="header" class="heading">
        ${this.hass.localize(
          `ui.components.target-picker.selected.${this.type}`,
@@ -78,6 +82,10 @@ export class HaTargetPickerItemGroup extends LitElement {
    </ha-expansion-panel>`;
  }

+  private _expandedChanged(ev: CustomEvent) {
+    this.collapsed = !ev.detail.expanded;
+  }
+
  static styles = css`
    :host {
      display: block;
--- a/src/components/target-picker/ha-target-picker-item-row.ts
+++ b/src/components/target-picker/ha-target-picker-item-row.ts
@@ -114,7 +114,6 @@ export class HaTargetPickerItemRow extends LitElement {
    const { name, context, iconPath, fallbackIconPath, stateObject } =
      this._itemData(this.type, this.itemId);

-    const showDevices = ["floor", "area", "label"].includes(this.type);
    const showEntities = this.type !== "entity";

    const entries = this.parentEntries || this._entries;
@@ -130,7 +129,7 @@ export class HaTargetPickerItemRow extends LitElement {

    return html`
      <ha-md-list-item type="text">
-        <div slot="start">
+        <div class="icon" slot="start">
          ${this.subEntry
            ? html`
                <div class="horizontal-line-wrapper">
@@ -163,16 +162,18 @@ export class HaTargetPickerItemRow extends LitElement {
        <div slot="headline">${name}</div>
        ${context && !this.hideContext
          ? html`<span slot="supporting-text">${context}</span>`
-          : this._domainName && this.subEntry
-            ? html`<span slot="supporting-text" class="domain"
-                >${this._domainName}</span
-              >`
-            : nothing}
-        ${!this.subEntry &&
-        ((entries && (showEntities || showDevices)) || this._domainName)
+          : nothing}
+        ${this._domainName && this.subEntry
+          ? html`<span slot="supporting-text" class="domain"
+              >${this._domainName}</span
+            >`
+          : nothing}
+        ${!this.subEntry && entries && showEntities
          ? html`
              <div slot="end" class="summary">
-                ${showEntities && !this.expand
+                ${showEntities &&
+                !this.expand &&
+                entries?.referenced_entities.length
                  ? html`<button class="main link" @click=${this._openDetails}>
                      ${this.hass.localize(
                        "ui.components.target-picker.entities_count",
@@ -191,21 +192,6 @@ export class HaTargetPickerItemRow extends LitElement {
                        )}
                      </span>`
                    : nothing}
-                ${showDevices
-                  ? html`<span class="secondary"
-                      >${this.hass.localize(
-                        "ui.components.target-picker.devices_count",
-                        {
-                          count: entries?.referenced_devices.length,
-                        }
-                      )}</span
-                    >`
-                  : nothing}
-                ${this._domainName && !showDevices
-                  ? html`<span class="secondary domain"
-                      >${this._domainName}</span
-                    >`
-                  : nothing}
              </div>
            `
          : nothing}
@@ -246,9 +232,11 @@ export class HaTargetPickerItemRow extends LitElement {
    const rows1 =
      (nextType === "area"
        ? entries?.referenced_areas
-        : nextType === "device"
+        : nextType === "device" && this.type !== "label"
          ? entries?.referenced_devices
-          : entries?.referenced_entities) || [];
+          : this.type !== "label"
+            ? entries?.referenced_entities
+            : []) || [];

    const devicesInAreas = [] as string[];

@@ -299,9 +287,13 @@ export class HaTargetPickerItemRow extends LitElement {

    const entityRows =
      this.type === "label" && entries
-        ? entries.referenced_entities.filter((entity_id) =>
-            this.hass.entities[entity_id].labels.includes(this.itemId)
-          )
+        ? entries.referenced_entities.filter((entity_id) => {
+            const entity = this.hass.entities[entity_id];
+            return (
+              entity.labels.includes(this.itemId) &&
+              !entries.referenced_devices.includes(entity.device_id || "")
+            );
+          })
        : nextType === "device" && entries
          ? entries.referenced_entities.filter(
              (entity_id) =>
@@ -427,7 +419,6 @@ export class HaTargetPickerItemRow extends LitElement {
            const device = this.hass.devices[device_id];
            if (
              !hiddenAreaIds.includes(device.area_id || "") &&
-              (this.type !== "label" || device.labels.includes(this.itemId)) &&
              deviceMeetsFilter(
                device,
                this.hass.entities,
@@ -455,6 +446,9 @@ export class HaTargetPickerItemRow extends LitElement {
          }
          if (
            (this.type === "area" && entity.area_id === this.itemId) ||
+            (this.type === "floor" &&
+              entity.area_id &&
+              entries.referenced_areas.includes(entity.area_id)) ||
            (this.type === "label" && entity.labels.includes(this.itemId)) ||
            entries.referenced_devices.includes(entity.device_id || "")
          ) {
@@ -606,6 +600,11 @@ export class HaTargetPickerItemRow extends LitElement {
      state-badge {
        color: var(--ha-color-on-neutral-quiet);
      }
+
+      .icon {
+        display: flex;
+      }
+
      img {
        width: 24px;
        height: 24px;
@@ -629,9 +628,6 @@ export class HaTargetPickerItemRow extends LitElement {
        font-size: var(--ha-font-size-s);
        color: var(--secondary-text-color);
      }
-      .domain {
-        font-family: var(--ha-font-family-code);
-      }

      .entries-tree {
        display: flex;
@@ -679,6 +675,14 @@ export class HaTargetPickerItemRow extends LitElement {
      button.link:focus {
        text-decoration: underline;
      }
+
+      .domain {
+        width: fit-content;
+        border-radius: var(--ha-border-radius-md);
+        background-color: var(--ha-color-fill-neutral-quiet-resting);
+        padding: var(--ha-space-1);
+        font-family: var(--ha-font-family-code);
+      }
    `,
  ];
 }
--- a/src/components/target-picker/ha-target-picker-selector.ts
+++ b/src/components/target-picker/ha-target-picker-selector.ts
@@ -1,6 +1,6 @@
 import type { LitVirtualizer } from "@lit-labs/virtualizer";
 import { consume } from "@lit/context";
-import { mdiCheck, mdiPlus, mdiTextureBox } from "@mdi/js";
+import { mdiPlus, mdiTextureBox } from "@mdi/js";
 import Fuse from "fuse.js";
 import type { HassServiceTarget } from "home-assistant-js-websocket";
 import { css, html, LitElement, nothing, type PropertyValues } from "lit";
@@ -43,9 +43,10 @@ import { haStyleScrollbar } from "../../resources/styles";
 import { loadVirtualizer } from "../../resources/virtualizer";
 import type { HomeAssistant } from "../../types";
 import { brandsUrl } from "../../util/brands-url";
+import "../chips/ha-chip-set";
+import "../chips/ha-filter-chip";
 import type { HaDevicePickerDeviceFilterFunc } from "../device/ha-device-picker";
 import "../entity/state-badge";
-import "../ha-button";
 import "../ha-combo-box-item";
 import "../ha-floor-icon";
 import "../ha-md-list";
@@ -63,8 +64,7 @@ const CREATE_ID = "___create-new-entity___";
 export class HaTargetPickerSelector extends LitElement {
  @property({ attribute: false }) public hass!: HomeAssistant;

-  @property({ attribute: false }) public filterTypes: TargetTypeFloorless[] =
-    [];
+  @property({ attribute: false }) public filterType?: TargetTypeFloorless;

  @property({ reflect: true }) public mode: "popover" | "dialog" = "popover";

@@ -159,11 +159,10 @@ export class HaTargetPickerSelector extends LitElement {
        @input=${this._searchChanged}
        .value=${this._searchTerm}
      ></ha-textfield>
-      <div class="filter">${this._renderFilterButtons()}</div>
+      <ha-chip-set class="filter">${this._renderFilterButtons()}</ha-chip-set>
      <div class="filter-header-wrapper">
        <div
-          class="filter-header ${this.filterTypes.length !== 1 &&
-          this._filterHeader
+          class="filter-header ${!this.filterType && this._filterHeader
            ? "show"
            : ""}"
        >
@@ -175,7 +174,6 @@ export class HaTargetPickerSelector extends LitElement {
        scroller
        .keyFunction=${this._keyFunction}
        .items=${this._getItems(
-          this.filterTypes,
          this.entityFilter,
          this.deviceFilter,
          this.includeDomains,
@@ -184,7 +182,8 @@ export class HaTargetPickerSelector extends LitElement {
          this._searchTerm,
          this.createDomains,
          this._configEntryLookup,
-          this.mode
+          this.mode,
+          this.filterType
        )}
        .renderItem=${this._renderRow}
        @scroll=${this._onScrollList}
@@ -428,23 +427,17 @@ export class HaTargetPickerSelector extends LitElement {
        return html`<div class="separator"></div>`;
      }

-      const selected = this.filterTypes.includes(filterType);
+      const selected = this.filterType === filterType;
      return html`
-        <ha-button
+        <ha-filter-chip
          @click=${this._toggleFilter}
          .type=${filterType}
-          size="small"
-          .variant=${selected ? "brand" : "neutral"}
-          appearance="filled"
-          no-shrink
-        >
-          ${selected
-            ? html`<ha-svg-icon slot="start" .path=${mdiCheck}></ha-svg-icon>`
-            : nothing}
-          ${this.hass.localize(
+          .selected=${selected}
+          .label=${this.hass.localize(
            `ui.components.target-picker.type.${filterType === "entity" ? "entities" : `${filterType}s`}` as LocalizeKeys
          )}
-        </ha-button>
+        >
+        </ha-filter-chip>
      `;
    });
  }
@@ -520,6 +513,7 @@ export class HaTargetPickerSelector extends LitElement {
        id=${`list-item-${index}`}
        tabindex="-1"
        .type=${type === "empty" ? "text" : "button"}
+        class=${type === "empty" ? "empty" : ""}
        @click=${this._handlePickTarget}
        .targetType=${type}
        .targetId=${type !== "empty" ? item.id : undefined}
@@ -574,9 +568,7 @@ export class HaTargetPickerSelector extends LitElement {
                      })}
                    />
                  `
-                : type === "area" &&
-                    (item as FloorComboBoxItem).type === "floor" &&
-                    (item as FloorComboBoxItem).floor
+                : type === "floor"
                  ? html`<ha-floor-icon
                      slot="start"
                      .floor=${(item as FloorComboBoxItem).floor!}
@@ -672,7 +664,6 @@ export class HaTargetPickerSelector extends LitElement {

  private _getItems = memoizeOne(
    (
-      filterTypes: TargetTypeFloorless[],
      entityFilter: this["entityFilter"],
      deviceFilter: this["deviceFilter"],
      includeDomains: this["includeDomains"],
@@ -681,7 +672,8 @@ export class HaTargetPickerSelector extends LitElement {
      searchTerm: string,
      createDomains: this["createDomains"],
      configEntryLookup: Record<string, ConfigEntry>,
-      mode: this["mode"]
+      mode: this["mode"],
+      filterType?: TargetTypeFloorless
    ) => {
      const items: (
        | string
@@ -690,7 +682,7 @@ export class HaTargetPickerSelector extends LitElement {
        | PickerComboBoxItem
      )[] = [];

-      if (filterTypes.length === 0 || filterTypes.includes("entity")) {
+      if (!filterType || filterType === "entity") {
        let entities = this._getEntitiesMemoized(
          this.hass,
          includeDomains,
@@ -713,7 +705,7 @@ export class HaTargetPickerSelector extends LitElement {
          ) as EntityComboBoxItem[];
        }

-        if (entities.length > 0 && filterTypes.length !== 1) {
+        if (!filterType) {
          // show group title
          items.push(
            this.hass.localize("ui.components.target-picker.type.entities")
@@ -723,7 +715,7 @@ export class HaTargetPickerSelector extends LitElement {
        items.push(...entities);
      }

-      if (filterTypes.length === 0 || filterTypes.includes("device")) {
+      if (!filterType || filterType === "device") {
        let devices = this._getDevicesMemoized(
          this.hass,
          configEntryLookup,
@@ -741,7 +733,7 @@ export class HaTargetPickerSelector extends LitElement {
          devices = this._filterGroup("device", devices);
        }

-        if (devices.length > 0 && filterTypes.length !== 1) {
+        if (!filterType) {
          // show group title
          items.push(
            this.hass.localize("ui.components.target-picker.type.devices")
@@ -751,7 +743,7 @@ export class HaTargetPickerSelector extends LitElement {
        items.push(...devices);
      }

-      if (filterTypes.length === 0 || filterTypes.includes("area")) {
+      if (!filterType || filterType === "area") {
        let areasAndFloors = this._getAreasAndFloorsMemoized(
          this.hass.states,
          this.hass.floors,
@@ -777,7 +769,7 @@ export class HaTargetPickerSelector extends LitElement {
          ) as FloorComboBoxItem[];
        }

-        if (areasAndFloors.length > 0 && filterTypes.length !== 1) {
+        if (!filterType) {
          // show group title
          items.push(
            this.hass.localize("ui.components.target-picker.type.areas")
@@ -803,7 +795,7 @@ export class HaTargetPickerSelector extends LitElement {
        );
      }

-      if (filterTypes.length === 0 || filterTypes.includes("label")) {
+      if (!filterType || filterType === "label") {
        let labels = this._getLabelsMemoized(
          this.hass,
          this._labelRegistry,
@@ -819,7 +811,7 @@ export class HaTargetPickerSelector extends LitElement {
          labels = this._filterGroup("label", labels);
        }

-        if (labels.length > 0 && filterTypes.length !== 1) {
+        if (!filterType) {
          // show group title
          items.push(
            this.hass.localize("ui.components.target-picker.type.labels")
@@ -836,7 +828,7 @@ export class HaTargetPickerSelector extends LitElement {
          id: EMPTY_SEARCH,
          primary: this.hass.localize(
            "ui.components.target-picker.no_target_found",
-            { term: html`<span class="search-term">"${searchTerm}"</span>` }
+            { term: html`<div><b>‘${searchTerm}’</b></div>` }
          ),
        });
      } else if (items.length === 0) {
@@ -944,17 +936,17 @@ export class HaTargetPickerSelector extends LitElement {
  }

  private _toggleFilter(ev: any) {
+    ev.stopPropagation();
    this._resetSelectedItem();
    this._filterHeader = undefined;
    const type = ev.target.type as TargetTypeFloorless;
    if (!type) {
      return;
    }
-    const index = this.filterTypes.indexOf(type);
-    if (index === -1) {
-      this.filterTypes = [...this.filterTypes, type];
+    if (this.filterType === type) {
+      this.filterType = undefined;
    } else {
-      this.filterTypes = this.filterTypes.filter((t) => t !== type);
+      this.filterType = type;
    }

    // Reset scroll position when filter changes
@@ -962,7 +954,7 @@ export class HaTargetPickerSelector extends LitElement {
      this._virtualizerElement.scrollToIndex(0);
    }

-    fireEvent(this, "filter-types-changed", this.filterTypes);
+    fireEvent(this, "filter-type-changed", this.filterType);
  }

  @eventOptions({ passive: true })
@@ -994,18 +986,22 @@ export class HaTargetPickerSelector extends LitElement {

      .filter {
        display: flex;
+        flex-wrap: nowrap;
        gap: var(--ha-space-2);
        padding: var(--ha-space-3) var(--ha-space-3);
        overflow: auto;
-        --ha-button-border-radius: var(--ha-border-radius-md);
      }

      :host([mode="dialog"]) .filter {
        padding: var(--ha-space-3) var(--ha-space-4);
      }

-      .filter ha-button {
+      .filter ha-filter-chip {
        flex-shrink: 0;
+        --md-filter-chip-selected-container-color: var(
+          --ha-color-fill-primary-normal-hover
+        );
+        color: var(--primary-color);
      }

      .filter .separator {
@@ -1020,10 +1016,14 @@ export class HaTargetPickerSelector extends LitElement {
        padding: var(--ha-space-1) var(--ha-space-2);
        font-weight: var(--ha-font-weight-bold);
        color: var(--secondary-text-color);
+        min-height: var(--ha-space-6);
+        display: flex;
+        align-items: center;
      }

      .title {
        width: 100%;
+        min-height: var(--ha-space-8);
      }

      :host([mode="dialog"]) .title {
@@ -1055,7 +1055,6 @@ export class HaTargetPickerSelector extends LitElement {

      .filter-header {
        opacity: 0;
-        transition: opacity 300ms ease-in;
        position: absolute;
        top: 1px;
        width: calc(100% - var(--ha-space-8));
@@ -1083,9 +1082,8 @@ export class HaTargetPickerSelector extends LitElement {
        width: 100%;
      }

-      .search-term {
-        color: var(--primary-color);
-        font-weight: var(--ha-font-weight-medium);
+      .empty {
+        text-align: center;
      }
    `,
  ];
@@ -1097,7 +1095,7 @@ declare global {
  }

  interface HASSDomEvents {
-    "filter-types-changed": TargetTypeFloorless[];
+    "filter-type-changed": TargetTypeFloorless | undefined;
    "target-picked": {
      type: TargetType;
      id: string;
--- a/src/components/target-picker/ha-target-picker-value-chip.ts
+++ b/src/components/target-picker/ha-target-picker-value-chip.ts
@@ -16,6 +16,7 @@ import memoizeOne from "memoize-one";
 import { computeCssColor } from "../../common/color/compute-color";
 import { hex2rgb } from "../../common/color/convert-color";
 import { fireEvent } from "../../common/dom/fire_event";
+import { slugify } from "../../common/string/slugify";
 import {
  computeDeviceName,
  computeDeviceNameDisplay,
@@ -102,7 +103,7 @@ export class HaTargetPickerValueChip extends LitElement {
        ${this.type === "entity"
          ? nothing
          : html`<span role="gridcell">
-              <ha-tooltip .for="expand-${this.itemId}"
+              <ha-tooltip .for="expand-${slugify(this.itemId)}"
                >${this.hass.localize(
                  `ui.components.target-picker.expand_${this.type}_id`
                )}
@@ -114,13 +115,13 @@ export class HaTargetPickerValueChip extends LitElement {
                )}
                .path=${mdiUnfoldMoreVertical}
                hide-title
-                .id="expand-${this.itemId}"
+                .id="expand-${slugify(this.itemId)}"
                .type=${this.type}
                @click=${this._handleExpand}
              ></ha-icon-button>
            </span>`}
        <span role="gridcell">
-          <ha-tooltip .for="remove-${this.itemId}">
+          <ha-tooltip .for="remove-${slugify(this.itemId)}">
            ${this.hass.localize(
              `ui.components.target-picker.remove_${this.type}_id`
            )}
@@ -130,7 +131,7 @@ export class HaTargetPickerValueChip extends LitElement {
            .label=${this.hass.localize("ui.components.target-picker.remove")}
            .path=${mdiClose}
            hide-title
-            .id="remove-${this.itemId}"
+            .id="remove-${slugify(this.itemId)}"
            .type=${this.type}
            @click=${this._removeItem}
          ></ha-icon-button>
--- a/src/data/action.ts
+++ b/src/data/action.ts
@@ -6,8 +6,6 @@ import {
  mdiCallSplit,
  mdiCodeBraces,
  mdiDevices,
-  mdiDotsHorizontal,
-  mdiExcavator,
  mdiFormatListNumbered,
  mdiGestureDoubleTap,
  mdiHandBackRight,
@@ -16,10 +14,10 @@ import {
  mdiRoomService,
  mdiShuffleDisabled,
  mdiTimerOutline,
-  mdiTools,
  mdiTrafficLight,
 } from "@mdi/js";
-import type { AutomationElementGroup } from "./automation";
+import type { AutomationElementGroupCollection } from "./automation";
+import type { Action } from "./script";

 export const ACTION_ICONS = {
  condition: mdiAbTesting,
@@ -48,37 +46,73 @@ export const YAML_ONLY_ACTION_TYPES = new Set<keyof typeof ACTION_ICONS>([
  "variables",
 ]);

-export const ACTION_GROUPS: AutomationElementGroup = {
-  device_id: {},
-  helpers: {
-    icon: mdiTools,
-    members: {},
-  },
-  building_blocks: {
-    icon: mdiExcavator,
-    members: {
-      condition: {},
-      delay: {},
-      wait_template: {},
-      wait_for_trigger: {},
-      repeat_count: {},
-      repeat_while: {},
-      repeat_until: {},
-      repeat_for_each: {},
-      choose: {},
-      if: {},
-      stop: {},
-      sequence: {},
-      parallel: {},
-      variables: {},
+export const ACTION_COLLECTIONS: AutomationElementGroupCollection[] = [
+  {
+    groups: {
+      device_id: {},
+      serviceGroups: {},
    },
  },
-  other: {
-    icon: mdiDotsHorizontal,
-    members: {
+  {
+    titleKey: "ui.panel.config.automation.editor.actions.groups.helpers.label",
+    groups: {
+      helpers: {},
+    },
+  },
+  {
+    titleKey: "ui.panel.config.automation.editor.actions.groups.other.label",
+    groups: {
      event: {},
      service: {},
      set_conversation_response: {},
+      other: {},
+    },
+  },
+] as const;
+
+export const ACTION_BUILDING_BLOCKS_GROUP = {
+  condition: {},
+  delay: {},
+  wait_template: {},
+  wait_for_trigger: {},
+  repeat_count: {},
+  repeat_while: {},
+  repeat_until: {},
+  repeat_for_each: {},
+  choose: {},
+  if: {},
+  stop: {},
+  sequence: {},
+  parallel: {},
+  variables: {},
+};
+
+// These will be replaced with the correct action
+export const VIRTUAL_ACTIONS: Partial<
+  Record<keyof typeof ACTION_BUILDING_BLOCKS_GROUP, Action>
+> = {
+  repeat_count: {
+    repeat: {
+      count: 2,
+      sequence: [],
+    },
+  },
+  repeat_while: {
+    repeat: {
+      while: [],
+      sequence: [],
+    },
+  },
+  repeat_until: {
+    repeat: {
+      until: [],
+      sequence: [],
+    },
+  },
+  repeat_for_each: {
+    repeat: {
+      for_each: {},
+      sequence: [],
    },
  },
 } as const;
--- a/src/data/area_floor.ts
+++ b/src/data/area_floor.ts
@@ -1,7 +1,6 @@
 import { computeAreaName } from "../common/entity/compute_area_name";
 import { computeDomain } from "../common/entity/compute_domain";
 import { computeFloorName } from "../common/entity/compute_floor_name";
-import { stringCompare } from "../common/string/compare";
 import type { HaDevicePickerDeviceFilterFunc } from "../components/device/ha-device-picker";
 import type { PickerComboBoxItem } from "../components/ha-picker-combo-box";
 import type { HomeAssistant } from "../types";
@@ -13,7 +12,11 @@ import {
 } from "./device_registry";
 import type { HaEntityPickerEntityFilterFunc } from "./entity";
 import type { EntityRegistryDisplayEntry } from "./entity_registry";
-import { getFloorAreaLookup, type FloorRegistryEntry } from "./floor_registry";
+import {
+  floorCompare,
+  getFloorAreaLookup,
+  type FloorRegistryEntry,
+} from "./floor_registry";

 export interface FloorComboBoxItem extends PickerComboBoxItem {
  type: "floor" | "area";
@@ -184,6 +187,8 @@ export const getAreasAndFloors = (
    (area) => !area.floor_id || !floorAreaLookup[area.floor_id]
  );

+  const compare = floorCompare(haFloors);
+
  // @ts-ignore
  const floorAreaEntries: [
    FloorRegistryEntry | undefined,
@@ -193,12 +198,7 @@ export const getAreasAndFloors = (
      const floor = floors.find((fl) => fl.floor_id === floorId)!;
      return [floor, floorAreas] as const;
    })
-    .sort(([floorA], [floorB]) => {
-      if (floorA.level !== floorB.level) {
-        return (floorA.level ?? 0) - (floorB.level ?? 0);
-      }
-      return stringCompare(floorA.name, floorB.name);
-    });
+    .sort(([floorA], [floorB]) => compare(floorA.floor_id, floorB.floor_id));

  const items: FloorComboBoxItem[] = [];

@@ -218,6 +218,7 @@ export const getAreasAndFloors = (
        type: "floor",
        primary: floorName,
        floor: floor,
+        icon: floor.icon || undefined,
        search_labels: [
          floor.floor_id,
          floorName,
--- a/src/data/automation.ts
+++ b/src/data/automation.ts
@@ -4,6 +4,7 @@ import type {
 } from "home-assistant-js-websocket";
 import { ensureArray } from "../common/array/ensure-array";
 import { navigate } from "../common/navigate";
+import type { LocalizeKeys } from "../common/translations/localize";
 import { createSearchParam } from "../common/url/search-params";
 import type { Context, HomeAssistant } from "../types";
 import type { BlueprintInput } from "./blueprint";
@@ -293,6 +294,11 @@ export interface ShorthandNotCondition extends ShorthandBaseCondition {
  not: Condition[];
 }

+export interface AutomationElementGroupCollection {
+  titleKey?: LocalizeKeys;
+  groups: AutomationElementGroup;
+}
+
 export type AutomationElementGroup = Record<
  string,
  { icon?: string; members?: AutomationElementGroup }
--- a/src/data/condition.ts
+++ b/src/data/condition.ts
@@ -3,8 +3,6 @@ import {
  mdiClockOutline,
  mdiCodeBraces,
  mdiDevices,
-  mdiDotsHorizontal,
-  mdiExcavator,
  mdiGateOr,
  mdiIdentifier,
  mdiMapClock,
@@ -15,7 +13,7 @@ import {
  mdiStateMachine,
  mdiWeatherSunny,
 } from "@mdi/js";
-import type { AutomationElementGroup } from "./automation";
+import type { AutomationElementGroupCollection } from "./automation";

 export const CONDITION_ICONS = {
  device: mdiDevices,
@@ -31,25 +29,31 @@ export const CONDITION_ICONS = {
  zone: mdiMapMarkerRadius,
 };

-export const CONDITION_GROUPS: AutomationElementGroup = {
-  device: {},
-  entity: { icon: mdiShape, members: { state: {}, numeric_state: {} } },
-  time_location: {
-    icon: mdiMapClock,
-    members: { sun: {}, time: {}, zone: {} },
+export const CONDITION_COLLECTIONS: AutomationElementGroupCollection[] = [
+  {
+    groups: {
+      device: {},
+      entity: { icon: mdiShape, members: { state: {}, numeric_state: {} } },
+      time_location: {
+        icon: mdiMapClock,
+        members: { sun: {}, time: {}, zone: {} },
+      },
+    },
  },
-  building_blocks: {
-    icon: mdiExcavator,
-    members: { and: {}, or: {}, not: {} },
-  },
-  other: {
-    icon: mdiDotsHorizontal,
-    members: {
+  {
+    titleKey: "ui.panel.config.automation.editor.conditions.groups.other.label",
+    groups: {
      template: {},
      trigger: {},
    },
  },
-} as const;
+] as const;
+
+export const CONDITION_BUILDING_BLOCKS_GROUP = {
+  and: {},
+  or: {},
+  not: {},
+};

 export const CONDITION_BUILDING_BLOCKS = ["and", "or", "not"];

--- a/src/data/floor_registry.ts
+++ b/src/data/floor_registry.ts
@@ -68,13 +68,18 @@ export const getFloorAreaLookup = (
 };

 export const floorCompare =
-  (entries?: FloorRegistryEntry[], order?: string[]) =>
+  (entries?: HomeAssistant["floors"], order?: string[]) =>
  (a: string, b: string) => {
    const indexA = order ? order.indexOf(a) : -1;
    const indexB = order ? order.indexOf(b) : -1;
    if (indexA === -1 && indexB === -1) {
-      const nameA = entries?.[a]?.name ?? a;
-      const nameB = entries?.[b]?.name ?? b;
+      const floorA = entries?.[a];
+      const floorB = entries?.[b];
+      if (floorA && floorB && floorA.level !== floorB.level) {
+        return (floorB.level ?? -9999) - (floorA.level ?? -9999);
+      }
+      const nameA = floorA?.name ?? a;
+      const nameB = floorB?.name ?? b;
      return stringCompare(nameA, nameB);
    }
    if (indexA === -1) {
--- a/src/data/history.ts
+++ b/src/data/history.ts
@@ -435,9 +435,9 @@ export const convertStatisticsToHistory = (
  Object.entries(orderedStatistics).forEach(([key, value]) => {
    const entityHistoryStates: EntityHistoryState[] = value.map((e) => ({
      s: e.mean != null ? e.mean.toString() : e.state!.toString(),
-      lc: e.start / 1000,
+      lc: e.end / 1000,
      a: {},
-      lu: e.start / 1000,
+      lu: e.end / 1000,
    }));
    statsHistoryStates[key] = entityHistoryStates;
  });
--- a/src/data/label_registry.ts
+++ b/src/data/label_registry.ts
@@ -264,6 +264,7 @@ export const getLabels = (
  const items = outputLabels.map<PickerComboBoxItem>((label) => ({
    id: label.label_id,
    primary: label.name,
+    secondary: label.description ?? "",
    icon: label.icon || undefined,
    icon_path: label.icon ? undefined : mdiLabel,
    sorting_label: label.name,
--- a/src/data/lovelace/config/view.ts
+++ b/src/data/lovelace/config/view.ts
@@ -1,3 +1,4 @@
+import type { MediaSelectorValue } from "../../selector";
 import type { LovelaceBadgeConfig } from "./badge";
 import type { LovelaceCardConfig } from "./card";
 import type { LovelaceSectionRawConfig } from "./section";
@@ -8,7 +9,7 @@ export interface ShowViewConfig {
 }

 export interface LovelaceViewBackgroundConfig {
-  image?: string;
+  image?: string | MediaSelectorValue;
  opacity?: number;
  size?: "auto" | "cover" | "contain";
  alignment?:
--- a/src/data/selector.ts
+++ b/src/data/selector.ts
@@ -5,7 +5,6 @@ import type {
 import { ensureArray } from "../common/array/ensure-array";
 import { computeStateDomain } from "../common/entity/compute_state_domain";
 import { supportsFeature } from "../common/entity/supports-feature";
-import type { CropOptions } from "../dialogs/image-cropper-dialog/show-image-cropper-dialog";
 import { isHelperDomain } from "../panels/config/helpers/const";
 import type { UiAction } from "../panels/lovelace/components/hui-action-editor";
 import type { HomeAssistant } from "../types";
@@ -47,8 +46,6 @@ export type Selector =
  | FileSelector
  | IconSelector
  | LabelSelector
-  | ImageSelector
-  | BackgroundSelector
  | LanguageSelector
  | LocationSelector
  | MediaSelector
@@ -273,14 +270,6 @@ export interface IconSelector {
  } | null;
 }

-export interface ImageSelector {
-  image: { original?: boolean; crop?: CropOptions } | null;
-}
-
-export interface BackgroundSelector {
-  background: { original?: boolean; crop?: CropOptions } | null;
-}
-
 export interface LabelSelector {
  label: {
    multiple?: boolean;
@@ -352,6 +341,7 @@ export interface NumberSelector {
 interface ObjectSelectorField {
  selector: Selector;
  label?: string;
+  description?: string;
  required?: boolean;
 }

--- a/src/data/trigger.ts
+++ b/src/data/trigger.ts
@@ -4,7 +4,6 @@ import {
  mdiClockOutline,
  mdiCodeBraces,
  mdiDevices,
-  mdiDotsHorizontal,
  mdiFormatListBulleted,
  mdiGestureDoubleTap,
  mdiMapClock,
@@ -23,7 +22,7 @@ import {

 import { mdiHomeAssistant } from "../resources/home-assistant-logo-svg";
 import type {
-  AutomationElementGroup,
+  AutomationElementGroupCollection,
  Trigger,
  TriggerList,
 } from "./automation";
@@ -49,16 +48,26 @@ export const TRIGGER_ICONS = {
  list: mdiFormatListBulleted,
 };

-export const TRIGGER_GROUPS: AutomationElementGroup = {
-  device: {},
-  entity: { icon: mdiShape, members: { state: {}, numeric_state: {} } },
-  time_location: {
-    icon: mdiMapClock,
-    members: { calendar: {}, sun: {}, time: {}, time_pattern: {}, zone: {} },
+export const TRIGGER_COLLECTIONS: AutomationElementGroupCollection[] = [
+  {
+    groups: {
+      device: {},
+      entity: { icon: mdiShape, members: { state: {}, numeric_state: {} } },
+      time_location: {
+        icon: mdiMapClock,
+        members: {
+          calendar: {},
+          sun: {},
+          time: {},
+          time_pattern: {},
+          zone: {},
+        },
+      },
+    },
  },
-  other: {
-    icon: mdiDotsHorizontal,
-    members: {
+  {
+    titleKey: "ui.panel.config.automation.editor.triggers.groups.other.label",
+    groups: {
      event: {},
      geo_location: {},
      homeassistant: {},
@@ -70,7 +79,7 @@ export const TRIGGER_GROUPS: AutomationElementGroup = {
      persistent_notification: {},
    },
  },
-} as const;
+] as const;

 export const isTriggerList = (trigger: Trigger): trigger is TriggerList =>
  "triggers" in trigger;
--- a/src/data/ws-area_registry.ts
+++ b/src/data/ws-area_registry.ts
@@ -1,18 +1,13 @@
 import type { Connection } from "home-assistant-js-websocket";
 import { createCollection } from "home-assistant-js-websocket";
 import type { Store } from "home-assistant-js-websocket/dist/store";
-import { stringCompare } from "../common/string/compare";
 import { debounce } from "../common/util/debounce";
 import type { AreaRegistryEntry } from "./area_registry";

 const fetchAreaRegistry = (conn: Connection) =>
-  conn
-    .sendMessagePromise<AreaRegistryEntry[]>({
-      type: "config/area_registry/list",
-    })
-    .then((areas) =>
-      areas.sort((ent1, ent2) => stringCompare(ent1.name, ent2.name))
-    );
+  conn.sendMessagePromise<AreaRegistryEntry[]>({
+    type: "config/area_registry/list",
+  });

 const subscribeAreaRegistryUpdates = (
  conn: Connection,
--- a/src/data/ws-floor_registry.ts
+++ b/src/data/ws-floor_registry.ts
@@ -1,23 +1,13 @@
 import type { Connection } from "home-assistant-js-websocket";
 import { createCollection } from "home-assistant-js-websocket";
 import type { Store } from "home-assistant-js-websocket/dist/store";
-import { stringCompare } from "../common/string/compare";
 import { debounce } from "../common/util/debounce";
 import type { FloorRegistryEntry } from "./floor_registry";

 const fetchFloorRegistry = (conn: Connection) =>
-  conn
-    .sendMessagePromise({
-      type: "config/floor_registry/list",
-    })
-    .then((floors) =>
-      (floors as FloorRegistryEntry[]).sort((ent1, ent2) => {
-        if (ent1.level !== ent2.level) {
-          return (ent1.level ?? 9999) - (ent2.level ?? 9999);
-        }
-        return stringCompare(ent1.name, ent2.name);
-      })
-    );
+  conn.sendMessagePromise<FloorRegistryEntry[]>({
+    type: "config/floor_registry/list",
+  });

 const subscribeFloorRegistryUpdates = (
  conn: Connection,
--- a/src/dialogs/config-flow/dialog-data-entry-flow.ts
+++ b/src/dialogs/config-flow/dialog-data-entry-flow.ts
@@ -484,7 +484,7 @@ class DataEntryFlowDialog extends LitElement {
        this._unsubDataEntryFlowProgress = undefined;
      }
      if (_step.next_flow[0] === "config_flow") {
-        showConfigFlowDialog(this._params!.dialogParentElement!, {
+        showConfigFlowDialog(this, {
          continueFlowId: _step.next_flow[1],
          carryOverDevices: this._devices(
            this._params!.flowConfig.showDevices,
@@ -496,32 +496,23 @@ class DataEntryFlowDialog extends LitElement {
        });
      } else if (_step.next_flow[0] === "options_flow") {
        if (_step.type === "create_entry") {
-          showOptionsFlowDialog(
-            this._params!.dialogParentElement!,
-            _step.result!,
-            {
-              continueFlowId: _step.next_flow[1],
-              navigateToResult: this._params!.navigateToResult,
-              dialogClosedCallback: this._params!.dialogClosedCallback,
-            }
-          );
+          showOptionsFlowDialog(this, _step.result!, {
+            continueFlowId: _step.next_flow[1],
+            navigateToResult: this._params!.navigateToResult,
+            dialogClosedCallback: this._params!.dialogClosedCallback,
+          });
        }
      } else if (_step.next_flow[0] === "config_subentries_flow") {
        if (_step.type === "create_entry") {
-          showSubConfigFlowDialog(
-            this._params!.dialogParentElement!,
-            _step.result!,
-            _step.next_flow[0],
-            {
-              continueFlowId: _step.next_flow[1],
-              navigateToResult: this._params!.navigateToResult,
-              dialogClosedCallback: this._params!.dialogClosedCallback,
-            }
-          );
+          showSubConfigFlowDialog(this, _step.result!, _step.next_flow[0], {
+            continueFlowId: _step.next_flow[1],
+            navigateToResult: this._params!.navigateToResult,
+            dialogClosedCallback: this._params!.dialogClosedCallback,
+          });
        }
      } else {
        this.closeDialog();
-        showAlertDialog(this._params!.dialogParentElement!, {
+        showAlertDialog(this, {
          text: this.hass.localize(
            "ui.panel.config.integrations.config_flow.error",
            { error: `Unsupported next flow type: ${_step.next_flow[0]}` }
--- a/src/dialogs/enter-code/dialog-enter-code.ts
+++ b/src/dialogs/enter-code/dialog-enter-code.ts
@@ -212,6 +212,7 @@ export class DialogEnterCode
      grid-gap: var(--ha-space-6);
      justify-items: center;
      align-items: center;
+      direction: ltr;
    }
    .clear {
      grid-row-start: 4;
--- a/src/dialogs/more-info/ha-more-info-dialog.ts
+++ b/src/dialogs/more-info/ha-more-info-dialog.ts
@@ -678,8 +678,8 @@ export class MoreInfoDialog extends LitElement {
          /* Set the top top of the dialog to a fixed position, so it doesnt jump when the content changes size */
          --vertical-align-dialog: flex-start;
          --dialog-surface-margin-top: max(
-            40px,
-            var(--safe-area-inset-top, 0px)
+            var(--ha-space-10),
+            var(--safe-area-inset-top, var(--ha-space-0))
          );
          --dialog-content-padding: 0;
        }
@@ -698,14 +698,15 @@ export class MoreInfoDialog extends LitElement {
        }

        ha-more-info-history-and-logbook {
-          padding: 8px 24px 24px 24px;
+          padding: var(--ha-space-2) var(--ha-space-6) var(--ha-space-6)
+            var(--ha-space-6);
          display: block;
        }

        @media all and (max-width: 450px), all and (max-height: 500px) {
          /* When in fullscreen dialog should be attached to top */
          ha-dialog {
-            --dialog-surface-margin-top: 0px;
+            --dialog-surface-margin-top: var(--ha-space-0);
          }
        }

@@ -730,7 +731,8 @@ export class MoreInfoDialog extends LitElement {
          display: flex;
          flex-direction: column;
          align-items: flex-start;
-          margin: 0 0 -10px 0;
+          margin: var(--ha-space-0) var(--ha-space-0)
+            calc(var(--ha-space-2) * -1) var(--ha-space-0);
        }

        .title p {
@@ -752,9 +754,9 @@ export class MoreInfoDialog extends LitElement {
          font-size: var(--ha-font-size-m);
          line-height: 16px;
          --mdc-icon-size: 16px;
-          padding: 4px;
-          margin: -4px;
-          margin-top: -10px;
+          padding: var(--ha-space-1);
+          margin: calc(var(--ha-space-1) * -1);
+          margin-top: calc(var(--ha-space-2) * -1);
          background: none;
          border: none;
          outline: none;
--- a/src/dialogs/quick-bar/ha-quick-bar.ts
+++ b/src/dialogs/quick-bar/ha-quick-bar.ts
@@ -1011,8 +1011,8 @@ export class QuickBar extends LitElement {
            --mdc-dialog-max-width: 800px;
            --mdc-dialog-min-width: 500px;
            --dialog-surface-position: fixed;
-            --dialog-surface-top: 40px;
-            --mdc-dialog-max-height: calc(100% - 72px);
+            --dialog-surface-top: var(--ha-space-10);
+            --mdc-dialog-max-height: calc(100% - var(--ha-space-18));
          }
        }

@@ -1055,8 +1055,8 @@ export class QuickBar extends LitElement {
        }

        span.command-text {
-          margin-left: 8px;
-          margin-inline-start: 8px;
+          margin-left: var(--ha-space-2);
+          margin-inline-start: var(--ha-space-2);
          margin-inline-end: initial;
          direction: var(--direction);
        }
@@ -1069,8 +1069,8 @@ export class QuickBar extends LitElement {
        ha-md-list-item.two-line {
          --md-list-item-one-line-container-height: 64px;
          --md-list-item-two-line-container-height: 64px;
-          --md-list-item-top-space: 8px;
-          --md-list-item-bottom-space: 8px;
+          --md-list-item-top-space: var(--ha-space-2);
+          --md-list-item-bottom-space: var(--ha-space-2);
        }

        ha-md-list-item.three-line {
@@ -1078,8 +1078,8 @@ export class QuickBar extends LitElement {
          --md-list-item-one-line-container-height: 72px;
          --md-list-item-two-line-container-height: 72px;
          --md-list-item-three-line-container-height: 72px;
-          --md-list-item-top-space: 8px;
-          --md-list-item-bottom-space: 8px;
+          --md-list-item-top-space: var(--ha-space-2);
+          --md-list-item-bottom-space: var(--ha-space-2);
        }

        ha-md-list-item .code {
@@ -1104,11 +1104,11 @@ export class QuickBar extends LitElement {
        }

        ha-tip {
-          padding: 20px;
+          padding: var(--ha-space-5);
        }

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

--- a/src/dialogs/voice-assistant-setup/voice-assistant-setup-dialog.ts
+++ b/src/dialogs/voice-assistant-setup/voice-assistant-setup-dialog.ts
@@ -193,12 +193,12 @@ export class HaVoiceAssistantSetupDialog extends LitElement {
                    ).map(
                      (lang) =>
                        html`<ha-md-menu-item
-                          .value=${lang.value}
+                          .value=${lang.id}
                          @click=${this._handlePickLanguage}
                          @keydown=${this._handlePickLanguage}
-                          .selected=${this._language === lang.value}
+                          .selected=${this._language === lang.id}
                        >
-                          ${lang.label}
+                          ${lang.primary}
                        </ha-md-menu-item>`
                    )}
                  </ha-md-button-menu>`
--- a/src/layouts/hass-tabs-subpage-data-table.ts
+++ b/src/layouts/hass-tabs-subpage-data-table.ts
@@ -18,7 +18,6 @@ import { classMap } from "lit/directives/class-map";
 import { fireEvent } from "../common/dom/fire_event";
 import type { LocalizeFunc } from "../common/translations/localize";
 import "../components/chips/ha-assist-chip";
-import "../components/chips/ha-filter-chip";
 import "../components/data-table/ha-data-table";
 import type {
  DataTableColumnContainer,
--- a/src/panels/calendar/dialog-calendar-event-detail.ts
+++ b/src/panels/calendar/dialog-calendar-event-detail.ts
@@ -143,9 +143,14 @@ class DialogCalendarEventDetail extends LitElement {
      this.hass.locale.time_zone,
      this.hass.config.time_zone
    );
-    const start = new TZDate(this._data!.dtstart, timeZone);
-    const endValue = new TZDate(this._data!.dtend, timeZone);
-    // All day events should be displayed as a day earlier
+    // For all-day events (date-only strings), parse without timezone to avoid offset issues
+    const start = isDate(this._data!.dtstart)
+      ? new Date(this._data!.dtstart + "T00:00:00")
+      : new TZDate(this._data!.dtstart, timeZone);
+    const endValue = isDate(this._data!.dtend)
+      ? new Date(this._data!.dtend + "T00:00:00")
+      : new TZDate(this._data!.dtend, timeZone);
+    // All day event end dates are exclusive in iCalendar format, subtract one day for display
    const end = isDate(this._data.dtend) ? addDays(endValue, -1) : endValue;
    // The range can be shortened when the start and end are on the same day.
    if (isSameDay(start, end)) {
--- a/src/panels/climate/strategies/climate-view-strategy.ts
+++ b/src/panels/climate/strategies/climate-view-strategy.ts
@@ -15,6 +15,7 @@ import {
  getFloors,
 } from "../../lovelace/strategies/areas/helpers/areas-strategy-helper";
 import { getHomeStructure } from "../../lovelace/strategies/home/helpers/home-structure";
+import { floorDefaultIcon } from "../../../components/ha-floor-icon";

 export interface ClimateViewStrategyConfig {
  type: "climate";
@@ -152,6 +153,7 @@ export class ClimateViewStrategy extends ReactiveElement {
              floorCount > 1
                ? floor.name
                : hass.localize("ui.panel.lovelace.strategy.home.areas"),
+            icon: floor.icon || floorDefaultIcon(floor),
          },
        ],
      };
--- a/src/panels/config/areas/dialog-area-registry-detail.ts
+++ b/src/panels/config/areas/dialog-area-registry-detail.ts
@@ -1,40 +1,39 @@
+import type { HassEntity } from "home-assistant-js-websocket";
 import type { CSSResultGroup } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { property, state } from "lit/decorators";
-import type { HassEntity } from "home-assistant-js-websocket";
 import { fireEvent } from "../../../common/dom/fire_event";
+import "../../../components/entity/ha-entity-picker";
+import type { HaEntityPicker } from "../../../components/entity/ha-entity-picker";
 import "../../../components/ha-alert";
 import "../../../components/ha-aliases-editor";
+import { createCloseHeading } from "../../../components/ha-dialog";
+import "../../../components/ha-floor-picker";
+import "../../../components/ha-icon-picker";
+import "../../../components/ha-labels-picker";
 import "../../../components/ha-picture-upload";
 import type { HaPictureUpload } from "../../../components/ha-picture-upload";
 import "../../../components/ha-settings-row";
-import "../../../components/ha-icon-picker";
-import "../../../components/ha-floor-picker";
-import "../../../components/entity/ha-entity-picker";
-import type { HaEntityPicker } from "../../../components/entity/ha-entity-picker";
 import "../../../components/ha-textfield";
-import "../../../components/ha-labels-picker";
 import type {
  AreaRegistryEntry,
  AreaRegistryEntryMutableParams,
 } from "../../../data/area_registry";
 import { deleteAreaRegistryEntry } from "../../../data/area_registry";
-import type { CropOptions } from "../../../dialogs/image-cropper-dialog/show-image-cropper-dialog";
-import { haStyleDialog } from "../../../resources/styles";
-import type { HomeAssistant, ValueChangedEvent } from "../../../types";
-import type { AreaRegistryDetailDialogParams } from "./show-dialog-area-registry-detail";
 import {
  SENSOR_DEVICE_CLASS_HUMIDITY,
  SENSOR_DEVICE_CLASS_TEMPERATURE,
 } from "../../../data/sensor";
 import { showConfirmationDialog } from "../../../dialogs/generic/show-dialog-box";
-import { createCloseHeading } from "../../../components/ha-dialog";
+import type { CropOptions } from "../../../dialogs/image-cropper-dialog/show-image-cropper-dialog";
+import { haStyleDialog } from "../../../resources/styles";
+import type { HomeAssistant, ValueChangedEvent } from "../../../types";
+import type { AreaRegistryDetailDialogParams } from "./show-dialog-area-registry-detail";

 const cropOptions: CropOptions = {
  round: false,
  type: "image/jpeg",
  quality: 0.75,
-  aspectRatio: 1.78,
 };

 const SENSOR_DOMAINS = ["sensor"];
@@ -139,6 +138,7 @@ class DialogAreaDetail extends LitElement {
      ></ha-floor-picker>

      <ha-labels-picker
+        .label=${this.hass.localize("ui.components.label-picker.labels")}
        .hass=${this.hass}
        .value=${this._labels}
        @value-changed=${this._labelsChanged}
@@ -265,19 +265,15 @@ class DialogAreaDetail extends LitElement {
              ${this.hass.localize("ui.common.delete")}
            </ha-button>`
          : nothing}
-        <div slot="primaryAction">
-          <ha-button appearance="plain" @click=${this.closeDialog}>
-            ${this.hass.localize("ui.common.cancel")}
-          </ha-button>
-          <ha-button
-            @click=${this._updateEntry}
-            .disabled=${nameInvalid || !!this._submitting}
-          >
-            ${entry
-              ? this.hass.localize("ui.common.save")
-              : this.hass.localize("ui.common.create")}
-          </ha-button>
-        </div>
+        <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>
    `;
  }
--- a/src/panels/config/automation/action/ha-automation-action.ts
+++ b/src/panels/config/automation/action/ha-automation-action.ts
@@ -1,9 +1,10 @@
-import { mdiDrag, mdiPlus } from "@mdi/js";
+import { mdiDragHorizontalVariant, mdiPlus } from "@mdi/js";
 import deepClone from "deep-clone-simple";
 import type { PropertyValues } from "lit";
-import { LitElement, html, nothing } from "lit";
+import { html, LitElement, nothing } from "lit";
 import { customElement, property, queryAll, state } from "lit/decorators";
 import { repeat } from "lit/directives/repeat";
+import { ensureArray } from "../../../../common/array/ensure-array";
 import { storage } from "../../../../common/decorators/storage";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import { stopPropagation } from "../../../../common/dom/stop_propagation";
@@ -15,19 +16,18 @@ import {
  ACTION_BUILDING_BLOCKS,
  getService,
  isService,
+  VIRTUAL_ACTIONS,
 } from "../../../../data/action";
 import type { AutomationClipboard } from "../../../../data/automation";
 import type { Action } from "../../../../data/script";
 import type { HomeAssistant } from "../../../../types";
 import {
  PASTE_VALUE,
-  VIRTUAL_ACTIONS,
  showAddAutomationElementDialog,
 } from "../show-add-automation-element-dialog";
 import { automationRowsStyles } from "../styles";
 import type HaAutomationActionRow from "./ha-automation-action-row";
 import { getAutomationActionType } from "./ha-automation-action-row";
-import { ensureArray } from "../../../../common/array/ensure-array";

@customElement("ha-automation-action")
 export default class HaAutomationAction extends LitElement {
@@ -115,7 +115,9 @@ export default class HaAutomationAction extends LitElement {
                        @click=${stopPropagation}
                        .index=${idx}
                      >
-                        <ha-svg-icon .path=${mdiDrag}></ha-svg-icon>
+                        <ha-svg-icon
+                          .path=${mdiDragHorizontalVariant}
+                        ></ha-svg-icon>
                      </div>
                    `
                  : nothing}
@@ -134,17 +136,6 @@ export default class HaAutomationAction extends LitElement {
                "ui.panel.config.automation.editor.actions.add"
              )}
            </ha-button>
-            <ha-button
-              .disabled=${this.disabled}
-              @click=${this._addActionBuildingBlockDialog}
-              appearance="plain"
-              .size=${this.root ? "medium" : "small"}
-            >
-              <ha-svg-icon .path=${mdiPlus} slot="start"></ha-svg-icon>
-              ${this.hass.localize(
-                "ui.panel.config.automation.editor.actions.add_building_block"
-              )}
-            </ha-button>
          </div>
        </div>
      </ha-sortable>
@@ -220,15 +211,6 @@ export default class HaAutomationAction extends LitElement {
    });
  }

-  private _addActionBuildingBlockDialog() {
-    showAddAutomationElementDialog(this, {
-      type: "action",
-      add: this._addAction,
-      clipboardItem: getAutomationActionType(this._clipboard?.action),
-      group: "building_blocks",
-    });
-  }
-
  private _addAction = (action: string) => {
    let actions: Action[];
    if (action === PASTE_VALUE) {
--- a/src/panels/config/automation/add-automation-element-dialog.ts
+++ b/src/panels/config/automation/add-automation-element-dialog.ts
--- a/src/panels/config/automation/automation-save-timeout-dialog/dialog-automation-save-timeout.ts
+++ b/src/panels/config/automation/automation-save-timeout-dialog/dialog-automation-save-timeout.ts
@@ -0,0 +1,130 @@
+import type { CSSResultGroup } from "lit";
+import { LitElement, css, html } from "lit";
+import { customElement, property, state } from "lit/decorators";
+import { fireEvent } from "../../../../common/dom/fire_event";
+import "../../../../components/ha-wa-dialog";
+import "../../../../components/ha-spinner";
+import "../../../../components/ha-alert";
+import "../../../../components/ha-button";
+import "../../../../components/ha-dialog-footer";
+import { haStyle, haStyleDialog } from "../../../../resources/styles";
+import type { HomeAssistant } from "../../../../types";
+import type { AutomationSaveTimeoutDialogParams } from "./show-dialog-automation-save-timeout";
+
+@customElement("ha-dialog-automation-save-timeout")
+class DialogAutomationSaveTimeout extends LitElement {
+  @property({ attribute: false }) public hass!: HomeAssistant;
+
+  @state() private _opened = false;
+
+  @state() private _saveComplete = false;
+
+  private _params!: AutomationSaveTimeoutDialogParams;
+
+  public showDialog(params: AutomationSaveTimeoutDialogParams): void {
+    this._opened = true;
+    this._params = params;
+    this._saveComplete = false;
+
+    this._params.savedPromise.then(() => {
+      this._saveComplete = true;
+    });
+  }
+
+  public closeDialog(): void {
+    this._opened = false;
+  }
+
+  private _dialogClosed() {
+    this._params.onClose?.();
+
+    if (this._opened) {
+      fireEvent(this, "dialog-closed");
+    }
+    this._opened = false;
+    return true;
+  }
+
+  protected render() {
+    const title = this.hass.localize(
+      "ui.panel.config.automation.editor.new_automation_setup_failed_title",
+      {
+        type: this.hass.localize(
+          `ui.panel.config.automation.editor.type_${this._params.type}`
+        ),
+      }
+    );
+
+    return html`
+      <ha-wa-dialog
+        .hass=${this.hass}
+        .open=${this._opened}
+        header-title=${title}
+        @closed=${this._dialogClosed}
+      >
+        <div class="content">
+          ${this.hass.localize(
+            "ui.panel.config.automation.editor.new_automation_setup_failed_text",
+            {
+              type: this.hass.localize(
+                `ui.panel.config.automation.editor.type_${this._params.type}`
+              ),
+              types: this.hass.localize(
+                `ui.panel.config.automation.editor.type_${this._params.type}_plural`
+              ),
+            }
+          )}
+          <p></p>
+          ${this.hass.localize(
+            "ui.panel.config.automation.editor.new_automation_setup_keep_waiting",
+            {
+              type: this.hass.localize(
+                `ui.panel.config.automation.editor.type_${this._params.type}`
+              ),
+            }
+          )}
+          ${this._saveComplete
+            ? html`<p></p>
+                <ha-alert alert-type="success"
+                  >${this.hass.localize(
+                    "ui.panel.config.automation.editor.new_automation_setup_timedout_success"
+                  )}</ha-alert
+                >`
+            : html`<div class="loading">
+                <ha-spinner size="medium"> </ha-spinner>
+              </div>`}
+        </div>
+        <ha-dialog-footer slot="footer">
+          <ha-button
+            slot="primaryAction"
+            @click=${this._dialogClosed}
+            variant=${this._saveComplete ? "brand" : "danger"}
+          >
+            ${this.hass.localize(
+              `ui.common.${this._saveComplete ? "ok" : "cancel"}`
+            )}
+          </ha-button>
+        </ha-dialog-footer>
+      </ha-wa-dialog>
+    `;
+  }
+
+  static get styles(): CSSResultGroup {
+    return [
+      haStyle,
+      haStyleDialog,
+      css`
+        .loading {
+          display: flex;
+          justify-content: center;
+        }
+      `,
+    ];
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-dialog-automation-save-timeout": DialogAutomationSaveTimeout;
+  }
+}
--- a/src/panels/config/automation/automation-save-timeout-dialog/show-dialog-automation-save-timeout.ts
+++ b/src/panels/config/automation/automation-save-timeout-dialog/show-dialog-automation-save-timeout.ts
@@ -0,0 +1,31 @@
+import { fireEvent } from "../../../../common/dom/fire_event";
+
+export const loadAutomationSaveTimeoutDialog = () =>
+  import("./dialog-automation-save-timeout");
+
+export interface AutomationSaveTimeoutDialogParams {
+  onClose?: () => void;
+  savedPromise: Promise<any>;
+  type: "automation" | "script";
+}
+
+export const showAutomationSaveTimeoutDialog = (
+  element: HTMLElement,
+  dialogParams: AutomationSaveTimeoutDialogParams
+) =>
+  new Promise<void>((resolve) => {
+    const origClose = dialogParams.onClose;
+    fireEvent(element, "show-dialog", {
+      dialogTag: "ha-dialog-automation-save-timeout",
+      dialogImport: loadAutomationSaveTimeoutDialog,
+      dialogParams: {
+        ...dialogParams,
+        onClose: () => {
+          resolve();
+          if (origClose) {
+            origClose();
+          }
+        },
+      },
+    });
+  });
--- a/src/panels/config/automation/condition/ha-automation-condition.ts
+++ b/src/panels/config/automation/condition/ha-automation-condition.ts
@@ -1,4 +1,4 @@
-import { mdiDrag, mdiPlus } from "@mdi/js";
+import { mdiDragHorizontalVariant, mdiPlus } from "@mdi/js";
 import deepClone from "deep-clone-simple";
 import type { PropertyValues } from "lit";
 import { html, LitElement, nothing } from "lit";
@@ -193,7 +193,9 @@ export default class HaAutomationCondition extends LitElement {
                        @click=${stopPropagation}
                        .index=${idx}
                      >
-                        <ha-svg-icon .path=${mdiDrag}></ha-svg-icon>
+                        <ha-svg-icon
+                          .path=${mdiDragHorizontalVariant}
+                        ></ha-svg-icon>
                      </div>
                    `
                  : nothing}
@@ -212,17 +214,6 @@ export default class HaAutomationCondition extends LitElement {
                "ui.panel.config.automation.editor.conditions.add"
              )}
            </ha-button>
-            <ha-button
-              .disabled=${this.disabled}
-              appearance="plain"
-              .size=${this.root ? "medium" : "small"}
-              @click=${this._addConditionBuildingBlockDialog}
-            >
-              <ha-svg-icon .path=${mdiPlus} slot="start"></ha-svg-icon>
-              ${this.hass.localize(
-                "ui.panel.config.automation.editor.conditions.add_building_block"
-              )}
-            </ha-button>
          </div>
        </div>
      </ha-sortable>
@@ -240,15 +231,6 @@ export default class HaAutomationCondition extends LitElement {
    });
  }

-  private _addConditionBuildingBlockDialog() {
-    showAddAutomationElementDialog(this, {
-      type: "condition",
-      add: this._addCondition,
-      clipboardItem: this._clipboard?.condition?.condition,
-      group: "building_blocks",
-    });
-  }
-
  private _addCondition = (value) => {
    let conditions: Condition[];
    if (value === PASTE_VALUE) {
--- a/src/panels/config/automation/condition/types/ha-automation-condition-state.ts
+++ b/src/panels/config/automation/condition/types/ha-automation-condition-state.ts
@@ -10,8 +10,10 @@ import {
  optional,
  string,
  union,
+  array,
 } from "superstruct";
 import { createDurationData } from "../../../../../common/datetime/create_duration_data";
+import { ensureArray } from "../../../../../common/array/ensure-array";
 import { fireEvent } from "../../../../../common/dom/fire_event";
 import "../../../../../components/ha-form/ha-form";
 import type { SchemaUnion } from "../../../../../components/ha-form/types";
@@ -25,7 +27,7 @@ const stateConditionStruct = object({
  condition: literal("state"),
  entity_id: optional(string()),
  attribute: optional(string()),
-  state: optional(string()),
+  state: optional(union([string(), array(string())])),
  for: optional(union([number(), string(), forDictStruct])),
  enabled: optional(boolean()),
 });
@@ -69,7 +71,7 @@ const SCHEMA = [
    name: "state",
    required: true,
    selector: {
-      state: {},
+      state: { multiple: true },
    },
    context: {
      filter_entity: "entity_id",
@@ -88,7 +90,7 @@ export class HaStateCondition extends LitElement implements ConditionElement {
  @property({ type: Boolean }) public disabled = false;

  public static get defaultConfig(): StateCondition {
-    return { condition: "state", entity_id: "", state: "" };
+    return { condition: "state", entity_id: "", state: [] };
  }

  public shouldUpdate(changedProperties: PropertyValues) {
@@ -105,7 +107,11 @@ export class HaStateCondition extends LitElement implements ConditionElement {

  protected render() {
    const trgFor = createDurationData(this.condition.for);
-    const data = { ...this.condition, for: trgFor };
+    const data = {
+      ...this.condition,
+      state: ensureArray(this.condition.state) || [],
+      for: trgFor,
+    };

    return html`
      <ha-form
@@ -129,10 +135,9 @@ export class HaStateCondition extends LitElement implements ConditionElement {
        : {}
    );

-    // We should not cleanup state in the above, as it is required.
-    // Set it to empty string if it is undefined.
-    if (!newCondition.state) {
-      newCondition.state = "";
+    // Ensure `state` stays an array for multi-select. If absent, set to []
+    if (newCondition.state === undefined || newCondition.state === "") {
+      newCondition.state = [];
    }

    fireEvent(this, "value-changed", { value: newCondition });
--- a/src/panels/config/automation/ha-automation-editor.ts
+++ b/src/panels/config/automation/ha-automation-editor.ts
@@ -89,6 +89,7 @@ import {
 import "./blueprint-automation-editor";
 import "./manual-automation-editor";
 import type { HaManualAutomationEditor } from "./manual-automation-editor";
+import { showAutomationSaveTimeoutDialog } from "./automation-save-timeout-dialog/show-dialog-automation-save-timeout";

 declare global {
  interface HTMLElementTagNameMap {
@@ -1136,28 +1137,22 @@ export class HaAutomationEditor extends PreventUnsavedMixin(
            entityId = automation.entity_id;
          } catch (e) {
            if (e instanceof Error && e.name === "TimeoutError") {
-              showAlertDialog(this, {
-                title: this.hass.localize(
-                  "ui.panel.config.automation.editor.new_automation_setup_failed_title",
-                  {
-                    type: this.hass.localize(
-                      "ui.panel.config.automation.editor.type_automation"
-                    ),
-                  }
-                ),
-                text: this.hass.localize(
-                  "ui.panel.config.automation.editor.new_automation_setup_failed_text",
-                  {
-                    type: this.hass.localize(
-                      "ui.panel.config.automation.editor.type_automation"
-                    ),
-                    types: this.hass.localize(
-                      "ui.panel.config.automation.editor.type_automation_plural"
-                    ),
-                  }
-                ),
-                warning: true,
+              // Show the dialog and give user a chance to wait for the registry
+              // to respond.
+              await showAutomationSaveTimeoutDialog(this, {
+                savedPromise: entityRegPromise,
+                type: "automation",
              });
+              try {
+                // We already gave the user a chance to wait once, so if they skipped
+                // the dialog and it's still not there just immediately timeout.
+                const automation = await promiseTimeout(0, entityRegPromise);
+                entityId = automation.entity_id;
+              } catch (e2) {
+                if (!(e2 instanceof Error && e2.name === "TimeoutError")) {
+                  throw e2;
+                }
+              }
            } else {
              throw e;
            }
--- a/src/panels/config/automation/ha-automation-sidebar.ts
+++ b/src/panels/config/automation/ha-automation-sidebar.ts
@@ -36,7 +36,8 @@ export default class HaAutomationSidebar extends LitElement {

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

-  @property({ attribute: "sidebar-key" }) public sidebarKey?: string;
+  @property({ type: Number, attribute: "sidebar-key" })
+  public sidebarKey?: number;

  @state() private _yamlMode = false;

--- a/src/panels/config/automation/manual-automation-editor.ts
+++ b/src/panels/config/automation/manual-automation-editor.ts
@@ -101,7 +101,7 @@ export class HaManualAutomationEditor extends LitElement {

  @state() private _sidebarConfig?: SidebarConfig;

-  @state() private _sidebarKey?: string;
+  @state() private _sidebarKey = 0;

  @storage({
    key: "automation-sidebar-width",
@@ -350,7 +350,9 @@ export class HaManualAutomationEditor extends LitElement {
    // deselect previous selected row
    this._sidebarConfig?.close?.();
    this._sidebarConfig = ev.detail;
-    this._sidebarKey = JSON.stringify(this._sidebarConfig);
+
+    // be sure the sidebar editor is recreated
+    this._sidebarKey++;

    await this._sidebarElement?.updateComplete;
    this._sidebarElement?.focus();
@@ -375,6 +377,7 @@ export class HaManualAutomationEditor extends LitElement {
        return;
      }
      this._sidebarConfig?.close();
+      this._sidebarKey = 0;
    }
  }

--- a/src/panels/config/automation/option/ha-automation-option.ts
+++ b/src/panels/config/automation/option/ha-automation-option.ts
@@ -1,4 +1,4 @@
-import { mdiDrag, mdiPlus } from "@mdi/js";
+import { mdiDragHorizontalVariant, mdiPlus } from "@mdi/js";
 import deepClone from "deep-clone-simple";
 import type { PropertyValues } from "lit";
 import { LitElement, css, html, nothing } from "lit";
@@ -100,7 +100,9 @@ export default class HaAutomationOption extends LitElement {
                        @click=${stopPropagation}
                        .index=${idx}
                      >
-                        <ha-svg-icon .path=${mdiDrag}></ha-svg-icon>
+                        <ha-svg-icon
+                          .path=${mdiDragHorizontalVariant}
+                        ></ha-svg-icon>
                      </div>
                    `
                  : nothing}
--- a/src/panels/config/automation/show-add-automation-element-dialog.ts
+++ b/src/panels/config/automation/show-add-automation-element-dialog.ts
@@ -1,45 +1,11 @@
 import { fireEvent } from "../../../common/dom/fire_event";
-import type { ACTION_GROUPS } from "../../../data/action";
-import type { ActionType } from "../../../data/script";

 export const PASTE_VALUE = "__paste__";

-// These will be replaced with the correct action
-export const VIRTUAL_ACTIONS: Record<
-  keyof (typeof ACTION_GROUPS)["building_blocks"]["members"],
-  ActionType
-> = {
-  repeat_count: {
-    repeat: {
-      count: 2,
-      sequence: [],
-    },
-  },
-  repeat_while: {
-    repeat: {
-      while: [],
-      sequence: [],
-    },
-  },
-  repeat_until: {
-    repeat: {
-      until: [],
-      sequence: [],
-    },
-  },
-  repeat_for_each: {
-    repeat: {
-      for_each: {},
-      sequence: [],
-    },
-  },
-} as const;
-
 export interface AddAutomationElementDialogParams {
  type: "trigger" | "condition" | "action";
  add: (key: string) => void;
  clipboardItem: string | undefined;
-  group?: string;
 }
 const loadDialog = () => import("./add-automation-element-dialog");

--- a/src/panels/config/automation/sidebar/ha-automation-sidebar-action.ts
+++ b/src/panels/config/automation/sidebar/ha-automation-sidebar-action.ts
@@ -44,7 +44,8 @@ export default class HaAutomationSidebarAction extends LitElement {

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

-  @property({ attribute: "sidebar-key" }) public sidebarKey?: string;
+  @property({ type: Number, attribute: "sidebar-key" })
+  public sidebarKey?: number;

  @state() private _warnings?: string[];

--- a/src/panels/config/automation/sidebar/ha-automation-sidebar-condition.ts
+++ b/src/panels/config/automation/sidebar/ha-automation-sidebar-condition.ts
@@ -44,7 +44,8 @@ export default class HaAutomationSidebarCondition extends LitElement {

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

-  @property({ attribute: "sidebar-key" }) public sidebarKey?: string;
+  @property({ type: Number, attribute: "sidebar-key" })
+  public sidebarKey?: number;

  @state() private _warnings?: string[];

--- a/src/panels/config/automation/sidebar/ha-automation-sidebar-script-field-selector.ts
+++ b/src/panels/config/automation/sidebar/ha-automation-sidebar-script-field-selector.ts
@@ -26,7 +26,8 @@ export default class HaAutomationSidebarScriptFieldSelector extends LitElement {

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

-  @property({ attribute: "sidebar-key" }) public sidebarKey?: string;
+  @property({ type: Number, attribute: "sidebar-key" })
+  public sidebarKey?: number;

  @state() private _warnings?: string[];

--- a/src/panels/config/automation/sidebar/ha-automation-sidebar-script-field.ts
+++ b/src/panels/config/automation/sidebar/ha-automation-sidebar-script-field.ts
@@ -25,7 +25,8 @@ export default class HaAutomationSidebarScriptField extends LitElement {

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

-  @property({ attribute: "sidebar-key" }) public sidebarKey?: string;
+  @property({ type: Number, attribute: "sidebar-key" })
+  public sidebarKey?: number;

  @state() private _warnings?: string[];

--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 .20.0
 .21.1
				`@@ -0,0 +1 @@`
				`export const ANY_STATE_VALUE = "__ANY_STATE_IGNORE_ATTRIBUTES__";`