Display label inside field for entity picker and area picker

2025-11-18 15:30:24 +00:00 · 2025-11-03 17:07:22 +01:00
208 changed files with 3691 additions and 9367 deletions
--- 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@014f16e7ab1402f30e7c3329d33797e7948572db # v4.31.3
+        uses: github/codeql-action/init@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
        with:
          languages: ${{ matrix.language }}

      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
      # If this step fails, then you should remove it and run the build manually (see below)
      - name: Autobuild
-        uses: github/codeql-action/autobuild@014f16e7ab1402f30e7c3329d33797e7948572db # v4.31.3
+        uses: github/codeql-action/autobuild@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2

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

      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@014f16e7ab1402f30e7c3329d33797e7948572db # v4.31.3
+        uses: github/codeql-action/analyze@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
--- 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@feb19ddc698445db27401f1490f6ac182da0816f # v3.2.0
+        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
@@ -55,7 +55,7 @@ jobs:
          script/release

      - name: Upload release assets
-        uses: softprops/action-gh-release@5be0e66d93ac7ed76da52eca8bb058f665c3a5fe # v2.4.2
+        uses: softprops/action-gh-release@6da8fa9354ddfdc4aeace5fc48d7f679b5214090 # v2.4.1
        with:
          files: |
            dist/*.whl
@@ -108,7 +108,7 @@ jobs:
      - name: Tar folder
        run: tar -czf landing-page/home_assistant_frontend_landingpage-${{ github.event.release.tag_name }}.tar.gz -C landing-page/dist .
      - name: Upload release asset
-        uses: softprops/action-gh-release@5be0e66d93ac7ed76da52eca8bb058f665c3a5fe # v2.4.2
+        uses: softprops/action-gh-release@6da8fa9354ddfdc4aeace5fc48d7f679b5214090 # v2.4.1
        with:
          files: landing-page/home_assistant_frontend_landingpage-${{ github.event.release.tag_name }}.tar.gz

@@ -137,6 +137,6 @@ jobs:
      - name: Tar folder
        run: tar -czf hassio/home_assistant_frontend_supervisor-${{ github.event.release.tag_name }}.tar.gz -C hassio/build .
      - name: Upload release asset
-        uses: softprops/action-gh-release@5be0e66d93ac7ed76da52eca8bb058f665c3a5fe # v2.4.2
+        uses: softprops/action-gh-release@6da8fa9354ddfdc4aeace5fc48d7f679b5214090 # v2.4.1
        with:
          files: hassio/home_assistant_frontend_supervisor-${{ github.event.release.tag_name }}.tar.gz
--- a/build-scripts/bundle.cjs
+++ b/build-scripts/bundle.cjs
@@ -18,16 +18,16 @@ module.exports.sourceMapURL = () => {
 module.exports.ignorePackages = () => [];

 // Files from NPM packages that we should replace with empty file
-module.exports.emptyPackages = ({ isHassioBuild, isLandingPageBuild }) =>
+module.exports.emptyPackages = ({ isHassioBuild }) =>
  [
    require.resolve("@vaadin/vaadin-material-styles/typography.js"),
    require.resolve("@vaadin/vaadin-material-styles/font-icons.js"),
    // Icons in supervisor conflict with icons in HA so we don't load.
-    (isHassioBuild || isLandingPageBuild) &&
+    isHassioBuild &&
      require.resolve(
        path.resolve(paths.root_dir, "src/components/ha-icon.ts")
      ),
-    (isHassioBuild || isLandingPageBuild) &&
+    isHassioBuild &&
      require.resolve(
        path.resolve(paths.root_dir, "src/components/ha-icon-picker.ts")
      ),
@@ -337,7 +337,6 @@ module.exports.config = {
      publicPath: publicPath(latestBuild),
      isProdBuild,
      latestBuild,
-      isLandingPageBuild: true,
    };
  },
 };
--- a/build-scripts/rspack.cjs
+++ b/build-scripts/rspack.cjs
@@ -41,7 +41,6 @@ const createRspackConfig = ({
  isStatsBuild,
  isTestBuild,
  isHassioBuild,
-  isLandingPageBuild,
  dontHash,
 }) => {
  if (!dontHash) {
@@ -169,9 +168,7 @@ const createRspackConfig = ({
        },
      }),
      new rspack.NormalModuleReplacementPlugin(
-        new RegExp(
-          bundle.emptyPackages({ isHassioBuild, isLandingPageBuild }).join("|")
-        ),
+        new RegExp(bundle.emptyPackages({ isHassioBuild }).join("|")),
        path.resolve(paths.root_dir, "src/util/empty.js")
      ),
      !isProdBuild && new LogStartCompilePlugin(),
@@ -260,6 +257,7 @@ const createRspackConfig = ({
      ),
    },
    experiments: {
+      layers: true,
      outputModule: true,
    },
  };
--- a/gallery/src/pages/automation/describe-trigger.ts
+++ b/gallery/src/pages/automation/describe-trigger.ts
@@ -3,7 +3,7 @@ import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import "../../../../src/components/ha-card";
 import "../../../../src/components/ha-yaml-editor";
-import type { LegacyTrigger } from "../../../../src/data/automation";
+import type { Trigger } from "../../../../src/data/automation";
 import { describeTrigger } from "../../../../src/data/automation_i18n";
 import { getEntity } from "../../../../src/fake_data/entity";
 import { provideHass } from "../../../../src/fake_data/provide_hass";
@@ -66,7 +66,7 @@ const triggers = [
  },
 ];

-const initialTrigger: LegacyTrigger = {
+const initialTrigger: Trigger = {
  trigger: "state",
  entity_id: "light.kitchen",
 };
--- a/gallery/src/pages/components/ha-dropdown.markdown
+++ b/gallery/src/pages/components/ha-dropdown.markdown
@@ -1,55 +0,0 @@
---
-title: Dropdown
---
-
-# Dropdown `<ha-dropdown>`
-
-## Implementation
-
-A compact, accessible dropdown menu for choosing actions or settings. `ha-dropdown` supports composed menu items (`<ha-dropdown-item>`) for icons, submenus, checkboxes, disabled entries, and destructive variants. Use composition with `slot="trigger"` to control the trigger button and use `<ha-dropdown-item>` for rich item content.
-
-### Example usage (composition)
-
-```html
-<ha-dropdown open>
-  <ha-button slot="trigger" with-caret>Dropdown</ha-button>
-
-  <ha-dropdown-item>
-    <ha-svg-icon .path="mdiContentCut" slot="icon"></ha-svg-icon>
-    Cut
-  </ha-dropdown-item>
-
-  <ha-dropdown-item>
-    <ha-svg-icon .path="mdiContentCopy" slot="icon"></ha-svg-icon>
-    Copy
-  </ha-dropdown-item>
-
-  <ha-dropdown-item disabled>
-    <ha-svg-icon .path="mdiContentPaste" slot="icon"></ha-svg-icon>
-    Paste
-  </ha-dropdown-item>
-
-  <ha-dropdown-item>
-    Show images
-    <ha-dropdown-item slot="submenu" value="show-all-images"
-      >Show all images</ha-dropdown-item
-    >
-    <ha-dropdown-item slot="submenu" value="show-thumbnails"
-      >Show thumbnails</ha-dropdown-item
-    >
-  </ha-dropdown-item>
-
-  <ha-dropdown-item type="checkbox" checked>Emoji shortcuts</ha-dropdown-item>
-  <ha-dropdown-item type="checkbox" checked>Word wrap</ha-dropdown-item>
-
-  <ha-dropdown-item variant="danger">
-    <ha-svg-icon .path="mdiDelete" slot="icon"></ha-svg-icon>
-    Delete
-  </ha-dropdown-item>
-</ha-dropdown>
-```
-
-### API
-
-This component is based on the webawesome dropdown component.
-Check the [webawesome documentation](https://webawesome.com/docs/components/dropdown/) for more details.
--- a/gallery/src/pages/components/ha-dropdown.ts
+++ b/gallery/src/pages/components/ha-dropdown.ts
@@ -1,133 +0,0 @@
-import "@home-assistant/webawesome/dist/components/button/button";
-import "@home-assistant/webawesome/dist/components/dropdown/dropdown";
-import "@home-assistant/webawesome/dist/components/icon/icon";
-import "@home-assistant/webawesome/dist/components/popup/popup";
-import {
-  mdiContentCopy,
-  mdiContentCut,
-  mdiContentPaste,
-  mdiDelete,
-} from "@mdi/js";
-import type { TemplateResult } from "lit";
-import { css, html, LitElement } from "lit";
-import { customElement } from "lit/decorators";
-import { applyThemesOnElement } from "../../../../src/common/dom/apply_themes_on_element";
-import "../../../../src/components/ha-button";
-import "../../../../src/components/ha-card";
-import "../../../../src/components/ha-dropdown";
-import "../../../../src/components/ha-dropdown-item";
-import "../../../../src/components/ha-icon-button";
-import "../../../../src/components/ha-svg-icon";
-
-@customElement("demo-components-ha-dropdown")
-export class DemoHaDropdown extends LitElement {
-  protected render(): TemplateResult {
-    return html`
-      ${["light", "dark"].map(
-        (mode) => html`
-          <div class=${mode}>
-            <ha-card header="ha-button in ${mode}">
-              <div class="card-content">
-                <ha-dropdown open>
-                  <ha-button slot="trigger" with-caret>Dropdown</ha-button>
-
-                  <ha-dropdown-item>
-                    <ha-svg-icon
-                      .path=${mdiContentCut}
-                      slot="icon"
-                    ></ha-svg-icon>
-                    Cut
-                  </ha-dropdown-item>
-                  <ha-dropdown-item>
-                    <ha-svg-icon
-                      .path=${mdiContentCopy}
-                      slot="icon"
-                    ></ha-svg-icon>
-                    Copy
-                  </ha-dropdown-item>
-                  <ha-dropdown-item disabled>
-                    <ha-svg-icon
-                      .path=${mdiContentPaste}
-                      slot="icon"
-                    ></ha-svg-icon>
-                    Paste
-                  </ha-dropdown-item>
-                  <ha-dropdown-item>
-                    Show images
-                    <ha-dropdown-item slot="submenu" value="show-all-images"
-                      >Show All Images</ha-dropdown-item
-                    >
-                    <ha-dropdown-item slot="submenu" value="show-thumbnails"
-                      >Show Thumbnails</ha-dropdown-item
-                    >
-                  </ha-dropdown-item>
-                  <ha-dropdown-item type="checkbox" checked
-                    >Emoji Shortcuts</ha-dropdown-item
-                  >
-                  <ha-dropdown-item type="checkbox" checked
-                    >Word Wrap</ha-dropdown-item
-                  >
-                  <ha-dropdown-item variant="danger">
-                    <ha-svg-icon .path=${mdiDelete} slot="icon"></ha-svg-icon>
-                    Delete
-                  </ha-dropdown-item>
-                </ha-dropdown>
-              </div>
-            </ha-card>
-          </div>
-        `
-      )}
-    `;
-  }
-
-  firstUpdated(changedProps) {
-    super.firstUpdated(changedProps);
-    applyThemesOnElement(
-      this.shadowRoot!.querySelector(".dark"),
-      {
-        default_theme: "default",
-        default_dark_theme: "default",
-        themes: {},
-        darkMode: true,
-        theme: "default",
-      },
-      undefined,
-      undefined,
-      true
-    );
-  }
-
-  static styles = css`
-    :host {
-      display: flex;
-      justify-content: center;
-    }
-    .dark,
-    .light {
-      display: block;
-      background-color: var(--primary-background-color);
-      padding: 0 50px;
-    }
-    .button {
-      padding: unset;
-    }
-    ha-card {
-      margin: 24px auto;
-    }
-    .card-content {
-      display: flex;
-      flex-direction: column;
-      gap: 24px;
-    }
-    .card-content div {
-      display: flex;
-      gap: 8px;
-    }
-  `;
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "demo-components-ha-dropdown": DemoHaDropdown;
-  }
-}
--- a/landing-page/src/ha-landing-page.ts
+++ b/landing-page/src/ha-landing-page.ts
@@ -1,25 +1,22 @@
 import "@material/mwc-linear-progress";
-import { mdiOpenInNew } from "@mdi/js";
-import { css, html, nothing, type PropertyValues } from "lit";
+import { type PropertyValues, css, html, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import { extractSearchParam } from "../../src/common/url/search-params";
 import "../../src/components/ha-alert";
-import "../../src/components/ha-button";
 import "../../src/components/ha-fade-in";
 import "../../src/components/ha-spinner";
-import "../../src/components/ha-svg-icon";
-import { makeDialogManager } from "../../src/dialogs/make-dialog-manager";
-import "../../src/onboarding/onboarding-welcome-links";
-import { onBoardingStyles } from "../../src/onboarding/styles";
 import { haStyle } from "../../src/resources/styles";
-import "./components/landing-page-logs";
+import "../../src/onboarding/onboarding-welcome-links";
 import "./components/landing-page-network";
+import "./components/landing-page-logs";
+import { extractSearchParam } from "../../src/common/url/search-params";
+import { onBoardingStyles } from "../../src/onboarding/styles";
+import { makeDialogManager } from "../../src/dialogs/make-dialog-manager";
+import { LandingPageBaseElement } from "./landing-page-base-element";
 import {
  getSupervisorNetworkInfo,
  pingSupervisor,
  type NetworkInfo,
 } from "./data/supervisor";
-import { LandingPageBaseElement } from "./landing-page-base-element";

 export const ASSUME_CORE_START_SECONDS = 60;
 const SCHEDULE_CORE_CHECK_SECONDS = 1;
@@ -97,21 +94,16 @@ class HaLandingPage extends LandingPageBaseElement {
        <ha-language-picker
          .value=${this.language}
          .label=${""}
-          button-style
          native-name
          @value-changed=${this._languageChanged}
          inline-arrow
        ></ha-language-picker>
-        <ha-button
-          appearance="plain"
-          variant="neutral"
+        <a
          href="https://www.home-assistant.io/getting-started/onboarding/"
          target="_blank"
          rel="noreferrer noopener"
+          >${this.localize("ui.panel.page-onboarding.help")}</a
        >
-          ${this.localize("ui.panel.page-onboarding.help")}
-          <ha-svg-icon slot="end" .path=${mdiOpenInNew}></ha-svg-icon>
-        </ha-button>
      </div>
    `;
  }
@@ -226,8 +218,26 @@ class HaLandingPage extends LandingPageBaseElement {
      ha-alert p {
        text-align: unset;
      }
-      .footer ha-svg-icon {
-        --mdc-icon-size: var(--ha-space-5);
+      ha-language-picker {
+        display: block;
+        width: 200px;
+        border-radius: var(--ha-border-radius-sm);
+        overflow: hidden;
+        --ha-select-height: 40px;
+        --mdc-select-fill-color: none;
+        --mdc-select-label-ink-color: var(--primary-text-color, #212121);
+        --mdc-select-ink-color: var(--primary-text-color, #212121);
+        --mdc-select-idle-line-color: transparent;
+        --mdc-select-hover-line-color: transparent;
+        --mdc-select-dropdown-icon-color: var(--primary-text-color, #212121);
+        --mdc-shape-small: 0;
+      }
+      a {
+        text-decoration: none;
+        color: var(--primary-text-color);
+        margin-right: 16px;
+        margin-inline-end: 16px;
+        margin-inline-start: initial;
      }
      ha-fade-in {
        min-height: calc(100vh - 64px - 88px);
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
    "@fullcalendar/list": "6.1.19",
    "@fullcalendar/luxon3": "6.1.19",
    "@fullcalendar/timegrid": "6.1.19",
-    "@home-assistant/webawesome": "3.0.0",
+    "@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",
@@ -89,8 +89,8 @@
    "@thomasloven/round-slider": "0.6.0",
    "@tsparticles/engine": "3.9.1",
    "@tsparticles/preset-links": "3.2.0",
-    "@vaadin/combo-box": "24.9.5",
-    "@vaadin/vaadin-themable-mixin": "24.9.5",
+    "@vaadin/combo-box": "24.9.4",
+    "@vaadin/vaadin-themable-mixin": "24.9.4",
    "@vibrant/color": "4.0.0",
    "@vue/web-component-wrapper": "1.3.0",
    "@webcomponents/scoped-custom-element-registry": "0.0.10",
@@ -111,18 +111,18 @@
    "fuse.js": "7.1.0",
    "google-timezones-json": "1.2.0",
    "gulp-zopfli-green": "6.0.2",
-    "hls.js": "1.6.14",
+    "hls.js": "1.6.13",
    "home-assistant-js-websocket": "9.5.0",
    "idb-keyval": "6.2.2",
    "intl-messageformat": "10.7.18",
-    "js-yaml": "4.1.1",
+    "js-yaml": "4.1.0",
    "leaflet": "1.9.4",
    "leaflet-draw": "patch:leaflet-draw@npm%3A1.0.4#./.yarn/patches/leaflet-draw-npm-1.0.4-0ca0ebcf65.patch",
    "leaflet.markercluster": "1.5.3",
    "lit": "3.3.1",
    "lit-html": "3.3.1",
    "luxon": "3.7.2",
-    "marked": "17.0.0",
+    "marked": "16.4.1",
    "memoize-one": "6.0.0",
    "node-vibrant": "4.0.3",
    "object-hash": "3.0.0",
@@ -152,13 +152,13 @@
    "@babel/helper-define-polyfill-provider": "0.6.5",
    "@babel/plugin-transform-runtime": "7.28.5",
    "@babel/preset-env": "7.28.5",
-    "@bundle-stats/plugin-webpack-filter": "4.21.6",
+    "@bundle-stats/plugin-webpack-filter": "4.21.5",
    "@lokalise/node-api": "15.3.1",
    "@octokit/auth-oauth-device": "8.0.3",
    "@octokit/plugin-retry": "8.0.3",
-    "@octokit/rest": "22.0.1",
-    "@rsdoctor/rspack-plugin": "1.3.8",
-    "@rspack/core": "1.6.1",
+    "@octokit/rest": "22.0.0",
+    "@rsdoctor/rspack-plugin": "1.3.7",
+    "@rspack/core": "1.6.0",
    "@rspack/dev-server": "1.1.4",
    "@types/babel__plugin-transform-runtime": "7.9.5",
    "@types/chromecast-caf-receiver": "6.0.22",
@@ -178,12 +178,12 @@
    "@types/tar": "6.1.13",
    "@types/ua-parser-js": "0.7.39",
    "@types/webspeechapi": "0.0.29",
-    "@vitest/coverage-v8": "4.0.8",
+    "@vitest/coverage-v8": "4.0.5",
    "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.39.1",
+    "eslint": "9.38.0",
    "eslint-config-airbnb-base": "15.0.0",
    "eslint-config-prettier": "10.1.8",
    "eslint-import-resolver-webpack": "0.13.10",
@@ -217,9 +217,9 @@
    "terser-webpack-plugin": "5.3.14",
    "ts-lit-plugin": "2.0.2",
    "typescript": "5.9.3",
-    "typescript-eslint": "8.46.3",
+    "typescript-eslint": "8.46.2",
    "vite-tsconfig-paths": "5.1.4",
-    "vitest": "4.0.8",
+    "vitest": "4.0.5",
    "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"
@@ -231,7 +231,7 @@
    "clean-css": "5.3.3",
    "@lit/reactive-element": "2.1.1",
    "@fullcalendar/daygrid": "6.1.19",
-    "globals": "16.5.0",
+    "globals": "16.4.0",
    "tslib": "2.8.1",
    "@material/mwc-list@^0.27.0": "patch:@material/mwc-list@npm%3A0.27.0#~/.yarn/patches/@material-mwc-list-npm-0.27.0-5344fc9de4.patch"
  },
--- a/src/auth/ha-authorize.ts
+++ b/src/auth/ha-authorize.ts
@@ -1,5 +1,4 @@
 /* eslint-disable lit/prefer-static-styles */
-import { mdiOpenInNew } from "@mdi/js";
 import type { PropertyValues } from "lit";
 import { html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
@@ -7,8 +6,6 @@ import punycode from "punycode";
 import { applyThemesOnElement } from "../common/dom/apply_themes_on_element";
 import { extractSearchParamsObject } from "../common/url/search-params";
 import "../components/ha-alert";
-import "../components/ha-button";
-import "../components/ha-svg-icon";
 import type { AuthProvider, AuthUrlSearchParams } from "../data/auth";
 import { fetchAuthProviders } from "../data/auth";
 import { litLocalizeLiteMixin } from "../mixins/lit-localize-lite-mixin";
@@ -136,8 +133,25 @@ export class HaAuthorize extends litLocalizeLiteMixin(LitElement) {
          justify-content: space-between;
          align-items: center;
        }
-        .footer ha-svg-icon {
-          --mdc-icon-size: var(--ha-space-5);
+        ha-language-picker {
+          width: 200px;
+          border-radius: var(--ha-border-radius-sm);
+          overflow: hidden;
+          --ha-select-height: 40px;
+          --mdc-select-fill-color: none;
+          --mdc-select-label-ink-color: var(--primary-text-color, #212121);
+          --mdc-select-ink-color: var(--primary-text-color, #212121);
+          --mdc-select-idle-line-color: transparent;
+          --mdc-select-hover-line-color: transparent;
+          --mdc-select-dropdown-icon-color: var(--primary-text-color, #212121);
+          --mdc-shape-small: 0;
+        }
+        .footer a {
+          text-decoration: none;
+          color: var(--primary-text-color);
+          margin-right: 16px;
+          margin-inline-end: 16px;
+          margin-inline-start: initial;
        }
        h1 {
          font-size: var(--ha-font-size-3xl);
@@ -191,21 +205,16 @@ export class HaAuthorize extends litLocalizeLiteMixin(LitElement) {
        <ha-language-picker
          .value=${this.language}
          .label=${""}
-          button-style
          native-name
          @value-changed=${this._languageChanged}
          inline-arrow
        ></ha-language-picker>
-        <ha-button
-          appearance="plain"
-          variant="neutral"
+        <a
          href="https://www.home-assistant.io/docs/authentication/"
          target="_blank"
          rel="noreferrer noopener"
+          >${this.localize("ui.panel.page-authorize.help")}</a
        >
-          ${this.localize("ui.panel.page-authorize.help")}
-          <ha-svg-icon slot="end" .path=${mdiOpenInNew}></ha-svg-icon>
-        </ha-button>
      </div>
    `;
  }
--- a/src/common/condition/extract.ts
+++ b/src/common/condition/extract.ts
@@ -1,36 +0,0 @@
-import type {
-  Condition,
-  TimeCondition,
-} from "../../panels/lovelace/common/validate-condition";
-
-/**
- * Extract media queries from conditions recursively
- */
-export function extractMediaQueries(conditions: Condition[]): string[] {
-  return conditions.reduce<string[]>((array, c) => {
-    if ("conditions" in c && c.conditions) {
-      array.push(...extractMediaQueries(c.conditions));
-    }
-    if (c.condition === "screen" && c.media_query) {
-      array.push(c.media_query);
-    }
-    return array;
-  }, []);
-}
-
-/**
- * Extract time conditions from conditions recursively
- */
-export function extractTimeConditions(
-  conditions: Condition[]
-): TimeCondition[] {
-  return conditions.reduce<TimeCondition[]>((array, c) => {
-    if ("conditions" in c && c.conditions) {
-      array.push(...extractTimeConditions(c.conditions));
-    }
-    if (c.condition === "time") {
-      array.push(c);
-    }
-    return array;
-  }, []);
-}
--- a/src/common/condition/listeners.ts
+++ b/src/common/condition/listeners.ts
@@ -1,89 +0,0 @@
-import { listenMediaQuery } from "../dom/media_query";
-import type { HomeAssistant } from "../../types";
-import type { Condition } from "../../panels/lovelace/common/validate-condition";
-import { checkConditionsMet } from "../../panels/lovelace/common/validate-condition";
-import { extractMediaQueries, extractTimeConditions } from "./extract";
-import { calculateNextTimeUpdate } from "./time-calculator";
-
-/** Maximum delay for setTimeout (2^31 - 1 milliseconds, ~24.8 days)
- * Values exceeding this will overflow and execute immediately
- *
- * @see https://developer.mozilla.org/en-US/docs/Web/API/Window/setTimeout#maximum_delay_value
- */
-const MAX_TIMEOUT_DELAY = 2147483647;
-
-/**
- * Helper to setup media query listeners for conditional visibility
- */
-export function setupMediaQueryListeners(
-  conditions: Condition[],
-  hass: HomeAssistant,
-  addListener: (unsub: () => void) => void,
-  onUpdate: (conditionsMet: boolean) => void
-): void {
-  const mediaQueries = extractMediaQueries(conditions);
-
-  if (mediaQueries.length === 0) return;
-
-  // Optimization for single media query
-  const hasOnlyMediaQuery =
-    conditions.length === 1 &&
-    conditions[0].condition === "screen" &&
-    !!conditions[0].media_query;
-
-  mediaQueries.forEach((mediaQuery) => {
-    const unsub = listenMediaQuery(mediaQuery, (matches) => {
-      if (hasOnlyMediaQuery) {
-        onUpdate(matches);
-      } else {
-        const conditionsMet = checkConditionsMet(conditions, hass);
-        onUpdate(conditionsMet);
-      }
-    });
-    addListener(unsub);
-  });
-}
-
-/**
- * Helper to setup time-based listeners for conditional visibility
- */
-export function setupTimeListeners(
-  conditions: Condition[],
-  hass: HomeAssistant,
-  addListener: (unsub: () => void) => void,
-  onUpdate: (conditionsMet: boolean) => void
-): void {
-  const timeConditions = extractTimeConditions(conditions);
-
-  if (timeConditions.length === 0) return;
-
-  timeConditions.forEach((timeCondition) => {
-    let timeoutId: ReturnType<typeof setTimeout> | undefined;
-
-    const scheduleUpdate = () => {
-      const delay = calculateNextTimeUpdate(hass, timeCondition);
-
-      if (delay === undefined) return;
-
-      // Cap delay to prevent setTimeout overflow
-      const cappedDelay = Math.min(delay, MAX_TIMEOUT_DELAY);
-
-      timeoutId = setTimeout(() => {
-        if (delay <= MAX_TIMEOUT_DELAY) {
-          const conditionsMet = checkConditionsMet(conditions, hass);
-          onUpdate(conditionsMet);
-        }
-        scheduleUpdate();
-      }, cappedDelay);
-    };
-
-    // Register cleanup function once, outside of scheduleUpdate
-    addListener(() => {
-      if (timeoutId !== undefined) {
-        clearTimeout(timeoutId);
-      }
-    });
-
-    scheduleUpdate();
-  });
-}
--- a/src/common/condition/time-calculator.ts
+++ b/src/common/condition/time-calculator.ts
@@ -1,73 +0,0 @@
-import { TZDate } from "@date-fns/tz";
-import {
-  startOfDay,
-  addDays,
-  addMinutes,
-  differenceInMilliseconds,
-} from "date-fns";
-import type { HomeAssistant } from "../../types";
-import { TimeZone } from "../../data/translation";
-import { parseTimeString } from "../datetime/check_time";
-import type { TimeCondition } from "../../panels/lovelace/common/validate-condition";
-
-/**
- * Calculate milliseconds until next time boundary for a time condition
- * @param hass Home Assistant object
- * @param timeCondition Time condition to calculate next update for
- * @returns Milliseconds until next boundary, or undefined if no boundaries
- */
-export function calculateNextTimeUpdate(
-  hass: HomeAssistant,
-  { after, before, weekdays }: Omit<TimeCondition, "condition">
-): number | undefined {
-  const timezone =
-    hass.locale.time_zone === TimeZone.server
-      ? hass.config.time_zone
-      : Intl.DateTimeFormat().resolvedOptions().timeZone;
-
-  const now = new TZDate(new Date(), timezone);
-  const updates: Date[] = [];
-
-  // Calculate next occurrence of after time
-  if (after) {
-    let afterDate = parseTimeString(after, timezone);
-    if (afterDate <= now) {
-      // If time has passed today, schedule for tomorrow
-      afterDate = addDays(afterDate, 1);
-    }
-    updates.push(afterDate);
-  }
-
-  // Calculate next occurrence of before time
-  if (before) {
-    let beforeDate = parseTimeString(before, timezone);
-    if (beforeDate <= now) {
-      // If time has passed today, schedule for tomorrow
-      beforeDate = addDays(beforeDate, 1);
-    }
-    updates.push(beforeDate);
-  }
-
-  // If weekdays are specified, check for midnight (weekday transition)
-  if (weekdays && weekdays.length > 0 && weekdays.length < 7) {
-    // Calculate next midnight using startOfDay + addDays
-    const tomorrow = addDays(now, 1);
-    const midnight = startOfDay(tomorrow);
-    updates.push(midnight);
-  }
-
-  if (updates.length === 0) {
-    return undefined;
-  }
-
-  // Find the soonest update time
-  const nextUpdate = updates.reduce((soonest, current) =>
-    current < soonest ? current : soonest
-  );
-
-  // Add 1 minute buffer to ensure we're past the boundary
-  const updateWithBuffer = addMinutes(nextUpdate, 1);
-
-  // Calculate difference in milliseconds
-  return differenceInMilliseconds(updateWithBuffer, now);
-}
--- a/src/common/datetime/check_time.ts
+++ b/src/common/datetime/check_time.ts
@@ -1,131 +0,0 @@
-import { TZDate } from "@date-fns/tz";
-import { isBefore, isAfter, isWithinInterval } from "date-fns";
-import type { HomeAssistant } from "../../types";
-import { TimeZone } from "../../data/translation";
-import { WEEKDAY_MAP } from "./weekday";
-import type { TimeCondition } from "../../panels/lovelace/common/validate-condition";
-
-/**
- * Validate a time string format and value ranges without creating Date objects
- * @param timeString Time string to validate (HH:MM or HH:MM:SS)
- * @returns true if valid, false otherwise
- */
-export function isValidTimeString(timeString: string): boolean {
-  // Reject empty strings
-  if (!timeString || timeString.trim() === "") {
-    return false;
-  }
-
-  const parts = timeString.split(":");
-
-  if (parts.length < 2 || parts.length > 3) {
-    return false;
-  }
-
-  // Ensure each part contains only digits (and optional leading zeros)
-  // This prevents "8:00 AM" from passing validation
-  if (!parts.every((part) => /^\d+$/.test(part))) {
-    return false;
-  }
-
-  const hours = parseInt(parts[0], 10);
-  const minutes = parseInt(parts[1], 10);
-  const seconds = parts.length === 3 ? parseInt(parts[2], 10) : 0;
-
-  if (isNaN(hours) || isNaN(minutes) || isNaN(seconds)) {
-    return false;
-  }
-
-  return (
-    hours >= 0 &&
-    hours <= 23 &&
-    minutes >= 0 &&
-    minutes <= 59 &&
-    seconds >= 0 &&
-    seconds <= 59
-  );
-}
-
-/**
- * Parse a time string (HH:MM or HH:MM:SS) and set it on today's date in the given timezone
- *
- * Note: This function assumes the time string has already been validated by
- * isValidTimeString() at configuration time. It does not re-validate at runtime
- * for consistency with other condition types (screen, user, location, etc.)
- *
- * @param timeString The time string to parse (must be pre-validated)
- * @param timezone The timezone to use
- * @returns The Date object
- */
-export const parseTimeString = (timeString: string, timezone: string): Date => {
-  const parts = timeString.split(":");
-  const hours = parseInt(parts[0], 10);
-  const minutes = parseInt(parts[1], 10);
-  const seconds = parts.length === 3 ? parseInt(parts[2], 10) : 0;
-
-  const now = new TZDate(new Date(), timezone);
-  const dateWithTime = new TZDate(
-    now.getFullYear(),
-    now.getMonth(),
-    now.getDate(),
-    hours,
-    minutes,
-    seconds,
-    0,
-    timezone
-  );
-
-  return new Date(dateWithTime.getTime());
-};
-
-/**
- * Check if the current time matches the time condition (after/before/weekday)
- * @param hass Home Assistant object
- * @param timeCondition Time condition to check
- * @returns true if current time matches the condition
- */
-export const checkTimeInRange = (
-  hass: HomeAssistant,
-  { after, before, weekdays }: Omit<TimeCondition, "condition">
-): boolean => {
-  const timezone =
-    hass.locale.time_zone === TimeZone.server
-      ? hass.config.time_zone
-      : Intl.DateTimeFormat().resolvedOptions().timeZone;
-
-  const now = new TZDate(new Date(), timezone);
-
-  // Check weekday condition
-  if (weekdays && weekdays.length > 0) {
-    const currentWeekday = WEEKDAY_MAP[now.getDay()];
-    if (!weekdays.includes(currentWeekday)) {
-      return false;
-    }
-  }
-
-  // Check time conditions
-  if (!after && !before) {
-    return true;
-  }
-
-  const afterDate = after ? parseTimeString(after, timezone) : undefined;
-  const beforeDate = before ? parseTimeString(before, timezone) : undefined;
-
-  if (afterDate && beforeDate) {
-    if (isBefore(beforeDate, afterDate)) {
-      // Crosses midnight (e.g., 22:00 to 06:00)
-      return !isBefore(now, afterDate) || !isAfter(now, beforeDate);
-    }
-    return isWithinInterval(now, { start: afterDate, end: beforeDate });
-  }
-
-  if (afterDate) {
-    return !isBefore(now, afterDate);
-  }
-
-  if (beforeDate) {
-    return !isAfter(now, beforeDate);
-  }
-
-  return true;
-};
--- a/src/common/datetime/first_weekday.ts
+++ b/src/common/datetime/first_weekday.ts
@@ -1,7 +1,18 @@
 import { getWeekStartByLocale } from "weekstart";
 import type { FrontendLocaleData } from "../../data/translation";
 import { FirstWeekday } from "../../data/translation";
-import { WEEKDAYS_LONG, type WeekdayIndex } from "./weekday";
+
+export const weekdays = [
+  "sunday",
+  "monday",
+  "tuesday",
+  "wednesday",
+  "thursday",
+  "friday",
+  "saturday",
+] as const;
+
+type WeekdayIndex = 0 | 1 | 2 | 3 | 4 | 5 | 6;

 export const firstWeekdayIndex = (locale: FrontendLocaleData): WeekdayIndex => {
  if (locale.first_weekday === FirstWeekday.language) {
@@ -12,12 +23,12 @@ export const firstWeekdayIndex = (locale: FrontendLocaleData): WeekdayIndex => {
    }
    return (getWeekStartByLocale(locale.language) % 7) as WeekdayIndex;
  }
-  return WEEKDAYS_LONG.includes(locale.first_weekday)
-    ? (WEEKDAYS_LONG.indexOf(locale.first_weekday) as WeekdayIndex)
+  return weekdays.includes(locale.first_weekday)
+    ? (weekdays.indexOf(locale.first_weekday) as WeekdayIndex)
    : 1;
 };

 export const firstWeekday = (locale: FrontendLocaleData) => {
  const index = firstWeekdayIndex(locale);
-  return WEEKDAYS_LONG[index];
+  return weekdays[index];
 };
--- a/src/common/datetime/weekday.ts
+++ b/src/common/datetime/weekday.ts
@@ -1,59 +0,0 @@
-export type WeekdayIndex = 0 | 1 | 2 | 3 | 4 | 5 | 6;
-
-export type WeekdayShort =
-  | "sun"
-  | "mon"
-  | "tue"
-  | "wed"
-  | "thu"
-  | "fri"
-  | "sat";
-
-export type WeekdayLong =
-  | "sunday"
-  | "monday"
-  | "tuesday"
-  | "wednesday"
-  | "thursday"
-  | "friday"
-  | "saturday";
-
-export const WEEKDAYS_SHORT = [
-  "sun",
-  "mon",
-  "tue",
-  "wed",
-  "thu",
-  "fri",
-  "sat",
-] as const satisfies readonly WeekdayShort[];
-
-export const WEEKDAYS_LONG = [
-  "sunday",
-  "monday",
-  "tuesday",
-  "wednesday",
-  "thursday",
-  "friday",
-  "saturday",
-] as const satisfies readonly WeekdayLong[];
-
-export const WEEKDAY_MAP = {
-  0: "sun",
-  1: "mon",
-  2: "tue",
-  3: "wed",
-  4: "thu",
-  5: "fri",
-  6: "sat",
-} as const satisfies Record<WeekdayIndex, WeekdayShort>;
-
-export const WEEKDAY_SHORT_TO_LONG = {
-  sun: "sunday",
-  mon: "monday",
-  tue: "tuesday",
-  wed: "wednesday",
-  thu: "thursday",
-  fri: "friday",
-  sat: "saturday",
-} as const satisfies Record<WeekdayShort, WeekdayLong>;
--- a/src/common/dom/apply_themes_on_element.ts
+++ b/src/common/dom/apply_themes_on_element.ts
@@ -1,6 +1,5 @@
 import type { ThemeVars } from "../../data/ws-themes";
 import { darkColorVariables } from "../../resources/theme/color";
-import { darkSemanticVariables } from "../../resources/theme/semantic.globals";
 import { derivedStyles } from "../../resources/theme/theme";
 import type { HomeAssistant } from "../../types";
 import {
@@ -53,7 +52,7 @@ export const applyThemesOnElement = (

  if (themeToApply && darkMode) {
    cacheKey = `${cacheKey}__dark`;
-    themeRules = { ...darkSemanticVariables, ...darkColorVariables };
+    themeRules = { ...darkColorVariables };
  }

  if (themeToApply === "default") {
--- a/src/common/entity/entity_filter.ts
+++ b/src/common/entity/entity_filter.ts
@@ -9,9 +9,9 @@ type EntityCategory = "none" | "config" | "diagnostic";
 export interface EntityFilter {
  domain?: string | string[];
  device_class?: string | string[];
-  device?: string | null | (string | null)[];
-  area?: string | null | (string | null)[];
-  floor?: string | null | (string | null)[];
+  device?: string | string[];
+  area?: string | string[];
+  floor?: string | string[];
  label?: string | string[];
  entity_category?: EntityCategory | EntityCategory[];
  hidden_platform?: string | string[];
@@ -19,18 +19,6 @@ export interface EntityFilter {

 export type EntityFilterFunc = (entityId: string) => boolean;

-const normalizeFilterArray = <T>(
-  value: T | null | T[] | (T | null)[] | undefined
-): Set<T | null> | undefined => {
-  if (value === undefined) {
-    return undefined;
-  }
-  if (value === null) {
-    return new Set([null]);
-  }
-  return new Set(ensureArray(value));
-};
-
 export const generateEntityFilter = (
  hass: HomeAssistant,
  filter: EntityFilter
@@ -41,9 +29,11 @@ export const generateEntityFilter = (
  const deviceClasses = filter.device_class
    ? new Set(ensureArray(filter.device_class))
    : undefined;
-  const floors = normalizeFilterArray(filter.floor);
-  const areas = normalizeFilterArray(filter.area);
-  const devices = normalizeFilterArray(filter.device);
+  const floors = filter.floor ? new Set(ensureArray(filter.floor)) : undefined;
+  const areas = filter.area ? new Set(ensureArray(filter.area)) : undefined;
+  const devices = filter.device
+    ? new Set(ensureArray(filter.device))
+    : undefined;
  const entityCategories = filter.entity_category
    ? new Set(ensureArray(filter.entity_category))
    : undefined;
@@ -83,20 +73,23 @@ export const generateEntityFilter = (
    }

    if (floors) {
-      const floorId = floor?.floor_id ?? null;
-      if (!floors.has(floorId)) {
+      if (!floor || !floors.has(floor.floor_id)) {
        return false;
      }
    }
    if (areas) {
-      const areaId = area?.area_id ?? null;
-      if (!areas.has(areaId)) {
+      if (!area) {
+        return false;
+      }
+      if (!areas.has(area.area_id)) {
        return false;
      }
    }
    if (devices) {
-      const deviceId = device?.id ?? null;
-      if (!devices.has(deviceId)) {
+      if (!device) {
+        return false;
+      }
+      if (!devices.has(device.id)) {
        return false;
      }
    }
--- a/src/common/util/parse-animation-duration.ts
+++ b/src/common/util/parse-animation-duration.ts
@@ -1,36 +0,0 @@
-/**
- * Parses a CSS duration string (e.g., "300ms", "3s") and returns the duration in milliseconds.
- *
- * @param duration - A CSS duration string (e.g., "300ms", "3s", "0.5s")
- * @returns The duration in milliseconds, or 0 if the input is invalid
- *
- * @example
- * parseAnimationDuration("300ms") // Returns 300
- * parseAnimationDuration("3s")    // Returns 3000
- * parseAnimationDuration("0.5s")  // Returns 500
- * parseAnimationDuration("invalid") // Returns 0
- */
-export const parseAnimationDuration = (duration: string): number => {
-  const trimmed = duration.trim();
-
-  let value: number;
-  let multiplier: number;
-
-  if (trimmed.endsWith("ms")) {
-    value = parseFloat(trimmed.slice(0, -2));
-    multiplier = 1;
-  } else if (trimmed.endsWith("s")) {
-    value = parseFloat(trimmed.slice(0, -1));
-    multiplier = 1000;
-  } else {
-    // No recognized unit, try parsing as number (assume ms)
-    value = parseFloat(trimmed);
-    multiplier = 1;
-  }
-
-  if (!isFinite(value) || value < 0) {
-    return 0;
-  }
-
-  return value * multiplier;
-};
--- a/src/common/util/select-unit.ts
+++ b/src/common/util/select-unit.ts
@@ -119,8 +119,8 @@ type Thresholds = Record<
 >;

 export const DEFAULT_THRESHOLDS: Thresholds = {
-  second: 59, // seconds to minute
-  minute: 59, // minutes to hour
+  second: 45, // seconds to minute
+  minute: 45, // minutes to hour
  hour: 22, // hour to day
  day: 5, // day to week
  week: 4, // week to months
--- a/src/common/util/view-transition.ts
+++ b/src/common/util/view-transition.ts
@@ -1,30 +0,0 @@
-/**
- * Executes a callback within a View Transition if supported, otherwise runs it directly.
- *
- * @param callback - Function to execute. Can be synchronous or return a Promise. The callback will be passed a boolean indicating whether the view transition is available.
- * @returns Promise that resolves when the transition completes (or immediately if not supported)
- *
- * @example
- * ```typescript
- * // Synchronous callback
- * withViewTransition(() => {
- *   this.large = !this.large;
- * });
- *
- * // Async callback
- * await withViewTransition(async () => {
- *   await this.updateData();
- * });
- * ```
- */
-export const withViewTransition = (
-  callback: (viewTransitionAvailable: boolean) => void | Promise<void>
-): Promise<void> => {
-  if (document.startViewTransition) {
-    return document.startViewTransition(() => callback(true)).finished;
-  }
-
-  // Fallback: Execute callback directly without transition
-  const result = callback(false);
-  return result instanceof Promise ? result : Promise.resolve();
-};
--- a/src/components/chart/down-sample.ts
+++ b/src/components/chart/down-sample.ts
@@ -6,8 +6,7 @@ export function downSampleLineData<
  data: T[] | undefined,
  maxDetails: number,
  minX?: number,
-  maxX?: number,
-  useMean = false
+  maxX?: number
 ): T[] {
  if (!data) {
    return [];
@@ -18,13 +17,15 @@ export function downSampleLineData<
  const min = minX ?? getPointData(data[0]!)[0];
  const max = maxX ?? getPointData(data[data.length - 1]!)[0];
  const step = Math.ceil((max - min) / Math.floor(maxDetails));
-
-  // Group points into frames
  const frames = new Map<
    number,
-    { point: (typeof data)[number]; x: number; y: number }[]
+    {
+      min: { point: (typeof data)[number]; x: number; y: number };
+      max: { point: (typeof data)[number]; x: number; y: number };
+    }
  >();

+  // Group points into frames
  for (const point of data) {
    const pointData = getPointData(point);
    if (!Array.isArray(pointData)) continue;
@@ -35,53 +36,28 @@ export function downSampleLineData<
    const frameIndex = Math.floor((x - min) / step);
    const frame = frames.get(frameIndex);
    if (!frame) {
-      frames.set(frameIndex, [{ point, x, y }]);
+      frames.set(frameIndex, { min: { point, x, y }, max: { point, x, y } });
    } else {
-      frame.push({ point, x, y });
+      if (frame.min.y > y) {
+        frame.min = { point, x, y };
+      }
+      if (frame.max.y < y) {
+        frame.max = { point, x, y };
+      }
    }
  }

  // Convert frames back to points
  const result: T[] = [];
-
-  if (useMean) {
-    // Use mean values for each frame
-    for (const [_i, framePoints] of frames) {
-      const sumY = framePoints.reduce((acc, p) => acc + p.y, 0);
-      const meanY = sumY / framePoints.length;
-      const sumX = framePoints.reduce((acc, p) => acc + p.x, 0);
-      const meanX = sumX / framePoints.length;
-
-      const firstPoint = framePoints[0].point;
-      const pointData = getPointData(firstPoint);
-      const meanPoint = (
-        Array.isArray(pointData) ? [meanX, meanY] : { value: [meanX, meanY] }
-      ) as T;
-      result.push(meanPoint);
+  for (const [_i, frame] of frames) {
+    // Use min/max points to preserve visual accuracy
+    // The order of the data must be preserved so max may be before min
+    if (frame.min.x > frame.max.x) {
+      result.push(frame.max.point);
    }
-  } else {
-    // Use min/max values for each frame
-    for (const [_i, framePoints] of frames) {
-      let minPoint = framePoints[0];
-      let maxPoint = framePoints[0];
-
-      for (const p of framePoints) {
-        if (p.y < minPoint.y) {
-          minPoint = p;
-        }
-        if (p.y > maxPoint.y) {
-          maxPoint = p;
-        }
-      }
-
-      // The order of the data must be preserved so max may be before min
-      if (minPoint.x > maxPoint.x) {
-        result.push(maxPoint.point);
-      }
-      result.push(minPoint.point);
-      if (minPoint.x < maxPoint.x) {
-        result.push(maxPoint.point);
-      }
+    result.push(frame.min.point);
+    if (frame.min.x < frame.max.x) {
+      result.push(frame.max.point);
    }
  }

--- 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";
@@ -90,8 +91,6 @@ export class HaChartBase extends LitElement {

  private _shouldResizeChart = false;

-  private _resizeAnimationDuration?: number;
-
  // @ts-ignore
  private _resizeController = new ResizeController(this, {
    callback: () => {
@@ -215,7 +214,6 @@ export class HaChartBase extends LitElement {
      ) {
        // custom legend changes may require a resize to layout properly
        this._shouldResizeChart = true;
-        this._resizeAnimationDuration = 250;
      }
    } else if (this._isTouchDevice && changedProps.has("_isZoomed")) {
      chartOptions.dataZoom = this._getDataZoomConfig();
@@ -427,7 +425,6 @@ export class HaChartBase extends LitElement {
                        ...axis.axisPointer?.handle,
                        show: true,
                      },
-                      label: { show: false },
                    },
                  }
                : axis
@@ -628,10 +625,6 @@ export class HaChartBase extends LitElement {
  }

  private _createTheme(style: CSSStyleDeclaration) {
-    const textBorderColor =
-      style.getPropertyValue("--ha-card-background") ||
-      style.getPropertyValue("--card-background-color");
-    const textBorderWidth = 2;
    return {
      color: getAllGraphColors(style),
      backgroundColor: "transparent",
@@ -655,22 +648,15 @@ export class HaChartBase extends LitElement {
      graph: {
        label: {
          color: style.getPropertyValue("--primary-text-color"),
-          textBorderColor,
-          textBorderWidth,
-        },
-      },
-      pie: {
-        label: {
-          color: style.getPropertyValue("--primary-text-color"),
-          textBorderColor,
-          textBorderWidth,
+          textBorderColor: style.getPropertyValue("--primary-background-color"),
+          textBorderWidth: 2,
        },
      },
      sankey: {
        label: {
          color: style.getPropertyValue("--primary-text-color"),
-          textBorderColor,
-          textBorderWidth,
+          textBorderColor: style.getPropertyValue("--primary-background-color"),
+          textBorderWidth: 2,
        },
      },
      categoryAxis: {
@@ -984,14 +970,11 @@ export class HaChartBase extends LitElement {
  private _handleChartRenderFinished = () => {
    if (this._shouldResizeChart) {
      this.chart?.resize({
-        animation:
-          this._reducedMotion ||
-          typeof this._resizeAnimationDuration !== "number"
-            ? undefined
-            : { duration: this._resizeAnimationDuration },
+        animation: this._reducedMotion
+          ? undefined
+          : { duration: RESIZE_ANIMATION_DURATION },
      });
      this._shouldResizeChart = false;
-      this._resizeAnimationDuration = undefined;
    }
  };

--- a/src/components/chart/ha-network-graph.ts
+++ b/src/components/chart/ha-network-graph.ts
@@ -2,10 +2,7 @@ import type { EChartsType } from "echarts/core";
 import type { GraphSeriesOption } from "echarts/charts";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state, query } from "lit/decorators";
-import type {
-  CallbackDataParams,
-  TopLevelFormatterParams,
-} from "echarts/types/dist/shared";
+import type { TopLevelFormatterParams } from "echarts/types/dist/shared";
 import { mdiFormatTextVariant, mdiGoogleCirclesGroup } from "@mdi/js";
 import memoizeOne from "memoize-one";
 import { listenMediaQuery } from "../../common/dom/media_query";
@@ -19,7 +16,6 @@ import { deepEqual } from "../../common/util/deep-equal";
 export interface NetworkNode {
  id: string;
  name?: string;
-  context?: string;
  category?: number;
  value?: number;
  symbolSize?: number;
@@ -192,25 +188,6 @@ export class HaNetworkGraph extends SubscribeMixin(LitElement) {
      label: {
        show: showLabels,
        position: "right",
-        formatter: (params: CallbackDataParams) => {
-          const node = params.data as NetworkNode;
-          if (node.context) {
-            return `{primary|${node.name ?? ""}}\n{secondary|${node.context}}`;
-          }
-          return node.name ?? "";
-        },
-        rich: {
-          primary: {
-            fontSize: 12,
-          },
-          secondary: {
-            fontSize: 12,
-            color: getComputedStyle(document.body).getPropertyValue(
-              "--secondary-text-color"
-            ),
-            lineHeight: 16,
-          },
-        },
      },
      emphasis: {
        focus: isMobile ? "none" : "adjacency",
@@ -248,7 +225,6 @@ export class HaNetworkGraph extends SubscribeMixin(LitElement) {
          ({
            id: node.id,
            name: node.name,
-            context: node.context,
            category: node.category,
            value: node.value,
            symbolSize: node.symbolSize || 30,
--- a/src/components/chart/state-history-chart-line.ts
+++ b/src/components/chart/state-history-chart-line.ts
@@ -87,8 +87,6 @@ export class StateHistoryChartLine extends LitElement {

  private _previousYAxisLabelValue = 0;

-  private _yAxisMaximumFractionDigits = 0;
-
  protected render() {
    return html`
      <ha-chart-base
@@ -759,12 +757,8 @@ export class StateHistoryChartLine extends LitElement {
        Math.log10(Math.abs(value - this._previousYAxisLabelValue || 1))
      )
    );
-    this._yAxisMaximumFractionDigits = Math.max(
-      this._yAxisMaximumFractionDigits,
-      maximumFractionDigits
-    );
    const label = formatNumber(value, this.hass.locale, {
-      maximumFractionDigits: this._yAxisMaximumFractionDigits,
+      maximumFractionDigits,
    });
    const width = measureTextWidth(label, 12) + 5;
    if (width > this._yWidth) {
--- a/src/components/chips/ha-filter-chip.ts
+++ b/src/components/chips/ha-filter-chip.ts
@@ -30,7 +30,6 @@ export class HaFilterChip extends FilterChip {
          var(--rgb-primary-text-color),
          0.15
        );
-        --_label-text-font: var(--ha-font-family-body);
        border-radius: var(--ha-border-radius-md);
      }
    `,
--- a/src/components/data-table/ha-data-table-labels.ts
+++ b/src/components/data-table/ha-data-table-labels.ts
@@ -62,7 +62,6 @@ class HaDataTableLabels extends LitElement {
        @click=${clickAction ? this._labelClicked : undefined}
        @keydown=${clickAction ? this._labelClicked : undefined}
        style=${color ? `--color: ${color}` : ""}
-        .description=${label.description}
      >
        ${label?.icon
          ? html`<ha-icon slot="icon" .icon=${label.icon}></ha-icon>`
--- a/src/components/device/ha-device-picker.ts
+++ b/src/components/device/ha-device-picker.ts
@@ -197,6 +197,9 @@ export class HaDevicePicker extends LitElement {
    const placeholder =
      this.placeholder ??
      this.hass.localize("ui.components.device-picker.placeholder");
+    const notFoundLabel = this.hass.localize(
+      "ui.components.device-picker.no_match"
+    );

    const valueRenderer = this._valueRenderer(this._configEntryLookup);

@@ -206,10 +209,7 @@ export class HaDevicePicker extends LitElement {
        .autofocus=${this.autofocus}
        .label=${this.label}
        .searchLabel=${this.searchLabel}
-        .notFoundLabel=${this._notFoundLabel}
-        .emptyLabel=${this.hass.localize(
-          "ui.components.device-picker.no_devices"
-        )}
+        .notFoundLabel=${notFoundLabel}
        .placeholder=${placeholder}
        .value=${this.value}
        .rowRenderer=${this._rowRenderer}
@@ -233,11 +233,6 @@ export class HaDevicePicker extends LitElement {
    this.value = value;
    fireEvent(this, "value-changed", { value });
  }
-
-  private _notFoundLabel = (search: string) =>
-    this.hass.localize("ui.components.device-picker.no_match", {
-      term: html`<b>‘${search}’</b>`,
-    });
 }

 declare global {
--- a/src/components/entity/ha-entity-picker.ts
+++ b/src/components/entity/ha-entity-picker.ts
@@ -269,6 +269,9 @@ export class HaEntityPicker extends LitElement {
    const placeholder =
      this.placeholder ??
      this.hass.localize("ui.components.entity.entity-picker.placeholder");
+    const notFoundLabel = this.hass.localize(
+      "ui.components.entity.entity-picker.no_match"
+    );

    return html`
      <ha-generic-picker
@@ -279,7 +282,7 @@ export class HaEntityPicker extends LitElement {
        .label=${this.label}
        .helper=${this.helper}
        .searchLabel=${this.searchLabel}
-        .notFoundLabel=${this._notFoundLabel}
+        .notFoundLabel=${notFoundLabel}
        .placeholder=${placeholder}
        .value=${this.addButton ? undefined : this.value}
        .rowRenderer=${this._rowRenderer}
@@ -353,11 +356,6 @@ export class HaEntityPicker extends LitElement {
    fireEvent(this, "value-changed", { value });
    fireEvent(this, "change");
  }
-
-  private _notFoundLabel = (search: string) =>
-    this.hass.localize("ui.components.entity.entity-picker.no_match", {
-      term: html`<b>‘${search}’</b>`,
-    });
 }

 declare global {
--- a/src/components/entity/ha-statistic-picker.ts
+++ b/src/components/entity/ha-statistic-picker.ts
@@ -21,6 +21,7 @@ import "../ha-combo-box-item";
 import "../ha-generic-picker";
 import type { HaGenericPicker } from "../ha-generic-picker";
 import "../ha-icon-button";
+import "../ha-input-helper-text";
 import type {
  PickerComboBoxItem,
  PickerComboBoxSearchFn,
@@ -270,6 +271,7 @@ export class HaStatisticPicker extends LitElement {
        const secondary = [areaName, entityName ? deviceName : undefined]
          .filter(Boolean)
          .join(isRTL ? " ◂ " : " ▸ ");
+        const a11yLabel = [deviceName, entityName].filter(Boolean).join(" - ");

        const sortingPrefix = `${TYPE_ORDER.indexOf("entity")}`;
        output.push({
@@ -277,6 +279,7 @@ export class HaStatisticPicker extends LitElement {
          statistic_id: id,
          primary,
          secondary,
+          a11y_label: a11yLabel,
          stateObj: stateObj,
          type: "entity",
          sorting_label: [sortingPrefix, deviceName, entityName].join("_"),
@@ -455,6 +458,9 @@ export class HaStatisticPicker extends LitElement {
    const placeholder =
      this.placeholder ??
      this.hass.localize("ui.components.statistic-picker.placeholder");
+    const notFoundLabel = this.hass.localize(
+      "ui.components.statistic-picker.no_match"
+    );

    return html`
      <ha-generic-picker
@@ -462,10 +468,7 @@ export class HaStatisticPicker extends LitElement {
        .autofocus=${this.autofocus}
        .allowCustomValue=${this.allowCustomEntity}
        .label=${this.label}
-        .notFoundLabel=${this._notFoundLabel}
-        .emptyLabel=${this.hass.localize(
-          "ui.components.statistic-picker.no_statistics"
-        )}
+        .notFoundLabel=${notFoundLabel}
        .placeholder=${placeholder}
        .value=${this.value}
        .rowRenderer=${this._rowRenderer}
@@ -474,7 +477,6 @@ export class HaStatisticPicker extends LitElement {
        .hideClearIcon=${this.hideClearIcon}
        .searchFn=${this._searchFn}
        .valueRenderer=${this._valueRenderer}
-        .helper=${this.helper}
        @value-changed=${this._valueChanged}
      >
      </ha-generic-picker>
@@ -519,11 +521,6 @@ export class HaStatisticPicker extends LitElement {
    await this.updateComplete;
    await this._picker?.open();
  }
-
-  private _notFoundLabel = (search: string) =>
-    this.hass.localize("ui.components.statistic-picker.no_match", {
-      term: html`<b>‘${search}’</b>`,
-    });
 }

 declare global {
--- a/src/components/ha-area-picker.ts
+++ b/src/components/ha-area-picker.ts
@@ -87,8 +87,6 @@ export class HaAreaPicker extends LitElement {

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

-  @property({ attribute: "add-button-label" }) public addButtonLabel?: string;
-
  @query("ha-generic-picker") private _picker?: HaGenericPicker;

  public async open() {
@@ -359,7 +357,11 @@ export class HaAreaPicker extends LitElement {

  protected render(): TemplateResult {
    const placeholder =
-      this.placeholder ?? this.hass.localize("ui.components.area-picker.area");
+      this.placeholder ??
+      this.hass.localize("ui.components.area-picker.placeholder");
+    const notFoundLabel = this.hass.localize(
+      "ui.components.area-picker.no_match"
+    );

    const valueRenderer = this._computeValueRenderer(this.hass.areas);

@@ -369,16 +371,12 @@ export class HaAreaPicker extends LitElement {
        .autofocus=${this.autofocus}
        .label=${this.label}
        .helper=${this.helper}
-        .notFoundLabel=${this._notFoundLabel}
-        .emptyLabel=${this.hass.localize("ui.components.area-picker.no_areas")}
-        .disabled=${this.disabled}
-        .required=${this.required}
+        .notFoundLabel=${notFoundLabel}
        .placeholder=${placeholder}
        .value=${this.value}
        .getItems=${this._getItems}
        .getAdditionalItems=${this._getAdditionalItems}
        .valueRenderer=${valueRenderer}
-        .addButtonLabel=${this.addButtonLabel}
        @value-changed=${this._valueChanged}
      >
      </ha-generic-picker>
@@ -426,11 +424,6 @@ export class HaAreaPicker extends LitElement {
    fireEvent(this, "value-changed", { value });
    fireEvent(this, "change");
  }
-
-  private _notFoundLabel = (search: string) =>
-    this.hass.localize("ui.components.area-picker.no_match", {
-      term: html`<b>‘${search}’</b>`,
-    });
 }

 declare global {
--- a/src/components/ha-dropdown-item.ts
+++ b/src/components/ha-dropdown-item.ts
@@ -1,41 +0,0 @@
-import DropdownItem from "@home-assistant/webawesome/dist/components/dropdown-item/dropdown-item";
-import { css, type CSSResultGroup } from "lit";
-import { customElement } from "lit/decorators";
-
-/**
- * Home Assistant dropdown item component
- *
- * @element ha-dropdown-item
- * @extends {DropdownItem}
- *
- * @summary
- * A stylable dropdown item component supporting Home Assistant theming, variants, and appearances based on webawesome dropdown item.
- *
- */
-@customElement("ha-dropdown-item")
-export class HaDropdownItem extends DropdownItem {
-  static get styles(): CSSResultGroup {
-    return [
-      DropdownItem.styles,
-      css`
-        :host {
-          min-height: var(--ha-space-10);
-        }
-
-        #icon ::slotted(*) {
-          color: var(--ha-color-on-neutral-normal);
-        }
-
-        :host([variant="danger"]) #icon ::slotted(*) {
-          color: var(--ha-color-on-danger-quiet);
-        }
-      `,
-    ];
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-dropdown-item": HaDropdownItem;
-  }
-}
--- a/src/components/ha-dropdown.ts
+++ b/src/components/ha-dropdown.ts
@@ -1,45 +0,0 @@
-import Dropdown from "@home-assistant/webawesome/dist/components/dropdown/dropdown";
-import { css, type CSSResultGroup } from "lit";
-import { customElement, property } from "lit/decorators";
-
-/**
- * Home Assistant dropdown component
- *
- * @element ha-dropdown
- * @extends {Dropdown}
- *
- * @summary
- * A stylable dropdown component supporting Home Assistant theming, variants, and appearances based on webawesome dropdown.
- *
- */
-@customElement("ha-dropdown")
-export class HaDropdown extends Dropdown {
-  @property({ attribute: false }) dropdownTag = "ha-dropdown";
-
-  @property({ attribute: false }) dropdownItemTag = "ha-dropdown-item";
-
-  static get styles(): CSSResultGroup {
-    return [
-      Dropdown.styles,
-      css`
-        :host {
-          font-size: var(--ha-dropdown-font-size, var(--ha-font-size-m));
-          --wa-color-surface-raised: var(
-            --card-background-color,
-            var(--ha-dialog-surface-background, var(--mdc-theme-surface, #fff)),
-          );
-        }
-
-        #menu {
-          padding: var(--ha-space-1);
-        }
-      `,
-    ];
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-dropdown": HaDropdown;
-  }
-}
--- a/src/components/ha-filter-labels.ts
+++ b/src/components/ha-filter-labels.ts
@@ -109,10 +109,7 @@ export class HaFilterLabels extends SubscribeMixin(LitElement) {
                      .selected=${(this.value || []).includes(label.label_id)}
                      hasMeta
                    >
-                      <ha-label
-                        style=${color ? `--color: ${color}` : ""}
-                        .description=${label.description}
-                      >
+                      <ha-label style=${color ? `--color: ${color}` : ""}>
                        ${label.icon
                          ? html`<ha-icon
                              slot="icon"
--- a/src/components/ha-floor-picker.ts
+++ b/src/components/ha-floor-picker.ts
@@ -383,9 +383,8 @@ export class HaFloorPicker extends LitElement {
        .hass=${this.hass}
        .autofocus=${this.autofocus}
        .label=${this.label}
-        .notFoundLabel=${this._notFoundLabel}
-        .emptyLabel=${this.hass.localize(
-          "ui.components.floor-picker.no_floors"
+        .notFoundLabel=${this.hass.localize(
+          "ui.components.floor-picker.no_match"
        )}
        .placeholder=${placeholder}
        .value=${this.value}
@@ -445,11 +444,6 @@ export class HaFloorPicker extends LitElement {
    fireEvent(this, "value-changed", { value });
    fireEvent(this, "change");
  }
-
-  private _notFoundLabel = (search: string) =>
-    this.hass.localize("ui.components.floor-picker.no_match", {
-      term: html`<b>‘${search}’</b>`,
-    });
 }

 declare global {
--- a/src/components/ha-generic-picker.ts
+++ b/src/components/ha-generic-picker.ts
@@ -3,13 +3,13 @@ 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";
 import "./ha-picker-combo-box";
 import type {
@@ -25,6 +25,9 @@ import "./ha-svg-icon";
 export class HaGenericPicker extends LitElement {
  @property({ attribute: false }) public hass?: HomeAssistant;

+  // eslint-disable-next-line lit/no-native-attributes
+  @property({ type: Boolean }) public autofocus = false;
+
  @property({ type: Boolean }) public disabled = false;

  @property({ type: Boolean }) public required = false;
@@ -46,11 +49,8 @@ export class HaGenericPicker extends LitElement {
  @property({ attribute: "hide-clear-icon", type: Boolean })
  public hideClearIcon = false;

-  @property({ attribute: false })
-  public getItems?: (
-    searchString?: string,
-    section?: string
-  ) => (PickerComboBoxItem | string)[];
+  @property({ attribute: false, type: Array })
+  public getItems?: () => PickerComboBoxItem[];

  @property({ attribute: false, type: Array })
  public getAdditionalItems?: (searchString?: string) => PickerComboBoxItem[];
@@ -64,11 +64,8 @@ export class HaGenericPicker extends LitElement {
  @property({ attribute: false })
  public searchFn?: PickerComboBoxSearchFn<PickerComboBoxItem>;

-  @property({ attribute: false })
-  public notFoundLabel?: string | ((search: string) => string);
-
-  @property({ attribute: "empty-label" })
-  public emptyLabel?: string;
+  @property({ attribute: "not-found-label", type: String })
+  public notFoundLabel?: string;

  @property({ attribute: "popover-placement" })
  public popoverPlacement:
@@ -88,25 +85,6 @@ export class HaGenericPicker extends LitElement {
  /** If set picker shows an add button instead of textbox when value isn't set */
  @property({ attribute: "add-button-label" }) public addButtonLabel?: string;

-  /** Section filter buttons for the list, section headers needs to be defined in getItems as strings */
-  @property({ attribute: false }) public sections?: (
-    | {
-        id: string;
-        label: string;
-      }
-    | "separator"
-  )[];
-
-  @property({ attribute: false }) public sectionTitleFunction?: (listInfo: {
-    firstIndex: number;
-    lastIndex: number;
-    firstItem: PickerComboBoxItem | string;
-    secondItem: PickerComboBoxItem | string;
-    itemsCount: number;
-  }) => string | undefined;
-
-  @property({ attribute: "selected-section" }) public selectedSection?: string;
-
  @query(".container") private _containerElement?: HTMLDivElement;

  @query("ha-picker-combo-box") private _comboBox?: HaPickerComboBox;
@@ -119,11 +97,6 @@ export class HaGenericPicker extends LitElement {

  @state() private _openedNarrow = false;

-  static shadowRootOptions = {
-    ...LitElement.shadowRootOptions,
-    delegatesFocus: true,
-  };
-
  private _narrow = false;

  // helper to set new value after closing picker, to avoid flicker
@@ -133,9 +106,6 @@ export class HaGenericPicker extends LitElement {

  protected render() {
    return html`
-      ${this.label
-        ? html`<label ?disabled=${this.disabled}>${this.label}</label>`
-        : nothing}
      <div class="container">
        <div id="picker">
          <slot name="field">
@@ -156,7 +126,7 @@ export class HaGenericPicker extends LitElement {
                  type="button"
                  class=${this._opened ? "opened" : ""}
                  compact
-                  aria-label=${ifDefined(this.label)}
+                  .label=${this.label}
                  @click=${this.open}
                  @clear=${this._clear}
                  .placeholder=${this.placeholder}
@@ -216,19 +186,16 @@ export class HaGenericPicker extends LitElement {
      <ha-picker-combo-box
        .hass=${this.hass}
        .allowCustomValue=${this.allowCustomValue}
-        .label=${this.searchLabel}
+        .label=${this.searchLabel ??
+        (this.hass?.localize("ui.common.search") || "Search")}
        .value=${this.value}
        @value-changed=${this._valueChanged}
        .rowRenderer=${this.rowRenderer}
        .notFoundLabel=${this.notFoundLabel}
-        .emptyLabel=${this.emptyLabel}
        .getItems=${this.getItems}
        .getAdditionalItems=${this.getAdditionalItems}
        .searchFn=${this.searchFn}
        .mode=${dialogMode ? "dialog" : "popover"}
-        .sections=${this.sections}
-        .sectionTitleFunction=${this.sectionTitleFunction}
-        .selectedSection=${this.selectedSection}
      ></ha-picker-combo-box>
    `;
  }
--- a/src/components/ha-label-picker.ts
+++ b/src/components/ha-label-picker.ts
@@ -224,9 +224,8 @@ export class HaLabelPicker extends SubscribeMixin(LitElement) {
        .hass=${this.hass}
        .autofocus=${this.autofocus}
        .label=${this.label}
-        .notFoundLabel=${this._notFoundLabel}
-        .emptyLabel=${this.hass.localize(
-          "ui.components.label-picker.no_labels"
+        .notFoundLabel=${this.hass.localize(
+          "ui.components.label-picker.no_match"
        )}
        .addButtonLabel=${this.hass.localize("ui.components.label-picker.add")}
        .placeholder=${placeholder}
@@ -289,11 +288,6 @@ export class HaLabelPicker extends SubscribeMixin(LitElement) {
      fireEvent(this, "change");
    }, 0);
  }
-
-  private _notFoundLabel = (search: string) =>
-    this.hass.localize("ui.components.label-picker.no_match", {
-      term: html`<b>‘${search}’</b>`,
-    });
 }

 declare global {
--- a/src/components/ha-label.ts
+++ b/src/components/ha-label.ts
@@ -1,32 +1,17 @@
 import type { CSSResultGroup, TemplateResult } from "lit";
 import { css, html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
-import { uid } from "../common/util/uid";
-import "./ha-tooltip";

@customElement("ha-label")
 class HaLabel extends LitElement {
  @property({ type: Boolean, reflect: true }) dense = false;

-  @property({ attribute: "description" })
-  public description?: string;
-
-  private _elementId = "label-" + uid();
-
  protected render(): TemplateResult {
    return html`
-      <ha-tooltip
-        .for=${this._elementId}
-        .disabled=${!this.description?.trim()}
-      >
-        ${this.description}
-      </ha-tooltip>
-      <div class="container" .id=${this._elementId}>
-        <span class="content">
-          <slot name="icon"></slot>
-          <slot></slot>
-        </span>
-      </div>
+      <span class="content">
+        <slot name="icon"></slot>
+        <slot></slot>
+      </span>
    `;
  }

@@ -51,7 +36,9 @@ class HaLabel extends LitElement {
          font-weight: var(--ha-font-weight-medium);
          line-height: var(--ha-line-height-condensed);
          letter-spacing: 0.1px;
+          vertical-align: middle;
          height: 32px;
+          padding: 0 16px;
          border-radius: var(--ha-border-radius-xl);
          color: var(--ha-label-text-color);
          --mdc-icon-size: 12px;
@@ -79,23 +66,14 @@ class HaLabel extends LitElement {
          display: flex;
        }

-        .container {
-          display: flex;
-          position: relative;
-          height: 100%;
-          padding: 0 16px;
-        }
-
        span {
          display: inline-flex;
        }

        :host([dense]) {
          height: 20px;
-          border-radius: var(--ha-border-radius-md);
-        }
-        :host([dense]) .container {
          padding: 0 12px;
+          border-radius: var(--ha-border-radius-md);
        }
        :host([dense]) ::slotted([slot="icon"]) {
          margin-right: 4px;
--- a/src/components/ha-labels-picker.ts
+++ b/src/components/ha-labels-picker.ts
@@ -21,7 +21,6 @@ import "./chips/ha-input-chip";
 import type { HaDevicePickerDeviceFilterFunc } from "./device/ha-device-picker";
 import "./ha-label-picker";
 import type { HaLabelPicker } from "./ha-label-picker";
-import "./ha-tooltip";

@customElement("ha-labels-picker")
 export class HaLabelsPicker extends SubscribeMixin(LitElement) {
@@ -143,17 +142,9 @@ export class HaLabelsPicker extends SubscribeMixin(LitElement) {
                  const color = label?.color
                    ? computeCssColor(label.color)
                    : undefined;
-                  const elementId = "label-" + label.label_id;
                  return html`
-                    <ha-tooltip
-                      .for=${elementId}
-                      .disabled=${!label?.description?.trim()}
-                    >
-                      ${label?.description}
-                    </ha-tooltip>
                    <ha-input-chip
                      .item=${label}
-                      .id=${elementId}
                      @remove=${this._removeItem}
                      @click=${this._openDetail}
                      .disabled=${this.disabled}
--- a/src/components/ha-language-picker.ts
+++ b/src/components/ha-language-picker.ts
@@ -1,7 +1,6 @@
-import { mdiMenuDown } from "@mdi/js";
 import type { PropertyValues } from "lit";
-import { css, html, LitElement, nothing } from "lit";
-import { customElement, property, query, state } from "lit/decorators";
+import { css, html, LitElement } from "lit";
+import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { fireEvent } from "../common/dom/fire_event";
 import { formatLanguageCode } from "../common/language/format_language";
@@ -9,10 +8,10 @@ import { caseInsensitiveStringCompare } from "../common/string/compare";
 import type { FrontendLocaleData } from "../data/translation";
 import { translationMetadata } from "../resources/translations-metadata";
 import type { HomeAssistant, ValueChangedEvent } from "../types";
-import "./ha-button";
 import "./ha-generic-picker";
-import type { HaGenericPicker } from "./ha-generic-picker";
+import "./ha-list-item";
 import type { PickerComboBoxItem } from "./ha-picker-combo-box";
+import "./ha-select";

 export const getLanguageOptions = (
  languages: string[],
@@ -76,9 +75,6 @@ export class HaLanguagePicker extends LitElement {
  @property({ attribute: "native-name", type: Boolean })
  public nativeName = false;

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

  @property({ attribute: "inline-arrow", type: Boolean })
@@ -86,8 +82,6 @@ export class HaLanguagePicker extends LitElement {

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

-  @query("ha-generic-picker", true) public genericPicker!: HaGenericPicker;
-
  protected firstUpdated(changedProps: PropertyValues) {
    super.firstUpdated(changedProps);
    this._computeDefaultLanguageOptions();
@@ -107,13 +101,12 @@ export class HaLanguagePicker extends LitElement {
      this.hass?.locale
    );

-  private _getLanguageName = (lang?: string) =>
-    this._getItems().find((language) => language.id === lang)?.primary;
-
-  private _valueRenderer = (value) =>
-    html`<span slot="headline"
-      >${this._getLanguageName(value) ?? value}</span
-    > `;
+  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 =
@@ -125,10 +118,9 @@ export class HaLanguagePicker extends LitElement {
        .hass=${this.hass}
        .autofocus=${this.autofocus}
        popover-placement="bottom-end"
-        .notFoundLabel=${this._notFoundLabel}
-        .emptyLabel=${this.hass?.localize(
-          "ui.components.language-picker.no_languages"
-        ) || "No languages available"}
+        .notFoundLabel=${this.hass?.localize(
+          "ui.components.language-picker.no_match"
+        )}
        .placeholder=${this.label ??
        (this.hass?.localize("ui.components.language-picker.language") ||
          "Language")}
@@ -138,28 +130,10 @@ export class HaLanguagePicker extends LitElement {
        .getItems=${this._getItems}
        @value-changed=${this._changed}
        hide-clear-icon
-      >
-        ${this.buttonStyle
-          ? html`<ha-button
-              slot="field"
-              .disabled=${this.disabled}
-              @click=${this._openPicker}
-              appearance="plain"
-              variant="neutral"
-            >
-              ${this._getLanguageName(value)}
-              <ha-svg-icon slot="end" .path=${mdiMenuDown}></ha-svg-icon>
-            </ha-button>`
-          : nothing}
-      </ha-generic-picker>
+      ></ha-generic-picker>
    `;
  }

-  private _openPicker(ev: Event) {
-    ev.stopPropagation();
-    this.genericPicker.open();
-  }
-
  static styles = css`
    ha-generic-picker {
      width: 100%;
@@ -173,15 +147,6 @@ export class HaLanguagePicker extends LitElement {
    this.value = ev.detail.value;
    fireEvent(this, "value-changed", { value: this.value });
  }
-
-  private _notFoundLabel = (search: string) => {
-    const term = html`<b>‘${search}’</b>`;
-    return this.hass
-      ? this.hass.localize("ui.components.language-picker.no_match", {
-          term,
-        })
-      : html`No languages found for ${term}`;
-  };
 }

 declare global {
--- a/src/components/ha-md-list-item.ts
+++ b/src/components/ha-md-list-item.ts
@@ -1,8 +1,7 @@
 import { ListItemEl } from "@material/web/list/internal/listitem/list-item";
 import { styles } from "@material/web/list/internal/listitem/list-item-styles";
-import { css, html, nothing, type TemplateResult } from "lit";
+import { css } from "lit";
 import { customElement } from "lit/decorators";
-import "./ha-ripple";

 export const haMdListStyles = [
  styles,
@@ -26,18 +25,6 @@ export const haMdListStyles = [
@customElement("ha-md-list-item")
 export class HaMdListItem extends ListItemEl {
  static override styles = haMdListStyles;
-
-  protected renderRipple(): TemplateResult | typeof nothing {
-    if (this.type === "text") {
-      return nothing;
-    }
-
-    return html`<ha-ripple
-      part="ripple"
-      for="item"
-      ?disabled=${this.disabled && this.type !== "link"}
-    ></ha-ripple>`;
-  }
 }

 declare global {
--- a/src/components/ha-navigation-picker.ts
+++ b/src/components/ha-navigation-picker.ts
@@ -6,7 +6,6 @@ import { fireEvent } from "../common/dom/fire_event";
 import { titleCase } from "../common/string/title-case";
 import { fetchConfig } from "../data/lovelace/config/types";
 import type { LovelaceViewRawConfig } from "../data/lovelace/config/view";
-import { getDefaultPanelUrlPath } from "../data/panel";
 import type { HomeAssistant, PanelInfo, ValueChangedEvent } from "../types";
 import "./ha-combo-box";
 import type { HaComboBox } from "./ha-combo-box";
@@ -45,7 +44,7 @@ const createPanelNavigationItem = (hass: HomeAssistant, panel: PanelInfo) => ({
  path: `/${panel.url_path}`,
  icon: panel.icon ?? "mdi:view-dashboard",
  title:
-    panel.url_path === getDefaultPanelUrlPath(hass)
+    panel.url_path === hass.defaultPanel
      ? hass.localize("panel.states")
      : hass.localize(`panel.${panel.title}`) ||
        panel.title ||
--- a/src/components/ha-picker-combo-box.ts
+++ b/src/components/ha-picker-combo-box.ts
@@ -1,6 +1,6 @@
 import type { LitVirtualizer } from "@lit-labs/virtualizer";
 import type { RenderItemFunction } from "@lit-labs/virtualizer/virtualize";
-import { mdiMagnify, mdiMinusBoxOutline } from "@mdi/js";
+import { mdiMagnify } from "@mdi/js";
 import Fuse from "fuse.js";
 import { css, html, LitElement, nothing } from "lit";
 import {
@@ -14,12 +14,11 @@ 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 { haStyleScrollbar } from "../resources/styles";
 import { loadVirtualizer } from "../resources/virtualizer";
 import type { HomeAssistant } from "../types";
-import "./chips/ha-chip-set";
-import "./chips/ha-filter-chip";
 import "./ha-combo-box-item";
 import "./ha-icon";
 import "./ha-textfield";
@@ -28,18 +27,28 @@ import type { HaTextField } from "./ha-textfield";
 export interface PickerComboBoxItem {
  id: string;
  primary: string;
+  a11y_label?: string;
  secondary?: string;
  search_labels?: string[];
  sorting_label?: string;
  icon_path?: string;
  icon?: string;
 }
-const NO_ITEMS_AVAILABLE_ID = "___no_items_available___";
+
+// Hack to force empty label to always display empty value by default in the search field
+export interface PickerComboBoxItemWithLabel extends PickerComboBoxItem {
+  a11y_label: string;
+}
+
+const NO_MATCHING_ITEMS_FOUND_ID = "___no_matching_items_found___";

 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
@@ -78,11 +87,8 @@ export class HaPickerComboBox extends LitElement {

  @state() private _listScrolled = false;

-  @property({ attribute: false })
-  public getItems?: (
-    searchString?: string,
-    section?: string
-  ) => (PickerComboBoxItem | string)[];
+  @property({ attribute: false, type: Array })
+  public getItems?: () => PickerComboBoxItem[];

  @property({ attribute: false, type: Array })
  public getAdditionalItems?: (searchString?: string) => PickerComboBoxItem[];
@@ -90,45 +96,21 @@ export class HaPickerComboBox extends LitElement {
  @property({ attribute: false })
  public rowRenderer?: RenderItemFunction<PickerComboBoxItem>;

-  @property({ attribute: false })
-  public notFoundLabel?: string | ((search: string) => string);
-
-  @property({ attribute: "empty-label" })
-  public emptyLabel?: string;
+  @property({ attribute: "not-found-label", type: String })
+  public notFoundLabel?: string;

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

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

-  /** Section filter buttons for the list, section headers needs to be defined in getItems as strings */
-  @property({ attribute: false }) public sections?: (
-    | {
-        id: string;
-        label: string;
-      }
-    | "separator"
-  )[];
-
-  @property({ attribute: false }) public sectionTitleFunction?: (listInfo: {
-    firstIndex: number;
-    lastIndex: number;
-    firstItem: PickerComboBoxItem | string;
-    secondItem: PickerComboBoxItem | string;
-    itemsCount: number;
-  }) => string | undefined;
-
-  @property({ attribute: "selected-section" }) public selectedSection?: string;
-
  @query("lit-virtualizer") private _virtualizerElement?: LitVirtualizer;

  @query("ha-textfield") private _searchFieldElement?: HaTextField;

-  @state() private _items: (PickerComboBoxItem | string)[] = [];
+  @state() private _items: PickerComboBoxItemWithLabel[] = [];

-  @state() private _sectionTitle?: string;
-
-  private _allItems: (PickerComboBoxItem | string)[] = [];
+  private _allItems: PickerComboBoxItemWithLabel[] = [];

  private _selectedItemIndex = -1;

@@ -139,8 +121,6 @@ export class HaPickerComboBox extends LitElement {

  private _removeKeyboardShortcuts?: () => void;

-  private _search = "";
-
  protected firstUpdated() {
    this._registerKeyboardShortcuts();
  }
@@ -165,142 +145,74 @@ export class HaPickerComboBox extends LitElement {
        "Search"}
        @input=${this._filterChanged}
      ></ha-textfield>
-      ${this._renderSectionButtons()}
-      ${this.sections?.length
-        ? html`
-            <div class="section-title-wrapper">
-              <div
-                class="section-title ${!this.selectedSection &&
-                this._sectionTitle
-                  ? "show"
-                  : ""}"
-              >
-                ${this._sectionTitle}
-              </div>
-            </div>
-          `
-        : nothing}
      <lit-virtualizer
-        .keyFunction=${this._keyFunction}
+        @scroll=${this._onScrollList}
        tabindex="0"
        scroller
        .items=${this._items}
        .renderItem=${this._renderItem}
        style="min-height: 36px;"
        class=${this._listScrolled ? "scrolled" : ""}
-        @scroll=${this._onScrollList}
        @focus=${this._focusList}
-        @visibilityChanged=${this._visibilityChanged}
      >
      </lit-virtualizer> `;
  }

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

-    return html`
-      <ha-chip-set class="sections">
-        ${this.sections.map((section) =>
-          section === "separator"
-            ? html`<div class="separator"></div>`
-            : html`<ha-filter-chip
-                @click=${this._toggleSection}
-                .section-id=${section.id}
-                .selected=${this.selectedSection === section.id}
-                .label=${section.label}
-              >
-              </ha-filter-chip>`
-        )}
-      </ha-chip-set>
-    `;
-  }
+  private _getAdditionalItems = (searchString?: string) => {
+    const items = this.getAdditionalItems?.(searchString) || [];

-  @eventOptions({ passive: true })
-  private _visibilityChanged(ev) {
-    if (
-      this._virtualizerElement &&
-      this.sectionTitleFunction &&
-      this.sections?.length
-    ) {
-      const firstItem = this._virtualizerElement.items[ev.first];
-      const secondItem = this._virtualizerElement.items[ev.first + 1];
-      this._sectionTitle = this.sectionTitleFunction({
-        firstIndex: ev.first,
-        lastIndex: ev.last,
-        firstItem: firstItem as PickerComboBoxItem | string,
-        secondItem: secondItem as PickerComboBoxItem | string,
-        itemsCount: this._virtualizerElement.items.length,
-      });
-    }
-  }
+    return items.map<PickerComboBoxItemWithLabel>((item) => ({
+      ...item,
+      a11y_label: item.a11y_label || item.primary,
+    }));
+  };

-  private _getAdditionalItems = (searchString?: string) =>
-    this.getAdditionalItems?.(searchString) || [];
+  private _getItems = (): PickerComboBoxItemWithLabel[] => {
+    const items = this.getItems ? this.getItems() : [];

-  private _getItems = () => {
-    let items = [
-      ...(this.getItems
-        ? this.getItems(this._search, this.selectedSection)
-        : []),
-    ];
-
-    if (!this.sections?.length) {
-      items = items.sort((entityA, entityB) =>
+    const sortedItems = items
+      .map<PickerComboBoxItemWithLabel>((item) => ({
+        ...item,
+        a11y_label: item.a11y_label || item.primary,
+      }))
+      .sort((entityA, entityB) =>
        caseInsensitiveStringCompare(
-          (entityA as PickerComboBoxItem).sorting_label!,
-          (entityB as PickerComboBoxItem).sorting_label!,
+          entityA.sorting_label!,
+          entityB.sorting_label!,
          this.hass?.locale.language ?? navigator.language
        )
      );
-    }

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

    const additionalItems = this._getAdditionalItems();
-    items.push(...additionalItems);
-
-    if (this.mode === "dialog") {
-      items.push("padding"); // padding for safe area inset
-    }
-
-    return items;
+    sortedItems.push(...additionalItems);
+    return sortedItems;
  };

-  private _renderItem = (item: PickerComboBoxItem | string, index: number) => {
-    if (item === "padding") {
-      return html`<div class="bottom-padding"></div>`;
-    }
-    if (item === NO_ITEMS_AVAILABLE_ID) {
-      return html`
-        <div class="combo-box-row">
-          <ha-combo-box-item type="text" compact>
-            <ha-svg-icon
-              slot="start"
-              .path=${this._search ? mdiMagnify : mdiMinusBoxOutline}
-            ></ha-svg-icon>
-            <span slot="headline"
-              >${this._search
-                ? typeof this.notFoundLabel === "function"
-                  ? this.notFoundLabel(this._search)
-                  : this.notFoundLabel ||
-                    this.hass?.localize("ui.components.combo-box.no_match") ||
-                    "No matching items found"
-                : this.emptyLabel ||
-                  this.hass?.localize("ui.components.combo-box.no_items") ||
-                  "No items available"}</span
-            >
-          </ha-combo-box-item>
-        </div>
-      `;
-    }
-    if (typeof item === "string") {
-      return html`<div class="title">${item}</div>`;
-    }
-
+  private _renderItem = (item: PickerComboBoxItem, index: number) => {
    const renderer = this.rowRenderer || DEFAULT_ROW_RENDERER;
    return html`<div
      id=${`list-item-${index}`}
@@ -309,7 +221,9 @@ export class HaPickerComboBox extends LitElement {
      .index=${index}
      @click=${this._valueSelected}
    >
-      ${renderer(item, index)}
+      ${item.id === NO_MATCHING_ITEMS_FOUND_ID
+        ? DEFAULT_ROW_RENDERER(item, index)
+        : renderer(item, index)}
    </div>`;
  };

@@ -328,6 +242,10 @@ export class HaPickerComboBox extends LitElement {
    const value = (ev.currentTarget as any).value as string;
    const newValue = value?.trim();

+    if (newValue === NO_MATCHING_ITEMS_FOUND_ID) {
+      return;
+    }
+
    fireEvent(this, "value-changed", { value: newValue });
  };

@@ -338,83 +256,51 @@ export class HaPickerComboBox extends LitElement {
  private _filterChanged = (ev: Event) => {
    const textfield = ev.target as HaTextField;
    const searchString = textfield.value.trim();
-    this._search = searchString;

-    if (this.sections?.length) {
-      this._items = this._getItems();
-    } else {
-      if (!searchString) {
-        this._items = this._allItems;
-        return;
-      }
-
-      const index = this._fuseIndex(this._allItems as PickerComboBoxItem[]);
-      const fuse = new HaFuse(
-        this._allItems as PickerComboBoxItem[],
-        {
-          shouldSort: false,
-          minMatchCharLength: Math.min(searchString.length, 2),
-        },
-        index
-      );
-
-      const results = fuse.multiTermsSearch(searchString);
-      let filteredItems = [...this._allItems];
-
-      if (results) {
-        const items: (PickerComboBoxItem | string)[] = results.map(
-          (result) => result.item
-        );
-
-        if (!items.length) {
-          filteredItems.push(NO_ITEMS_AVAILABLE_ID);
-        }
-
-        const additionalItems = this._getAdditionalItems();
-        items.push(...additionalItems);
-
-        filteredItems = items;
-      }
-
-      if (this.searchFn) {
-        filteredItems = this.searchFn(
-          searchString,
-          filteredItems as PickerComboBoxItem[],
-          this._allItems as PickerComboBoxItem[]
-        );
-      }
-
-      this._items = filteredItems as PickerComboBoxItem[];
+    if (!searchString) {
+      this._items = this._allItems;
+      return;
    }

+    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._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)
+        );
+      }
+      const additionalItems = this._getAdditionalItems(searchString);
+      items.push(...additionalItems);
+      filteredItems = items;
+    }
+
+    if (this.searchFn) {
+      filteredItems = this.searchFn(
+        searchString,
+        filteredItems,
+        this._allItems
+      );
+    }
+
+    this._items = filteredItems as PickerComboBoxItemWithLabel[];
    this._selectedItemIndex = -1;
    if (this._virtualizerElement) {
      this._virtualizerElement.scrollTo(0, 0);
    }
  };

-  private _toggleSection(ev: Event) {
-    ev.stopPropagation();
-    this._resetSelectedItem();
-    this._sectionTitle = undefined;
-    const section = (ev.target as HTMLElement)["section-id"] as string;
-    if (!section) {
-      return;
-    }
-    if (this.selectedSection === section) {
-      this.selectedSection = undefined;
-    } else {
-      this.selectedSection = section;
-    }
-
-    this._items = this._getItems();
-
-    // Reset scroll position when filter changes
-    if (this._virtualizerElement) {
-      this._virtualizerElement.scrollToIndex(0);
-    }
-  }
-
  private _registerKeyboardShortcuts() {
    this._removeKeyboardShortcuts = tinykeys(this, {
      ArrowUp: this._selectPreviousItem,
@@ -458,7 +344,7 @@ export class HaPickerComboBox extends LitElement {
      return;
    }

-    if (typeof items[nextIndex] === "string") {
+    if (items[nextIndex].id === NO_MATCHING_ITEMS_FOUND_ID) {
      // Skip titles, padding and empty search
      if (nextIndex === maxItems) {
        return;
@@ -487,7 +373,7 @@ export class HaPickerComboBox extends LitElement {
        return;
      }

-      if (typeof items[nextIndex] === "string") {
+      if (items[nextIndex]?.id === NO_MATCHING_ITEMS_FOUND_ID) {
        // Skip titles, padding and empty search
        if (nextIndex === 0) {
          return;
@@ -509,6 +395,13 @@ export class HaPickerComboBox extends LitElement {

    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 {
@@ -526,6 +419,13 @@ export class HaPickerComboBox extends LitElement {

    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 {
@@ -553,7 +453,10 @@ export class HaPickerComboBox extends LitElement {
    ev.stopPropagation();
    const firstItem = this._virtualizerElement?.items[0] as PickerComboBoxItem;

-    if (this._virtualizerElement?.items.length === 1) {
+    if (
+      this._virtualizerElement?.items.length === 1 &&
+      firstItem.id !== NO_MATCHING_ITEMS_FOUND_ID
+    ) {
      fireEvent(this, "value-changed", {
        value: firstItem.id,
      });
@@ -569,7 +472,7 @@ export class HaPickerComboBox extends LitElement {
    const item = this._virtualizerElement?.items[
      this._selectedItemIndex
    ] as PickerComboBoxItem;
-    if (item) {
+    if (item && item.id !== NO_MATCHING_ITEMS_FOUND_ID) {
      fireEvent(this, "value-changed", { value: item.id });
    }
  };
@@ -581,9 +484,6 @@ export class HaPickerComboBox extends LitElement {
    this._selectedItemIndex = -1;
  }

-  private _keyFunction = (item: PickerComboBoxItem | string) =>
-    typeof item === "string" ? item : item.id;
-
  static styles = [
    haStyleScrollbar,
    css`
@@ -658,80 +558,6 @@ export class HaPickerComboBox extends LitElement {
          background-color: var(--ha-color-fill-neutral-normal-hover);
        }
      }
-
-      .sections {
-        display: flex;
-        flex-wrap: nowrap;
-        gap: var(--ha-space-2);
-        padding: var(--ha-space-3) var(--ha-space-3);
-        overflow: auto;
-      }
-
-      :host([mode="dialog"]) .sections {
-        padding: var(--ha-space-3) var(--ha-space-4);
-      }
-
-      .sections ha-filter-chip {
-        flex-shrink: 0;
-        --md-filter-chip-selected-container-color: var(
-          --ha-color-fill-primary-normal-hover
-        );
-        color: var(--primary-color);
-      }
-
-      .sections .separator {
-        height: var(--ha-space-8);
-        width: 0;
-        border: 1px solid var(--ha-color-border-neutral-quiet);
-      }
-
-      .section-title,
-      .title {
-        background-color: var(--ha-color-fill-neutral-quiet-resting);
-        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%;
-      }
-
-      :host([mode="dialog"]) .title {
-        padding: var(--ha-space-1) var(--ha-space-4);
-      }
-
-      :host([mode="dialog"]) ha-textfield {
-        padding: 0 var(--ha-space-4);
-      }
-
-      .section-title-wrapper {
-        height: 0;
-        position: relative;
-      }
-
-      .section-title {
-        opacity: 0;
-        position: absolute;
-        top: 1px;
-        width: calc(100% - var(--ha-space-8));
-      }
-
-      .section-title.show {
-        opacity: 1;
-        z-index: 1;
-      }
-
-      .empty-search {
-        display: flex;
-        width: 100%;
-        flex-direction: column;
-        align-items: center;
-        padding: var(--ha-space-3);
-      }
    `,
  ];
 }
--- a/src/components/ha-picker-field.ts
+++ b/src/components/ha-picker-field.ts
@@ -8,6 +8,7 @@ import {
  type TemplateResult,
 } from "lit";
 import { customElement, property, query } from "lit/decorators";
+import { ifDefined } from "lit/directives/if-defined";
 import { fireEvent } from "../common/dom/fire_event";
 import "./ha-combo-box-item";
 import type { HaComboBoxItem } from "./ha-combo-box-item";
@@ -33,6 +34,8 @@ export class HaPickerField extends LitElement {

  @property() public placeholder?: string;

+  @property() public label?: string;
+
  @property({ attribute: "hide-clear-icon", type: Boolean })
  public hideClearIcon = false;

@@ -51,15 +54,35 @@ export class HaPickerField extends LitElement {
      !!this.value && !this.required && !this.disabled && !this.hideClearIcon;

    return html`
-      <ha-combo-box-item .disabled=${this.disabled} type="button" compact>
+      <ha-combo-box-item
+        .disabled=${this.disabled}
+        type="button"
+        compact
+        aria-label=${ifDefined(this.label)}
+      >
        ${this.value
          ? this.valueRenderer
            ? this.valueRenderer(this.value)
-            : html`<slot name="headline">${this.value}</slot>`
+            : html`<span slot="headline">${this.value}</span>`
          : html`
-              <span slot="headline" class="placeholder">
-                ${this.placeholder}
-              </span>
+              ${this.label
+                ? html`
+                    <span
+                      slot="headline"
+                      class="label ${this.placeholder
+                        ? "with-placeholder"
+                        : ""}"
+                      >${this.label}</span
+                    >
+                  `
+                : nothing}
+              ${this.placeholder
+                ? html`
+                    <span slot="headline" class="placeholder">
+                      ${this.placeholder}
+                    </span>
+                  `
+                : nothing}
            `}
        ${showClearIcon
          ? html`
@@ -152,9 +175,24 @@ export class HaPickerField extends LitElement {
          width: 32px;
        }

+        .label {
+          padding: 0 8px;
+          color: var(--secondary-text-color);
+          line-height: var(--ha-line-height-normal);
+          font-size: var(--ha-font-size-m);
+          white-space: nowrap;
+        }
+
+        .label.with-placeholder {
+          line-height: var(--ha-line-height-condensed);
+          font-size: var(--ha-font-size-xs);
+        }
+
        .placeholder {
          color: var(--secondary-text-color);
          padding: 0 8px;
+          line-height: var(--ha-line-height-normal);
+          font-size: var(--ha-font-size-m);
        }
      `,
    ];
--- a/src/components/ha-selector/ha-selector-state.ts
+++ b/src/components/ha-selector/ha-selector-state.ts
@@ -1,8 +1,6 @@
-import type { HassServiceTarget } from "home-assistant-js-websocket";
 import { html, LitElement } from "lit";
-import { customElement, property, state } from "lit/decorators";
+import { customElement, property } from "lit/decorators";
 import type { StateSelector } from "../../data/selector";
-import { extractFromTarget } from "../../data/target";
 import { SubscribeMixin } from "../../mixins/subscribe-mixin";
 import type { HomeAssistant } from "../../types";
 import "../entity/ha-entity-state-picker";
@@ -27,29 +25,15 @@ export class HaSelectorState extends SubscribeMixin(LitElement) {
  @property({ attribute: false }) public context?: {
    filter_attribute?: string;
    filter_entity?: string | string[];
-    filter_target?: HassServiceTarget;
  };

-  @state() private _entityIds?: string | string[];
-
-  willUpdate(changedProps) {
-    if (changedProps.has("selector") || changedProps.has("context")) {
-      this._resolveEntityIds(
-        this.selector.state?.entity_id,
-        this.context?.filter_entity,
-        this.context?.filter_target
-      ).then((entityIds) => {
-        this._entityIds = entityIds;
-      });
-    }
-  }
-
  protected render() {
    if (this.selector.state?.multiple) {
      return html`
        <ha-entity-states-picker
          .hass=${this.hass}
-          .entityId=${this._entityIds}
+          .entityId=${this.selector.state?.entity_id ||
+          this.context?.filter_entity}
          .attribute=${this.selector.state?.attribute ||
          this.context?.filter_attribute}
          .extraOptions=${this.selector.state?.extra_options}
@@ -66,7 +50,8 @@ export class HaSelectorState extends SubscribeMixin(LitElement) {
    return html`
      <ha-entity-state-picker
        .hass=${this.hass}
-        .entityId=${this._entityIds}
+        .entityId=${this.selector.state?.entity_id ||
+        this.context?.filter_entity}
        .attribute=${this.selector.state?.attribute ||
        this.context?.filter_attribute}
        .extraOptions=${this.selector.state?.extra_options}
@@ -80,24 +65,6 @@ export class HaSelectorState extends SubscribeMixin(LitElement) {
      ></ha-entity-state-picker>
    `;
  }
-
-  private async _resolveEntityIds(
-    selectorEntityId: string | string[] | undefined,
-    contextFilterEntity: string | string[] | undefined,
-    contextFilterTarget: HassServiceTarget | undefined
-  ): Promise<string | string[] | undefined> {
-    if (selectorEntityId !== undefined) {
-      return selectorEntityId;
-    }
-    if (contextFilterEntity !== undefined) {
-      return contextFilterEntity;
-    }
-    if (contextFilterTarget !== undefined) {
-      const result = await extractFromTarget(this.hass, contextFilterTarget);
-      return result.referenced_entities;
-    }
-    return undefined;
-  }
 }

 declare global {
--- a/src/components/ha-sidebar.ts
+++ b/src/components/ha-sidebar.ts
@@ -33,7 +33,6 @@ 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";
-import { getDefaultPanelUrlPath } from "../data/panel";
 import type { PersistentNotification } from "../data/persistent_notification";
 import { subscribeNotifications } from "../data/persistent_notification";
 import { subscribeRepairsIssueRegistry } from "../data/repairs";
@@ -143,7 +142,7 @@ const defaultPanelSorter = (
 export const computePanels = memoizeOne(
  (
    panels: HomeAssistant["panels"],
-    defaultPanel: string,
+    defaultPanel: HomeAssistant["defaultPanel"],
    panelsOrder: string[],
    hiddenPanels: string[],
    locale: HomeAssistant["locale"]
@@ -158,9 +157,7 @@ export const computePanels = memoizeOne(
    Object.values(panels).forEach((panel) => {
      if (
        hiddenPanels.includes(panel.url_path) ||
-        (!panel.title && panel.url_path !== defaultPanel) ||
-        (panel.default_visible === false &&
-          !panelsOrder.includes(panel.url_path))
+        (!panel.title && panel.url_path !== defaultPanel)
      ) {
        return;
      }
@@ -299,8 +296,7 @@ class HaSidebar extends SubscribeMixin(LitElement) {
      hass.localize !== oldHass.localize ||
      hass.locale !== oldHass.locale ||
      hass.states !== oldHass.states ||
-      hass.userData !== oldHass.userData ||
-      hass.systemData !== oldHass.systemData ||
+      hass.defaultPanel !== oldHass.defaultPanel ||
      hass.connected !== oldHass.connected
    );
  }
@@ -403,11 +399,9 @@ class HaSidebar extends SubscribeMixin(LitElement) {
      `;
    }

-    const defaultPanel = getDefaultPanelUrlPath(this.hass);
-
    const [beforeSpacer, afterSpacer] = computePanels(
      this.hass.panels,
-      defaultPanel,
+      this.hass.defaultPanel,
      this._panelOrder,
      this._hiddenPanels,
      this.hass.locale
@@ -422,27 +416,23 @@ class HaSidebar extends SubscribeMixin(LitElement) {
        @scroll=${this._listboxScroll}
        @keydown=${this._listboxKeydown}
      >
-        ${this._renderPanels(beforeSpacer, selectedPanel, defaultPanel)}
+        ${this._renderPanels(beforeSpacer, selectedPanel)}
        ${this._renderSpacer()}
-        ${this._renderPanels(afterSpacer, selectedPanel, defaultPanel)}
+        ${this._renderPanels(afterSpacer, selectedPanel)}
        ${this._renderExternalConfiguration()}
      </ha-md-list>
    `;
  }

-  private _renderPanels(
-    panels: PanelInfo[],
-    selectedPanel: string,
-    defaultPanel: string
-  ) {
+  private _renderPanels(panels: PanelInfo[], selectedPanel: string) {
    return panels.map((panel) =>
      this._renderPanel(
        panel.url_path,
-        panel.url_path === defaultPanel
+        panel.url_path === this.hass.defaultPanel
          ? panel.title || this.hass.localize("panel.states")
          : this.hass.localize(`panel.${panel.title}`) || panel.title,
        panel.icon,
-        panel.url_path === defaultPanel && !panel.icon
+        panel.url_path === this.hass.defaultPanel && !panel.icon
          ? PANEL_ICONS.lovelace
          : panel.url_path in PANEL_ICONS
            ? PANEL_ICONS[panel.url_path]
--- a/src/components/ha-target-picker.ts
+++ b/src/components/ha-target-picker.ts
--- a/src/components/ha-tooltip.ts
+++ b/src/components/ha-tooltip.ts
@@ -9,7 +9,7 @@ export class HaTooltip extends Tooltip {
  @property({ attribute: "show-delay", type: Number }) showDelay = 150;

  /** The amount of time to wait before hiding the tooltip when the user mouses out.. */
-  @property({ attribute: "hide-delay", type: Number }) hideDelay = 150;
+  @property({ attribute: "hide-delay", type: Number }) hideDelay = 400;

  static get styles(): CSSResultGroup {
    return [
--- a/src/components/ha-trigger-icon.ts
+++ b/src/components/ha-trigger-icon.ts
@@ -1,97 +0,0 @@
-import {
-  mdiAvTimer,
-  mdiCalendar,
-  mdiClockOutline,
-  mdiCodeBraces,
-  mdiDevices,
-  mdiFormatListBulleted,
-  mdiGestureDoubleTap,
-  mdiHomeAssistant,
-  mdiMapMarker,
-  mdiMapMarkerRadius,
-  mdiMessageAlert,
-  mdiMicrophoneMessage,
-  mdiNfcVariant,
-  mdiNumeric,
-  mdiStateMachine,
-  mdiSwapHorizontal,
-  mdiWeatherSunny,
-  mdiWebhook,
-} from "@mdi/js";
-import { html, LitElement, nothing } from "lit";
-import { customElement, property } from "lit/decorators";
-import { until } from "lit/directives/until";
-import { computeDomain } from "../common/entity/compute_domain";
-import { FALLBACK_DOMAIN_ICONS, triggerIcon } from "../data/icons";
-import type { HomeAssistant } from "../types";
-import "./ha-icon";
-import "./ha-svg-icon";
-
-export const TRIGGER_ICONS = {
-  calendar: mdiCalendar,
-  device: mdiDevices,
-  event: mdiGestureDoubleTap,
-  state: mdiStateMachine,
-  geo_location: mdiMapMarker,
-  homeassistant: mdiHomeAssistant,
-  mqtt: mdiSwapHorizontal,
-  numeric_state: mdiNumeric,
-  sun: mdiWeatherSunny,
-  conversation: mdiMicrophoneMessage,
-  tag: mdiNfcVariant,
-  template: mdiCodeBraces,
-  time: mdiClockOutline,
-  time_pattern: mdiAvTimer,
-  webhook: mdiWebhook,
-  persistent_notification: mdiMessageAlert,
-  zone: mdiMapMarkerRadius,
-  list: mdiFormatListBulleted,
-};
-
-@customElement("ha-trigger-icon")
-export class HaTriggerIcon extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
-  @property() public trigger?: string;
-
-  @property() public icon?: string;
-
-  protected render() {
-    if (this.icon) {
-      return html`<ha-icon .icon=${this.icon}></ha-icon>`;
-    }
-
-    if (!this.trigger) {
-      return nothing;
-    }
-
-    if (!this.hass) {
-      return this._renderFallback();
-    }
-
-    const icon = triggerIcon(this.hass, this.trigger).then((icn) => {
-      if (icn) {
-        return html`<ha-icon .icon=${icn}></ha-icon>`;
-      }
-      return this._renderFallback();
-    });
-
-    return html`${until(icon)}`;
-  }
-
-  private _renderFallback() {
-    const domain = computeDomain(this.trigger!);
-
-    return html`
-      <ha-svg-icon
-        .path=${TRIGGER_ICONS[this.trigger!] || FALLBACK_DOMAIN_ICONS[domain]}
-      ></ha-svg-icon>
-    `;
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-trigger-icon": HaTriggerIcon;
-  }
-}
--- a/src/components/ha-wa-dialog.ts
+++ b/src/components/ha-wa-dialog.ts
@@ -1,4 +1,6 @@
-import { css, html, LitElement } from "lit";
+import "@home-assistant/webawesome/dist/components/dialog/dialog";
+import { mdiClose } from "@mdi/js";
+import { css, html, LitElement, nothing } from "lit";
 import {
  customElement,
  eventOptions,
@@ -6,9 +8,6 @@ import {
  query,
  state,
 } from "lit/decorators";
-import { ifDefined } from "lit/directives/if-defined";
-import { mdiClose } from "@mdi/js";
-import "@home-assistant/webawesome/dist/components/dialog/dialog";
 import { fireEvent } from "../common/dom/fire_event";
 import { haStyleScrollbar } from "../resources/styles";
 import type { HomeAssistant } from "../types";
@@ -32,8 +31,6 @@ export type DialogWidth = "small" | "medium" | "large" | "full";
 *
 * @slot header - Replace the entire header area.
 * @slot headerNavigationIcon - Leading header action (e.g. close/back button).
- * @slot headerTitle - Custom title content (used when header-title is not set).
- * @slot headerSubtitle - Custom subtitle content (used when header-subtitle is not set).
 * @slot headerActionItems - Trailing header actions (e.g. buttons, menus).
 * @slot - Dialog content body.
 * @slot footer - Dialog footer content.
@@ -55,8 +52,8 @@ export type DialogWidth = "small" | "medium" | "large" | "full";
 * @attr {boolean} open - Controls the dialog open state.
 * @attr {("small"|"medium"|"large"|"full")} width - Preferred dialog width preset. Defaults to "medium".
 * @attr {boolean} prevent-scrim-close - Prevents closing the dialog by clicking the scrim/overlay. Defaults to false.
- * @attr {string} header-title - Header title text. If not set, the headerTitle slot is used.
- * @attr {string} header-subtitle - Header subtitle text. If not set, the headerSubtitle slot is used.
+ * @attr {string} header-title - Header title text when no custom title slot is provided.
+ * @attr {string} header-subtitle - Header subtitle text when no custom subtitle slot is provided.
 * @attr {("above"|"below")} header-subtitle-position - Position of the subtitle relative to the title. Defaults to "below".
 * @attr {boolean} flexcontent - Makes the dialog body a flex container for flexible layouts.
 *
@@ -75,12 +72,6 @@ export type DialogWidth = "small" | "medium" | "large" | "full";
 export class HaWaDialog extends LitElement {
  @property({ attribute: false }) public hass!: HomeAssistant;

-  @property({ attribute: "aria-labelledby" })
-  public ariaLabelledBy?: string;
-
-  @property({ attribute: "aria-describedby" })
-  public ariaDescribedBy?: string;
-
  @property({ type: Boolean, reflect: true })
  public open = false;

@@ -90,11 +81,11 @@ export class HaWaDialog extends LitElement {
  @property({ type: Boolean, reflect: true, attribute: "prevent-scrim-close" })
  public preventScrimClose = false;

-  @property({ attribute: "header-title" })
-  public headerTitle?: string;
+  @property({ type: String, attribute: "header-title" })
+  public headerTitle = "";

-  @property({ attribute: "header-subtitle" })
-  public headerSubtitle?: string;
+  @property({ type: String, attribute: "header-subtitle" })
+  public headerSubtitle = "";

  @property({ type: String, attribute: "header-subtitle-position" })
  public headerSubtitlePosition: "above" | "below" = "below";
@@ -126,11 +117,6 @@ export class HaWaDialog extends LitElement {
        .open=${this._open}
        .lightDismiss=${!this.preventScrimClose}
        without-header
-        aria-labelledby=${ifDefined(
-          this.ariaLabelledBy ||
-            (this.headerTitle !== undefined ? "ha-wa-dialog-title" : undefined)
-        )}
-        aria-describedby=${ifDefined(this.ariaDescribedBy)}
        @wa-show=${this._handleShow}
        @wa-after-show=${this._handleAfterShow}
        @wa-after-hide=${this._handleAfterHide}
@@ -147,14 +133,14 @@ export class HaWaDialog extends LitElement {
                .path=${mdiClose}
              ></ha-icon-button>
            </slot>
-            ${this.headerTitle !== undefined
-              ? html`<span slot="title" class="title" id="ha-wa-dialog-title">
+            ${this.headerTitle
+              ? html`<span slot="title" class="title">
                  ${this.headerTitle}
                </span>`
-              : html`<slot name="headerTitle" slot="title"></slot>`}
-            ${this.headerSubtitle !== undefined
+              : nothing}
+            ${this.headerSubtitle
              ? html`<span slot="subtitle">${this.headerSubtitle}</span>`
-              : html`<slot name="headerSubtitle" slot="subtitle"></slot>`}
+              : nothing}
            <slot name="headerActionItems" slot="actionItems"></slot>
          </ha-dialog-header>
        </slot>
--- a/src/components/search-input.ts
+++ b/src/components/search-input.ts
@@ -34,7 +34,6 @@ class SearchInput extends LitElement {
    return html`
      <ha-textfield
        .autofocus=${this.autofocus}
-        autocomplete="off"
        .label=${this.label || this.hass.localize("ui.common.search")}
        .value=${this.filter || ""}
        icon
--- a/src/components/target-picker/ha-target-picker-item-row.ts
+++ b/src/components/target-picker/ha-target-picker-item-row.ts
@@ -6,7 +6,6 @@ import {
  mdiLabel,
  mdiTextureBox,
 } from "@mdi/js";
-import type { HassEntity } from "home-assistant-js-websocket";
 import { css, html, LitElement, nothing, type PropertyValues } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
@@ -20,12 +19,9 @@ import { computeDomain } from "../../common/entity/compute_domain";
 import { computeEntityName } from "../../common/entity/compute_entity_name";
 import { getEntityContext } from "../../common/entity/context/get_entity_context";
 import { computeRTL } from "../../common/util/compute_rtl";
-import type { AreaRegistryEntry } from "../../data/area_registry";
 import { getConfigEntry } from "../../data/config_entries";
 import { labelsContext } from "../../data/context";
-import type { DeviceRegistryEntry } from "../../data/device_registry";
 import type { HaEntityPickerEntityFilterFunc } from "../../data/entity";
-import type { FloorRegistryEntry } from "../../data/floor_registry";
 import { domainToName } from "../../data/integration";
 import type { LabelRegistryEntry } from "../../data/label_registry";
 import {
@@ -115,10 +111,10 @@ export class HaTargetPickerItemRow extends LitElement {
  }

  protected render() {
-    const { name, context, iconPath, fallbackIconPath, stateObject, notFound } =
+    const { name, context, iconPath, fallbackIconPath, stateObject } =
      this._itemData(this.type, this.itemId);

-    const showEntities = this.type !== "entity" && !notFound;
+    const showEntities = this.type !== "entity";

    const entries = this.parentEntries || this._entries;

@@ -132,7 +128,7 @@ export class HaTargetPickerItemRow extends LitElement {
    }

    return html`
-      <ha-md-list-item type="text" class=${notFound ? "error" : ""}>
+      <ha-md-list-item type="text">
        <div class="icon" slot="start">
          ${this.subEntry
            ? html`
@@ -152,15 +148,11 @@ export class HaTargetPickerItemRow extends LitElement {
                />`
              : fallbackIconPath
                ? html`<ha-svg-icon .path=${fallbackIconPath}></ha-svg-icon>`
-                : this.type === "entity"
+                : stateObject
                  ? html`
                      <ha-state-icon
                        .hass=${this.hass}
-                        .stateObj=${stateObject ||
-                        ({
-                          entity_id: this.itemId,
-                          attributes: {},
-                        } as HassEntity)}
+                        .stateObj=${stateObject}
                      >
                      </ha-state-icon>
                    `
@@ -168,14 +160,8 @@ export class HaTargetPickerItemRow extends LitElement {
        </div>

        <div slot="headline">${name}</div>
-        ${notFound || (context && !this.hideContext)
-          ? html`<span slot="supporting-text"
-              >${notFound
-                ? this.hass.localize(
-                    `ui.components.target-picker.${this.type}_not_found`
-                  )
-                : context}</span
-            >`
+        ${context && !this.hideContext
+          ? html`<span slot="supporting-text">${context}</span>`
          : nothing}
        ${this._domainName && this.subEntry
          ? html`<span slot="supporting-text" class="domain"
@@ -488,28 +474,26 @@ export class HaTargetPickerItemRow extends LitElement {

  private _itemData = memoizeOne((type: TargetType, item: string) => {
    if (type === "floor") {
-      const floor: FloorRegistryEntry | undefined = this.hass.floors?.[item];
+      const floor = this.hass.floors?.[item];
      return {
        name: floor?.name || item,
        iconPath: floor?.icon,
        fallbackIconPath: floor ? floorDefaultIconPath(floor) : mdiHome,
-        notFound: !floor,
      };
    }
    if (type === "area") {
-      const area: AreaRegistryEntry | undefined = this.hass.areas?.[item];
+      const area = this.hass.areas?.[item];
      return {
        name: area?.name || item,
-        context: area?.floor_id && this.hass.floors?.[area.floor_id]?.name,
+        context: area.floor_id && this.hass.floors?.[area.floor_id]?.name,
        iconPath: area?.icon,
        fallbackIconPath: mdiTextureBox,
-        notFound: !area,
      };
    }
    if (type === "device") {
-      const device: DeviceRegistryEntry | undefined = this.hass.devices?.[item];
+      const device = this.hass.devices?.[item];

-      if (device?.primary_config_entry) {
+      if (device.primary_config_entry) {
        this._getDeviceDomain(device.primary_config_entry);
      }

@@ -517,25 +501,24 @@ export class HaTargetPickerItemRow extends LitElement {
        name: device ? computeDeviceNameDisplay(device, this.hass) : item,
        context: device?.area_id && this.hass.areas?.[device.area_id]?.name,
        fallbackIconPath: mdiDevices,
-        notFound: !device,
      };
    }
    if (type === "entity") {
      this._setDomainName(computeDomain(item));

-      const stateObject: HassEntity | undefined = this.hass.states[item];
-      const entityName = stateObject
-        ? computeEntityName(stateObject, this.hass.entities, this.hass.devices)
-        : item;
-      const { area, device } = stateObject
-        ? getEntityContext(
-            stateObject,
-            this.hass.entities,
-            this.hass.devices,
-            this.hass.areas,
-            this.hass.floors
-          )
-        : { area: undefined, device: undefined };
+      const stateObject = this.hass.states[item];
+      const entityName = computeEntityName(
+        stateObject,
+        this.hass.entities,
+        this.hass.devices
+      );
+      const { area, device } = getEntityContext(
+        stateObject,
+        this.hass.entities,
+        this.hass.devices,
+        this.hass.areas,
+        this.hass.floors
+      );
      const deviceName = device ? computeDeviceName(device) : undefined;
      const areaName = area ? computeAreaName(area) : undefined;
      const context = [areaName, entityName ? deviceName : undefined]
@@ -545,19 +528,15 @@ export class HaTargetPickerItemRow extends LitElement {
        name: entityName || deviceName || item,
        context,
        stateObject,
-        notFound: !stateObject && item !== "all" && item !== "none",
      };
    }

    // type label
-    const label: LabelRegistryEntry | undefined = this._labelRegistry.find(
-      (lab) => lab.label_id === item
-    );
+    const label = this._labelRegistry.find((lab) => lab.label_id === item);
    return {
      name: label?.name || item,
      iconPath: label?.icon,
      fallbackIconPath: mdiLabel,
-      notFound: !label,
    };
  });

@@ -618,27 +597,17 @@ export class HaTargetPickerItemRow extends LitElement {
        border-radius: var(--ha-card-border-radius, var(--ha-border-radius-lg));
      }

-      .error {
-        background: var(--ha-color-fill-warning-quiet-resting);
-      }
-
-      .error [slot="supporting-text"] {
-        color: var(--ha-color-on-warning-normal);
-      }
-
      state-badge {
        color: var(--ha-color-on-neutral-quiet);
      }

      .icon {
-        width: 24px;
        display: flex;
      }

      img {
        width: 24px;
        height: 24px;
-        z-index: 1;
      }
      ha-icon-button {
        --mdc-icon-button-size: 32px;
--- a/src/components/target-picker/ha-target-picker-selector.ts
+++ b/src/components/target-picker/ha-target-picker-selector.ts
--- a/src/components/user/ha-user-picker.ts
+++ b/src/components/user/ha-user-picker.ts
@@ -128,7 +128,9 @@ class HaUserPicker extends LitElement {
        .hass=${this.hass}
        .autofocus=${this.autofocus}
        .label=${this.label}
-        .notFoundLabel=${this._notFoundLabel}
+        .notFoundLabel=${this.hass.localize(
+          "ui.components.user-picker.no_match"
+        )}
        .placeholder=${placeholder}
        .value=${this.value}
        .getItems=${this._getItems}
@@ -147,11 +149,6 @@ class HaUserPicker extends LitElement {
    fireEvent(this, "value-changed", { value });
    fireEvent(this, "change");
  }
-
-  private _notFoundLabel = (search: string) =>
-    this.hass.localize("ui.components.user-picker.no_match", {
-      term: html`<b>‘${search}’</b>`,
-    });
 }

 declare global {
--- a/src/data/action.ts
+++ b/src/data/action.ts
@@ -50,7 +50,7 @@ export const ACTION_COLLECTIONS: AutomationElementGroupCollection[] = [
  {
    groups: {
      device_id: {},
-      dynamicGroups: {},
+      serviceGroups: {},
    },
  },
  {
@@ -117,6 +117,14 @@ export const VIRTUAL_ACTIONS: Partial<
  },
 } as const;

+export const SERVICE_PREFIX = "__SERVICE__";
+
+export const isService = (key: string | undefined): boolean | undefined =>
+  key?.startsWith(SERVICE_PREFIX);
+
+export const getService = (key: string): string =>
+  key.substring(SERVICE_PREFIX.length);
+
 export const COLLAPSIBLE_ACTION_ELEMENTS = [
  "ha-automation-action-choose",
  "ha-automation-action-condition",
--- a/src/data/automation.ts
+++ b/src/data/automation.ts
@@ -1,10 +1,8 @@
 import type {
  HassEntityAttributeBase,
  HassEntityBase,
-  HassServiceTarget,
 } from "home-assistant-js-websocket";
 import { ensureArray } from "../common/array/ensure-array";
-import type { WeekdayShort } from "../common/datetime/weekday";
 import { navigate } from "../common/navigate";
 import type { LocalizeKeys } from "../common/translations/localize";
 import { createSearchParam } from "../common/url/search-params";
@@ -14,19 +12,10 @@ import { CONDITION_BUILDING_BLOCKS } from "./condition";
 import type { DeviceCondition, DeviceTrigger } from "./device_automation";
 import type { Action, Field, MODES } from "./script";
 import { migrateAutomationAction } from "./script";
-import type { TriggerDescription } from "./trigger";

 export const AUTOMATION_DEFAULT_MODE: (typeof MODES)[number] = "single";
 export const AUTOMATION_DEFAULT_MAX = 10;

-export const DYNAMIC_PREFIX = "__DYNAMIC__";
-
-export const isDynamic = (key: string | undefined): boolean | undefined =>
-  key?.startsWith(DYNAMIC_PREFIX);
-
-export const getValueFromDynamic = (key: string): string =>
-  key.substring(DYNAMIC_PREFIX.length);
-
 export interface AutomationEntity extends HassEntityBase {
  attributes: HassEntityAttributeBase & {
    id?: string;
@@ -96,12 +85,6 @@ export interface BaseTrigger {
  id?: string;
  variables?: Record<string, unknown>;
  enabled?: boolean;
-  options?: Record<string, unknown>;
-}
-
-export interface PlatformTrigger extends BaseTrigger {
-  trigger: Exclude<string, LegacyTrigger["trigger"]>;
-  target?: HassServiceTarget;
 }

 export interface StateTrigger extends BaseTrigger {
@@ -211,7 +194,7 @@ export interface CalendarTrigger extends BaseTrigger {
  offset: string;
 }

-export type LegacyTrigger =
+export type Trigger =
  | StateTrigger
  | MqttTrigger
  | GeoLocationTrigger
@@ -228,9 +211,8 @@ export type LegacyTrigger =
  | TemplateTrigger
  | EventTrigger
  | DeviceTrigger
-  | CalendarTrigger;
-
-export type Trigger = LegacyTrigger | TriggerList | PlatformTrigger;
+  | CalendarTrigger
+  | TriggerList;

 interface BaseCondition {
  condition: string;
@@ -275,11 +257,13 @@ export interface ZoneCondition extends BaseCondition {
  zone: string;
 }

+type Weekday = "sun" | "mon" | "tue" | "wed" | "thu" | "fri" | "sat";
+
 export interface TimeCondition extends BaseCondition {
  condition: "time";
  after?: string;
  before?: string;
-  weekday?: WeekdayShort | WeekdayShort[];
+  weekday?: Weekday | Weekday[];
 }

 export interface TemplateCondition extends BaseCondition {
@@ -592,7 +576,6 @@ export interface TriggerSidebarConfig extends BaseSidebarConfig {
  insertAfter: (value: Trigger | Trigger[]) => boolean;
  toggleYamlMode: () => void;
  config: Trigger;
-  description?: TriggerDescription;
  yamlMode: boolean;
  uiSupported: boolean;
 }
--- a/src/data/automation_i18n.ts
+++ b/src/data/automation_i18n.ts
@@ -16,9 +16,8 @@ import {
  formatListWithAnds,
  formatListWithOrs,
 } from "../common/string/format-list";
-import { hasTemplate } from "../common/string/has-template";
 import type { HomeAssistant } from "../types";
-import type { Condition, ForDict, LegacyTrigger, Trigger } from "./automation";
+import type { Condition, ForDict, Trigger } from "./automation";
 import type { DeviceCondition, DeviceTrigger } from "./device_automation";
 import {
  localizeDeviceAutomationCondition,
@@ -26,7 +25,8 @@ import {
 } from "./device_automation";
 import type { EntityRegistryEntry } from "./entity_registry";
 import type { FrontendLocaleData } from "./translation";
-import { getTriggerDomain, getTriggerObjectId, isTriggerList } from "./trigger";
+import { isTriggerList } from "./trigger";
+import { hasTemplate } from "../common/string/has-template";

 const triggerTranslationBaseKey =
  "ui.panel.config.automation.editor.triggers.type";
@@ -121,37 +121,6 @@ const tryDescribeTrigger = (
    return trigger.alias;
  }

-  const description = describeLegacyTrigger(
-    trigger as LegacyTrigger,
-    hass,
-    entityRegistry
-  );
-
-  if (description) {
-    return description;
-  }
-
-  const triggerType = trigger.trigger;
-
-  const domain = getTriggerDomain(trigger.trigger);
-  const type = getTriggerObjectId(trigger.trigger);
-
-  return (
-    hass.localize(
-      `component.${domain}.triggers.${type}.description_configured`
-    ) ||
-    hass.localize(
-      `ui.panel.config.automation.editor.triggers.type.${triggerType as LegacyTrigger["trigger"]}.label`
-    ) ||
-    hass.localize(`ui.panel.config.automation.editor.triggers.unknown_trigger`)
-  );
-};
-
-const describeLegacyTrigger = (
-  trigger: LegacyTrigger,
-  hass: HomeAssistant,
-  entityRegistry: EntityRegistryEntry[]
-) => {
  // Event Trigger
  if (trigger.trigger === "event" && trigger.event_type) {
    const eventTypes: string[] = [];
@@ -833,7 +802,13 @@ const describeLegacyTrigger = (
      }
    );
  }
-  return undefined;
+
+  return (
+    hass.localize(
+      `ui.panel.config.automation.editor.triggers.type.${trigger.trigger}.label`
+    ) ||
+    hass.localize(`ui.panel.config.automation.editor.triggers.unknown_trigger`)
+  );
 };

 export const describeCondition = (
--- a/src/data/device_registry.ts
+++ b/src/data/device_registry.ts
@@ -186,8 +186,7 @@ export const getDevices = (
  deviceFilter?: HaDevicePickerDeviceFilterFunc,
  entityFilter?: HaEntityPickerEntityFilterFunc,
  excludeDevices?: string[],
-  value?: string,
-  idPrefix = ""
+  value?: string
 ): DevicePickerItem[] => {
  const devices = Object.values(hass.devices);
  const entities = Object.values(hass.entities);
@@ -299,7 +298,7 @@ export const getDevices = (
    const domainName = domain ? domainToName(hass.localize, domain) : undefined;

    return {
-      id: `${idPrefix}${device.id}`,
+      id: device.id,
      label: "",
      primary:
        deviceName ||
--- a/src/data/energy.ts
+++ b/src/data/energy.ts
@@ -102,7 +102,6 @@ export type EnergySolarForecasts = Record<string, EnergySolarForecast>;
 export interface DeviceConsumptionEnergyPreference {
  // This is an ever increasing value
  stat_consumption: string;
-  stat_rate?: string;
  name?: string;
  included_in_stat?: string;
 }
@@ -131,17 +130,11 @@ export interface FlowToGridSourceEnergyPreference {
  number_energy_price: number | null;
 }

-export interface GridPowerSourceEnergyPreference {
-  // W meter
-  stat_rate: string;
-}
-
 export interface GridSourceTypeEnergyPreference {
  type: "grid";

  flow_from: FlowFromGridSourceEnergyPreference[];
  flow_to: FlowToGridSourceEnergyPreference[];
-  power?: GridPowerSourceEnergyPreference[];

  cost_adjustment_day: number;
 }
@@ -150,7 +143,6 @@ export interface SolarSourceTypeEnergyPreference {
  type: "solar";

  stat_energy_from: string;
-  stat_rate?: string;
  config_entry_solar_forecast: string[] | null;
 }

@@ -158,7 +150,6 @@ export interface BatterySourceTypeEnergyPreference {
  type: "battery";
  stat_energy_from: string;
  stat_energy_to: string;
-  stat_rate?: string;
 }
 export interface GasSourceTypeEnergyPreference {
  type: "gas";
@@ -360,35 +351,6 @@ export const getReferencedStatisticIds = (
  return statIDs;
 };

-export const getReferencedStatisticIdsPower = (
-  prefs: EnergyPreferences
-): string[] => {
-  const statIDs: (string | undefined)[] = [];
-
-  for (const source of prefs.energy_sources) {
-    if (source.type === "gas" || source.type === "water") {
-      continue;
-    }
-
-    if (source.type === "solar") {
-      statIDs.push(source.stat_rate);
-      continue;
-    }
-
-    if (source.type === "battery") {
-      statIDs.push(source.stat_rate);
-      continue;
-    }
-
-    if (source.power) {
-      statIDs.push(...source.power.map((p) => p.stat_rate));
-    }
-  }
-  statIDs.push(...prefs.device_consumption.map((d) => d.stat_rate));
-
-  return statIDs.filter(Boolean) as string[];
-};
-
 export const enum CompareMode {
  NONE = "",
  PREVIOUS = "previous",
@@ -436,10 +398,9 @@ const getEnergyData = async (
    "gas",
    "device",
  ]);
-  const powerStatIds = getReferencedStatisticIdsPower(prefs);
  const waterStatIds = getReferencedStatisticIds(prefs, info, ["water"]);

-  const allStatIDs = [...energyStatIds, ...waterStatIds, ...powerStatIds];
+  const allStatIDs = [...energyStatIds, ...waterStatIds];

  const dayDifference = differenceInDays(end || new Date(), start);
  const period =
@@ -450,8 +411,6 @@ const getEnergyData = async (
      : dayDifference > 2
        ? "day"
        : "hour";
-  const finePeriod =
-    dayDifference > 64 ? "day" : dayDifference > 8 ? "hour" : "5minute";

  const statsMetadata: Record<string, StatisticsMetaData> = {};
  const statsMetadataArray = allStatIDs.length
@@ -473,9 +432,6 @@ const getEnergyData = async (
      ? (gasUnit as (typeof VOLUME_UNITS)[number])
      : undefined,
  };
-  const powerUnits: StatisticsUnitConfiguration = {
-    power: "kW",
-  };
  const waterUnit = getEnergyWaterUnit(hass, prefs, statsMetadata);
  const waterUnits: StatisticsUnitConfiguration = {
    volume: waterUnit,
@@ -486,12 +442,6 @@ const getEnergyData = async (
        "change",
      ])
    : {};
-  const _powerStats: Statistics | Promise<Statistics> = powerStatIds.length
-    ? fetchStatistics(hass!, start, end, powerStatIds, finePeriod, powerUnits, [
-        "mean",
-      ])
-    : {};
-
  const _waterStats: Statistics | Promise<Statistics> = waterStatIds.length
    ? fetchStatistics(hass!, start, end, waterStatIds, period, waterUnits, [
        "change",
@@ -598,7 +548,6 @@ const getEnergyData = async (

  const [
    energyStats,
-    powerStats,
    waterStats,
    energyStatsCompare,
    waterStatsCompare,
@@ -606,14 +555,13 @@ const getEnergyData = async (
    fossilEnergyConsumptionCompare,
  ] = await Promise.all([
    _energyStats,
-    _powerStats,
    _waterStats,
    _energyStatsCompare,
    _waterStatsCompare,
    _fossilEnergyConsumption,
    _fossilEnergyConsumptionCompare,
  ]);
-  const stats = { ...energyStats, ...waterStats, ...powerStats };
+  const stats = { ...energyStats, ...waterStats };
  if (compare) {
    statsCompare = { ...energyStatsCompare, ...waterStatsCompare };
  }
--- a/src/data/entity_registry.ts
+++ b/src/data/entity_registry.ts
@@ -344,8 +344,7 @@ export const getEntities = (
  includeUnitOfMeasurement?: string[],
  includeEntities?: string[],
  excludeEntities?: string[],
-  value?: string,
-  idPrefix = ""
+  value?: string
 ): EntityComboBoxItem[] => {
  let items: EntityComboBoxItem[] = [];

@@ -396,9 +395,10 @@ export const getEntities = (
    const secondary = [areaName, entityName ? deviceName : undefined]
      .filter(Boolean)
      .join(isRTL ? " ◂ " : " ▸ ");
+    const a11yLabel = [deviceName, entityName].filter(Boolean).join(" - ");

    return {
-      id: `${idPrefix}${entityId}`,
+      id: entityId,
      primary: primary,
      secondary: secondary,
      domain_name: domainName,
@@ -411,6 +411,7 @@ export const getEntities = (
        friendlyName,
        entityId,
      ].filter(Boolean) as string[],
+      a11y_label: a11yLabel,
      stateObj: stateObj,
    };
  });
--- a/src/data/error_log.ts
+++ b/src/data/error_log.ts
@@ -1,5 +1,3 @@
-import { isComponentLoaded } from "../common/config/is_component_loaded";
-import { atLeastVersion } from "../common/config/version";
 import type { HomeAssistant } from "../types";

 export interface LogProvider {
@@ -10,8 +8,4 @@ export interface LogProvider {
 export const fetchErrorLog = (hass: HomeAssistant) =>
  hass.callApi<string>("GET", "error_log");

-export const getErrorLogDownloadUrl = (hass: HomeAssistant) =>
-  isComponentLoaded(hass, "hassio") &&
-  atLeastVersion(hass.config.version, 2025, 10)
-    ? "/api/hassio/core/logs/latest"
-    : "/api/error_log";
+export const getErrorLogDownloadUrl = "/api/error_log";
--- a/src/data/frontend.ts
+++ b/src/data/frontend.ts
@@ -3,7 +3,6 @@ import type { Connection } from "home-assistant-js-websocket";
 export interface CoreFrontendUserData {
  showAdvanced?: boolean;
  showEntityIdPicker?: boolean;
-  defaultPanel?: string;
 }

 export interface SidebarFrontendUserData {
@@ -11,24 +10,15 @@ export interface SidebarFrontendUserData {
  hiddenPanels: string[];
 }

-export interface CoreFrontendSystemData {
-  defaultPanel?: string;
-}
-
 declare global {
  interface FrontendUserData {
    core: CoreFrontendUserData;
    sidebar: SidebarFrontendUserData;
  }
-  interface FrontendSystemData {
-    core: CoreFrontendSystemData;
-  }
 }

 export type ValidUserDataKey = keyof FrontendUserData;

-export type ValidSystemDataKey = keyof FrontendSystemData;
-
 export const fetchFrontendUserData = async <
  UserDataKey extends ValidUserDataKey,
 >(
@@ -69,46 +59,3 @@ export const subscribeFrontendUserData = <UserDataKey extends ValidUserDataKey>(
      key: userDataKey,
    }
  );
-
-export const fetchFrontendSystemData = async <
-  SystemDataKey extends ValidSystemDataKey,
->(
-  conn: Connection,
-  key: SystemDataKey
-): Promise<FrontendSystemData[SystemDataKey] | null> => {
-  const result = await conn.sendMessagePromise<{
-    value: FrontendSystemData[SystemDataKey] | null;
-  }>({
-    type: "frontend/get_system_data",
-    key,
-  });
-  return result.value;
-};
-
-export const saveFrontendSystemData = async <
-  SystemDataKey extends ValidSystemDataKey,
->(
-  conn: Connection,
-  key: SystemDataKey,
-  value: FrontendSystemData[SystemDataKey]
-): Promise<void> =>
-  conn.sendMessagePromise<undefined>({
-    type: "frontend/set_system_data",
-    key,
-    value,
-  });
-
-export const subscribeFrontendSystemData = <
-  SystemDataKey extends ValidSystemDataKey,
->(
-  conn: Connection,
-  systemDataKey: SystemDataKey,
-  onChange: (data: { value: FrontendSystemData[SystemDataKey] | null }) => void
-) =>
-  conn.subscribeMessage<{ value: FrontendSystemData[SystemDataKey] | null }>(
-    onChange,
-    {
-      type: "frontend/subscribe_system_data",
-      key: systemDataKey,
-    }
-  );
--- a/src/data/icons.ts
+++ b/src/data/icons.ts
@@ -12,7 +12,6 @@ import {
  mdiChatSleep,
  mdiClipboardList,
  mdiClock,
-  mdiCodeBraces,
  mdiCog,
  mdiCommentAlert,
  mdiCounter,
@@ -59,7 +58,6 @@ import type {
 } from "./entity_registry";

 import { mdiHomeAssistant } from "../resources/home-assistant-logo-svg";
-import { getTriggerDomain, getTriggerObjectId } from "./trigger";

 /** Icon to use when no icon specified for service. */
 export const DEFAULT_SERVICE_ICON = mdiRoomService;
@@ -115,7 +113,6 @@ export const FALLBACK_DOMAIN_ICONS = {
  text: mdiFormTextbox,
  time: mdiClock,
  timer: mdiTimerOutline,
-  template: mdiCodeBraces,
  todo: mdiClipboardList,
  tts: mdiSpeakerMessage,
  vacuum: mdiRobotVacuum,
@@ -134,19 +131,14 @@ const resources: {
    all?: Promise<Record<string, ServiceIcons>>;
    domains: Record<string, ServiceIcons | Promise<ServiceIcons>>;
  };
-  triggers: {
-    all?: Promise<Record<string, TriggerIcons>>;
-    domains: Record<string, TriggerIcons | Promise<TriggerIcons>>;
-  };
 } = {
  entity: {},
  entity_component: {},
  services: { domains: {} },
-  triggers: { domains: {} },
 };

 interface IconResources<
-  T extends ComponentIcons | PlatformIcons | ServiceIcons | TriggerIcons,
+  T extends ComponentIcons | PlatformIcons | ServiceIcons,
 > {
  resources: Record<string, T>;
 }
@@ -190,22 +182,12 @@ type ServiceIcons = Record<
  { service: string; sections?: Record<string, string> }
 >;

-type TriggerIcons = Record<
-  string,
-  { trigger: string; sections?: Record<string, string> }
->;
-
-export type IconCategory =
-  | "entity"
-  | "entity_component"
-  | "services"
-  | "triggers";
+export type IconCategory = "entity" | "entity_component" | "services";

 interface CategoryType {
  entity: PlatformIcons;
  entity_component: ComponentIcons;
  services: ServiceIcons;
-  triggers: TriggerIcons;
 }

 export const getHassIcons = async <T extends IconCategory>(
@@ -274,59 +256,42 @@ export const getComponentIcons = async (
  return resources.entity_component.resources.then((res) => res[domain]);
 };

-export const getCategoryIcons = async <
-  T extends Exclude<IconCategory, "entity" | "entity_component">,
->(
+export const getServiceIcons = async (
  hass: HomeAssistant,
-  category: T,
  domain?: string,
  force = false
-): Promise<CategoryType[T] | Record<string, CategoryType[T]> | undefined> => {
+): Promise<ServiceIcons | Record<string, ServiceIcons> | undefined> => {
  if (!domain) {
-    if (!force && resources[category].all) {
-      return resources[category].all as Promise<
-        Record<string, CategoryType[T]>
-      >;
+    if (!force && resources.services.all) {
+      return resources.services.all;
    }
-    resources[category].all = getHassIcons(hass, category).then((res) => {
-      resources[category].domains = res.resources as any;
-      return res?.resources as Record<string, CategoryType[T]>;
-    }) as any;
-    return resources[category].all as Promise<Record<string, CategoryType[T]>>;
+    resources.services.all = getHassIcons(hass, "services", domain).then(
+      (res) => {
+        resources.services.domains = res.resources;
+        return res?.resources;
+      }
+    );
+    return resources.services.all;
  }
-  if (!force && domain in resources[category].domains) {
-    return resources[category].domains[domain] as Promise<CategoryType[T]>;
+  if (!force && domain in resources.services.domains) {
+    return resources.services.domains[domain];
  }
-  if (resources[category].all && !force) {
-    await resources[category].all;
-    if (domain in resources[category].domains) {
-      return resources[category].domains[domain] as Promise<CategoryType[T]>;
+  if (resources.services.all && !force) {
+    await resources.services.all;
+    if (domain in resources.services.domains) {
+      return resources.services.domains[domain];
    }
  }
  if (!isComponentLoaded(hass, domain)) {
    return undefined;
  }
-  const result = getHassIcons(hass, category, domain);
-  resources[category].domains[domain] = result.then(
+  const result = getHassIcons(hass, "services", domain);
+  resources.services.domains[domain] = result.then(
    (res) => res?.resources[domain]
-  ) as any;
-  return resources[category].domains[domain] as Promise<CategoryType[T]>;
+  );
+  return resources.services.domains[domain];
 };

-export const getServiceIcons = async (
-  hass: HomeAssistant,
-  domain?: string,
-  force = false
-): Promise<ServiceIcons | Record<string, ServiceIcons> | undefined> =>
-  getCategoryIcons(hass, "services", domain, force);
-
-export const getTriggerIcons = async (
-  hass: HomeAssistant,
-  domain?: string,
-  force = false
-): Promise<TriggerIcons | Record<string, TriggerIcons> | undefined> =>
-  getCategoryIcons(hass, "triggers", domain, force);
-
 // Cache for sorted range keys
 const sortedRangeCache = new WeakMap<Record<string, string>, number[]>();

@@ -506,26 +471,6 @@ export const attributeIcon = async (
  return icon;
 };

-export const triggerIcon = async (
-  hass: HomeAssistant,
-  trigger: string
-): Promise<string | undefined> => {
-  let icon: string | undefined;
-
-  const domain = getTriggerDomain(trigger);
-  const triggerName = getTriggerObjectId(trigger);
-
-  const triggerIcons = await getTriggerIcons(hass, domain);
-  if (triggerIcons) {
-    const trgrIcon = triggerIcons[triggerName] as TriggerIcons[string];
-    icon = trgrIcon?.trigger;
-  }
-  if (!icon) {
-    icon = await domainIcon(hass, domain);
-  }
-  return icon;
-};
-
 export const serviceIcon = async (
  hass: HomeAssistant,
  service: string
--- a/src/data/label_registry.ts
+++ b/src/data/label_registry.ts
@@ -108,8 +108,7 @@ export const getLabels = (
  includeDeviceClasses?: string[],
  deviceFilter?: HaDevicePickerDeviceFilterFunc,
  entityFilter?: HaEntityPickerEntityFilterFunc,
-  excludeLabels?: string[],
-  idPrefix = ""
+  excludeLabels?: string[]
 ): PickerComboBoxItem[] => {
  if (!labels || labels.length === 0) {
    return [];
@@ -263,7 +262,7 @@ export const getLabels = (
  }

  const items = outputLabels.map<PickerComboBoxItem>((label) => ({
-    id: `${idPrefix}${label.label_id}`,
+    id: label.label_id,
    primary: label.name,
    secondary: label.description ?? "",
    icon: label.icon || undefined,
--- a/src/data/panel.ts
+++ b/src/data/panel.ts
@@ -1,25 +1,27 @@
+import { fireEvent } from "../common/dom/fire_event";
 import type { HomeAssistant, PanelInfo } from "../types";

 /** Panel to show when no panel is picked. */
 export const DEFAULT_PANEL = "lovelace";

-export const getLegacyDefaultPanelUrlPath = (): string | null => {
+export const getStorageDefaultPanelUrlPath = (): string => {
  const defaultPanel = window.localStorage.getItem("defaultPanel");
-  return defaultPanel ? JSON.parse(defaultPanel) : null;
+
+  return defaultPanel ? JSON.parse(defaultPanel) : DEFAULT_PANEL;
 };

-export const getDefaultPanelUrlPath = (hass: HomeAssistant): string =>
-  hass.userData?.defaultPanel ||
-  hass.systemData?.defaultPanel ||
-  getLegacyDefaultPanelUrlPath() ||
-  DEFAULT_PANEL;
-
-export const getDefaultPanel = (hass: HomeAssistant): PanelInfo => {
-  const panel = getDefaultPanelUrlPath(hass);
-
-  return (panel ? hass.panels[panel] : undefined) ?? hass.panels[DEFAULT_PANEL];
+export const setDefaultPanel = (
+  element: HTMLElement,
+  urlPath: string
+): void => {
+  fireEvent(element, "hass-default-panel", { defaultPanel: urlPath });
 };

+export const getDefaultPanel = (hass: HomeAssistant): PanelInfo =>
+  hass.panels[hass.defaultPanel]
+    ? hass.panels[hass.defaultPanel]
+    : hass.panels[DEFAULT_PANEL];
+
 export const getPanelNameTranslationKey = (panel: PanelInfo) => {
  if (panel.url_path === "lovelace") {
    return "panel.states" as const;
--- a/src/data/script.ts
+++ b/src/data/script.ts
@@ -222,7 +222,6 @@ export interface StopAction extends BaseAction {

 export interface SequenceAction extends BaseAction {
  sequence: (ManualScriptConfig | Action)[];
-  metadata?: {};
 }

 export interface ParallelAction extends BaseAction {
@@ -480,7 +479,6 @@ export const migrateAutomationAction = (
  }

  if (typeof action === "object" && action !== null && "sequence" in action) {
-    delete (action as SequenceAction).metadata;
    for (const sequenceAction of (action as SequenceAction).sequence) {
      migrateAutomationAction(sequenceAction);
    }
--- a/src/data/todo.ts
+++ b/src/data/todo.ts
@@ -28,7 +28,6 @@ export interface TodoItem {
  status: TodoItemStatus | null;
  description?: string | null;
  due?: string | null;
-  completed?: string | null;
 }

 export const enum TodoListEntityFeature {
--- a/src/data/translation.ts
+++ b/src/data/translation.ts
@@ -73,8 +73,7 @@ export type TranslationCategory =
  | "application_credentials"
  | "issues"
  | "selector"
-  | "services"
-  | "triggers";
+  | "services";

 export const subscribeTranslationPreferences = (
  hass: HomeAssistant,
--- a/src/data/trigger.ts
+++ b/src/data/trigger.ts
@@ -1,20 +1,57 @@
-import { mdiMapClock, mdiShape } from "@mdi/js";
+import {
+  mdiAvTimer,
+  mdiCalendar,
+  mdiClockOutline,
+  mdiCodeBraces,
+  mdiDevices,
+  mdiFormatListBulleted,
+  mdiGestureDoubleTap,
+  mdiMapClock,
+  mdiMapMarker,
+  mdiMapMarkerRadius,
+  mdiMessageAlert,
+  mdiMicrophoneMessage,
+  mdiNfcVariant,
+  mdiNumeric,
+  mdiShape,
+  mdiStateMachine,
+  mdiSwapHorizontal,
+  mdiWeatherSunny,
+  mdiWebhook,
+} from "@mdi/js";

-import { computeDomain } from "../common/entity/compute_domain";
-import { computeObjectId } from "../common/entity/compute_object_id";
-import type { HomeAssistant } from "../types";
+import { mdiHomeAssistant } from "../resources/home-assistant-logo-svg";
 import type {
  AutomationElementGroupCollection,
  Trigger,
  TriggerList,
 } from "./automation";
-import type { Selector, TargetSelector } from "./selector";
+
+export const TRIGGER_ICONS = {
+  calendar: mdiCalendar,
+  device: mdiDevices,
+  event: mdiGestureDoubleTap,
+  state: mdiStateMachine,
+  geo_location: mdiMapMarker,
+  homeassistant: mdiHomeAssistant,
+  mqtt: mdiSwapHorizontal,
+  numeric_state: mdiNumeric,
+  sun: mdiWeatherSunny,
+  conversation: mdiMicrophoneMessage,
+  tag: mdiNfcVariant,
+  template: mdiCodeBraces,
+  time: mdiClockOutline,
+  time_pattern: mdiAvTimer,
+  webhook: mdiWebhook,
+  persistent_notification: mdiMessageAlert,
+  zone: mdiMapMarkerRadius,
+  list: mdiFormatListBulleted,
+};

 export const TRIGGER_COLLECTIONS: AutomationElementGroupCollection[] = [
  {
    groups: {
      device: {},
-      dynamicGroups: {},
      entity: { icon: mdiShape, members: { state: {}, numeric_state: {} } },
      time_location: {
        icon: mdiMapClock,
@@ -46,33 +83,3 @@ export const TRIGGER_COLLECTIONS: AutomationElementGroupCollection[] = [

 export const isTriggerList = (trigger: Trigger): trigger is TriggerList =>
  "triggers" in trigger;
-
-export interface TriggerDescription {
-  target?: TargetSelector["target"];
-  fields: Record<
-    string,
-    {
-      example?: string | boolean | number;
-      default?: unknown;
-      required?: boolean;
-      selector?: Selector;
-      context?: Record<string, string>;
-    }
-  >;
-}
-
-export type TriggerDescriptions = Record<string, TriggerDescription>;
-
-export const subscribeTriggers = (
-  hass: HomeAssistant,
-  callback: (triggers: TriggerDescriptions) => void
-) =>
-  hass.connection.subscribeMessage<TriggerDescriptions>(callback, {
-    type: "trigger_platforms/subscribe",
-  });
-
-export const getTriggerDomain = (trigger: string) =>
-  trigger.includes(".") ? computeDomain(trigger) : trigger;
-
-export const getTriggerObjectId = (trigger: string) =>
-  trigger.includes(".") ? computeObjectId(trigger) : "_";
--- a/src/dialogs/config-entry-system-options/dialog-config-entry-system-options.ts
+++ b/src/dialogs/config-entry-system-options/dialog-config-entry-system-options.ts
@@ -2,8 +2,7 @@ import type { CSSResultGroup } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../../common/dom/fire_event";
-import "../../components/ha-wa-dialog";
-import "../../components/ha-dialog-footer";
+import { createCloseHeading } from "../../components/ha-dialog";
 import "../../components/ha-formfield";
 import "../../components/ha-switch";
 import "../../components/ha-button";
@@ -29,8 +28,6 @@ class DialogConfigEntrySystemOptions extends LitElement {

  @state() private _submitting = false;

-  @state() private _open = false;
-
  public async showDialog(
    params: ConfigEntrySystemOptionsDialogParams
  ): Promise<void> {
@@ -38,14 +35,9 @@ class DialogConfigEntrySystemOptions extends LitElement {
    this._error = undefined;
    this._disableNewEntities = params.entry.pref_disable_new_entities;
    this._disablePolling = params.entry.pref_disable_polling;
-    this._open = true;
  }

  public closeDialog(): void {
-    this._open = false;
-  }
-
-  private _dialogClosed(): void {
    this._error = "";
    this._params = undefined;
    fireEvent(this, "dialog-closed", { dialog: this.localName });
@@ -57,19 +49,18 @@ class DialogConfigEntrySystemOptions extends LitElement {
    }

    return html`
-      <ha-wa-dialog
-        .hass=${this.hass}
-        .open=${this._open}
-        header-title=${this.hass.localize(
-          "ui.dialogs.config_entry_system_options.title",
-          {
+      <ha-dialog
+        open
+        @closed=${this.closeDialog}
+        .heading=${createCloseHeading(
+          this.hass,
+          this.hass.localize("ui.dialogs.config_entry_system_options.title", {
            integration:
              this.hass.localize(
                `component.${this._params.entry.domain}.title`
              ) || this._params.entry.domain,
-          }
+          })
        )}
-        @closed=${this._dialogClosed}
      >
        ${this._error ? html` <div class="error">${this._error}</div> ` : ""}
        <ha-formfield
@@ -91,10 +82,10 @@ class DialogConfigEntrySystemOptions extends LitElement {
            </p>`}
        >
          <ha-switch
-            autofocus
            .checked=${!this._disableNewEntities}
            @change=${this._disableNewEntitiesChanged}
            .disabled=${this._submitting}
+            dialogInitialFocus
          ></ha-switch>
        </ha-formfield>

@@ -122,27 +113,22 @@ class DialogConfigEntrySystemOptions extends LitElement {
            .disabled=${this._submitting}
          ></ha-switch>
        </ha-formfield>
-
-        <ha-dialog-footer slot="footer">
-          <ha-button
-            appearance="plain"
-            slot="secondaryAction"
-            @click=${this.closeDialog}
-            .disabled=${this._submitting}
-          >
-            ${this.hass.localize("ui.common.cancel")}
-          </ha-button>
-          <ha-button
-            slot="primaryAction"
-            @click=${this._updateEntry}
-            .disabled=${this._submitting}
-          >
-            ${this.hass.localize(
-              "ui.dialogs.config_entry_system_options.update"
-            )}
-          </ha-button>
-        </ha-dialog-footer>
-      </ha-wa-dialog>
+        <ha-button
+          appearance="plain"
+          slot="primaryAction"
+          @click=${this.closeDialog}
+          .disabled=${this._submitting}
+        >
+          ${this.hass.localize("ui.common.cancel")}
+        </ha-button>
+        <ha-button
+          slot="primaryAction"
+          @click=${this._updateEntry}
+          .disabled=${this._submitting}
+        >
+          ${this.hass.localize("ui.dialogs.config_entry_system_options.update")}
+        </ha-button>
+      </ha-dialog>
    `;
  }

--- a/src/dialogs/more-info/ha-more-info-add-to.ts
+++ b/src/dialogs/more-info/ha-more-info-add-to.ts
@@ -1,152 +0,0 @@
-import { LitElement, css, html, nothing } from "lit";
-import { customElement, property, state } from "lit/decorators";
-import "../../components/ha-alert";
-import "../../components/ha-icon";
-import "../../components/ha-list-item";
-import "../../components/ha-spinner";
-import type {
-  ExternalEntityAddToActions,
-  ExternalEntityAddToAction,
-} from "../../external_app/external_messaging";
-import { showToast } from "../../util/toast";
-
-import type { HomeAssistant } from "../../types";
-
-@customElement("ha-more-info-add-to")
-export class HaMoreInfoAddTo extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
-  @property({ attribute: false }) public entityId!: string;
-
-  @state() private _externalActions?: ExternalEntityAddToActions = {
-    actions: [],
-  };
-
-  @state() private _loading = true;
-
-  private async _loadExternalActions() {
-    if (this.hass.auth.external?.config.hasEntityAddTo) {
-      this._externalActions =
-        await this.hass.auth.external?.sendMessage<"entity/add_to/get_actions">(
-          {
-            type: "entity/add_to/get_actions",
-            payload: { entity_id: this.entityId },
-          }
-        );
-    }
-  }
-
-  private async _actionSelected(ev: CustomEvent) {
-    const action = (ev.currentTarget as any)
-      .action as ExternalEntityAddToAction;
-    if (!action.enabled) {
-      return;
-    }
-
-    try {
-      await this.hass.auth.external!.fireMessage({
-        type: "entity/add_to",
-        payload: {
-          entity_id: this.entityId,
-          app_payload: action.app_payload,
-        },
-      });
-    } catch (err: any) {
-      showToast(this, {
-        message: this.hass.localize(
-          "ui.dialogs.more_info_control.add_to.action_failed",
-          {
-            error: err.message || err,
-          }
-        ),
-      });
-    }
-  }
-
-  protected async firstUpdated() {
-    await this._loadExternalActions();
-    this._loading = false;
-  }
-
-  protected render() {
-    if (this._loading) {
-      return html`
-        <div class="loading">
-          <ha-spinner></ha-spinner>
-        </div>
-      `;
-    }
-
-    if (!this._externalActions?.actions.length) {
-      return html`
-        <ha-alert alert-type="info">
-          ${this.hass.localize(
-            "ui.dialogs.more_info_control.add_to.no_actions"
-          )}
-        </ha-alert>
-      `;
-    }
-
-    return html`
-      <div class="actions-list">
-        ${this._externalActions.actions.map(
-          (action) => html`
-            <ha-list-item
-              graphic="icon"
-              .disabled=${!action.enabled}
-              .action=${action}
-              .twoline=${!!action.details}
-              @click=${this._actionSelected}
-            >
-              <span>${action.name}</span>
-              ${action.details
-                ? html`<span slot="secondary">${action.details}</span>`
-                : nothing}
-              <ha-icon slot="graphic" .icon=${action.mdi_icon}></ha-icon>
-            </ha-list-item>
-          `
-        )}
-      </div>
-    `;
-  }
-
-  static styles = css`
-    :host {
-      display: block;
-      padding: var(--ha-space-2) var(--ha-space-6) var(--ha-space-6)
-        var(--ha-space-6);
-    }
-
-    .loading {
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      padding: var(--ha-space-8);
-    }
-
-    .actions-list {
-      display: flex;
-      flex-direction: column;
-    }
-
-    ha-list-item {
-      cursor: pointer;
-    }
-
-    ha-list-item[disabled] {
-      cursor: not-allowed;
-      opacity: 0.5;
-    }
-
-    ha-icon {
-      display: flex;
-      align-items: center;
-    }
-  `;
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-more-info-add-to": HaMoreInfoAddTo;
-  }
-}
--- a/src/dialogs/more-info/ha-more-info-dialog.ts
+++ b/src/dialogs/more-info/ha-more-info-dialog.ts
@@ -8,7 +8,6 @@ import {
  mdiPencil,
  mdiPencilOff,
  mdiPencilOutline,
-  mdiPlusBoxMultipleOutline,
  mdiTransitConnectionVariant,
 } from "@mdi/js";
 import type { HassEntity } from "home-assistant-js-websocket";
@@ -61,7 +60,6 @@ import {
  computeShowLogBookComponent,
 } from "./const";
 import "./controls/more-info-default";
-import "./ha-more-info-add-to";
 import "./ha-more-info-history-and-logbook";
 import "./ha-more-info-info";
 import "./ha-more-info-settings";
@@ -75,7 +73,7 @@ export interface MoreInfoDialogParams {
  data?: Record<string, any>;
 }

-type View = "info" | "history" | "settings" | "related" | "add_to";
+type View = "info" | "history" | "settings" | "related";

 interface ChildView {
  viewTag: string;
@@ -196,10 +194,6 @@ export class MoreInfoDialog extends LitElement {
    );
  }

-  private _shouldShowAddEntityTo(): boolean {
-    return !!this.hass.auth.external?.config.hasEntityAddTo;
-  }
-
  private _getDeviceId(): string | null {
    const entity = this.hass.entities[this._entityId!] as
      | EntityRegistryEntry
@@ -301,11 +295,6 @@ export class MoreInfoDialog extends LitElement {
    this._setView("related");
  }

-  private _goToAddEntityTo(ev) {
-    if (!shouldHandleRequestSelectedEvent(ev)) return;
-    this._setView("add_to");
-  }
-
  private _breadcrumbClick(ev: Event) {
    ev.stopPropagation();
    this._setView("related");
@@ -532,22 +521,6 @@ export class MoreInfoDialog extends LitElement {
                            .path=${mdiInformationOutline}
                          ></ha-svg-icon>
                        </ha-list-item>
-                        ${this._shouldShowAddEntityTo()
-                          ? html`
-                              <ha-list-item
-                                graphic="icon"
-                                @request-selected=${this._goToAddEntityTo}
-                              >
-                                ${this.hass.localize(
-                                  "ui.dialogs.more_info_control.add_entity_to"
-                                )}
-                                <ha-svg-icon
-                                  slot="graphic"
-                                  .path=${mdiPlusBoxMultipleOutline}
-                                ></ha-svg-icon>
-                              </ha-list-item>
-                            `
-                          : nothing}
                      </ha-button-menu>
                    `
                  : nothing}
@@ -640,14 +613,7 @@ export class MoreInfoDialog extends LitElement {
                                  : "entity"}
                              ></ha-related-items>
                            `
-                          : this._currView === "add_to"
-                            ? html`
-                                <ha-more-info-add-to
-                                  .hass=${this.hass}
-                                  .entityId=${entityId}
-                                ></ha-more-info-add-to>
-                              `
-                            : nothing
+                          : nothing
              )}
            </div>
          `
--- a/src/dialogs/sidebar/dialog-edit-sidebar.ts
+++ b/src/dialogs/sidebar/dialog-edit-sidebar.ts
@@ -20,7 +20,6 @@ import {
 } from "../../data/frontend";
 import type { HomeAssistant } from "../../types";
 import { showConfirmationDialog } from "../generic/show-dialog-box";
-import { getDefaultPanelUrlPath } from "../../data/panel";

@customElement("dialog-edit-sidebar")
 class DialogEditSidebar extends LitElement {
@@ -95,27 +94,14 @@ class DialogEditSidebar extends LitElement {

    const panels = this._panels(this.hass.panels);

-    const defaultPanel = getDefaultPanelUrlPath(this.hass);
-
    const [beforeSpacer, afterSpacer] = computePanels(
      this.hass.panels,
-      defaultPanel,
+      this.hass.defaultPanel,
      this._order,
      this._hidden,
      this.hass.locale
    );

-    // Add default hidden panels that are missing in hidden
-    for (const panel of panels) {
-      if (
-        panel.default_visible === false &&
-        !this._order.includes(panel.url_path) &&
-        !this._hidden.includes(panel.url_path)
-      ) {
-        this._hidden.push(panel.url_path);
-      }
-    }
-
    const items = [
      ...beforeSpacer,
      ...panels.filter((panel) => this._hidden!.includes(panel.url_path)),
@@ -123,12 +109,12 @@ class DialogEditSidebar extends LitElement {
    ].map((panel) => ({
      value: panel.url_path,
      label:
-        panel.url_path === defaultPanel
+        panel.url_path === this.hass.defaultPanel
          ? panel.title || this.hass.localize("panel.states")
          : this.hass.localize(`panel.${panel.title}`) || panel.title || "?",
      icon: panel.icon || undefined,
      iconPath:
-        panel.url_path === defaultPanel && !panel.icon
+        panel.url_path === this.hass.defaultPanel && !panel.icon
          ? PANEL_ICONS.lovelace
          : panel.url_path in PANEL_ICONS
            ? PANEL_ICONS[panel.url_path]
--- a/src/external_app/external_messaging.ts
+++ b/src/external_app/external_messaging.ts
@@ -36,13 +36,6 @@ interface EMOutgoingMessageConfigGet extends EMMessage {
  type: "config/get";
 }

-interface EMOutgoingMessageEntityAddToGetActions extends EMMessage {
-  type: "entity/add_to/get_actions";
-  payload: {
-    entity_id: string;
-  };
-}
-
 interface EMOutgoingMessageBarCodeScan extends EMMessage {
  type: "bar_code/scan";
  payload: {
@@ -82,10 +75,6 @@ interface EMOutgoingMessageWithAnswer {
    request: EMOutgoingMessageConfigGet;
    response: ExternalConfig;
  };
-  "entity/add_to/get_actions": {
-    request: EMOutgoingMessageEntityAddToGetActions;
-    response: ExternalEntityAddToActions;
-  };
 }

 interface EMOutgoingMessageExoplayerPlayHLS extends EMMessage {
@@ -168,14 +157,6 @@ interface EMOutgoingMessageThreadStoreInPlatformKeychain extends EMMessage {
  };
 }

-interface EMOutgoingMessageAddEntityTo extends EMMessage {
-  type: "entity/add_to";
-  payload: {
-    entity_id: string;
-    app_payload: string; // Opaque string received from get_actions
-  };
-}
-
 type EMOutgoingMessageWithoutAnswer =
  | EMMessageResultError
  | EMMessageResultSuccess
@@ -196,8 +177,7 @@ type EMOutgoingMessageWithoutAnswer =
  | EMOutgoingMessageThemeUpdate
  | EMOutgoingMessageThreadStoreInPlatformKeychain
  | EMOutgoingMessageImprovScan
-  | EMOutgoingMessageImprovConfigureDevice
-  | EMOutgoingMessageAddEntityTo;
+  | EMOutgoingMessageImprovConfigureDevice;

 export interface EMIncomingMessageRestart {
  id: number;
@@ -313,31 +293,18 @@ type EMIncomingMessage =
 type EMIncomingMessageHandler = (msg: EMIncomingMessageCommands) => boolean;

 export interface ExternalConfig {
-  hasSettingsScreen?: boolean;
-  hasSidebar?: boolean;
-  canWriteTag?: boolean;
-  hasExoPlayer?: boolean;
-  canCommissionMatter?: boolean;
-  canImportThreadCredentials?: boolean;
-  canTransferThreadCredentialsToKeychain?: boolean;
-  hasAssist?: boolean;
-  hasBarCodeScanner?: number;
-  canSetupImprov?: boolean;
-  downloadFileSupported?: boolean;
-  appVersion?: string;
-  hasEntityAddTo?: boolean; // Supports "Add to" from more-info dialog, with action coming from external app
-}
-
-export interface ExternalEntityAddToAction {
-  enabled: boolean;
-  name: string; // Translated name of the action to be displayed in the UI
-  details?: string; // Optional translated details of the action to be displayed in the UI
-  mdi_icon: string; // MDI icon name to be displayed in the UI (e.g., "mdi:car")
-  app_payload: string; // Opaque string to be sent back when the action is selected
-}
-
-export interface ExternalEntityAddToActions {
-  actions: ExternalEntityAddToAction[];
+  hasSettingsScreen: boolean;
+  hasSidebar: boolean;
+  canWriteTag: boolean;
+  hasExoPlayer: boolean;
+  canCommissionMatter: boolean;
+  canImportThreadCredentials: boolean;
+  canTransferThreadCredentialsToKeychain: boolean;
+  hasAssist: boolean;
+  hasBarCodeScanner: number;
+  canSetupImprov: boolean;
+  downloadFileSupported: boolean;
+  appVersion: string;
 }

 export class ExternalMessaging {
--- a/src/html/index.html.template
+++ b/src/html/index.html.template
@@ -20,44 +20,23 @@
    <meta name="color-scheme" content="dark light" />
    <%= renderTemplate("_style_base.html.template") %>
    <style>
-      @keyframes fade-out {
-        from {
-          opacity: 1;
-        }
-        to {
-          opacity: 0;
-        }
-      }
-      ::view-transition-group(launch-screen) {
-        animation-duration: var(--ha-animation-base-duration, 350ms);
-        animation-timing-function: ease-out;
-      }
-      ::view-transition-old(launch-screen) {
-        animation: fade-out var(--ha-animation-base-duration, 350ms) ease-out;
-      }
      html {
        background-color: var(--primary-background-color, #fafafa);
        color: var(--primary-text-color, #212121);
        height: 100vh;
      }
+      @media (prefers-color-scheme: dark) {
+        html {
+          background-color: var(--primary-background-color, #111111);
+          color: var(--primary-text-color, #e1e1e1);
+        }
+      }
      #ha-launch-screen {
-        position: fixed;
-        top: 0;
-        left: 0;
-        right: 0;
-        bottom: 0;
-        width: 100%;
        height: 100%;
        display: flex;
        flex-direction: column;
        justify-content: center;
        align-items: center;
-        view-transition-name: launch-screen;
-        background-color: var(--primary-background-color, #fafafa);
-        z-index: 100;
-      }
-      #ha-launch-screen.removing {
-        opacity: 0;
      }
      #ha-launch-screen svg {
        width: 112px;
@@ -80,14 +59,6 @@
        opacity: .66;
      }
      @media (prefers-color-scheme: dark) {
-        html {
-          background-color: var(--primary-background-color, #111111);
-          color: var(--primary-text-color, #e1e1e1);
-        }
-        /* body selector to avoid minification causing bad jinja2 */
-        body #ha-launch-screen {
-          background-color: var(--primary-background-color, #111111);
-        }
        .ohf-logo {
          filter: invert(1);
        }
--- a/src/layouts/home-assistant-main.ts
+++ b/src/layouts/home-assistant-main.ts
@@ -1,5 +1,5 @@
 import type { PropertyValues, TemplateResult } from "lit";
-import { css, html, LitElement, nothing } from "lit";
+import { css, html, LitElement } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import type { HASSDomEvent } from "../common/dom/fire_event";
 import { fireEvent } from "../common/dom/fire_event";
@@ -46,13 +46,10 @@ export class HomeAssistantMain extends LitElement {
  protected render(): TemplateResult {
    const sidebarNarrow = this._sidebarNarrow || this._externalSidebar;

-    const isPanelReady =
-      this.hass.panels && this.hass.userData && this.hass.systemData;
-
    return html`
      <ha-drawer
        .type=${sidebarNarrow ? "modal" : ""}
-        .open=${sidebarNarrow ? this._drawerOpen : false}
+        .open=${sidebarNarrow ? this._drawerOpen : undefined}
        .direction=${computeRTLDirection(this.hass)}
        @MDCDrawer:closed=${this._drawerClosed}
      >
@@ -62,14 +59,12 @@ export class HomeAssistantMain extends LitElement {
          .route=${this.route}
          .alwaysExpand=${sidebarNarrow || this.hass.dockedSidebar === "docked"}
        ></ha-sidebar>
-        ${isPanelReady
-          ? html`<partial-panel-resolver
-              .narrow=${this.narrow}
-              .hass=${this.hass}
-              .route=${this.route}
-              slot="appContent"
-            ></partial-panel-resolver>`
-          : nothing}
+        <partial-panel-resolver
+          .narrow=${this.narrow}
+          .hass=${this.hass}
+          .route=${this.route}
+          slot="appContent"
+        ></partial-panel-resolver>
      </ha-drawer>
    `;
  }
--- a/src/layouts/home-assistant.ts
+++ b/src/layouts/home-assistant.ts
@@ -1,10 +1,10 @@
-import type { Connection } from "home-assistant-js-websocket";
 import type { PropertyValues } from "lit";
 import { html } from "lit";
 import { customElement, state } from "lit/decorators";
-import { storage } from "../common/decorators/storage";
+import type { Connection } from "home-assistant-js-websocket";
 import { isNavigationClick } from "../common/dom/is-navigation-click";
 import { navigate } from "../common/navigate";
+import { getStorageDefaultPanelUrlPath } from "../data/panel";
 import type { WindowWithPreloads } from "../data/preloads";
 import type { RecorderInfo } from "../data/recorder";
 import { getRecorderInfo } from "../data/recorder";
@@ -23,6 +23,7 @@ import {
 } from "../util/register-service-worker";
 import "./ha-init-page";
 import "./home-assistant-main";
+import { storage } from "../common/decorators/storage";

 const useHash = __DEMO__;
 const curPath = () =>
@@ -52,6 +53,11 @@ export class HomeAssistantAppEl extends QuickBarMixin(HassElement) {
    super();
    const path = curPath();

+    if (["", "/"].includes(path)) {
+      navigate(`/${getStorageDefaultPanelUrlPath()}${location.search}`, {
+        replace: true,
+      });
+    }
    this._route = {
      prefix: "",
      path,
--- a/src/layouts/partial-panel-resolver.ts
+++ b/src/layouts/partial-panel-resolver.ts
@@ -33,9 +33,8 @@ const COMPONENTS = {
  "media-browser": () =>
    import("../panels/media-browser/ha-panel-media-browser"),
  light: () => import("../panels/light/ha-panel-light"),
-  security: () => import("../panels/security/ha-panel-security"),
+  safety: () => import("../panels/safety/ha-panel-safety"),
  climate: () => import("../panels/climate/ha-panel-climate"),
-  home: () => import("../panels/home/ha-panel-home"),
 };

@customElement("partial-panel-resolver")
--- a/src/mixins/conditional-listener-mixin.ts
+++ b/src/mixins/conditional-listener-mixin.ts
@@ -1,133 +0,0 @@
-import type { ReactiveElement } from "lit";
-import type { HomeAssistant } from "../types";
-import {
-  setupMediaQueryListeners,
-  setupTimeListeners,
-} from "../common/condition/listeners";
-import type { Condition } from "../panels/lovelace/common/validate-condition";
-
-type Constructor<T> = abstract new (...args: any[]) => T;
-
-/**
- * Base config type that can be used with conditional listeners
- */
-export interface ConditionalConfig {
-  visibility?: Condition[];
-  [key: string]: any;
-}
-
-/**
- * Mixin to handle conditional listeners for visibility control
- *
- * Provides lifecycle management for listeners that control conditional
- * visibility of components.
- *
- * Usage:
- * 1. Extend your component with ConditionalListenerMixin<YourConfigType>(ReactiveElement)
- * 2. Ensure component has config.visibility or _config.visibility property with conditions
- * 3. Ensure component has _updateVisibility() or _updateElement() method
- * 4. Override setupConditionalListeners() if custom behavior needed (e.g., filter conditions)
- *
- * The mixin automatically:
- * - Sets up listeners when component connects to DOM
- * - Cleans up listeners when component disconnects from DOM
- * - Handles conditional visibility based on defined conditions
- */
-export const ConditionalListenerMixin = <
-  TConfig extends ConditionalConfig = ConditionalConfig,
->(
-  superClass: Constructor<ReactiveElement>
-) => {
-  abstract class ConditionalListenerClass extends superClass {
-    private __listeners: (() => void)[] = [];
-
-    protected _config?: TConfig;
-
-    public config?: TConfig;
-
-    public hass?: HomeAssistant;
-
-    protected _updateElement?(config: TConfig): void;
-
-    protected _updateVisibility?(conditionsMet?: boolean): void;
-
-    public connectedCallback() {
-      super.connectedCallback();
-      this.setupConditionalListeners();
-    }
-
-    public disconnectedCallback() {
-      super.disconnectedCallback();
-      this.clearConditionalListeners();
-    }
-
-    /**
-     * Clear conditional listeners
-     *
-     * This method is called when the component is disconnected from the DOM.
-     * It clears all the listeners that were set up by the setupConditionalListeners() method.
-     */
-    protected clearConditionalListeners(): void {
-      this.__listeners.forEach((unsub) => unsub());
-      this.__listeners = [];
-    }
-
-    /**
-     * Add a conditional listener to the list of listeners
-     *
-     * This method is called when a new listener is added.
-     * It adds the listener to the list of listeners.
-     *
-     * @param unsubscribe - The unsubscribe function to call when the listener is no longer needed
-     * @returns void
-     */
-    protected addConditionalListener(unsubscribe: () => void): void {
-      this.__listeners.push(unsubscribe);
-    }
-
-    /**
-     * Setup conditional listeners for visibility control
-     *
-     * Default implementation:
-     * - Checks config.visibility or _config.visibility for conditions (if not provided)
-     * - Sets up appropriate listeners based on condition types
-     * - Calls _updateVisibility() or _updateElement() when conditions change
-     *
-     * Override this method to customize behavior (e.g., filter conditions first)
-     * and call super.setupConditionalListeners(customConditions) to reuse the base implementation
-     *
-     * @param conditions - Optional conditions array. If not provided, will check config.visibility or _config.visibility
-     */
-    protected setupConditionalListeners(conditions?: Condition[]): void {
-      const config = this.config || this._config;
-      const finalConditions = conditions || config?.visibility;
-
-      if (!finalConditions || !this.hass) {
-        return;
-      }
-
-      const onUpdate = (conditionsMet: boolean) => {
-        if (this._updateVisibility) {
-          this._updateVisibility(conditionsMet);
-        } else if (this._updateElement && config) {
-          this._updateElement(config);
-        }
-      };
-
-      setupMediaQueryListeners(
-        finalConditions,
-        this.hass,
-        (unsub) => this.addConditionalListener(unsub),
-        onUpdate
-      );
-
-      setupTimeListeners(
-        finalConditions,
-        this.hass,
-        (unsub) => this.addConditionalListener(unsub),
-        onUpdate
-      );
-    }
-  }
-  return ConditionalListenerClass;
-};
--- a/src/panels/climate/ha-panel-climate.ts
+++ b/src/panels/climate/ha-panel-climate.ts
@@ -1,23 +1,24 @@
-import type { CSSResultGroup, PropertyValues } from "lit";
-import { LitElement, css, html, nothing } from "lit";
+import type { CSSResultGroup, PropertyValues, TemplateResult } from "lit";
+import { LitElement, css, html } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { goBack } from "../../common/navigate";
-import { debounce } from "../../common/util/debounce";
-import { deepEqual } from "../../common/util/deep-equal";
 import "../../components/ha-icon-button-arrow-prev";
 import "../../components/ha-menu-button";
-import type { LovelaceStrategyViewConfig } from "../../data/lovelace/config/view";
+import type { LovelaceConfig } from "../../data/lovelace/config/types";
 import { haStyle } from "../../resources/styles";
 import type { HomeAssistant } from "../../types";
-import { generateLovelaceViewStrategy } from "../lovelace/strategies/get-strategy";
 import type { Lovelace } from "../lovelace/types";
 import "../lovelace/views/hui-view";
 import "../lovelace/views/hui-view-container";

-const CLIMATE_LOVELACE_VIEW_CONFIG: LovelaceStrategyViewConfig = {
-  strategy: {
-    type: "climate",
-  },
+const CLIMATE_LOVELACE_CONFIG: LovelaceConfig = {
+  views: [
+    {
+      strategy: {
+        type: "climate",
+      },
+    },
+  ],
 };

@customElement("ha-panel-climate")
@@ -32,119 +33,65 @@ class PanelClimate extends LitElement {

  @state() private _searchParms = new URLSearchParams(window.location.search);

+  public firstUpdated(_changedProperties: PropertyValues): void {
+    super.firstUpdated(_changedProperties);
+  }
+
  public willUpdate(changedProps: PropertyValues) {
-    super.willUpdate(changedProps);
-    // Initial setup
    if (!this.hasUpdated) {
      this.hass.loadFragmentTranslation("lovelace");
-      this._setLovelace();
-      return;
    }
-
    if (!changedProps.has("hass")) {
      return;
    }
-
    const oldHass = changedProps.get("hass") as this["hass"];
-    if (oldHass && oldHass.localize !== this.hass.localize) {
+    if (oldHass?.locale !== this.hass.locale) {
      this._setLovelace();
-      return;
-    }
-
-    if (oldHass && this.hass) {
-      // If the entity registry changed, ask the user if they want to refresh the config
-      if (
-        oldHass.entities !== this.hass.entities ||
-        oldHass.devices !== this.hass.devices ||
-        oldHass.areas !== this.hass.areas ||
-        oldHass.floors !== this.hass.floors
-      ) {
-        if (this.hass.config.state === "RUNNING") {
-          this._debounceRegistriesChanged();
-          return;
-        }
-      }
-      // If ha started, refresh the config
-      if (
-        this.hass.config.state === "RUNNING" &&
-        oldHass.config.state !== "RUNNING"
-      ) {
-        this._setLovelace();
-      }
    }
  }

-  private _debounceRegistriesChanged = debounce(
-    () => this._registriesChanged(),
-    200
-  );
-
-  private _registriesChanged = async () => {
-    this._setLovelace();
-  };
-
  private _back(ev) {
    ev.stopPropagation();
    goBack();
  }

-  protected render() {
+  protected render(): TemplateResult {
    return html`
      <div class="header">
        <div class="toolbar">
-          ${
-            this._searchParms.has("historyBack")
-              ? html`
-                  <ha-icon-button-arrow-prev
-                    @click=${this._back}
-                    slot="navigationIcon"
-                  ></ha-icon-button-arrow-prev>
-                `
-              : html`
-                  <ha-menu-button
-                    slot="navigationIcon"
-                    .hass=${this.hass}
-                    .narrow=${this.narrow}
-                  ></ha-menu-button>
-                `
-          }
+          ${this._searchParms.has("historyBack")
+            ? html`
+                <ha-icon-button-arrow-prev
+                  @click=${this._back}
+                  slot="navigationIcon"
+                ></ha-icon-button-arrow-prev>
+              `
+            : html`
+                <ha-menu-button
+                  slot="navigationIcon"
+                  .hass=${this.hass}
+                  .narrow=${this.narrow}
+                ></ha-menu-button>
+              `}
          <div class="main-title">${this.hass.localize("panel.climate")}</div>
        </div>
      </div>
-      ${
-        this._lovelace
-          ? html`
-              <hui-view-container .hass=${this.hass}>
-                <hui-view
-                  .hass=${this.hass}
-                  .narrow=${this.narrow}
-                  .lovelace=${this._lovelace}
-                  .index=${this._viewIndex}
-                ></hui-view
-              ></hui-view-container>
-            `
-          : nothing
-      }
+
+      <hui-view-container .hass=${this.hass}>
+        <hui-view
+          .hass=${this.hass}
+          .narrow=${this.narrow}
+          .lovelace=${this._lovelace}
+          .index=${this._viewIndex}
+        ></hui-view>
      </hui-view-container>
    `;
  }

-  private async _setLovelace() {
-    const viewConfig = await generateLovelaceViewStrategy(
-      CLIMATE_LOVELACE_VIEW_CONFIG,
-      this.hass
-    );
-
-    const config = { views: [viewConfig] };
-    const rawConfig = { views: [CLIMATE_LOVELACE_VIEW_CONFIG] };
-
-    if (deepEqual(config, this._lovelace?.config)) {
-      return;
-    }
-
+  private _setLovelace() {
    this._lovelace = {
-      config: config,
-      rawConfig: rawConfig,
+      config: CLIMATE_LOVELACE_CONFIG,
+      rawConfig: CLIMATE_LOVELACE_CONFIG,
      editMode: false,
      urlPath: "climate",
      mode: "generated",
--- a/src/panels/climate/strategies/climate-view-strategy.ts
+++ b/src/panels/climate/strategies/climate-view-strategy.ts
@@ -115,24 +115,6 @@ const processAreasForClimate = (
  return cards;
 };

-const processUnassignedEntities = (
-  hass: HomeAssistant,
-  entities: string[]
-): LovelaceCardConfig[] => {
-  const unassignedFilter = generateEntityFilter(hass, {
-    area: null,
-  });
-  const unassignedEntities = entities.filter(unassignedFilter);
-  const areaCards: LovelaceCardConfig[] = [];
-  const computeTileCard = computeAreaTileCardConfig(hass, "", true);
-
-  for (const entityId of unassignedEntities) {
-    areaCards.push(computeTileCard(entityId));
-  }
-
-  return areaCards;
-};
-
@customElement("climate-view-strategy")
 export class ClimateViewStrategy extends ReactiveElement {
  static async generate(
@@ -208,33 +190,10 @@ export class ClimateViewStrategy extends ReactiveElement {
      }
    }

-    // Process unassigned entities
-    const unassignedCards = processUnassignedEntities(hass, entities);
-
-    if (unassignedCards.length > 0) {
-      const section: LovelaceSectionRawConfig = {
-        type: "grid",
-        column_span: 2,
-        cards: [
-          {
-            type: "heading",
-            heading:
-              sections.length > 0
-                ? hass.localize(
-                    "ui.panel.lovelace.strategy.climate.other_devices"
-                  )
-                : hass.localize("ui.panel.lovelace.strategy.climate.devices"),
-          },
-          ...unassignedCards,
-        ],
-      };
-      sections.push(section);
-    }
-
    return {
      type: "sections",
      max_columns: 2,
-      sections: sections,
+      sections: sections || [],
    };
  }
 }
--- a/src/panels/config/application_credentials/ha-config-application-credentials.ts
+++ b/src/panels/config/application_credentials/ha-config-application-credentials.ts
@@ -104,6 +104,7 @@ export class HaConfigApplicationCredentials extends LitElement {
          ),
          sortable: true,
          filterable: true,
+          direction: "asc",
        },
        actions: {
          title: "",
--- a/src/panels/config/areas/dialog-floor-registry-detail.ts
+++ b/src/panels/config/areas/dialog-floor-registry-detail.ts
@@ -8,24 +8,24 @@ import { fireEvent } from "../../../common/dom/fire_event";
 import "../../../components/chips/ha-chip-set";
 import "../../../components/chips/ha-input-chip";
 import "../../../components/ha-alert";
-import "../../../components/ha-aliases-editor";
-import "../../../components/ha-area-picker";
 import "../../../components/ha-button";
+import "../../../components/ha-aliases-editor";
 import { createCloseHeading } from "../../../components/ha-dialog";
 import "../../../components/ha-icon-picker";
 import "../../../components/ha-picture-upload";
 import "../../../components/ha-settings-row";
 import "../../../components/ha-svg-icon";
 import "../../../components/ha-textfield";
-import { updateAreaRegistryEntry } from "../../../data/area_registry";
+import "../../../components/ha-area-picker";
 import type {
  FloorRegistryEntry,
  FloorRegistryEntryMutableParams,
 } from "../../../data/floor_registry";
 import { haStyle, haStyleDialog } from "../../../resources/styles";
 import type { HomeAssistant } from "../../../types";
-import { showAreaRegistryDetailDialog } from "./show-dialog-area-registry-detail";
 import type { FloorRegistryDetailDialogParams } from "./show-dialog-floor-registry-detail";
+import { showAreaRegistryDetailDialog } from "./show-dialog-area-registry-detail";
+import { updateAreaRegistryEntry } from "../../../data/area_registry";

 class DialogFloorDetail extends LitElement {
  @property({ attribute: false }) public hass!: HomeAssistant;
@@ -168,6 +168,11 @@ class DialogFloorDetail extends LitElement {
              )}
            </h3>

+            <p class="description">
+              ${this.hass.localize(
+                "ui.panel.config.floors.editor.areas_description"
+              )}
+            </p>
            ${areas.length
              ? html`<ha-chip-set>
                  ${repeat(
@@ -192,17 +197,13 @@ class DialogFloorDetail extends LitElement {
                      </ha-input-chip>`
                  )}
                </ha-chip-set>`
-              : html`<p class="description">
-                  ${this.hass.localize(
-                    "ui.panel.config.floors.editor.areas_description"
-                  )}
-                </p>`}
+              : nothing}
            <ha-area-picker
              no-add
              .hass=${this.hass}
              @value-changed=${this._addArea}
              .excludeAreas=${areas.map((a) => a.area_id)}
-              .addButtonLabel=${this.hass.localize(
+              .label=${this.hass.localize(
                "ui.panel.config.floors.editor.add_area"
              )}
            ></ha-area-picker>
--- a/src/panels/config/automation/action/ha-automation-action-row.ts
+++ b/src/panels/config/automation/action/ha-automation-action-row.ts
@@ -588,11 +588,7 @@ export default class HaAutomationActionRow extends LitElement {
      ...this._clipboard,
      action: deepClone(this.action),
    };
-    let action = this.action;
-    if ("sequence" in action) {
-      action = { ...this.action, metadata: {} };
-    }
-    copyToClipboard(dump(action));
+    copyToClipboard(dump(this.action));
  }

  private _onDisable = () => {
--- a/src/panels/config/automation/action/ha-automation-action.ts
+++ b/src/panels/config/automation/action/ha-automation-action.ts
@@ -14,13 +14,11 @@ import "../../../../components/ha-sortable";
 import "../../../../components/ha-svg-icon";
 import {
  ACTION_BUILDING_BLOCKS,
+  getService,
+  isService,
  VIRTUAL_ACTIONS,
 } from "../../../../data/action";
-import {
-  getValueFromDynamic,
-  isDynamic,
-  type AutomationClipboard,
-} from "../../../../data/automation";
+import type { AutomationClipboard } from "../../../../data/automation";
 import type { Action } from "../../../../data/script";
 import type { HomeAssistant } from "../../../../types";
 import {
@@ -219,9 +217,9 @@ export default class HaAutomationAction extends LitElement {
      actions = this.actions.concat(deepClone(this._clipboard!.action));
    } else if (action in VIRTUAL_ACTIONS) {
      actions = this.actions.concat(VIRTUAL_ACTIONS[action]);
-    } else if (isDynamic(action)) {
+    } else if (isService(action)) {
      actions = this.actions.concat({
-        action: getValueFromDynamic(action),
+        action: getService(action),
        metadata: {},
      });
    } else {
--- a/src/panels/config/automation/add-automation-element-dialog.ts
+++ b/src/panels/config/automation/add-automation-element-dialog.ts
@@ -5,7 +5,6 @@ import {
  mdiPlus,
 } from "@mdi/js";
 import Fuse from "fuse.js";
-import type { UnsubscribeFunc } from "home-assistant-js-websocket";
 import type { CSSResultGroup, PropertyValues, TemplateResult } from "lit";
 import { LitElement, css, html, nothing } from "lit";
 import {
@@ -41,39 +40,32 @@ import "../../../components/ha-md-list";
 import type { HaMdList } from "../../../components/ha-md-list";
 import "../../../components/ha-md-list-item";
 import "../../../components/ha-service-icon";
-import { TRIGGER_ICONS } from "../../../components/ha-trigger-icon";
 import "../../../components/ha-wa-dialog";
 import "../../../components/search-input";
 import {
  ACTION_BUILDING_BLOCKS_GROUP,
  ACTION_COLLECTIONS,
  ACTION_ICONS,
+  SERVICE_PREFIX,
+  getService,
+  isService,
 } from "../../../data/action";
-import {
-  DYNAMIC_PREFIX,
-  getValueFromDynamic,
-  isDynamic,
-  type AutomationElementGroup,
-  type AutomationElementGroupCollection,
+import type {
+  AutomationElementGroup,
+  AutomationElementGroupCollection,
 } from "../../../data/automation";
 import {
  CONDITION_BUILDING_BLOCKS_GROUP,
  CONDITION_COLLECTIONS,
  CONDITION_ICONS,
 } from "../../../data/condition";
-import { getServiceIcons, getTriggerIcons } from "../../../data/icons";
+import { getServiceIcons } from "../../../data/icons";
 import type { IntegrationManifest } from "../../../data/integration";
 import {
  domainToName,
  fetchIntegrationManifests,
 } from "../../../data/integration";
-import type { TriggerDescriptions } from "../../../data/trigger";
-import {
-  TRIGGER_COLLECTIONS,
-  getTriggerDomain,
-  getTriggerObjectId,
-  subscribeTriggers,
-} from "../../../data/trigger";
+import { TRIGGER_COLLECTIONS, TRIGGER_ICONS } from "../../../data/trigger";
 import type { HassDialog } from "../../../dialogs/make-dialog-manager";
 import { KeyboardShortcutMixin } from "../../../mixins/keyboard-shortcut-mixin";
 import { HaFuse } from "../../../resources/fuse";
@@ -119,7 +111,7 @@ const ENTITY_DOMAINS_OTHER = new Set([

 const ENTITY_DOMAINS_MAIN = new Set(["notify"]);

-const ACTION_SERVICE_KEYWORDS = ["dynamicGroups", "helpers", "other"];
+const ACTION_SERVICE_KEYWORDS = ["serviceGroups", "helpers", "other"];

@customElement("add-automation-element-dialog")
 class DialogAddAutomationElement
@@ -150,8 +142,6 @@ class DialogAddAutomationElement

  @state() private _narrow = false;

-  @state() private _triggerDescriptions: TriggerDescriptions = {};
-
  @query(".items ha-md-list ha-md-list-item")
  private _itemsListFirstElement?: HaMdList;

@@ -162,8 +152,6 @@ class DialogAddAutomationElement

  private _removeKeyboardShortcuts?: () => void;

-  private _unsub?: Promise<UnsubscribeFunc>;
-
  public showDialog(params): void {
    this._params = params;

@@ -175,17 +163,6 @@ class DialogAddAutomationElement
      this._calculateUsedDomains();
      getServiceIcons(this.hass);
    }
-    if (this._params?.type === "trigger") {
-      this.hass.loadBackendTranslation("triggers");
-      this._fetchManifests();
-      getTriggerIcons(this.hass);
-      this._unsub = subscribeTriggers(this.hass, (triggers) => {
-        this._triggerDescriptions = {
-          ...this._triggerDescriptions,
-          ...triggers,
-        };
-      });
-    }
    this._fullScreen = matchMedia(
      "all and (max-width: 450px), all and (max-height: 500px)"
    ).matches;
@@ -199,10 +176,6 @@ class DialogAddAutomationElement

  public closeDialog() {
    this.removeKeyboardShortcuts();
-    if (this._unsub) {
-      this._unsub.then((unsub) => unsub());
-      this._unsub = undefined;
-    }
    if (this._params) {
      fireEvent(this, "dialog-closed", { dialog: this.localName });
    }
@@ -284,7 +257,7 @@ class DialogAddAutomationElement

      const results = fuse.multiTermsSearch(filter);
      if (results) {
-        return results.map((result) => result.item).filter((item) => item.name);
+        return results.map((result) => result.item);
      }
      return items;
    }
@@ -321,7 +294,7 @@ class DialogAddAutomationElement

      const results = fuse.multiTermsSearch(filter);
      if (results) {
-        return results.map((result) => result.item).filter((item) => item.name);
+        return results.map((result) => result.item);
      }
      return items;
    }
@@ -344,11 +317,6 @@ class DialogAddAutomationElement
        );

      const items = flattenGroups(groups).flat();
-      if (type === "trigger") {
-        items.push(
-          ...this._triggers(localize, this._triggerDescriptions, manifests)
-        );
-      }
      if (type === "action") {
        items.push(...this._services(localize, services, manifests));
      }
@@ -371,7 +339,6 @@ class DialogAddAutomationElement
      domains: Set<string> | undefined,
      localize: LocalizeFunc,
      services: HomeAssistant["services"],
-      triggerDescriptions: TriggerDescriptions,
      manifests?: DomainManifestLookup
    ): {
      titleKey?: LocalizeKeys;
@@ -395,32 +362,7 @@ class DialogAddAutomationElement
              services,
              manifests,
              domains,
-              collection.groups.dynamicGroups
-                ? undefined
-                : collection.groups.helpers
-                  ? "helper"
-                  : "other"
-            )
-          );
-
-          collectionGroups = collectionGroups.filter(
-            ([key]) => !ACTION_SERVICE_KEYWORDS.includes(key)
-          );
-        }
-
-        if (
-          type === "trigger" &&
-          Object.keys(collection.groups).some((item) =>
-            ACTION_SERVICE_KEYWORDS.includes(item)
-          )
-        ) {
-          groups.push(
-            ...this._triggerGroups(
-              localize,
-              triggerDescriptions,
-              manifests,
-              domains,
-              collection.groups.dynamicGroups
+              collection.groups.serviceGroups
                ? undefined
                : collection.groups.helpers
                  ? "helper"
@@ -441,16 +383,9 @@ class DialogAddAutomationElement

        generatedCollections.push({
          titleKey: collection.titleKey,
-          groups: groups.sort((a, b) => {
-            // make sure device is always on top
-            if (a.key === "device" || a.key === "device_id") {
-              return -1;
-            }
-            if (b.key === "device" || b.key === "device_id") {
-              return 1;
-            }
-            return stringCompare(a.name, b.name, this.hass.locale.language);
-          }),
+          groups: groups.sort((a, b) =>
+            stringCompare(a.name, b.name, this.hass.locale.language)
+          ),
        });
      });
      return generatedCollections;
@@ -487,19 +422,10 @@ class DialogAddAutomationElement
      services: HomeAssistant["services"],
      manifests?: DomainManifestLookup
    ): ListItem[] => {
-      if (type === "action" && isDynamic(group)) {
+      if (type === "action" && isService(group)) {
        return this._services(localize, services, manifests, group);
      }

-      if (type === "trigger" && isDynamic(group)) {
-        return this._triggers(
-          localize,
-          this._triggerDescriptions,
-          manifests,
-          group
-        );
-      }
-
      const groups = this._getGroups(type, group, collectionIndex);

      const result = Object.entries(groups).map(([key, options]) =>
@@ -581,7 +507,7 @@ class DialogAddAutomationElement
              brand-fallback
            ></ha-domain-icon>
          `,
-          key: `${DYNAMIC_PREFIX}${domain}`,
+          key: `${SERVICE_PREFIX}${domain}`,
          name: domainToName(localize, domain, manifest),
          description: "",
        });
@@ -592,102 +518,6 @@ class DialogAddAutomationElement
    );
  };

-  private _triggerGroups = (
-    localize: LocalizeFunc,
-    triggers: TriggerDescriptions,
-    manifests: DomainManifestLookup | undefined,
-    domains: Set<string> | undefined,
-    type: "helper" | "other" | undefined
-  ): ListItem[] => {
-    if (!triggers || !manifests) {
-      return [];
-    }
-    const result: ListItem[] = [];
-    const addedDomains = new Set<string>();
-    Object.keys(triggers).forEach((trigger) => {
-      const domain = getTriggerDomain(trigger);
-
-      if (addedDomains.has(domain)) {
-        return;
-      }
-      addedDomains.add(domain);
-
-      const manifest = manifests[domain];
-      const domainUsed = !domains ? true : domains.has(domain);
-
-      if (
-        (type === undefined &&
-          (ENTITY_DOMAINS_MAIN.has(domain) ||
-            (manifest?.integration_type === "entity" &&
-              domainUsed &&
-              !ENTITY_DOMAINS_OTHER.has(domain)))) ||
-        (type === "helper" && manifest?.integration_type === "helper") ||
-        (type === "other" &&
-          !ENTITY_DOMAINS_MAIN.has(domain) &&
-          (ENTITY_DOMAINS_OTHER.has(domain) ||
-            (!domainUsed && manifest?.integration_type === "entity") ||
-            !["helper", "entity"].includes(manifest?.integration_type || "")))
-      ) {
-        result.push({
-          icon: html`
-            <ha-domain-icon
-              .hass=${this.hass}
-              .domain=${domain}
-              brand-fallback
-            ></ha-domain-icon>
-          `,
-          key: `${DYNAMIC_PREFIX}${domain}`,
-          name: domainToName(localize, domain, manifest),
-          description: "",
-        });
-      }
-    });
-    return result.sort((a, b) =>
-      stringCompare(a.name, b.name, this.hass.locale.language)
-    );
-  };
-
-  private _triggers = memoizeOne(
-    (
-      localize: LocalizeFunc,
-      triggers: TriggerDescriptions,
-      _manifests: DomainManifestLookup | undefined,
-      group?: string
-    ): ListItem[] => {
-      if (!triggers) {
-        return [];
-      }
-      const result: ListItem[] = [];
-
-      for (const trigger of Object.keys(triggers)) {
-        const domain = getTriggerDomain(trigger);
-        const triggerName = getTriggerObjectId(trigger);
-
-        if (group && group !== `${DYNAMIC_PREFIX}${domain}`) {
-          continue;
-        }
-
-        result.push({
-          icon: html`
-            <ha-trigger-icon
-              .hass=${this.hass}
-              .trigger=${trigger}
-            ></ha-trigger-icon>
-          `,
-          key: `${DYNAMIC_PREFIX}${trigger}`,
-          name:
-            localize(`component.${domain}.triggers.${triggerName}.name`) ||
-            trigger,
-          description:
-            localize(
-              `component.${domain}.triggers.${triggerName}.description`
-            ) || trigger,
-        });
-      }
-      return result;
-    }
-  );
-
  private _services = memoizeOne(
    (
      localize: LocalizeFunc,
@@ -702,8 +532,8 @@ class DialogAddAutomationElement

      let domain: string | undefined;

-      if (isDynamic(group)) {
-        domain = getValueFromDynamic(group!);
+      if (isService(group)) {
+        domain = getService(group!);
      }

      const addDomain = (dmn: string) => {
@@ -717,7 +547,7 @@ class DialogAddAutomationElement
                .service=${`${dmn}.${service}`}
              ></ha-service-icon>
            `,
-            key: `${DYNAMIC_PREFIX}${dmn}.${service}`,
+            key: `${SERVICE_PREFIX}${dmn}.${service}`,
            name: `${domain ? "" : `${domainToName(localize, dmn)}: `}${
              this.hass.localize(`component.${dmn}.services.${service}.name`) ||
              services[dmn][service]?.name ||
@@ -831,15 +661,14 @@ class DialogAddAutomationElement
      this._domains,
      this.hass.localize,
      this.hass.services,
-      this._triggerDescriptions,
      this._manifests
    );

-    const groupName = isDynamic(this._selectedGroup)
+    const groupName = isService(this._selectedGroup)
      ? domainToName(
          this.hass.localize,
-          getValueFromDynamic(this._selectedGroup!),
-          this._manifests?.[getValueFromDynamic(this._selectedGroup!)]
+          getService(this._selectedGroup!),
+          this._manifests?.[getService(this._selectedGroup!)]
        )
      : this.hass.localize(
          `ui.panel.config.automation.editor.${this._params!.type}s.groups.${this._selectedGroup}.label` as LocalizeKeys
@@ -849,7 +678,7 @@ class DialogAddAutomationElement
        );

    const typeTitle = this.hass.localize(
-      `ui.panel.config.automation.editor.${automationElementType}s.add`
+      `ui.panel.config.automation.editor.${automationElementType}s.header`
    );

    const tabButtons = [
@@ -1066,9 +895,7 @@ class DialogAddAutomationElement

    return html`
      <div class="items-title ${this._itemsScrolled ? "scrolled" : ""}">
-        ${this._tab === "blocks" && !this._filter
-          ? this.hass.localize("ui.panel.config.automation.editor.blocks")
-          : title}
+        ${title}
      </div>
      <ha-md-list
        dialogInitialFocus=${ifDefined(this._fullScreen ? "" : undefined)}
@@ -1218,7 +1045,6 @@ class DialogAddAutomationElement
  private _onSearchFocus(ev) {
    this._removeKeyboardShortcuts = tinykeys(ev.target, {
      ArrowDown: this._focusSearchList,
-      Enter: this._pickSingleItem,
    });
  }

@@ -1235,39 +1061,6 @@ class DialogAddAutomationElement
    this._itemsListFirstElement.focus();
  };

-  private _pickSingleItem = (ev: KeyboardEvent) => {
-    if (!this._filter) {
-      return;
-    }
-
-    ev.preventDefault();
-    const automationElementType = this._params!.type;
-
-    const items = [
-      ...this._getFilteredItems(
-        automationElementType,
-        this._filter,
-        this.hass.localize,
-        this.hass.services,
-        this._manifests
-      ),
-      ...(automationElementType !== "trigger"
-        ? this._getFilteredBuildingBlocks(
-            automationElementType,
-            this._filter,
-            this.hass.localize
-          )
-        : []),
-    ];
-
-    if (items.length !== 1) {
-      return;
-    }
-
-    this._params!.add(items[0].key);
-    this.closeDialog();
-  };
-
  static get styles(): CSSResultGroup {
    return [
      css`
@@ -1336,7 +1129,7 @@ class DialogAddAutomationElement
          --md-list-item-trailing-space: var(--md-list-item-leading-space);
          --md-list-item-bottom-space: var(--ha-space-1);
          --md-list-item-top-space: var(--md-list-item-bottom-space);
-          --md-list-item-supporting-text-font: var(--ha-font-family-body);
+          --md-list-item-supporting-text-font: var(--ha-font-size-s);
          --md-list-item-one-line-container-height: var(--ha-space-10);
        }
        ha-bottom-sheet .groups {
@@ -1344,11 +1137,11 @@ class DialogAddAutomationElement
        }
        .groups .selected {
          background-color: var(--ha-color-fill-primary-normal-active);
-          --md-list-item-label-text-color: var(--ha-color-on-primary-normal);
-          --icon-primary-color: var(--ha-color-on-primary-normal);
+          --md-list-item-label-text-color: var(--primary-color);
+          --icon-primary-color: var(--primary-color);
        }
        .groups .selected ha-svg-icon {
-          color: var(--ha-color-on-primary-normal);
+          color: var(--primary-color);
        }

        .collection-title {
@@ -1400,7 +1193,7 @@ class DialogAddAutomationElement
          --md-list-item-trailing-space: var(--md-list-item-leading-space);
          --md-list-item-bottom-space: var(--ha-space-2);
          --md-list-item-top-space: var(--md-list-item-bottom-space);
-          --md-list-item-supporting-text-font: var(--ha-font-family-body);
+          --md-list-item-supporting-text-font: var(--ha-font-size-s);
          gap: var(--ha-space-2);
          padding: var(--ha-space-0) var(--ha-space-4);
        }
--- a/src/panels/config/automation/ha-automation-picker.ts
+++ b/src/panels/config/automation/ha-automation-picker.ts
@@ -452,10 +452,7 @@ class HaAutomationPicker extends SubscribeMixin(LitElement) {
            .indeterminate=${partial}
            reducedTouchTarget
          ></ha-checkbox>
-          <ha-label
-            style=${color ? `--color: ${color}` : ""}
-            .description=${label.description}
-          >
+          <ha-label style=${color ? `--color: ${color}` : ""}>
            ${label.icon
              ? html`<ha-icon slot="icon" .icon=${label.icon}></ha-icon>`
              : nothing}
--- a/src/panels/config/automation/sidebar/ha-automation-sidebar-action.ts
+++ b/src/panels/config/automation/sidebar/ha-automation-sidebar-action.ts
@@ -1,3 +1,4 @@
+import { consume } from "@lit/context";
 import {
  mdiAppleKeyboardCommand,
  mdiContentCopy,
@@ -13,6 +14,7 @@ import {
 import { html, LitElement, nothing } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import { keyed } from "lit/directives/keyed";
+import { capitalizeFirstLetter } from "../../../../common/string/capitalize-first-letter";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import { handleStructError } from "../../../../common/structs/handle-errors";
 import type { LocalizeKeys } from "../../../../common/translations/localize";
@@ -20,14 +22,23 @@ import "../../../../components/ha-md-divider";
 import "../../../../components/ha-md-menu-item";
 import { ACTION_BUILDING_BLOCKS } from "../../../../data/action";
 import type { ActionSidebarConfig } from "../../../../data/automation";
-import { domainToName } from "../../../../data/integration";
-import type { RepeatAction, ServiceAction } from "../../../../data/script";
+import {
+  floorsContext,
+  fullEntitiesContext,
+  labelsContext,
+} from "../../../../data/context";
+import type { EntityRegistryEntry } from "../../../../data/entity_registry";
+import type { FloorRegistryEntry } from "../../../../data/floor_registry";
+import type { LabelRegistryEntry } from "../../../../data/label_registry";
+import type { RepeatAction } from "../../../../data/script";
+import { describeAction } from "../../../../data/script_i18n";
 import type { HomeAssistant } from "../../../../types";
 import { isMac } from "../../../../util/is_mac";
 import type HaAutomationConditionEditor from "../action/ha-automation-action-editor";
 import { getAutomationActionType } from "../action/ha-automation-action-row";
 import { getRepeatType } from "../action/types/ha-automation-action-repeat";
 import { overflowStyles, sidebarEditorStyles } from "../styles";
+import "../trigger/ha-automation-trigger-editor";
 import "./ha-automation-sidebar-card";

@customElement("ha-automation-sidebar-action")
@@ -49,6 +60,18 @@ export default class HaAutomationSidebarAction extends LitElement {

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

+  @state()
+  @consume({ context: fullEntitiesContext, subscribe: true })
+  _entityReg!: EntityRegistryEntry[];
+
+  @state()
+  @consume({ context: labelsContext, subscribe: true })
+  _labelReg!: LabelRegistryEntry[];
+
+  @state()
+  @consume({ context: floorsContext, subscribe: true })
+  _floorReg!: Record<string, FloorRegistryEntry>;
+
  @query(".sidebar-editor")
  public editor?: HaAutomationConditionEditor;

@@ -79,27 +102,20 @@ export default class HaAutomationSidebarAction extends LitElement {

    const isBuildingBlock = ACTION_BUILDING_BLOCKS.includes(type || "");

+    const title = capitalizeFirstLetter(
+      describeAction(
+        this.hass,
+        this._entityReg,
+        this._labelReg,
+        this._floorReg,
+        actionConfig
+      )
+    );
+
    const subtitle = this.hass.localize(
      "ui.panel.config.automation.editor.actions.action"
    );

-    let title =
-      this.hass.localize(
-        `ui.panel.config.automation.editor.actions.type.${type}.label` as LocalizeKeys
-      ) || type;
-
-    if (type === "service" && (actionConfig as ServiceAction).action) {
-      const [domain, service] = (actionConfig as ServiceAction).action!.split(
-        ".",
-        2
-      );
-      title = `${domainToName(this.hass.localize, domain)}: ${
-        this.hass.localize(`component.${domain}.services.${service}.name`) ||
-        this.hass.services[domain][service]?.name ||
-        title
-      }`;
-    }
-
    const description = isBuildingBlock
      ? this.hass.localize(
          `ui.panel.config.automation.editor.actions.type.${type}.description.picker` as LocalizeKeys
--- a/src/panels/config/automation/sidebar/ha-automation-sidebar-card.ts
+++ b/src/panels/config/automation/sidebar/ha-automation-sidebar-card.ts
@@ -17,6 +17,7 @@ import "../../../../components/ha-dialog-header";
 import "../../../../components/ha-icon-button";
 import "../../../../components/ha-md-button-menu";
 import "../../../../components/ha-md-divider";
+import "../../../../components/ha-md-menu-item";
 import type { HomeAssistant } from "../../../../types";
 import "../ha-automation-editor-warning";

--- a/src/panels/config/automation/sidebar/ha-automation-sidebar-option.ts
+++ b/src/panels/config/automation/sidebar/ha-automation-sidebar-option.ts
@@ -6,9 +6,6 @@ import {
 } from "@mdi/js";
 import { html, LitElement, nothing } from "lit";
 import { customElement, property, query } from "lit/decorators";
-import "../../../../components/ha-md-divider";
-import "../../../../components/ha-md-menu-item";
-import "../../../../components/ha-svg-icon";
 import type { OptionSidebarConfig } from "../../../../data/automation";
 import type { HomeAssistant } from "../../../../types";
 import { isMac } from "../../../../util/is_mac";
--- a/src/panels/config/automation/sidebar/ha-automation-sidebar-trigger.ts
+++ b/src/panels/config/automation/sidebar/ha-automation-sidebar-trigger.ts
@@ -15,15 +15,8 @@ import { customElement, property, query, state } from "lit/decorators";
 import { keyed } from "lit/directives/keyed";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import { handleStructError } from "../../../../common/structs/handle-errors";
-import type {
-  LegacyTrigger,
-  TriggerSidebarConfig,
-} from "../../../../data/automation";
-import {
-  getTriggerDomain,
-  getTriggerObjectId,
-  isTriggerList,
-} from "../../../../data/trigger";
+import type { TriggerSidebarConfig } from "../../../../data/automation";
+import { isTriggerList } from "../../../../data/trigger";
 import type { HomeAssistant } from "../../../../types";
 import { isMac } from "../../../../util/is_mac";
 import { overflowStyles, sidebarEditorStyles } from "../styles";
@@ -70,7 +63,8 @@ export default class HaAutomationSidebarTrigger extends LitElement {

  protected render() {
    const rowDisabled =
-      "enabled" in this.config.config && this.config.config.enabled === false;
+      this.disabled ||
+      ("enabled" in this.config.config && this.config.config.enabled === false);
    const type = isTriggerList(this.config.config)
      ? "list"
      : this.config.config.trigger;
@@ -79,18 +73,9 @@ export default class HaAutomationSidebarTrigger extends LitElement {
      "ui.panel.config.automation.editor.triggers.trigger"
    );

-    const domain =
-      "trigger" in this.config.config &&
-      getTriggerDomain(this.config.config.trigger);
-    const triggerName =
-      "trigger" in this.config.config &&
-      getTriggerObjectId(this.config.config.trigger);
-
-    const title =
-      this.hass.localize(
-        `ui.panel.config.automation.editor.triggers.type.${type as LegacyTrigger["trigger"]}.label`
-      ) ||
-      this.hass.localize(`component.${domain}.triggers.${triggerName}.name`);
+    const title = this.hass.localize(
+      `ui.panel.config.automation.editor.triggers.type.${type}.label`
+    );

    return html`
      <ha-automation-sidebar-card
@@ -284,7 +269,6 @@ export default class HaAutomationSidebarTrigger extends LitElement {
            class="sidebar-editor"
            .hass=${this.hass}
            .trigger=${this.config.config}
-            .description=${this.config.description}
            @value-changed=${this._valueChangedSidebar}
            @yaml-changed=${this._yamlChangedSidebar}
            .uiSupported=${this.config.uiSupported}
--- a/src/panels/config/automation/trigger/ha-automation-trigger-editor.ts
+++ b/src/panels/config/automation/trigger/ha-automation-trigger-editor.ts
@@ -9,12 +9,10 @@ import "../../../../components/ha-yaml-editor";
 import type { HaYamlEditor } from "../../../../components/ha-yaml-editor";
 import type { Trigger } from "../../../../data/automation";
 import { migrateAutomationTrigger } from "../../../../data/automation";
-import type { TriggerDescription } from "../../../../data/trigger";
 import { isTriggerList } from "../../../../data/trigger";
 import { haStyle } from "../../../../resources/styles";
 import type { HomeAssistant } from "../../../../types";
 import "../ha-automation-editor-warning";
-import "./types/ha-automation-trigger-platform";

@customElement("ha-automation-trigger-editor")
 export default class HaAutomationTriggerEditor extends LitElement {
@@ -33,8 +31,6 @@ export default class HaAutomationTriggerEditor extends LitElement {

  @property({ type: Boolean, attribute: "show-id" }) public showId = false;

-  @property({ attribute: false }) public description?: TriggerDescription;
-
  @query("ha-yaml-editor") public yamlEditor?: HaYamlEditor;

  protected render() {
@@ -91,18 +87,11 @@ export default class HaAutomationTriggerEditor extends LitElement {
                  `
                : nothing}
              <div @value-changed=${this._onUiChanged}>
-                ${this.description
-                  ? html`<ha-automation-trigger-platform
-                      .hass=${this.hass}
-                      .trigger=${this.trigger}
-                      .description=${this.description}
-                      .disabled=${this.disabled}
-                    ></ha-automation-trigger-platform>`
-                  : dynamicElement(`ha-automation-trigger-${type}`, {
-                      hass: this.hass,
-                      trigger: this.trigger,
-                      disabled: this.disabled,
-                    })}
+                ${dynamicElement(`ha-automation-trigger-${type}`, {
+                  hass: this.hass,
+                  trigger: this.trigger,
+                  disabled: this.disabled,
+                })}
              </div>
            `}
      </div>
--- a/src/panels/config/automation/trigger/ha-automation-trigger-row.ts
+++ b/src/panels/config/automation/trigger/ha-automation-trigger-row.ts
@@ -40,11 +40,9 @@ import "../../../../components/ha-md-button-menu";
 import "../../../../components/ha-md-divider";
 import "../../../../components/ha-md-menu-item";
 import "../../../../components/ha-svg-icon";
-import { TRIGGER_ICONS } from "../../../../components/ha-trigger-icon";
 import type {
  AutomationClipboard,
  Trigger,
-  TriggerList,
  TriggerSidebarConfig,
 } from "../../../../data/automation";
 import { isTrigger, subscribeTrigger } from "../../../../data/automation";
@@ -52,8 +50,7 @@ import { describeTrigger } from "../../../../data/automation_i18n";
 import { validateConfig } from "../../../../data/config";
 import { fullEntitiesContext } from "../../../../data/context";
 import type { EntityRegistryEntry } from "../../../../data/entity_registry";
-import type { TriggerDescriptions } from "../../../../data/trigger";
-import { isTriggerList } from "../../../../data/trigger";
+import { TRIGGER_ICONS, isTriggerList } from "../../../../data/trigger";
 import {
  showAlertDialog,
  showPromptDialog,
@@ -75,7 +72,6 @@ import "./types/ha-automation-trigger-list";
 import "./types/ha-automation-trigger-mqtt";
 import "./types/ha-automation-trigger-numeric_state";
 import "./types/ha-automation-trigger-persistent_notification";
-import "./types/ha-automation-trigger-platform";
 import "./types/ha-automation-trigger-state";
 import "./types/ha-automation-trigger-sun";
 import "./types/ha-automation-trigger-tag";
@@ -141,9 +137,6 @@ export default class HaAutomationTriggerRow extends LitElement {

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

-  @property({ attribute: false })
-  public triggerDescriptions: TriggerDescriptions = {};
-
  @property({ type: Boolean }) public narrow = false;

  @query("ha-automation-trigger-editor")
@@ -185,24 +178,18 @@ export default class HaAutomationTriggerRow extends LitElement {
  }

  private _renderRow() {
-    const type = this._getType(this.trigger, this.triggerDescriptions);
+    const type = this._getType(this.trigger);

    const supported = this._uiSupported(type);

    const yamlMode = this._yamlMode || !supported;

    return html`
-      ${type === "list"
-        ? html`<ha-svg-icon
-            slot="leading-icon"
-            class="trigger-icon"
-            .path=${TRIGGER_ICONS[type]}
-          ></ha-svg-icon>`
-        : html`<ha-trigger-icon
-            slot="leading-icon"
-            .hass=${this.hass}
-            .trigger=${(this.trigger as Exclude<Trigger, TriggerList>).trigger}
-          ></ha-trigger-icon>`}
+      <ha-svg-icon
+        slot="leading-icon"
+        class="trigger-icon"
+        .path=${TRIGGER_ICONS[type]}
+      ></ha-svg-icon>
      <h3 slot="header">
        ${describeTrigger(this.trigger, this.hass, this._entityReg)}
      </h3>
@@ -406,9 +393,6 @@ export default class HaAutomationTriggerRow extends LitElement {
            <ha-automation-trigger-editor
              .hass=${this.hass}
              .trigger=${this.trigger}
-              .description=${"trigger" in this.trigger
-                ? this.triggerDescriptions[this.trigger.trigger]
-                : undefined}
              .disabled=${this.disabled}
              .yamlMode=${this._yamlMode}
              .uiSupported=${supported}
@@ -568,7 +552,6 @@ export default class HaAutomationTriggerRow extends LitElement {
  }

  public openSidebar(trigger?: Trigger): void {
-    trigger = trigger || this.trigger;
    fireEvent(this, "open-sidebar", {
      save: (value) => {
        fireEvent(this, "value-changed", { value });
@@ -593,14 +576,8 @@ export default class HaAutomationTriggerRow extends LitElement {
      duplicate: this._duplicateTrigger,
      cut: this._cutTrigger,
      insertAfter: this._insertAfter,
-      config: trigger,
-      uiSupported: this._uiSupported(
-        this._getType(trigger, this.triggerDescriptions)
-      ),
-      description:
-        "trigger" in trigger
-          ? this.triggerDescriptions[trigger.trigger]
-          : undefined,
+      config: trigger || this.trigger,
+      uiSupported: this._uiSupported(this._getType(trigger || this.trigger)),
      yamlMode: this._yamlMode,
    } satisfies TriggerSidebarConfig);
    this._selected = true;
@@ -782,18 +759,8 @@ export default class HaAutomationTriggerRow extends LitElement {
    });
  }

-  private _getType = memoizeOne(
-    (trigger: Trigger, triggerDescriptions: TriggerDescriptions) => {
-      if (isTriggerList(trigger)) {
-        return "list";
-      }
-
-      if (trigger.trigger in triggerDescriptions) {
-        return "platform";
-      }
-
-      return trigger.trigger;
-    }
+  private _getType = memoizeOne((trigger: Trigger) =>
+    isTriggerList(trigger) ? "list" : trigger.trigger
  );

  private _uiSupported = memoizeOne(
--- a/src/panels/config/automation/trigger/ha-automation-trigger.ts
+++ b/src/panels/config/automation/trigger/ha-automation-trigger.ts
@@ -4,7 +4,6 @@ import type { PropertyValues } from "lit";
 import { html, LitElement, nothing } from "lit";
 import { customElement, property, 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";
@@ -13,16 +12,12 @@ import "../../../../components/ha-button";
 import "../../../../components/ha-button-menu";
 import "../../../../components/ha-sortable";
 import "../../../../components/ha-svg-icon";
-import {
-  getValueFromDynamic,
-  isDynamic,
-  type AutomationClipboard,
-  type Trigger,
-  type TriggerList,
+import type {
+  AutomationClipboard,
+  Trigger,
+  TriggerList,
 } from "../../../../data/automation";
-import type { TriggerDescriptions } from "../../../../data/trigger";
-import { isTriggerList, subscribeTriggers } from "../../../../data/trigger";
-import { SubscribeMixin } from "../../../../mixins/subscribe-mixin";
+import { isTriggerList } from "../../../../data/trigger";
 import type { HomeAssistant } from "../../../../types";
 import {
  PASTE_VALUE,
@@ -31,9 +26,10 @@ import {
 import { automationRowsStyles } from "../styles";
 import "./ha-automation-trigger-row";
 import type HaAutomationTriggerRow from "./ha-automation-trigger-row";
+import { ensureArray } from "../../../../common/array/ensure-array";

@customElement("ha-automation-trigger")
-export default class HaAutomationTrigger extends SubscribeMixin(LitElement) {
+export default class HaAutomationTrigger extends LitElement {
  @property({ attribute: false }) public hass!: HomeAssistant;

  @property({ attribute: false }) public triggers!: Trigger[];
@@ -66,23 +62,6 @@ export default class HaAutomationTrigger extends SubscribeMixin(LitElement) {

  private _triggerKeys = new WeakMap<Trigger, string>();

-  @state() private _triggerDescriptions: TriggerDescriptions = {};
-
-  protected hassSubscribe() {
-    return [
-      subscribeTriggers(this.hass, (triggers) => this._addTriggers(triggers)),
-    ];
-  }
-
-  private _addTriggers(triggers: TriggerDescriptions) {
-    this._triggerDescriptions = { ...this._triggerDescriptions, ...triggers };
-  }
-
-  protected firstUpdated(changedProps: PropertyValues) {
-    super.firstUpdated(changedProps);
-    this.hass.loadBackendTranslation("triggers");
-  }
-
  protected render() {
    return html`
      <ha-sortable
@@ -106,7 +85,6 @@ export default class HaAutomationTrigger extends SubscribeMixin(LitElement) {
                .first=${idx === 0}
                .last=${idx === this.triggers.length - 1}
                .trigger=${trg}
-                .triggerDescriptions=${this._triggerDescriptions}
                @duplicate=${this._duplicateTrigger}
                @insert-after=${this._insertAfter}
                @move-down=${this._moveDown}
@@ -178,10 +156,6 @@ export default class HaAutomationTrigger extends SubscribeMixin(LitElement) {
    let triggers: Trigger[];
    if (value === PASTE_VALUE) {
      triggers = this.triggers.concat(deepClone(this._clipboard!.trigger));
-    } else if (isDynamic(value)) {
-      triggers = this.triggers.concat({
-        trigger: getValueFromDynamic(value),
-      });
    } else {
      const trigger = value as Exclude<Trigger, TriggerList>["trigger"];
      const elClass = customElements.get(
--- a/src/panels/config/automation/trigger/types/ha-automation-trigger-platform.ts
+++ b/src/panels/config/automation/trigger/types/ha-automation-trigger-platform.ts
@@ -1,416 +0,0 @@
-import { mdiHelpCircle } from "@mdi/js";
-import type { PropertyValues } from "lit";
-import { css, html, LitElement, nothing } from "lit";
-import { customElement, property, state } from "lit/decorators";
-import memoizeOne from "memoize-one";
-import { fireEvent } from "../../../../../common/dom/fire_event";
-import { computeDomain } from "../../../../../common/entity/compute_domain";
-import "../../../../../components/ha-checkbox";
-import "../../../../../components/ha-selector/ha-selector";
-import "../../../../../components/ha-settings-row";
-import type { PlatformTrigger } from "../../../../../data/automation";
-import type { IntegrationManifest } from "../../../../../data/integration";
-import { fetchIntegrationManifest } from "../../../../../data/integration";
-import type { TargetSelector } from "../../../../../data/selector";
-import {
-  getTriggerDomain,
-  getTriggerObjectId,
-  type TriggerDescription,
-} from "../../../../../data/trigger";
-import type { HomeAssistant } from "../../../../../types";
-import { documentationUrl } from "../../../../../util/documentation-url";
-
-const showOptionalToggle = (field: TriggerDescription["fields"][string]) =>
-  field.selector &&
-  !field.required &&
-  !("boolean" in field.selector && field.default);
-
-@customElement("ha-automation-trigger-platform")
-export class HaPlatformTrigger extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
-  @property({ attribute: false }) public trigger!: PlatformTrigger;
-
-  @property({ attribute: false }) public description?: TriggerDescription;
-
-  @property({ type: Boolean }) public disabled = false;
-
-  @state() private _checkedKeys = new Set();
-
-  @state() private _manifest?: IntegrationManifest;
-
-  public static get defaultConfig(): PlatformTrigger {
-    return { trigger: "" };
-  }
-
-  protected willUpdate(changedProperties: PropertyValues<this>) {
-    super.willUpdate(changedProperties);
-    if (!this.hasUpdated) {
-      this.hass.loadBackendTranslation("triggers");
-      this.hass.loadBackendTranslation("selector");
-    }
-    if (!changedProperties.has("trigger")) {
-      return;
-    }
-    const oldValue = changedProperties.get("trigger") as
-      | undefined
-      | this["trigger"];
-
-    // Fetch the manifest if we have a trigger selected and the trigger domain changed.
-    // If no trigger is selected, clear the manifest.
-    if (this.trigger?.trigger) {
-      const domain = getTriggerDomain(this.trigger.trigger);
-
-      const oldDomain = getTriggerDomain(oldValue?.trigger || "");
-
-      if (domain !== oldDomain) {
-        this._fetchManifest(domain);
-      }
-    } else {
-      this._manifest = undefined;
-    }
-  }
-
-  protected render() {
-    const domain = getTriggerDomain(this.trigger.trigger);
-    const triggerName = getTriggerObjectId(this.trigger.trigger);
-
-    const description = this.hass.localize(
-      `component.${domain}.triggers.${triggerName}.description`
-    );
-
-    const triggerDesc = this.description;
-
-    const shouldRenderDataYaml = !triggerDesc?.fields;
-
-    const hasOptional = Boolean(
-      triggerDesc?.fields &&
-        Object.values(triggerDesc.fields).some((field) =>
-          showOptionalToggle(field)
-        )
-    );
-
-    return html`
-      <div class="description">
-        ${description ? html`<p>${description}</p>` : nothing}
-        ${this._manifest
-          ? html`<a
-              href=${this._manifest.is_built_in
-                ? documentationUrl(
-                    this.hass,
-                    `/integrations/${this._manifest.domain}`
-                  )
-                : this._manifest.documentation}
-              title=${this.hass.localize(
-                "ui.components.service-control.integration_doc"
-              )}
-              target="_blank"
-              rel="noreferrer"
-            >
-              <ha-icon-button
-                .path=${mdiHelpCircle}
-                class="help-icon"
-              ></ha-icon-button>
-            </a>`
-          : nothing}
-      </div>
-      ${triggerDesc && "target" in triggerDesc
-        ? html`<ha-settings-row narrow>
-            ${hasOptional
-              ? html`<div slot="prefix" class="checkbox-spacer"></div>`
-              : nothing}
-            <span slot="heading"
-              >${this.hass.localize(
-                "ui.components.service-control.target"
-              )}</span
-            >
-            <span slot="description"
-              >${this.hass.localize(
-                "ui.components.service-control.target_secondary"
-              )}</span
-            ><ha-selector
-              .hass=${this.hass}
-              .selector=${this._targetSelector(triggerDesc.target)}
-              .disabled=${this.disabled}
-              @value-changed=${this._targetChanged}
-              .value=${this.trigger?.target}
-            ></ha-selector
-          ></ha-settings-row>`
-        : nothing}
-      ${shouldRenderDataYaml
-        ? html`<ha-yaml-editor
-            .hass=${this.hass}
-            .label=${this.hass.localize(
-              "ui.components.service-control.action_data"
-            )}
-            .name=${"data"}
-            .readOnly=${this.disabled}
-            .defaultValue=${this.trigger?.options}
-            @value-changed=${this._dataChanged}
-          ></ha-yaml-editor>`
-        : Object.entries(triggerDesc.fields).map(([fieldName, dataField]) =>
-            this._renderField(
-              fieldName,
-              dataField,
-              hasOptional,
-              domain,
-              triggerName
-            )
-          )}
-    `;
-  }
-
-  private _targetSelector = memoizeOne(
-    (targetSelector: TargetSelector["target"] | null | undefined) =>
-      targetSelector ? { target: { ...targetSelector } } : { target: {} }
-  );
-
-  private _renderField = (
-    fieldName: string,
-    dataField: TriggerDescription["fields"][string],
-    hasOptional: boolean,
-    domain: string | undefined,
-    triggerName: string | undefined
-  ) => {
-    const selector = dataField?.selector ?? { text: null };
-
-    const showOptional = showOptionalToggle(dataField);
-
-    return dataField.selector
-      ? html`<ha-settings-row narrow>
-          ${!showOptional
-            ? hasOptional
-              ? html`<div slot="prefix" class="checkbox-spacer"></div>`
-              : nothing
-            : html`<ha-checkbox
-                .key=${fieldName}
-                .checked=${this._checkedKeys.has(fieldName) ||
-                (this.trigger?.options &&
-                  this.trigger.options[fieldName] !== undefined)}
-                .disabled=${this.disabled}
-                @change=${this._checkboxChanged}
-                slot="prefix"
-              ></ha-checkbox>`}
-          <span slot="heading"
-            >${this.hass.localize(
-              `component.${domain}.triggers.${triggerName}.fields.${fieldName}.name`
-            ) || triggerName}</span
-          >
-          <span slot="description"
-            >${this.hass.localize(
-              `component.${domain}.triggers.${triggerName}.fields.${fieldName}.description`
-            )}</span
-          >
-          <ha-selector
-            .disabled=${this.disabled ||
-            (showOptional &&
-              !this._checkedKeys.has(fieldName) &&
-              (!this.trigger?.options ||
-                this.trigger.options[fieldName] === undefined))}
-            .hass=${this.hass}
-            .selector=${selector}
-            .context=${this._generateContext(dataField)}
-            .key=${fieldName}
-            @value-changed=${this._dataChanged}
-            .value=${this.trigger?.options
-              ? this.trigger.options[fieldName]
-              : undefined}
-            .placeholder=${dataField.default}
-            .localizeValue=${this._localizeValueCallback}
-          ></ha-selector>
-        </ha-settings-row>`
-      : nothing;
-  };
-
-  private _generateContext(
-    field: TriggerDescription["fields"][string]
-  ): Record<string, any> | undefined {
-    if (!field.context) {
-      return undefined;
-    }
-
-    const context = {};
-    for (const [context_key, data_key] of Object.entries(field.context)) {
-      context[context_key] =
-        data_key === "target"
-          ? this.trigger.target
-          : this.trigger.options?.[data_key];
-    }
-    return context;
-  }
-
-  private _dataChanged(ev: CustomEvent) {
-    ev.stopPropagation();
-    if (ev.detail.isValid === false) {
-      // Don't clear an object selector that returns invalid YAML
-      return;
-    }
-    const key = (ev.currentTarget as any).key;
-    const value = ev.detail.value;
-    if (
-      this.trigger?.options?.[key] === value ||
-      ((!this.trigger?.options || !(key in this.trigger.options)) &&
-        (value === "" || value === undefined))
-    ) {
-      return;
-    }
-
-    const options = { ...this.trigger?.options, [key]: value };
-
-    if (
-      value === "" ||
-      value === undefined ||
-      (typeof value === "object" && !Object.keys(value).length)
-    ) {
-      delete options[key];
-    }
-
-    fireEvent(this, "value-changed", {
-      value: {
-        ...this.trigger,
-        options,
-      },
-    });
-  }
-
-  private _targetChanged(ev: CustomEvent): void {
-    ev.stopPropagation();
-    fireEvent(this, "value-changed", {
-      value: {
-        ...this.trigger,
-        target: ev.detail.value,
-      },
-    });
-  }
-
-  private _checkboxChanged(ev) {
-    const checked = ev.currentTarget.checked;
-    const key = ev.currentTarget.key;
-    let options;
-
-    if (checked) {
-      this._checkedKeys.add(key);
-      const field =
-        this.description &&
-        Object.entries(this.description).find(([k, _value]) => k === key)?.[1];
-      let defaultValue = field?.default;
-
-      if (
-        defaultValue == null &&
-        field?.selector &&
-        "constant" in field.selector
-      ) {
-        defaultValue = field.selector.constant?.value;
-      }
-
-      if (
-        defaultValue == null &&
-        field?.selector &&
-        "boolean" in field.selector
-      ) {
-        defaultValue = false;
-      }
-
-      if (defaultValue != null) {
-        options = {
-          ...this.trigger?.options,
-          [key]: defaultValue,
-        };
-      }
-    } else {
-      this._checkedKeys.delete(key);
-      options = { ...this.trigger?.options };
-      delete options[key];
-    }
-    if (options) {
-      fireEvent(this, "value-changed", {
-        value: {
-          ...this.trigger,
-          options,
-        },
-      });
-    }
-    this.requestUpdate("_checkedKeys");
-  }
-
-  private _localizeValueCallback = (key: string) => {
-    if (!this.trigger?.trigger) {
-      return "";
-    }
-    return this.hass.localize(
-      `component.${computeDomain(this.trigger.trigger)}.selector.${key}`
-    );
-  };
-
-  private async _fetchManifest(integration: string) {
-    this._manifest = undefined;
-    try {
-      this._manifest = await fetchIntegrationManifest(this.hass, integration);
-    } catch (_err: any) {
-      // eslint-disable-next-line no-console
-      console.log(`Unable to fetch integration manifest for ${integration}`);
-      // Ignore if loading manifest fails. Probably bad JSON in manifest
-    }
-  }
-
-  static styles = css`
-    ha-settings-row {
-      padding: 0 var(--ha-space-4);
-    }
-    ha-settings-row[narrow] {
-      padding-bottom: var(--ha-space-2);
-    }
-    ha-settings-row {
-      --settings-row-content-width: 100%;
-      --settings-row-prefix-display: contents;
-      border-top: var(
-        --service-control-items-border-top,
-        1px solid var(--divider-color)
-      );
-    }
-    ha-service-picker,
-    ha-entity-picker,
-    ha-yaml-editor {
-      display: block;
-      margin: 0 var(--ha-space-4);
-    }
-    ha-yaml-editor {
-      padding: var(--ha-space-4) 0;
-    }
-    p {
-      margin: 0 var(--ha-space-4);
-      padding: var(--ha-space-4) 0;
-    }
-    :host([hide-picker]) p {
-      padding-top: 0;
-    }
-    .checkbox-spacer {
-      width: 32px;
-    }
-    ha-checkbox {
-      margin-left: calc(var(--ha-space-4) * -1);
-      margin-inline-start: calc(var(--ha-space-4) * -1);
-      margin-inline-end: initial;
-    }
-    .help-icon {
-      color: var(--secondary-text-color);
-    }
-    .description {
-      justify-content: space-between;
-      display: flex;
-      align-items: center;
-      padding-right: 2px;
-      padding-inline-end: 2px;
-      padding-inline-start: initial;
-    }
-    .description p {
-      direction: ltr;
-    }
-  `;
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-automation-trigger-platform": HaPlatformTrigger;
-  }
-}
--- a/src/panels/config/backup/ha-config-backup-backups.ts
+++ b/src/panels/config/backup/ha-config-backup-backups.ts
@@ -125,6 +125,8 @@ class HaConfigBackupBackups extends SubscribeMixin(LitElement) {

  @query("#overflow-menu") private _overflowMenu?: HaMdMenu;

+  private _overflowBackup?: BackupContent;
+
  public connectedCallback() {
    super.connectedCallback();
    window.addEventListener("location-changed", this._locationChanged);
@@ -260,7 +262,7 @@ class HaConfigBackupBackups extends SubscribeMixin(LitElement) {
        type: "overflow-menu",
        template: (backup) => html`
          <ha-icon-button
-            .backup=${backup}
+            .selected=${backup}
            .label=${this.hass.localize("ui.common.overflow_menu")}
            .path=${mdiDotsVertical}
            @click=${this._toggleOverflowMenu}
@@ -292,6 +294,7 @@ class HaConfigBackupBackups extends SubscribeMixin(LitElement) {
      this._overflowMenu.close();
      return;
    }
+    this._overflowBackup = ev.target.selected;
    this._overflowMenu.anchorElement = ev.target;
    this._overflowMenu.show();
  };
@@ -372,14 +375,16 @@ class HaConfigBackupBackups extends SubscribeMixin(LitElement) {
        clickable
        id="backup_id"
        has-filters
-        .filters=${Object.values(this._filters).filter((filter) =>
-          Array.isArray(filter)
-            ? filter.length
-            : filter &&
-              Object.values(filter).some((val) =>
-                Array.isArray(val) ? val.length : val
-              )
-        ).length}
+        .filters=${
+          Object.values(this._filters).filter((filter) =>
+            Array.isArray(filter)
+              ? filter.length
+              : filter &&
+                Object.values(filter).some((val) =>
+                  Array.isArray(val) ? val.length : val
+                )
+          ).length
+        }
        selectable
        .selected=${this._selected.length}
        .initialGroupColumn=${this._activeGrouping}
@@ -421,28 +426,30 @@ class HaConfigBackupBackups extends SubscribeMixin(LitElement) {
        </div>

        <div slot="selection-bar">
-          ${!this.narrow
-            ? html`
-                <ha-button
-                  appearance="plain"
-                  @click=${this._deleteSelected}
-                  variant="danger"
-                >
-                  ${this.hass.localize(
-                    "ui.panel.config.backup.backups.delete_selected"
-                  )}
-                </ha-button>
-              `
-            : html`
-                <ha-icon-button
-                  .label=${this.hass.localize(
-                    "ui.panel.config.backup.backups.delete_selected"
-                  )}
-                  .path=${mdiDelete}
-                  class="warning"
-                  @click=${this._deleteSelected}
-                ></ha-icon-button>
-              `}
+          ${
+            !this.narrow
+              ? html`
+                  <ha-button
+                    appearance="plain"
+                    @click=${this._deleteSelected}
+                    variant="danger"
+                  >
+                    ${this.hass.localize(
+                      "ui.panel.config.backup.backups.delete_selected"
+                    )}
+                  </ha-button>
+                `
+              : html`
+                  <ha-icon-button
+                    .label=${this.hass.localize(
+                      "ui.panel.config.backup.backups.delete_selected"
+                    )}
+                    .path=${mdiDelete}
+                    class="warning"
+                    @click=${this._deleteSelected}
+                  ></ha-icon-button>
+                `
+          }
        </div>

        <ha-filter-states
@@ -455,39 +462,43 @@ class HaConfigBackupBackups extends SubscribeMixin(LitElement) {
          expanded
          .narrow=${this.narrow}
        ></ha-filter-states>
-        ${!this._needsOnboarding
-          ? html`
-              <ha-fab
-                slot="fab"
-                ?disabled=${backupInProgress}
-                .label=${this.hass.localize(
-                  "ui.panel.config.backup.backups.new_backup"
-                )}
-                extended
-                @click=${this._newBackup}
-              >
-                ${backupInProgress
-                  ? html`<div slot="icon" class="loading">
-                      <ha-spinner .size=${"small"}></ha-spinner>
-                    </div>`
-                  : html`<ha-svg-icon
-                      slot="icon"
-                      .path=${mdiPlus}
-                    ></ha-svg-icon>`}
-              </ha-fab>
-            `
-          : nothing}
+        ${
+          !this._needsOnboarding
+            ? html`
+                <ha-fab
+                  slot="fab"
+                  ?disabled=${backupInProgress}
+                  .label=${this.hass.localize(
+                    "ui.panel.config.backup.backups.new_backup"
+                  )}
+                  extended
+                  @click=${this._newBackup}
+                >
+                  ${backupInProgress
+                    ? html`<div slot="icon" class="loading">
+                        <ha-spinner .size=${"small"}></ha-spinner>
+                      </div>`
+                    : html`<ha-svg-icon
+                        slot="icon"
+                        .path=${mdiPlus}
+                      ></ha-svg-icon>`}
+                </ha-fab>
+              `
+            : nothing
+        }
      </hass-tabs-subpage-data-table>
      <ha-md-menu id="overflow-menu" positioning="fixed">
-        <ha-md-menu-item .clickAction=${this._downloadBackup}>
-          <ha-svg-icon slot="start" .path=${mdiDownload}></ha-svg-icon>
-          ${this.hass.localize("ui.common.download")}
-        </ha-md-menu-item>
-        <ha-md-menu-item class="warning" .clickAction=${this._deleteBackup}>
-          <ha-svg-icon slot="start" .path=${mdiDelete}></ha-svg-icon>
-          ${this.hass.localize("ui.common.delete")}
-        </ha-md-menu-item>
-      </ha-md-menu>
+          <ha-md-menu-item .clickAction=${this._downloadBackup}>
+              <ha-svg-icon slot="start" .path=${mdiDownload}></ha-svg-icon>
+            ${this.hass.localize("ui.common.download")}
+          </ha-md-menu-item>
+            <ha-md-menu-item class="warning" .clickAction=${this._deleteBackup}>
+              <ha-svg-icon slot="start" .path=${mdiDelete}></ha-svg-icon>
+            ${this.hass.localize("ui.common.delete")}
+            </ha-md-menu-item>
+        </ha-md-menu>
+      >
+      </ha-icon-overflow-menu>
    `;
  }

@@ -561,17 +572,15 @@ class HaConfigBackupBackups extends SubscribeMixin(LitElement) {
    navigate(`/config/backup/details/${id}`);
  }

-  private _downloadBackup = async (ev): Promise<void> => {
-    const backup = ev.parentElement.anchorElement.backup;
-    if (!backup) {
+  private async _downloadBackup(): Promise<void> {
+    if (!this._overflowBackup) {
      return;
    }
-    downloadBackup(this.hass, this, backup, this.config);
-  };
+    downloadBackup(this.hass, this, this._overflowBackup, this.config);
+  }

-  private _deleteBackup = async (ev): Promise<void> => {
-    const backup = ev.parentElement.anchorElement.backup;
-    if (!backup) {
+  private async _deleteBackup(): Promise<void> {
+    if (!this._overflowBackup) {
      return;
    }

@@ -587,9 +596,11 @@ class HaConfigBackupBackups extends SubscribeMixin(LitElement) {
    }

    try {
-      await deleteBackup(this.hass, backup.backup_id);
-      if (this._selected.includes(backup.backup_id)) {
-        this._selected = this._selected.filter((id) => id !== backup.backup_id);
+      await deleteBackup(this.hass, this._overflowBackup.backup_id);
+      if (this._selected.includes(this._overflowBackup.backup_id)) {
+        this._selected = this._selected.filter(
+          (id) => id !== this._overflowBackup!.backup_id
+        );
      }
    } catch (err: any) {
      showAlertDialog(this, {
@@ -601,7 +612,7 @@ class HaConfigBackupBackups extends SubscribeMixin(LitElement) {
      return;
    }
    fireEvent(this, "ha-refresh-backup-info");
-  };
+  }

  private async _deleteSelected() {
    const confirm = await showConfirmationDialog(this, {
--- a/src/panels/config/blueprint/ha-blueprint-overview.ts
+++ b/src/panels/config/blueprint/ha-blueprint-overview.ts
@@ -182,11 +182,13 @@ class HaBlueprintOverview extends LitElement {
        sortable: true,
        filterable: true,
        groupable: true,
+        direction: "asc",
      },
      path: {
        title: localize("ui.panel.config.blueprint.overview.headers.file_name"),
        sortable: true,
        filterable: true,
+        direction: "asc",
        flex: 2,
      },
      fullpath: {
--- a/src/panels/config/category/ha-category-picker.ts
+++ b/src/panels/config/category/ha-category-picker.ts
@@ -1,4 +1,4 @@
-import { mdiPlus, mdiTag } from "@mdi/js";
+import { mdiTag, mdiPlus } from "@mdi/js";
 import type { UnsubscribeFunc } from "home-assistant-js-websocket";
 import type { TemplateResult } from "lit";
 import { html, LitElement } from "lit";
@@ -194,9 +194,8 @@ export class HaCategoryPicker extends SubscribeMixin(LitElement) {
        .hass=${this.hass}
        .autofocus=${this.autofocus}
        .label=${this.label}
-        .notFoundLabel=${this._notFoundLabel}
-        .emptyLabel=${this.hass.localize(
-          "ui.components.category-picker.no_categories"
+        .notFoundLabel=${this.hass.localize(
+          "ui.components.category-picker.no_match"
        )}
        .placeholder=${placeholder}
        .value=${this.value}
@@ -255,11 +254,6 @@ export class HaCategoryPicker extends SubscribeMixin(LitElement) {
      fireEvent(this, "change");
    }, 0);
  }
-
-  private _notFoundLabel = (search: string) =>
-    this.hass.localize("ui.components.category-picker.no_match", {
-      term: html`<b>‘${search}’</b>`,
-    });
 }

 declare global {
--- a/src/panels/config/devices/ha-config-devices-dashboard.ts
+++ b/src/panels/config/devices/ha-config-devices-dashboard.ts
@@ -771,10 +771,7 @@ export class HaConfigDeviceDashboard extends SubscribeMixin(LitElement) {
            .indeterminate=${partial}
            reducedTouchTarget
          ></ha-checkbox>
-          <ha-label
-            style=${color ? `--color: ${color}` : ""}
-            .description=${label.description}
-          >
+          <ha-label style=${color ? `--color: ${color}` : ""}>
            ${label.icon
              ? html`<ha-icon slot="icon" .icon=${label.icon}></ha-icon>`
              : nothing}
--- a/Show More
+++ b/Show More