Add support for error state

Restore optimised parts code
memo
2025-11-07 18:09:47 +00:00 · 2025-10-29 09:03:13 +00:00 · 2025-10-28 16:01:49 +00:00 · 2025-10-27 16:26:29 +00:00 · 2025-10-27 16:21:17 +00:00 · 2025-10-27 16:19:49 +00:00
180 changed files with 2173 additions and 4253 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@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
+        uses: github/codeql-action/init@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
        with:
          languages: ${{ matrix.language }}

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

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

      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
+        uses: github/codeql-action/analyze@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-22.21.1
+22.21.0
--- 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(),
--- a/cast/src/launcher/layout/hc-cast.ts
+++ b/cast/src/launcher/layout/hc-cast.ts
@@ -16,9 +16,9 @@ import {
 } from "../../../../src/common/auth/token_storage";
 import { atLeastVersion } from "../../../../src/common/config/version";
 import { toggleAttribute } from "../../../../src/common/dom/toggle_attribute";
-import "../../../../src/components/ha-button";
 import "../../../../src/components/ha-icon";
 import "../../../../src/components/ha-list";
+import "../../../../src/components/ha-button";
 import "../../../../src/components/ha-list-item";
 import "../../../../src/components/ha-svg-icon";
 import {
@@ -28,6 +28,7 @@ import {
 import { isStrategyDashboard } from "../../../../src/data/lovelace/config/types";
 import type { LovelaceViewConfig } from "../../../../src/data/lovelace/config/view";
 import "../../../../src/layouts/hass-loading-screen";
+import { generateDefaultViewConfig } from "../../../../src/panels/lovelace/common/generate-lovelace-config";
 import "./hc-layout";

@customElement("hc-cast")
@@ -95,9 +96,7 @@ class HcCast extends LitElement {
                <ha-list @action=${this._handlePickView} activatable>
                  ${(
                    this.lovelaceViews ?? [
-                      {
-                        title: "Home",
-                      },
+                      generateDefaultViewConfig({}, {}, {}, {}, () => ""),
                    ]
                  ).map(
                    (view, idx) => html`
--- a/gallery/src/pages/components/ha-dialogs.markdown
+++ b/gallery/src/pages/components/ha-dialogs.markdown
@@ -5,14 +5,14 @@ subtitle: Dialogs provide important prompts in a user flow.

 # Material Design 3

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

 # Guidelines

 ## Design

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

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

--- a/gallery/src/pages/misc/entity-state.ts
+++ b/gallery/src/pages/misc/entity-state.ts
@@ -39,7 +39,6 @@ const SENSOR_DEVICE_CLASSES = [
  "pm1",
  "pm10",
  "pm25",
-  "pm4",
  "power_factor",
  "power",
  "precipitation",
--- 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,8 +52,8 @@
    "@fullcalendar/list": "6.1.19",
    "@fullcalendar/luxon3": "6.1.19",
    "@fullcalendar/timegrid": "6.1.19",
-    "@home-assistant/webawesome": "3.0.0-beta.6.ha.7",
-    "@lezer/highlight": "1.2.3",
+    "@home-assistant/webawesome": "3.0.0-beta.6.ha.6",
+    "@lezer/highlight": "1.2.2",
    "@lit-labs/motion": "1.0.9",
    "@lit-labs/observers": "2.0.6",
    "@lit-labs/virtualizer": "2.1.1",
@@ -81,7 +81,7 @@
    "@material/mwc-top-app-bar": "0.27.0",
    "@material/mwc-top-app-bar-fixed": "0.27.0",
    "@material/top-app-bar": "=14.0.0-canary.53b3cad2f.0",
-    "@material/web": "2.4.1",
+    "@material/web": "2.4.0",
    "@mdi/js": "7.4.47",
    "@mdi/svg": "7.4.47",
    "@replit/codemirror-indentation-markers": "6.5.3",
@@ -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.4",
-    "@vaadin/vaadin-themable-mixin": "24.9.4",
+    "@vaadin/combo-box": "24.9.2",
+    "@vaadin/vaadin-themable-mixin": "24.9.2",
    "@vibrant/color": "4.0.0",
    "@vue/web-component-wrapper": "1.3.0",
    "@webcomponents/scoped-custom-element-registry": "0.0.10",
@@ -111,7 +111,7 @@
    "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",
@@ -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.7",
-    "@rspack/core": "1.6.0",
+    "@octokit/auth-oauth-device": "8.0.2",
+    "@octokit/plugin-retry": "8.0.2",
+    "@octokit/rest": "22.0.0",
+    "@rsdoctor/rspack-plugin": "1.3.4",
+    "@rspack/core": "1.5.8",
    "@rspack/dev-server": "1.1.4",
    "@types/babel__plugin-transform-runtime": "7.9.5",
    "@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.6",
+    "@vitest/coverage-v8": "4.0.3",
    "babel-loader": "10.0.0",
    "babel-plugin-template-html-minifier": "4.1.0",
    "browserslist-useragent-regexp": "4.1.3",
    "del": "8.0.1",
-    "eslint": "9.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",
@@ -201,7 +201,7 @@
    "gulp-rename": "2.1.0",
    "html-minifier-terser": "7.2.0",
    "husky": "9.1.7",
-    "jsdom": "27.1.0",
+    "jsdom": "27.0.1",
    "jszip": "3.10.1",
    "lint-staged": "16.2.6",
    "lit-analyzer": "2.0.3",
@@ -213,13 +213,13 @@
    "rspack-manifest-plugin": "5.1.0",
    "serve": "14.2.5",
    "sinon": "21.0.0",
-    "tar": "7.5.2",
+    "tar": "7.5.1",
    "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.6",
+    "vitest": "4.0.3",
    "webpack-stats-plugin": "1.1.3",
    "webpackbar": "7.0.0",
    "workbox-build": "patch:workbox-build@npm%3A7.1.1#~/.yarn/patches/workbox-build-npm-7.1.1-a854f3faae.patch"
@@ -231,12 +231,9 @@
    "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"
  },
-  "packageManager": "yarn@4.10.3",
-  "volta": {
-    "node": "22.21.1"
-  }
+  "packageManager": "yarn@4.10.3"
 }
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

 [project]
 name         = "home-assistant-frontend"
-version      = "20251029.0"
+version      = "20250924.0"
 license      = "Apache-2.0"
 license-files = ["LICENSE*"]
 description  = "The Home Assistant frontend"
--- 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,16 +0,0 @@
-import type { Condition } 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;
-  }, []);
-}
--- a/src/common/condition/listeners.ts
+++ b/src/common/condition/listeners.ts
@@ -1,37 +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 } from "./extract";
-
-/**
- * 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);
-  });
-}
--- 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/entity/get_states.ts
+++ b/src/common/entity/get_states.ts
@@ -214,7 +214,6 @@ const FIXED_DOMAIN_ATTRIBUTE_STATES = {
      "pm1",
      "pm10",
      "pm25",
-      "pm4",
      "power_factor",
      "power",
      "pressure",
--- a/src/common/util/swipe-gesture-recognizer.ts
+++ b/src/common/util/swipe-gesture-recognizer.ts
@@ -1,116 +0,0 @@
-export interface SwipeGestureResult {
-  velocity: number;
-  delta: number;
-  isSwipe: boolean;
-  isDownwardSwipe: boolean;
-}
-
-export interface SwipeGestureConfig {
-  velocitySwipeThreshold?: number;
-  movementTimeThreshold?: number;
-}
-
-const VELOCITY_SWIPE_THRESHOLD = 0.5; // px/ms
-const MOVEMENT_TIME_THRESHOLD = 100; // ms
-
-/**
- * Recognizes swipe gestures and calculates velocity for touch interactions.
- * Tracks touch movement and provides velocity-based and position-based gesture detection.
- */
-export class SwipeGestureRecognizer {
-  private _startY = 0;
-
-  private _delta = 0;
-
-  private _startTime = 0;
-
-  private _lastY = 0;
-
-  private _lastTime = 0;
-
-  private _velocityThreshold: number;
-
-  private _movementTimeThreshold: number;
-
-  constructor(config: SwipeGestureConfig = {}) {
-    this._velocityThreshold =
-      config.velocitySwipeThreshold ?? VELOCITY_SWIPE_THRESHOLD; // px/ms
-    this._movementTimeThreshold =
-      config.movementTimeThreshold ?? MOVEMENT_TIME_THRESHOLD; // ms
-  }
-
-  /**
-   * Initialize gesture tracking with starting touch position
-   */
-  public start(clientY: number): void {
-    const now = Date.now();
-    this._startY = clientY;
-    this._startTime = now;
-    this._lastY = clientY;
-    this._lastTime = now;
-    this._delta = 0;
-  }
-
-  /**
-   * Update gesture state during movement
-   * Returns the current delta (negative when dragging down)
-   */
-  public move(clientY: number): number {
-    const now = Date.now();
-    this._delta = this._startY - clientY;
-    this._lastY = clientY;
-    this._lastTime = now;
-    return this._delta;
-  }
-
-  /**
-   * Calculate final gesture result when touch ends
-   */
-  public end(): SwipeGestureResult {
-    const velocity = this.getVelocity();
-    const hasSignificantVelocity = Math.abs(velocity) > this._velocityThreshold;
-
-    return {
-      velocity,
-      delta: this._delta,
-      isSwipe: hasSignificantVelocity,
-      isDownwardSwipe: velocity > 0,
-    };
-  }
-
-  /**
-   * Get current drag delta (negative when dragging down)
-   */
-  public getDelta(): number {
-    return this._delta;
-  }
-
-  /**
-   * Calculate velocity based on recent movement
-   * Returns 0 if no recent movement detected
-   * Positive velocity means downward swipe
-   */
-  public getVelocity(): number {
-    const now = Date.now();
-    const timeSinceLastMove = now - this._lastTime;
-
-    // Only consider velocity if the last movement was recent
-    if (timeSinceLastMove >= this._movementTimeThreshold) {
-      return 0;
-    }
-
-    const timeDelta = this._lastTime - this._startTime;
-    return timeDelta > 0 ? (this._lastY - this._startY) / timeDelta : 0;
-  }
-
-  /**
-   * Reset all tracking state
-   */
-  public reset(): void {
-    this._startY = 0;
-    this._delta = 0;
-    this._startTime = 0;
-    this._lastY = 0;
-    this._lastTime = 0;
-  }
-}
--- a/src/components/chart/ha-chart-base.ts
+++ b/src/components/chart/ha-chart-base.ts
@@ -90,8 +90,6 @@ export class HaChartBase extends LitElement {

  private _shouldResizeChart = false;

-  private _resizeAnimationDuration?: number;
-
  // @ts-ignore
  private _resizeController = new ResizeController(this, {
    callback: () => {
@@ -207,16 +205,6 @@ export class HaChartBase extends LitElement {
    }
    if (changedProps.has("options")) {
      chartOptions = { ...chartOptions, ...this._createOptions() };
-      if (
-        this._compareCustomLegendOptions(
-          changedProps.get("options"),
-          this.options
-        )
-      ) {
-        // custom legend changes may require a resize to layout properly
-        this._shouldResizeChart = true;
-        this._resizeAnimationDuration = 250;
-      }
    } else if (this._isTouchDevice && changedProps.has("_isZoomed")) {
      chartOptions.dataZoom = this._getDataZoomConfig();
    }
@@ -308,7 +296,7 @@ export class HaChartBase extends LitElement {
          itemStyle = {
            color: dataset?.color as string,
            ...(dataset?.itemStyle as { borderColor?: string }),
-            ...itemStyle,
+            itemStyle,
          };
          const color = itemStyle?.color as string;
          const borderColor = itemStyle?.borderColor as string;
@@ -520,7 +508,6 @@ export class HaChartBase extends LitElement {
        );
      }
    });
-    this.requestUpdate("_hiddenDatasets");
  }

  private _getDataZoomConfig(): DataZoomComponentOption | undefined {
@@ -654,13 +641,6 @@ export class HaChartBase extends LitElement {
          textBorderWidth: 2,
        },
      },
-      pie: {
-        label: {
-          color: style.getPropertyValue("--primary-text-color"),
-          textBorderColor: style.getPropertyValue("--primary-background-color"),
-          textBorderWidth: 2,
-        },
-      },
      sankey: {
        label: {
          color: style.getPropertyValue("--primary-text-color"),
@@ -978,34 +958,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 },
-      });
+      this.chart?.resize();
      this._shouldResizeChart = false;
-      this._resizeAnimationDuration = undefined;
    }
  };

-  private _compareCustomLegendOptions(
-    oldOptions: ECOption | undefined,
-    newOptions: ECOption | undefined
-  ): boolean {
-    const oldLegends = ensureArray(
-      oldOptions?.legend || []
-    ) as LegendComponentOption[];
-    const newLegends = ensureArray(
-      newOptions?.legend || []
-    ) as LegendComponentOption[];
-    return (
-      oldLegends.some((l) => l.show && l.type === "custom") !==
-      newLegends.some((l) => l.show && l.type === "custom")
-    );
-  }
-
  static styles = css`
    :host {
      display: block;
--- a/src/components/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/entity/const.ts
+++ b/src/components/entity/const.ts
@@ -1 +0,0 @@
-export const ANY_STATE_VALUE = "__ANY_STATE_IGNORE_ATTRIBUTES__";
--- a/src/components/entity/ha-entities-picker.ts
+++ b/src/components/entity/ha-entities-picker.ts
@@ -147,7 +147,7 @@ class HaEntitiesPicker extends LitElement {
          .createDomains=${this.createDomains}
          .required=${this.required && !currentEntities.length}
          @value-changed=${this._addEntity}
-          .addButton=${currentEntities.length > 0}
+          add-button
        ></ha-entity-picker>
      </div>
    `;
--- a/src/components/entity/ha-entity-name-picker.ts
+++ b/src/components/entity/ha-entity-name-picker.ts
@@ -312,7 +312,7 @@ export class HaEntityNamePicker extends LitElement {
  private _toValue = memoizeOne(
    (items: EntityNameItem[]): typeof this.value => {
      if (items.length === 0) {
-        return undefined;
+        return "";
      }
      if (items.length === 1) {
        const item = items[0];
--- a/src/components/entity/ha-entity-states-picker.ts
+++ b/src/components/entity/ha-entity-states-picker.ts
@@ -4,7 +4,6 @@ import { customElement, property } from "lit/decorators";
 import { keyed } from "lit/directives/keyed";
 import { repeat } from "lit/directives/repeat";
 import { fireEvent } from "../../common/dom/fire_event";
-import { ANY_STATE_VALUE } from "./const";
 import { ensureArray } from "../../common/array/ensure-array";
 import type { HomeAssistant } from "../../types";
 import "./ha-entity-state-picker";
@@ -58,7 +57,6 @@ export class HaEntityStatesPicker extends LitElement {

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

    return html`
      ${repeat(
@@ -86,7 +84,7 @@ export class HaEntityStatesPicker extends LitElement {
        `
      )}
      <div>
-        ${(this.disabled && value.length) || hideValue
+        ${this.disabled && value.length
          ? nothing
          : keyed(
              value.length,
--- 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() {
@@ -377,7 +375,6 @@ export class HaAreaPicker extends LitElement {
        .getItems=${this._getItems}
        .getAdditionalItems=${this._getAdditionalItems}
        .valueRenderer=${valueRenderer}
-        .addButtonLabel=${this.addButtonLabel}
        @value-changed=${this._valueChanged}
      >
      </ha-generic-picker>
--- a/src/components/ha-bottom-sheet.ts
+++ b/src/components/ha-bottom-sheet.ts
@@ -1,7 +1,6 @@
 import "@home-assistant/webawesome/dist/components/drawer/drawer";
 import { css, html, LitElement, type PropertyValues } from "lit";
-import { customElement, property, query, state } from "lit/decorators";
-import { SwipeGestureRecognizer } from "../common/util/swipe-gesture-recognizer";
+import { customElement, property, state } from "lit/decorators";
 import { haStyleScrollbar } from "../resources/styles";

 export const BOTTOM_SHEET_ANIMATION_DURATION_MS = 300;
@@ -15,12 +14,6 @@ export class HaBottomSheet extends LitElement {

  @state() private _drawerOpen = false;

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

-  private _handleTouchStart = (ev: TouchEvent) => {
-    // Check if any element inside drawer in the composed path has scrollTop > 0
-    for (const path of ev.composedPath()) {
-      const el = path as HTMLElement;
-      if (el === this._drawer) {
-        break;
-      }
-      if (el.scrollTop > 0) {
-        return;
-      }
-    }
-
-    this._startResizing(ev.touches[0].clientY);
-  };
-
-  private _startResizing(clientY: number) {
-    // register event listeners for drag handling
-    document.addEventListener("touchmove", this._handleTouchMove, {
-      passive: false,
-    });
-    document.addEventListener("touchend", this._handleTouchEnd);
-    document.addEventListener("touchcancel", this._handleTouchEnd);
-
-    this._gestureRecognizer.start(clientY);
-  }
-
-  private _handleTouchMove = (ev: TouchEvent) => {
-    const currentY = ev.touches[0].clientY;
-    const delta = this._gestureRecognizer.move(currentY);
-
-    if (delta < 0) {
-      ev.preventDefault();
-      this._isDragging = true;
-      requestAnimationFrame(() => {
-        if (this._isDragging) {
-          this.style.setProperty(
-            "--dialog-transform",
-            `translateY(${delta * -1}px)`
-          );
-        }
-      });
-    }
-  };
-
-  private _animateSnapBack() {
-    // Add transition for smooth animation
-    this.style.setProperty(
-      "--dialog-transition",
-      `transform ${BOTTOM_SHEET_ANIMATION_DURATION_MS}ms ease-out`
-    );
-
-    // Reset transform to snap back
-    this.style.removeProperty("--dialog-transform");
-
-    // Remove transition after animation completes
-    setTimeout(() => {
-      this.style.removeProperty("--dialog-transition");
-    }, BOTTOM_SHEET_ANIMATION_DURATION_MS);
-  }
-
-  private _handleTouchEnd = () => {
-    this._unregisterResizeHandlers();
-
-    this._isDragging = false;
-
-    const result = this._gestureRecognizer.end();
-
-    // If velocity exceeds threshold, use velocity direction to determine action
-    if (result.isSwipe) {
-      if (result.isDownwardSwipe) {
-        // Downward swipe - close the bottom sheet
-        this._drawerOpen = false;
-      } else {
-        // Upward swipe - keep open and animate back
-        this._animateSnapBack();
-      }
-      return;
-    }
-
-    // If velocity is below threshold, use position-based logic
-    // Get the drawer height to calculate 50% threshold
-    const drawerBody = this._drawer.shadowRoot?.querySelector(
-      '[part="body"]'
-    ) as HTMLElement;
-    const drawerHeight = drawerBody?.offsetHeight || 0;
-
-    // delta is negative when dragging down
-    // Close if dragged down past 50% of the drawer height
-    if (
-      drawerHeight > 0 &&
-      result.delta < 0 &&
-      Math.abs(result.delta) > drawerHeight * 0.5
-    ) {
-      this._drawerOpen = false;
-    } else {
-      this._animateSnapBack();
-    }
-  };
-
-  private _unregisterResizeHandlers = () => {
-    document.removeEventListener("touchmove", this._handleTouchMove);
-    document.removeEventListener("touchend", this._handleTouchEnd);
-    document.removeEventListener("touchcancel", this._handleTouchEnd);
-  };
-
-  disconnectedCallback() {
-    super.disconnectedCallback();
-    this._unregisterResizeHandlers();
-    this._isDragging = false;
-  }
-
  static styles = [
    haStyleScrollbar,
    css`
@@ -179,8 +59,6 @@ export class HaBottomSheet extends LitElement {
      wa-drawer::part(dialog) {
        max-height: var(--ha-bottom-sheet-max-height, 90vh);
        align-items: center;
-        transform: var(--dialog-transform);
-        transition: var(--dialog-transition);
      }
      wa-drawer::part(body) {
        max-width: var(--ha-bottom-sheet-max-width);
@@ -212,11 +90,6 @@ export class HaBottomSheet extends LitElement {
        max-width: 100%;
        display: flex;
        flex-direction: column;
-        padding: var(
-          --ha-bottom-sheet-padding,
-          0 var(--safe-area-inset-right) var(--safe-area-inset-bottom)
-            var(--safe-area-inset-left)
-        );
      }
    `,
  ];
--- a/src/components/ha-button.ts
+++ b/src/components/ha-button.ts
@@ -59,7 +59,6 @@ export class HaButton extends Button {
          line-height: 1;

          transition: background-color 0.15s ease-in-out;
-          text-wrap: wrap;
        }

        :host([size="small"]) .button {
--- a/src/components/ha-form/ha-form.ts
+++ b/src/components/ha-form/ha-form.ts
@@ -148,7 +148,7 @@ export class HaForm extends LitElement implements HaFormElement {
                  .value=${getValue(this.data, item)}
                  .label=${this._computeLabel(item, this.data)}
                  .disabled=${item.disabled || this.disabled || false}
-                  .placeholder=${item.required ? undefined : item.default}
+                  .placeholder=${item.required ? "" : item.default}
                  .helper=${this._computeHelper(item)}
                  .localizeValue=${this.localizeValue}
                  .required=${item.required || false}
--- a/src/components/ha-generic-picker.ts
+++ b/src/components/ha-generic-picker.ts
@@ -10,6 +10,7 @@ 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 {
@@ -102,6 +103,10 @@ export class HaGenericPicker extends LitElement {
  // helper to set new value after closing picker, to avoid flicker
  private _newValue?: string;

+  @property({ attribute: "error-message" }) public errorMessage?: string;
+
+  @property({ type: Boolean, reflect: true }) public invalid = false;
+
  private _unsubscribeTinyKeys?: () => void;

  protected render() {
@@ -136,6 +141,8 @@ export class HaGenericPicker extends LitElement {
                  .value=${this.value}
                  .required=${this.required}
                  .disabled=${this.disabled}
+                  .errorMessage=${this.errorMessage}
+                  .invalid=${this.invalid}
                  .hideClearIcon=${this.hideClearIcon}
                  .valueRenderer=${this.valueRenderer}
                >
@@ -204,11 +211,16 @@ export class HaGenericPicker extends LitElement {
  }

  private _renderHelper() {
-    return this.helper
-      ? html`<ha-input-helper-text .disabled=${this.disabled}
-          >${this.helper}</ha-input-helper-text
-        >`
-      : nothing;
+    const showError = this.invalid && this.errorMessage;
+    const showHelper = !showError && this.helper;
+
+    if (!showError && !showHelper) {
+      return nothing;
+    }
+
+    return html`<ha-input-helper-text .disabled=${this.disabled}>
+      ${showError ? this.errorMessage : this.helper}
+    </ha-input-helper-text>`;
  }

  private _dialogOpened = () => {
@@ -307,6 +319,9 @@ export class HaGenericPicker extends LitElement {
          display: block;
          margin: var(--ha-space-2) 0 0;
        }
+        :host([invalid]) ha-input-helper-text {
+          color: var(--mdc-theme-error, var(--error-color, #b00020));
+        }

        wa-popover {
          --wa-space-l: var(--ha-space-0);
--- a/src/components/ha-icon-picker.ts
+++ b/src/components/ha-icon-picker.ts
@@ -1,8 +1,4 @@
-import type { ComboBoxLitRenderer } from "@vaadin/combo-box/lit";
-import type {
-  ComboBoxDataProviderCallback,
-  ComboBoxDataProviderParams,
-} from "@vaadin/combo-box/vaadin-combo-box-light";
+import type { RenderItemFunction } from "@lit-labs/virtualizer/virtualize";
 import type { TemplateResult } from "lit";
 import { LitElement, css, html } from "lit";
 import { customElement, property } from "lit/decorators";
@@ -10,9 +6,10 @@ import memoizeOne from "memoize-one";
 import { fireEvent } from "../common/dom/fire_event";
 import { customIcons } from "../data/custom_icons";
 import type { HomeAssistant, ValueChangedEvent } from "../types";
-import "./ha-combo-box";
-import "./ha-icon";
 import "./ha-combo-box-item";
+import "./ha-generic-picker";
+import "./ha-icon";
+import type { PickerComboBoxItem } from "./ha-picker-combo-box";

 interface IconItem {
  icon: string;
@@ -21,7 +18,7 @@ interface IconItem {
 }

 interface RankedIcon {
-  icon: string;
+  item: PickerComboBoxItem;
  rank: number;
 }

@@ -67,13 +64,18 @@ const loadCustomIconItems = async (iconsetPrefix: string) => {
  }
 };

-const rowRenderer: ComboBoxLitRenderer<IconItem | RankedIcon> = (item) => html`
+const rowRenderer: RenderItemFunction<PickerComboBoxItem> = (item) => html`
  <ha-combo-box-item type="button">
-    <ha-icon .icon=${item.icon} slot="start"></ha-icon>
-    ${item.icon}
+    <ha-icon .icon=${item.id} slot="start"></ha-icon>
+    ${item.id}
  </ha-combo-box-item>
 `;

+const valueRenderer = (value: string) => html`
+  <ha-icon .icon=${value} slot="start"></ha-icon>
+  <span slot="headline">${value}</span>
+`;
+
@customElement("ha-icon-picker")
 export class HaIconPicker extends LitElement {
  @property({ attribute: false }) public hass?: HomeAssistant;
@@ -96,13 +98,11 @@ export class HaIconPicker extends LitElement {

  protected render(): TemplateResult {
    return html`
-      <ha-combo-box
+      <ha-generic-picker
        .hass=${this.hass}
-        item-value-path="icon"
-        item-label-path="icon"
        .value=${this._value}
        allow-custom-value
-        .dataProvider=${ICONS_LOADED ? this._iconProvider : undefined}
+        .getItems=${this._getItems}
        .label=${this.label}
        .helper=${this.helper}
        .disabled=${this.disabled}
@@ -110,69 +110,85 @@ export class HaIconPicker extends LitElement {
        .placeholder=${this.placeholder}
        .errorMessage=${this.errorMessage}
        .invalid=${this.invalid}
-        .renderer=${rowRenderer}
-        icon
-        @opened-changed=${this._openedChanged}
+        .rowRenderer=${rowRenderer}
+        .valueRenderer=${valueRenderer}
+        .searchFn=${this._filterIcons}
+        .notFoundLabel=${this.hass?.localize(
+          "ui.components.icon-picker.no_match"
+        )}
+        popover-placement="bottom-start"
        @value-changed=${this._valueChanged}
      >
-        ${this._value || this.placeholder
-          ? html`
-              <ha-icon .icon=${this._value || this.placeholder} slot="icon">
-              </ha-icon>
-            `
-          : html`<slot slot="icon" name="fallback"></slot>`}
-      </ha-combo-box>
+      </ha-generic-picker>
    `;
  }

  // Filter can take a significant chunk of frame (up to 3-5 ms)
  private _filterIcons = memoizeOne(
-    (filter: string, iconItems: IconItem[] = ICONS) => {
+    (filter: string, items: PickerComboBoxItem[]): PickerComboBoxItem[] => {
      if (!filter) {
-        return iconItems;
+        return items;
      }

      const filteredItems: RankedIcon[] = [];
-      const addIcon = (icon: string, rank: number) =>
-        filteredItems.push({ icon, rank });
+      const addIcon = (item: PickerComboBoxItem, rank: number) =>
+        filteredItems.push({ item, rank });

      // Filter and rank such that exact matches rank higher, and prefer icon name matches over keywords
-      for (const item of iconItems) {
-        if (item.parts.has(filter)) {
-          addIcon(item.icon, 1);
-        } else if (item.keywords.includes(filter)) {
-          addIcon(item.icon, 2);
-        } else if (item.icon.includes(filter)) {
-          addIcon(item.icon, 3);
-        } else if (item.keywords.some((word) => word.includes(filter))) {
-          addIcon(item.icon, 4);
+      for (const item of items) {
+        const iconName = item.id.split(":")[1] || item.id;
+        const parts = iconName.split("-");
+        const keywords = item.search_labels?.slice(1) || [];
+
+        if (parts.includes(filter)) {
+          addIcon(item, 1);
+        } else if (keywords.includes(filter)) {
+          addIcon(item, 2);
+        } else if (item.id.includes(filter)) {
+          addIcon(item, 3);
+        } else if (keywords.some((word) => word.includes(filter))) {
+          addIcon(item, 4);
        }
      }

      // Allow preview for custom icon not in list
      if (filteredItems.length === 0) {
-        addIcon(filter, 0);
+        addIcon(
+          {
+            id: filter,
+            primary: filter,
+            icon: filter,
+            search_labels: [filter],
+            sorting_label: filter,
+          },
+          0
+        );
      }

-      return filteredItems.sort((itemA, itemB) => itemA.rank - itemB.rank);
+      return filteredItems
+        .sort((itemA, itemB) => itemA.rank - itemB.rank)
+        .map((item) => item.item);
    }
  );

-  private _iconProvider = (
-    params: ComboBoxDataProviderParams,
-    callback: ComboBoxDataProviderCallback<IconItem | RankedIcon>
-  ) => {
-    const filteredItems = this._filterIcons(params.filter.toLowerCase(), ICONS);
-    const iStart = params.page * params.pageSize;
-    const iEnd = iStart + params.pageSize;
-    callback(filteredItems.slice(iStart, iEnd), filteredItems.length);
-  };
+  private _getItems = (): PickerComboBoxItem[] =>
+    ICONS.map((icon: IconItem) => ({
+      id: icon.icon,
+      primary: icon.icon,
+      icon: icon.icon,
+      search_labels: [
+        icon.icon.split(":")[1] || icon.icon,
+        ...Array.from(icon.parts),
+        ...icon.keywords,
+      ],
+      sorting_label: icon.icon,
+    }));

-  private async _openedChanged(ev: ValueChangedEvent<boolean>) {
-    const opened = ev.detail.value;
-    if (opened && !ICONS_LOADED) {
-      await loadIcons();
-      this.requestUpdate();
+  protected firstUpdated() {
+    if (!ICONS_LOADED) {
+      loadIcons().then(() => {
+        this.requestUpdate();
+      });
    }
  }

@@ -199,15 +215,9 @@ export class HaIconPicker extends LitElement {
  }

  static styles = css`
-    *[slot="icon"] {
-      color: var(--primary-text-color);
-      position: relative;
-      bottom: 2px;
-    }
-    *[slot="prefix"] {
-      margin-right: 8px;
-      margin-inline-end: 8px;
-      margin-inline-start: initial;
+    ha-generic-picker {
+      width: 100%;
+      display: block;
    }
  `;
 }
--- 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 =
@@ -137,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%;
--- a/src/components/ha-picker-field.ts
+++ b/src/components/ha-picker-field.ts
@@ -39,6 +39,10 @@ export class HaPickerField extends LitElement {
  @property({ attribute: false })
  public valueRenderer?: PickerValueRenderer;

+  @property({ attribute: "error-message" }) public errorMessage?: string;
+
+  @property({ type: Boolean, reflect: true }) public invalid = false;
+
  @query("ha-combo-box-item", true) public item!: HaComboBoxItem;

  public async focus() {
@@ -142,6 +146,11 @@ export class HaPickerField extends LitElement {
          background-color: var(--mdc-theme-primary);
        }

+        :host([invalid]) ha-combo-box-item:after {
+          height: 2px;
+          background-color: var(--mdc-theme-error, var(--error-color, #b00020));
+        }
+
        .clear {
          margin: 0 -8px;
          --mdc-icon-button-size: 32px;
--- a/src/components/ha-target-picker.ts
+++ b/src/components/ha-target-picker.ts
@@ -87,208 +87,166 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) {

  protected render() {
    if (this.addOnTop) {
-      return html` ${this._renderPicker()} ${this._renderItems()} `;
+      return html` ${this._renderChips()} ${this._renderItems()} `;
    }
-    return html` ${this._renderItems()} ${this._renderPicker()} `;
+    return html` ${this._renderItems()} ${this._renderChips()} `;
  }

  private _renderValueChips() {
-    const entityIds = this.value?.entity_id
-      ? ensureArray(this.value.entity_id)
-      : [];
-    const deviceIds = this.value?.device_id
-      ? ensureArray(this.value.device_id)
-      : [];
-    const areaIds = this.value?.area_id ? ensureArray(this.value.area_id) : [];
-    const floorIds = this.value?.floor_id
-      ? ensureArray(this.value.floor_id)
-      : [];
-    const labelIds = this.value?.label_id
-      ? ensureArray(this.value.label_id)
-      : [];
-
-    if (
-      !entityIds.length &&
-      !deviceIds.length &&
-      !areaIds.length &&
-      !floorIds.length &&
-      !labelIds.length
-    ) {
-      return nothing;
-    }
-
-    return html`
-      <div class="mdc-chip-set items">
-        ${floorIds.length
-          ? floorIds.map(
-              (floor_id) => html`
-                <ha-target-picker-value-chip
-                  .hass=${this.hass}
-                  type="floor"
-                  .itemId=${floor_id}
-                  @remove-target-item=${this._handleRemove}
-                  @expand-target-item=${this._handleExpand}
-                ></ha-target-picker-value-chip>
-              `
-            )
-          : nothing}
-        ${areaIds.length
-          ? areaIds.map(
-              (area_id) => html`
-                <ha-target-picker-value-chip
-                  .hass=${this.hass}
-                  type="area"
-                  .itemId=${area_id}
-                  @remove-target-item=${this._handleRemove}
-                  @expand-target-item=${this._handleExpand}
-                ></ha-target-picker-value-chip>
-              `
-            )
-          : nothing}
-        ${deviceIds.length
-          ? deviceIds.map(
-              (device_id) => html`
-                <ha-target-picker-value-chip
-                  .hass=${this.hass}
-                  type="device"
-                  .itemId=${device_id}
-                  @remove-target-item=${this._handleRemove}
-                  @expand-target-item=${this._handleExpand}
-                ></ha-target-picker-value-chip>
-              `
-            )
-          : nothing}
-        ${entityIds.length
-          ? entityIds.map(
-              (entity_id) => html`
-                <ha-target-picker-value-chip
-                  .hass=${this.hass}
-                  type="entity"
-                  .itemId=${entity_id}
-                  @remove-target-item=${this._handleRemove}
-                  @expand-target-item=${this._handleExpand}
-                ></ha-target-picker-value-chip>
-              `
-            )
-          : nothing}
-        ${labelIds.length
-          ? labelIds.map(
-              (label_id) => html`
-                <ha-target-picker-value-chip
-                  .hass=${this.hass}
-                  type="label"
-                  .itemId=${label_id}
-                  @remove-target-item=${this._handleRemove}
-                  @expand-target-item=${this._handleExpand}
-                ></ha-target-picker-value-chip>
-              `
-            )
-          : nothing}
-      </div>
-    `;
+    return html`<div class="mdc-chip-set items">
+      ${this.value?.floor_id
+        ? ensureArray(this.value.floor_id).map(
+            (floor_id) => html`
+              <ha-target-picker-value-chip
+                .hass=${this.hass}
+                type="floor"
+                .itemId=${floor_id}
+                @remove-target-item=${this._handleRemove}
+                @expand-target-item=${this._handleExpand}
+              ></ha-target-picker-value-chip>
+            `
+          )
+        : nothing}
+      ${this.value?.area_id
+        ? ensureArray(this.value.area_id).map(
+            (area_id) => html`
+              <ha-target-picker-value-chip
+                .hass=${this.hass}
+                type="area"
+                .itemId=${area_id}
+                @remove-target-item=${this._handleRemove}
+                @expand-target-item=${this._handleExpand}
+              ></ha-target-picker-value-chip>
+            `
+          )
+        : nothing}
+      ${this.value?.device_id
+        ? ensureArray(this.value.device_id).map(
+            (device_id) => html`
+              <ha-target-picker-value-chip
+                .hass=${this.hass}
+                type="device"
+                .itemId=${device_id}
+                @remove-target-item=${this._handleRemove}
+                @expand-target-item=${this._handleExpand}
+              ></ha-target-picker-value-chip>
+            `
+          )
+        : nothing}
+      ${this.value?.entity_id
+        ? ensureArray(this.value.entity_id).map(
+            (entity_id) => html`
+              <ha-target-picker-value-chip
+                .hass=${this.hass}
+                type="entity"
+                .itemId=${entity_id}
+                @remove-target-item=${this._handleRemove}
+                @expand-target-item=${this._handleExpand}
+              ></ha-target-picker-value-chip>
+            `
+          )
+        : nothing}
+      ${this.value?.label_id
+        ? ensureArray(this.value.label_id).map(
+            (label_id) => html`
+              <ha-target-picker-value-chip
+                .hass=${this.hass}
+                type="label"
+                .itemId=${label_id}
+                @remove-target-item=${this._handleRemove}
+                @expand-target-item=${this._handleExpand}
+              ></ha-target-picker-value-chip>
+            `
+          )
+        : nothing}
+    </div>`;
  }

  private _renderValueGroups() {
-    const entityIds = this.value?.entity_id
-      ? ensureArray(this.value.entity_id)
-      : [];
-    const deviceIds = this.value?.device_id
-      ? ensureArray(this.value.device_id)
-      : [];
-    const areaIds = this.value?.area_id ? ensureArray(this.value.area_id) : [];
-    const floorIds = this.value?.floor_id
-      ? ensureArray(this.value.floor_id)
-      : [];
-    const labelIds = this.value?.label_id
-      ? ensureArray(this.value?.label_id)
-      : [];
+    return html`<div class="item-groups">
+      ${this.value?.entity_id
+        ? html`
+            <ha-target-picker-item-group
+              @remove-target-item=${this._handleRemove}
+              type="entity"
+              .hass=${this.hass}
+              .items=${{ entity: ensureArray(this.value?.entity_id) }}
+              .deviceFilter=${this.deviceFilter}
+              .entityFilter=${this.entityFilter}
+              .includeDomains=${this.includeDomains}
+              .includeDeviceClasses=${this.includeDeviceClasses}
+            >
+            </ha-target-picker-item-group>
+          `
+        : nothing}
+      ${this.value?.device_id
+        ? html`
+            <ha-target-picker-item-group
+              @remove-target-item=${this._handleRemove}
+              type="device"
+              .hass=${this.hass}
+              .items=${{ device: ensureArray(this.value?.device_id) }}
+              .deviceFilter=${this.deviceFilter}
+              .entityFilter=${this.entityFilter}
+              .includeDomains=${this.includeDomains}
+              .includeDeviceClasses=${this.includeDeviceClasses}
+            >
+            </ha-target-picker-item-group>
+          `
+        : nothing}
+      ${this.value?.floor_id || this.value?.area_id
+        ? html`
+            <ha-target-picker-item-group
+              @remove-target-item=${this._handleRemove}
+              type="area"
+              .hass=${this.hass}
+              .items=${{
+                floor: ensureArray(this.value?.floor_id),
+                area: ensureArray(this.value?.area_id),
+              }}
+              .deviceFilter=${this.deviceFilter}
+              .entityFilter=${this.entityFilter}
+              .includeDomains=${this.includeDomains}
+              .includeDeviceClasses=${this.includeDeviceClasses}
+            >
+            </ha-target-picker-item-group>
+          `
+        : nothing}
+      ${this.value?.label_id
+        ? html`
+            <ha-target-picker-item-group
+              @remove-target-item=${this._handleRemove}
+              type="label"
+              .hass=${this.hass}
+              .items=${{ label: ensureArray(this.value?.label_id) }}
+              .deviceFilter=${this.deviceFilter}
+              .entityFilter=${this.entityFilter}
+              .includeDomains=${this.includeDomains}
+              .includeDeviceClasses=${this.includeDeviceClasses}
+            >
+            </ha-target-picker-item-group>
+          `
+        : nothing}
+    </div>`;
+  }

+  private _renderItems() {
    if (
-      !entityIds.length &&
-      !deviceIds.length &&
-      !areaIds.length &&
-      !floorIds.length &&
-      !labelIds.length
+      !this.value?.floor_id &&
+      !this.value?.area_id &&
+      !this.value?.device_id &&
+      !this.value?.entity_id &&
+      !this.value?.label_id
    ) {
      return nothing;
    }

-    return html`
-      <div class="item-groups">
-        ${entityIds.length
-          ? html`
-              <ha-target-picker-item-group
-                @remove-target-item=${this._handleRemove}
-                type="entity"
-                .hass=${this.hass}
-                .items=${{ entity: entityIds }}
-                .deviceFilter=${this.deviceFilter}
-                .entityFilter=${this.entityFilter}
-                .includeDomains=${this.includeDomains}
-                .includeDeviceClasses=${this.includeDeviceClasses}
-              >
-              </ha-target-picker-item-group>
-            `
-          : nothing}
-        ${deviceIds.length
-          ? html`
-              <ha-target-picker-item-group
-                @remove-target-item=${this._handleRemove}
-                type="device"
-                .hass=${this.hass}
-                .items=${{ device: deviceIds }}
-                .deviceFilter=${this.deviceFilter}
-                .entityFilter=${this.entityFilter}
-                .includeDomains=${this.includeDomains}
-                .includeDeviceClasses=${this.includeDeviceClasses}
-              >
-              </ha-target-picker-item-group>
-            `
-          : nothing}
-        ${floorIds.length || areaIds.length
-          ? html`
-              <ha-target-picker-item-group
-                @remove-target-item=${this._handleRemove}
-                type="area"
-                .hass=${this.hass}
-                .items=${{
-                  floor: floorIds,
-                  area: areaIds,
-                }}
-                .deviceFilter=${this.deviceFilter}
-                .entityFilter=${this.entityFilter}
-                .includeDomains=${this.includeDomains}
-                .includeDeviceClasses=${this.includeDeviceClasses}
-              >
-              </ha-target-picker-item-group>
-            `
-          : nothing}
-        ${labelIds.length
-          ? html`
-              <ha-target-picker-item-group
-                @remove-target-item=${this._handleRemove}
-                type="label"
-                .hass=${this.hass}
-                .items=${{ label: labelIds }}
-                .deviceFilter=${this.deviceFilter}
-                .entityFilter=${this.entityFilter}
-                .includeDomains=${this.includeDomains}
-                .includeDeviceClasses=${this.includeDeviceClasses}
-              >
-              </ha-target-picker-item-group>
-            `
-          : nothing}
-      </div>
-    `;
-  }
-
-  private _renderItems() {
    return html`
      ${this.compact ? this._renderValueChips() : this._renderValueGroups()}
    `;
  }

-  private _renderPicker() {
+  private _renderChips() {
    return html`
      <div class="add-target-wrapper">
        <ha-button
@@ -389,8 +347,7 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) {
    this._pickerFilter = filter;
  };

-  private _hidePicker(ev) {
-    ev.stopPropagation();
+  private _hidePicker() {
    this._open = false;
    this._pickerWrapperOpen = false;

--- 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-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/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",
      };
    }

    // 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
@@ -705,7 +705,7 @@ export class HaTargetPickerSelector extends LitElement {
          ) as EntityComboBoxItem[];
        }

-        if (!filterType && entities.length) {
+        if (!filterType) {
          // show group title
          items.push(
            this.hass.localize("ui.components.target-picker.type.entities")
@@ -733,7 +733,7 @@ export class HaTargetPickerSelector extends LitElement {
          devices = this._filterGroup("device", devices);
        }

-        if (!filterType && devices.length) {
+        if (!filterType) {
          // show group title
          items.push(
            this.hass.localize("ui.components.target-picker.type.devices")
@@ -769,7 +769,7 @@ export class HaTargetPickerSelector extends LitElement {
          ) as FloorComboBoxItem[];
        }

-        if (!filterType && areasAndFloors.length) {
+        if (!filterType) {
          // show group title
          items.push(
            this.hass.localize("ui.components.target-picker.type.areas")
@@ -811,7 +811,7 @@ export class HaTargetPickerSelector extends LitElement {
          labels = this._filterGroup("label", labels);
        }

-        if (!filterType && labels.length) {
+        if (!filterType) {
          // show group title
          items.push(
            this.hass.localize("ui.components.target-picker.type.labels")
--- a/src/components/target-picker/ha-target-picker-value-chip.ts
+++ b/src/components/target-picker/ha-target-picker-value-chip.ts
@@ -16,10 +16,14 @@ import memoizeOne from "memoize-one";
 import { computeCssColor } from "../../common/color/compute-color";
 import { hex2rgb } from "../../common/color/convert-color";
 import { fireEvent } from "../../common/dom/fire_event";
-import { computeDeviceNameDisplay } from "../../common/entity/compute_device_name";
-import { computeDomain } from "../../common/entity/compute_domain";
-import { computeStateName } from "../../common/entity/compute_state_name";
 import { slugify } from "../../common/string/slugify";
+import {
+  computeDeviceName,
+  computeDeviceNameDisplay,
+} from "../../common/entity/compute_device_name";
+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 { getConfigEntry } from "../../data/config_entries";
 import { labelsContext } from "../../data/context";
 import { domainToName } from "../../data/integration";
@@ -168,10 +172,23 @@ export class HaTargetPickerValueChip extends LitElement {
    if (type === "entity") {
      this._setDomainName(computeDomain(itemId));

-      const stateObj = this.hass.states[itemId];
+      const stateObject = this.hass.states[itemId];
+      const entityName = computeEntityName(
+        stateObject,
+        this.hass.entities,
+        this.hass.devices
+      );
+      const { device } = getEntityContext(
+        stateObject,
+        this.hass.entities,
+        this.hass.devices,
+        this.hass.areas,
+        this.hass.floors
+      );
+      const deviceName = device ? computeDeviceName(device) : undefined;
      return {
-        name: computeStateName(stateObj) || itemId,
-        stateObject: stateObj,
+        name: entityName || deviceName || itemId,
+        stateObject,
      };
    }

--- 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/history.ts
+++ b/src/data/history.ts
@@ -435,9 +435,9 @@ export const convertStatisticsToHistory = (
  Object.entries(orderedStatistics).forEach(([key, value]) => {
    const entityHistoryStates: EntityHistoryState[] = value.map((e) => ({
      s: e.mean != null ? e.mean.toString() : e.state!.toString(),
-      lc: e.end / 1000,
+      lc: e.start / 1000,
      a: {},
-      lu: e.end / 1000,
+      lu: e.start / 1000,
    }));
    statsHistoryStates[key] = entityHistoryStates;
  });
--- a/src/data/icons.ts
+++ b/src/data/icons.ts
@@ -12,7 +12,6 @@ import {
  mdiChatSleep,
  mdiClipboardList,
  mdiClock,
-  mdiCodeBraces,
  mdiCog,
  mdiCommentAlert,
  mdiCounter,
@@ -114,7 +113,6 @@ export const FALLBACK_DOMAIN_ICONS = {
  text: mdiFormTextbox,
  time: mdiClock,
  timer: mdiTimerOutline,
-  template: mdiCodeBraces,
  todo: mdiClipboardList,
  tts: mdiSpeakerMessage,
  vacuum: mdiRobotVacuum,
--- a/src/dialogs/config-flow/dialog-data-entry-flow.ts
+++ b/src/dialogs/config-flow/dialog-data-entry-flow.ts
@@ -484,7 +484,7 @@ class DataEntryFlowDialog extends LitElement {
        this._unsubDataEntryFlowProgress = undefined;
      }
      if (_step.next_flow[0] === "config_flow") {
-        showConfigFlowDialog(this, {
+        showConfigFlowDialog(this._params!.dialogParentElement!, {
          continueFlowId: _step.next_flow[1],
          carryOverDevices: this._devices(
            this._params!.flowConfig.showDevices,
@@ -496,23 +496,32 @@ class DataEntryFlowDialog extends LitElement {
        });
      } else if (_step.next_flow[0] === "options_flow") {
        if (_step.type === "create_entry") {
-          showOptionsFlowDialog(this, _step.result!, {
-            continueFlowId: _step.next_flow[1],
-            navigateToResult: this._params!.navigateToResult,
-            dialogClosedCallback: this._params!.dialogClosedCallback,
-          });
+          showOptionsFlowDialog(
+            this._params!.dialogParentElement!,
+            _step.result!,
+            {
+              continueFlowId: _step.next_flow[1],
+              navigateToResult: this._params!.navigateToResult,
+              dialogClosedCallback: this._params!.dialogClosedCallback,
+            }
+          );
        }
      } else if (_step.next_flow[0] === "config_subentries_flow") {
        if (_step.type === "create_entry") {
-          showSubConfigFlowDialog(this, _step.result!, _step.next_flow[0], {
-            continueFlowId: _step.next_flow[1],
-            navigateToResult: this._params!.navigateToResult,
-            dialogClosedCallback: this._params!.dialogClosedCallback,
-          });
+          showSubConfigFlowDialog(
+            this._params!.dialogParentElement!,
+            _step.result!,
+            _step.next_flow[0],
+            {
+              continueFlowId: _step.next_flow[1],
+              navigateToResult: this._params!.navigateToResult,
+              dialogClosedCallback: this._params!.dialogClosedCallback,
+            }
+          );
        }
      } else {
        this.closeDialog();
-        showAlertDialog(this, {
+        showAlertDialog(this._params!.dialogParentElement!, {
          text: this.hass.localize(
            "ui.panel.config.integrations.config_flow.error",
            { error: `Unsupported next flow type: ${_step.next_flow[0]}` }
--- 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/more-info/ha-more-info-history.ts
+++ b/src/dialogs/more-info/ha-more-info-history.ts
@@ -152,18 +152,10 @@ export class MoreInfoHistory extends LitElement {
    }
  }

-  private _setUpdateTimer() {
+  private _setRedrawTimer() {
+    // redraw the graph every minute to update the time axis
    clearInterval(this._interval);
-    this._interval = window.setInterval(() => {
-      // If using statistics, refresh the data
-      if (this._statistics) {
-        this._fetchStatistics();
-      }
-      // If using history, redraw the graph to update the time axis
-      if (this._stateHistory) {
-        this._redrawGraph();
-      }
-    }, 1000 * 60);
+    this._interval = window.setInterval(() => this._redrawGraph(), 1000 * 60);
  }

  private async _getStatisticsMetaData(statisticIds: string[] | undefined) {
@@ -178,30 +170,6 @@ export class MoreInfoHistory extends LitElement {
    return statisticsMetaData;
  }

-  private async _fetchStatistics(): Promise<boolean> {
-    // Fire off the metadata and fetch at the same time
-    // to avoid waiting in sequence so the UI responds
-    // faster.
-    const _metadata = this._getStatisticsMetaData([this.entityId]);
-    const _statistics = fetchStatistics(
-      this.hass!,
-      subHours(new Date(), 24),
-      undefined,
-      [this.entityId],
-      "5minute",
-      undefined,
-      statTypes
-    );
-    const [metadata, statistics] = await Promise.all([_metadata, _statistics]);
-    if (metadata && Object.keys(metadata).length) {
-      this._metadata = metadata;
-      this._statistics = statistics;
-      this._statNames = { [this.entityId]: "" };
-      return true;
-    }
-    return false;
-  }
-
  private async _getStateHistory(): Promise<void> {
    if (
      isComponentLoaded(this.hass, "recorder") &&
@@ -212,10 +180,27 @@ export class MoreInfoHistory extends LitElement {
      // has not opted into statistics so there is no need to check as it
      // requires another round-trip to the server.
      if (stateObj && stateObj.attributes.state_class) {
-        const hasStatistics = await this._fetchStatistics();
-        if (hasStatistics) {
-          // Using statistics, set up refresh timer
-          this._setUpdateTimer();
+        // Fire off the metadata and fetch at the same time
+        // to avoid waiting in sequence so the UI responds
+        // faster.
+        const _metadata = this._getStatisticsMetaData([this.entityId]);
+        const _statistics = fetchStatistics(
+          this.hass!,
+          subHours(new Date(), 24),
+          undefined,
+          [this.entityId],
+          "5minute",
+          undefined,
+          statTypes
+        );
+        const [metadata, statistics] = await Promise.all([
+          _metadata,
+          _statistics,
+        ]);
+        if (metadata && Object.keys(metadata).length) {
+          this._metadata = metadata;
+          this._statistics = statistics;
+          this._statNames = { [this.entityId]: "" };
          return;
        }
      }
@@ -253,7 +238,7 @@ export class MoreInfoHistory extends LitElement {
      this._error = err;
      return undefined;
    });
-    this._setUpdateTimer();
+    this._setRedrawTimer();
  }

  static styles = [
--- 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/fake_data/entity_component_icons.ts
+++ b/src/fake_data/entity_component_icons.ts
@@ -97,9 +97,6 @@ export const ENTITY_COMPONENT_ICONS: Record<string, ComponentIcons> = {
    pm25: {
      default: "mdi:molecule",
    },
-    pm4: {
-      default: "mdi:molecule",
-    },
    power: {
      default: "mdi:flash",
    },
@@ -677,9 +674,6 @@ export const ENTITY_COMPONENT_ICONS: Record<string, ComponentIcons> = {
    pm25: {
      default: "mdi:molecule",
    },
-    pm4: {
-      default: "mdi:molecule",
-    },
    power: {
      default: "mdi:flash",
    },
--- a/src/layouts/partial-panel-resolver.ts
+++ b/src/layouts/partial-panel-resolver.ts
@@ -33,7 +33,7 @@ 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"),
 };

--- a/src/mixins/conditional-listener-mixin.ts
+++ b/src/mixins/conditional-listener-mixin.ts
@@ -1,95 +0,0 @@
-import type { ReactiveElement } from "lit";
-import type { HomeAssistant } from "../types";
-import { setupMediaQueryListeners } from "../common/condition/listeners";
-
-type Constructor<T> = abstract new (...args: any[]) => T;
-
-/**
- * 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(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 = <
-  T extends Constructor<ReactiveElement>,
->(
-  superClass: T
-) => {
-  abstract class ConditionalListenerClass extends superClass {
-    private __listeners: (() => void)[] = [];
-
-    // Type hint for hass property (should be provided by subclass)
-    abstract hass?: HomeAssistant;
-
-    public connectedCallback() {
-      super.connectedCallback();
-      this.setupConditionalListeners();
-    }
-
-    public disconnectedCallback() {
-      super.disconnectedCallback();
-      this.clearConditionalListeners();
-    }
-
-    protected clearConditionalListeners(): void {
-      this.__listeners.forEach((unsub) => unsub());
-      this.__listeners = [];
-    }
-
-    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?: any[]): void {
-      const component = this as any;
-      const finalConditions =
-        conditions ||
-        component.config?.visibility ||
-        component._config?.visibility;
-
-      if (!finalConditions || !this.hass) {
-        return;
-      }
-
-      const onUpdate = (conditionsMet: boolean) => {
-        if (component._updateVisibility) {
-          component._updateVisibility(conditionsMet);
-        } else if (component._updateElement) {
-          component._updateElement(conditionsMet);
-        }
-      };
-
-      setupMediaQueryListeners(
-        finalConditions,
-        this.hass,
-        (unsub) => this.addConditionalListener(unsub),
-        onUpdate
-      );
-    }
-  }
-  return ConditionalListenerClass;
-};
--- a/src/panels/calendar/dialog-calendar-event-detail.ts
+++ b/src/panels/calendar/dialog-calendar-event-detail.ts
@@ -143,14 +143,9 @@ class DialogCalendarEventDetail extends LitElement {
      this.hass.locale.time_zone,
      this.hass.config.time_zone
    );
-    // For all-day events (date-only strings), parse without timezone to avoid offset issues
-    const start = isDate(this._data!.dtstart)
-      ? new Date(this._data!.dtstart + "T00:00:00")
-      : new TZDate(this._data!.dtstart, timeZone);
-    const endValue = isDate(this._data!.dtend)
-      ? new Date(this._data!.dtend + "T00:00:00")
-      : new TZDate(this._data!.dtend, timeZone);
-    // All day event end dates are exclusive in iCalendar format, subtract one day for display
+    const start = new TZDate(this._data!.dtstart, timeZone);
+    const endValue = new TZDate(this._data!.dtend, timeZone);
+    // All day events should be displayed as a day earlier
    const end = isDate(this._data.dtend) ? addDays(endValue, -1) : endValue;
    // The range can be shortened when the start and end are on the same day.
    if (isSameDay(start, end)) {
--- a/src/panels/calendar/dialog-calendar-event-editor.ts
+++ b/src/panels/calendar/dialog-calendar-event-editor.ts
@@ -332,15 +332,6 @@ class DialogCalendarEventEditor extends LitElement {

  private _allDayToggleChanged(ev) {
    this._allDay = ev.target.checked;
-    // When switching to all-day mode, normalize dates to midnight so time portions don't interfere with date comparisons
-    if (this._allDay && this._dtstart && this._dtend) {
-      this._dtstart = new Date(
-        formatDate(this._dtstart, this._timeZone!) + "T00:00:00"
-      );
-      this._dtend = new Date(
-        formatDate(this._dtend, this._timeZone!) + "T00:00:00"
-      );
-    }
  }

  private _startDateChanged(ev: CustomEvent) {
--- 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
@@ -15,7 +15,6 @@ import {
  getFloors,
 } from "../../lovelace/strategies/areas/helpers/areas-strategy-helper";
 import { getHomeStructure } from "../../lovelace/strategies/home/helpers/home-structure";
-import { floorDefaultIcon } from "../../../components/ha-floor-icon";

 export interface ClimateViewStrategyConfig {
  type: "climate";
@@ -115,24 +114,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(
@@ -171,7 +152,6 @@ export class ClimateViewStrategy extends ReactiveElement {
              floorCount > 1
                ? floor.name
                : hass.localize("ui.panel.lovelace.strategy.home.areas"),
-            icon: floor.icon || floorDefaultIcon(floor),
          },
        ],
      };
@@ -208,33 +188,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/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/add-automation-element-dialog.ts
+++ b/src/panels/config/automation/add-automation-element-dialog.ts
@@ -257,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;
    }
@@ -294,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;
    }
@@ -383,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;
@@ -685,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 = [
@@ -902,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)}
@@ -1054,7 +1045,6 @@ class DialogAddAutomationElement
  private _onSearchFocus(ev) {
    this._removeKeyboardShortcuts = tinykeys(ev.target, {
      ArrowDown: this._focusSearchList,
-      Enter: this._pickSingleItem,
    });
  }

@@ -1071,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`
@@ -1180,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 {
--- a/src/panels/config/automation/sidebar/ha-automation-sidebar-action.ts
+++ b/src/panels/config/automation/sidebar/ha-automation-sidebar-action.ts
@@ -20,8 +20,7 @@ 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 type { RepeatAction } from "../../../../data/script";
 import type { HomeAssistant } from "../../../../types";
 import { isMac } from "../../../../util/is_mac";
 import type HaAutomationConditionEditor from "../action/ha-automation-action-editor";
@@ -84,23 +83,11 @@ export default class HaAutomationSidebarAction extends LitElement {
      "ui.panel.config.automation.editor.actions.action"
    );

-    let title =
+    const 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-trigger.ts
+++ b/src/panels/config/automation/sidebar/ha-automation-sidebar-trigger.ts
@@ -3,7 +3,6 @@ import {
  mdiContentCopy,
  mdiContentCut,
  mdiDelete,
-  mdiIdentifier,
  mdiPlayCircleOutline,
  mdiPlaylistEdit,
  mdiPlusCircleMultipleOutline,
@@ -41,8 +40,6 @@ export default class HaAutomationSidebarTrigger extends LitElement {
  @property({ type: Number, attribute: "sidebar-key" })
  public sidebarKey?: number;

-  @state() private _requestShowId = false;
-
  @state() private _warnings?: string[];

  @query(".sidebar-editor")
@@ -50,7 +47,6 @@ export default class HaAutomationSidebarTrigger extends LitElement {

  protected willUpdate(changedProperties) {
    if (changedProperties.has("config")) {
-      this._requestShowId = false;
      this._warnings = undefined;
      if (this.config) {
        this.yamlMode = this.config.yamlMode;
@@ -105,24 +101,6 @@ export default class HaAutomationSidebarTrigger extends LitElement {
          </div>
        </ha-md-menu-item>

-        ${!this.yamlMode &&
-        !("id" in this.config.config) &&
-        !this._requestShowId
-          ? html`<ha-md-menu-item
-              slot="menu-items"
-              .clickAction=${this._showTriggerId}
-              .disabled=${this.disabled || type === "list"}
-            >
-              <ha-svg-icon slot="start" .path=${mdiIdentifier}></ha-svg-icon>
-              <div class="overflow-label">
-                ${this.hass.localize(
-                  "ui.panel.config.automation.editor.triggers.edit_id"
-                )}
-                <span class="shortcut-placeholder ${isMac ? "mac" : ""}"></span>
-              </div>
-            </ha-md-menu-item>`
-          : nothing}
-
        <ha-md-divider
          slot="menu-items"
          role="separator"
@@ -272,7 +250,6 @@ export default class HaAutomationSidebarTrigger extends LitElement {
            @value-changed=${this._valueChangedSidebar}
            @yaml-changed=${this._yamlChangedSidebar}
            .uiSupported=${this.config.uiSupported}
-            .showId=${this._requestShowId}
            .yamlMode=${this.yamlMode}
            .disabled=${this.disabled}
            @ui-mode-not-available=${this._handleUiModeNotAvailable}
@@ -315,10 +292,6 @@ export default class HaAutomationSidebarTrigger extends LitElement {
    fireEvent(this, "toggle-yaml-mode");
  };

-  private _showTriggerId = () => {
-    this._requestShowId = true;
-  };
-
  static styles = [sidebarEditorStyles, overflowStyles];
 }

--- a/src/panels/config/automation/trigger/ha-automation-trigger-editor.ts
+++ b/src/panels/config/automation/trigger/ha-automation-trigger-editor.ts
@@ -29,8 +29,6 @@ export default class HaAutomationTriggerEditor extends LitElement {

  @property({ type: Boolean, attribute: "sidebar" }) public inSidebar = false;

-  @property({ type: Boolean, attribute: "show-id" }) public showId = false;
-
  @query("ha-yaml-editor") public yamlEditor?: HaYamlEditor;

  protected render() {
@@ -38,8 +36,6 @@ export default class HaAutomationTriggerEditor extends LitElement {

    const yamlMode = this.yamlMode || !this.uiSupported;

-    const showId = "id" in this.trigger || this.showId;
-
    return html`
      <div
        class=${classMap({
@@ -74,15 +70,20 @@ export default class HaAutomationTriggerEditor extends LitElement {
              ></ha-yaml-editor>
            `
          : html`
-              ${showId && !isTriggerList(this.trigger)
+              ${!isTriggerList(this.trigger)
                ? html`
                    <ha-textfield
-                      .label=${this.hass.localize(
+                      .label=${`${this.hass.localize(
                        "ui.panel.config.automation.editor.triggers.id"
-                      )}
+                      )} (${this.hass.localize(
+                        "ui.panel.config.automation.editor.triggers.optional"
+                      )})`}
                      .value=${this.trigger.id || ""}
                      .disabled=${this.disabled}
                      @change=${this._idChanged}
+                      .helper=${this.hass.localize(
+                        "ui.panel.config.automation.editor.triggers.id_helper"
+                      )}
                    ></ha-textfield>
                  `
                : nothing}
--- a/src/panels/config/automation/trigger/types/ha-automation-trigger-state.ts
+++ b/src/panels/config/automation/trigger/types/ha-automation-trigger-state.ts
@@ -19,7 +19,6 @@ import { ensureArray } from "../../../../../common/array/ensure-array";
 import { fireEvent } from "../../../../../common/dom/fire_event";
 import { hasTemplate } from "../../../../../common/string/has-template";
 import type { StateTrigger } from "../../../../../data/automation";
-import { ANY_STATE_VALUE } from "../../../../../components/entity/const";
 import type { HomeAssistant } from "../../../../../types";
 import { baseTriggerStruct, forDictStruct } from "../../structs";
 import type { TriggerElement } from "../ha-automation-trigger-row";
@@ -37,12 +36,14 @@ const stateTriggerStruct = assign(
    trigger: literal("state"),
    entity_id: optional(union([string(), array(string())])),
    attribute: optional(string()),
-    from: optional(union([nullable(string()), array(string())])),
-    to: optional(union([nullable(string()), array(string())])),
+    from: optional(nullable(string())),
+    to: optional(nullable(string())),
    for: optional(union([number(), string(), forDictStruct])),
  })
 );

+const ANY_STATE_VALUE = "__ANY_STATE_IGNORE_ATTRIBUTES__";
+
@customElement("ha-automation-trigger-state")
 export class HaStateTrigger extends LitElement implements TriggerElement {
  @property({ attribute: false }) public hass!: HomeAssistant;
@@ -56,12 +57,7 @@ export class HaStateTrigger extends LitElement implements TriggerElement {
  }

  private _schema = memoizeOne(
-    (
-      localize: LocalizeFunc,
-      attribute: string | undefined,
-      hideInFrom: string[],
-      hideInTo: string[]
-    ) =>
+    (localize: LocalizeFunc, attribute) =>
      [
        {
          name: "entity_id",
@@ -135,7 +131,6 @@ export class HaStateTrigger extends LitElement implements TriggerElement {
          },
          selector: {
            state: {
-              multiple: true,
              extra_options: (attribute
                ? []
                : [
@@ -147,7 +142,6 @@ export class HaStateTrigger extends LitElement implements TriggerElement {
                    },
                  ]) as any,
              attribute: attribute,
-              hide_states: hideInFrom,
            },
          },
        },
@@ -158,7 +152,6 @@ export class HaStateTrigger extends LitElement implements TriggerElement {
          },
          selector: {
            state: {
-              multiple: true,
              extra_options: (attribute
                ? []
                : [
@@ -170,7 +163,6 @@ export class HaStateTrigger extends LitElement implements TriggerElement {
                    },
                  ]) as any,
              attribute: attribute,
-              hide_states: hideInTo,
            },
          },
        },
@@ -215,15 +207,13 @@ export class HaStateTrigger extends LitElement implements TriggerElement {
      entity_id: ensureArray(this.trigger.entity_id),
      for: trgFor,
    };
-
-    data.to = this._normalizeStates(this.trigger.to, data.attribute);
-    data.from = this._normalizeStates(this.trigger.from, data.attribute);
-    const schema = this._schema(
-      this.hass.localize,
-      this.trigger.attribute,
-      data.to,
-      data.from
-    );
+    if (!data.attribute && data.to === null) {
+      data.to = ANY_STATE_VALUE;
+    }
+    if (!data.attribute && data.from === null) {
+      data.from = ANY_STATE_VALUE;
+    }
+    const schema = this._schema(this.hass.localize, this.trigger.attribute);

    return html`
      <ha-form
@@ -241,60 +231,22 @@ export class HaStateTrigger extends LitElement implements TriggerElement {
    ev.stopPropagation();
    const newTrigger = ev.detail.value;

-    newTrigger.to = this._applyAnyStateExclusive(
-      newTrigger.to,
-      newTrigger.attribute
-    );
-    if (Array.isArray(newTrigger.to) && newTrigger.to.length === 0) {
-      delete newTrigger.to;
+    if (newTrigger.to === ANY_STATE_VALUE) {
+      newTrigger.to = newTrigger.attribute ? undefined : null;
    }
-    newTrigger.from = this._applyAnyStateExclusive(
-      newTrigger.from,
-      newTrigger.attribute
-    );
-    if (Array.isArray(newTrigger.from) && newTrigger.from.length === 0) {
-      delete newTrigger.from;
+    if (newTrigger.from === ANY_STATE_VALUE) {
+      newTrigger.from = newTrigger.attribute ? undefined : null;
    }

-    Object.keys(newTrigger).forEach((key) => {
-      const val = newTrigger[key];
-      if (val === undefined || val === "") {
-        delete newTrigger[key];
-      }
-    });
+    Object.keys(newTrigger).forEach((key) =>
+      newTrigger[key] === undefined || newTrigger[key] === ""
+        ? delete newTrigger[key]
+        : {}
+    );

    fireEvent(this, "value-changed", { value: newTrigger });
  }

-  private _applyAnyStateExclusive(
-    val: string | string[] | null | undefined,
-    attribute?: string
-  ): string | string[] | null | undefined {
-    const anyStateSelected = Array.isArray(val)
-      ? val.includes(ANY_STATE_VALUE)
-      : val === ANY_STATE_VALUE;
-    if (anyStateSelected) {
-      // Any state is exclusive: null if no attribute, undefined if attribute
-      return attribute ? undefined : null;
-    }
-    return val;
-  }
-
-  private _normalizeStates(
-    value: string | string[] | null | undefined,
-    attribute?: string
-  ): string[] {
-    // If no attribute is selected and backend value is null,
-    // expose it as the special ANY state option in the UI.
-    if (!attribute && value === null) {
-      return [ANY_STATE_VALUE];
-    }
-    if (value === undefined || value === null) {
-      return [];
-    }
-    return ensureArray(value);
-  }
-
  private _computeLabelCallback = (
    schema: SchemaUnion<ReturnType<typeof this._schema>>
  ): string =>
--- 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();
  };
@@ -569,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;
    }

@@ -595,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, {
@@ -609,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/dashboard/ha-config-updates.ts
+++ b/src/panels/config/dashboard/ha-config-updates.ts
@@ -20,7 +20,6 @@ import { subscribeEntityRegistry } from "../../../data/entity_registry";
 import type { UpdateEntity } from "../../../data/update";
 import { SubscribeMixin } from "../../../mixins/subscribe-mixin";
 import type { HomeAssistant } from "../../../types";
-import "../../../components/ha-progress-ring";

@customElement("ha-config-updates")
 class HaConfigUpdates extends SubscribeMixin(LitElement) {
@@ -57,29 +56,6 @@ class HaConfigUpdates extends SubscribeMixin(LitElement) {
      this._entities?.find((entity) => entity.entity_id === entityId)
  );

-  private _renderUpdateProgress(entity: UpdateEntity) {
-    if (entity.attributes.update_percentage != null) {
-      return html`<ha-progress-ring
-        size="small"
-        .value=${entity.attributes.update_percentage}
-        .label=${this.hass.localize(
-          "ui.panel.config.updates.update_in_progress"
-        )}
-      ></ha-progress-ring>`;
-    }
-
-    if (entity.attributes.in_progress) {
-      return html`<ha-spinner
-        size="small"
-        .ariaLabel=${this.hass.localize(
-          "ui.panel.config.updates.update_in_progress"
-        )}
-      ></ha-spinner>`;
-    }
-
-    return html`<ha-icon-next></ha-icon-next>`;
-  }
-
  protected render() {
    if (!this.updateEntities?.length) {
      return nothing;
@@ -130,9 +106,13 @@ class HaConfigUpdates extends SubscribeMixin(LitElement) {
                  )}
                ></state-badge>
                ${this.narrow && entity.attributes.in_progress
-                  ? html`<div class="absolute">
-                      ${this._renderUpdateProgress(entity)}
-                    </div>`
+                  ? html`<ha-spinner
+                      class="absolute"
+                      size="small"
+                      .ariaLabel=${this.hass.localize(
+                        "ui.panel.config.updates.update_in_progress"
+                      )}
+                    ></ha-spinner>`
                  : nothing}
              </div>
              <span slot="headline"
@@ -148,9 +128,16 @@ class HaConfigUpdates extends SubscribeMixin(LitElement) {
                  : nothing}
              </span>
              ${!this.narrow
-                ? html`<div slot="end">
-                    ${this._renderUpdateProgress(entity)}
-                  </div>`
+                ? entity.attributes.in_progress
+                  ? html`<div slot="end">
+                      <ha-spinner
+                        size="small"
+                        .ariaLabel=${this.hass.localize(
+                          "ui.panel.config.updates.update_in_progress"
+                        )}
+                      ></ha-spinner>
+                    </div>`
+                  : html`<ha-icon-next slot="end"></ha-icon-next>`
                : nothing}
            </ha-md-list-item>
          `;
@@ -206,13 +193,13 @@ class HaConfigUpdates extends SubscribeMixin(LitElement) {
        div[slot="start"] {
          position: relative;
        }
-        div.absolute {
+        ha-spinner.absolute {
          position: absolute;
          left: 6px;
          top: 6px;
        }
        state-badge.updating {
-          opacity: 0.2;
+          opacity: 0.5;
        }
      `,
    ];
--- a/src/panels/config/devices/device-detail/ha-device-entities-card.ts
+++ b/src/panels/config/devices/device-detail/ha-device-entities-card.ts
@@ -228,7 +228,7 @@ export class HaDeviceEntitiesCard extends LitElement {
    addEntitiesToLovelaceView(
      this,
      this.hass,
-      computeCards(this.hass, entities, {
+      computeCards(this.hass.states, entities, {
        title: this.deviceName,
      }),
      computeSection(entities, {
--- a/src/panels/config/devices/device-registry-detail/dialog-device-registry-detail.ts
+++ b/src/panels/config/devices/device-registry-detail/dialog-device-registry-detail.ts
@@ -5,7 +5,8 @@ import { fireEvent } from "../../../../common/dom/fire_event";
 import { computeDeviceNameDisplay } from "../../../../common/entity/compute_device_name";
 import "../../../../components/ha-alert";
 import "../../../../components/ha-area-picker";
-import "../../../../components/ha-dialog";
+import "../../../../components/ha-wa-dialog";
+import "../../../../components/ha-dialog-footer";
 import "../../../../components/ha-button";
 import "../../../../components/ha-labels-picker";
 import type { HaSwitch } from "../../../../components/ha-switch";
@@ -19,6 +20,8 @@ import type { DeviceRegistryDetailDialogParams } from "./show-dialog-device-regi
 class DialogDeviceRegistryDetail extends LitElement {
  @property({ attribute: false }) public hass!: HomeAssistant;

+  @state() private _open = false;
+
  @state() private _nameByUser!: string;

  @state() private _error?: string;
@@ -42,10 +45,15 @@ class DialogDeviceRegistryDetail extends LitElement {
    this._areaId = this._params.device.area_id || "";
    this._labels = this._params.device.labels || [];
    this._disabledBy = this._params.device.disabled_by;
+    this._open = true;
    await this.updateComplete;
  }

  public closeDialog(): void {
+    this._open = false;
+  }
+
+  private _dialogClosed(): void {
    this._error = "";
    this._params = undefined;
    fireEvent(this, "dialog-closed", { dialog: this.localName });
@@ -57,10 +65,12 @@ class DialogDeviceRegistryDetail extends LitElement {
    }
    const device = this._params.device;
    return html`
-      <ha-dialog
-        open
-        @closed=${this.closeDialog}
-        .heading=${computeDeviceNameDisplay(device, this.hass)}
+      <ha-wa-dialog
+        .hass=${this.hass}
+        .open=${this._open}
+        header-title=${computeDeviceNameDisplay(device, this.hass)}
+        prevent-scrim-close
+        @closed=${this._dialogClosed}
      >
        <div>
          ${this._error
@@ -68,6 +78,7 @@ class DialogDeviceRegistryDetail extends LitElement {
            : ""}
          <div class="form">
            <ha-textfield
+              autofocus
              .value=${this._nameByUser}
              @input=${this._nameChanged}
              .label=${this.hass.localize(
@@ -75,7 +86,6 @@ class DialogDeviceRegistryDetail extends LitElement {
              )}
              .placeholder=${device.name || ""}
              .disabled=${this._submitting}
-              dialogInitialFocus
            ></ha-textfield>
            <ha-area-picker
              .hass=${this.hass}
@@ -131,22 +141,25 @@ class DialogDeviceRegistryDetail extends LitElement {
            </div>
          </div>
        </div>
-        <ha-button
-          slot="secondaryAction"
-          @click=${this.closeDialog}
-          .disabled=${this._submitting}
-          appearance="plain"
-        >
-          ${this.hass.localize("ui.common.cancel")}
-        </ha-button>
-        <ha-button
-          slot="primaryAction"
-          @click=${this._updateEntry}
-          .disabled=${this._submitting}
-        >
-          ${this.hass.localize("ui.dialogs.device-registry-detail.update")}
-        </ha-button>
-      </ha-dialog>
+
+        <ha-dialog-footer slot="footer">
+          <ha-button
+            slot="secondaryAction"
+            @click=${this.closeDialog}
+            .disabled=${this._submitting}
+            appearance="plain"
+          >
+            ${this.hass.localize("ui.common.cancel")}
+          </ha-button>
+          <ha-button
+            slot="primaryAction"
+            @click=${this._updateEntry}
+            .disabled=${this._submitting}
+          >
+            ${this.hass.localize("ui.dialogs.device-registry-detail.update")}
+          </ha-button>
+        </ha-dialog-footer>
+      </ha-wa-dialog>
    `;
  }

--- a/src/panels/config/energy/dialogs/dialog-energy-grid-flow-settings.ts
+++ b/src/panels/config/energy/dialogs/dialog-energy-grid-flow-settings.ts
@@ -9,7 +9,6 @@ import "../../../../components/ha-dialog";
 import "../../../../components/ha-button";
 import "../../../../components/ha-formfield";
 import "../../../../components/ha-radio";
-import "../../../../components/ha-markdown";
 import type { HaRadio } from "../../../../components/ha-radio";
 import type {
  FlowFromGridSourceEnergyPreference,
@@ -20,7 +19,11 @@ import {
  emptyFlowToGridSourceEnergyPreference,
  energyStatisticHelpUrl,
 } from "../../../../data/energy";
-import { isExternalStatistic } from "../../../../data/recorder";
+import {
+  getDisplayUnit,
+  getStatisticMetadata,
+  isExternalStatistic,
+} from "../../../../data/recorder";
 import { getSensorDeviceClassConvertibleUnits } from "../../../../data/sensor";
 import type { HassDialog } from "../../../../dialogs/make-dialog-manager";
 import { haStyleDialog } from "../../../../resources/styles";
@@ -44,6 +47,8 @@ export class DialogEnergyGridFlowSettings

  @state() private _costs?: "no-costs" | "number" | "entity" | "statistic";

+  @state() private _pickedDisplayUnit?: string | null;
+
  @state() private _energy_units?: string[];

  @state() private _error?: string;
@@ -76,6 +81,11 @@ export class DialogEnergyGridFlowSettings
          : "stat_energy_to"
      ];

+    this._pickedDisplayUnit = getDisplayUnit(
+      this.hass,
+      initialSourceId,
+      params.metadata
+    );
    this._energy_units = (
      await getSensorDeviceClassConvertibleUnits(this.hass, "energy")
    ).units;
@@ -93,6 +103,7 @@ export class DialogEnergyGridFlowSettings
  public closeDialog() {
    this._params = undefined;
    this._source = undefined;
+    this._pickedDisplayUnit = undefined;
    this._error = undefined;
    this._excludeList = undefined;
    fireEvent(this, "dialog-closed", { dialog: this.localName });
@@ -106,6 +117,10 @@ export class DialogEnergyGridFlowSettings

    const pickableUnit = this._energy_units?.join(", ") || "";

+    const unitPriceSensor = this._pickedDisplayUnit
+      ? `${this.hass.config.currency}/${this._pickedDisplayUnit}`
+      : undefined;
+
    const unitPriceFixed = `${this.hass.config.currency}/kWh`;

    const externalSource =
@@ -231,15 +246,9 @@ export class DialogEnergyGridFlowSettings
              .hass=${this.hass}
              include-domains='["sensor", "input_number"]'
              .value=${this._source.entity_energy_price}
-              .label=${this.hass.localize(
+              .label=${`${this.hass.localize(
                `ui.panel.config.energy.grid.flow_dialog.${this._params.direction}.cost_entity_input`
-              )}
-              .helper=${html`<ha-markdown
-                .content=${this.hass.localize(
-                  "ui.panel.config.energy.grid.flow_dialog.cost_entity_helper",
-                  { currency: this.hass.config.currency }
-                )}
-              ></ha-markdown>`}
+              )} ${unitPriceSensor ? ` (${unitPriceSensor})` : ""}`}
              @value-changed=${this._priceEntityChanged}
            ></ha-entity-picker>`
          : ""}
@@ -332,6 +341,16 @@ export class DialogEnergyGridFlowSettings
  }

  private async _statisticChanged(ev: CustomEvent<{ value: string }>) {
+    if (ev.detail.value) {
+      const metadata = await getStatisticMetadata(this.hass, [ev.detail.value]);
+      this._pickedDisplayUnit = getDisplayUnit(
+        this.hass,
+        ev.detail.value,
+        metadata[0]
+      );
+    } else {
+      this._pickedDisplayUnit = undefined;
+    }
    this._source = {
      ...this._source!,
      [this._params!.direction === "from"
--- a/src/panels/config/entities/editor-tabs/settings/entity-settings-helper-tab.ts
+++ b/src/panels/config/entities/editor-tabs/settings/entity-settings-helper-tab.ts
@@ -4,7 +4,6 @@ import { customElement, property, query, state } from "lit/decorators";
 import { isComponentLoaded } from "../../../../../common/config/is_component_loaded";
 import { dynamicElement } from "../../../../../common/dom/dynamic-element-directive";
 import { fireEvent } from "../../../../../common/dom/fire_event";
-import "../../../../../components/ha-button";
 import type { ExtEntityRegistryEntry } from "../../../../../data/entity_registry";
 import { removeEntityRegistryEntry } from "../../../../../data/entity_registry";
 import { HELPERS_CRUD } from "../../../../../data/helpers_crud";
@@ -23,6 +22,7 @@ import "../../../helpers/forms/ha-schedule-form";
 import "../../../helpers/forms/ha-timer-form";
 import "../../../voice-assistants/entity-voice-settings";
 import "../../entity-registry-settings-editor";
+import "../../../../../components/ha-button";
 import type { EntityRegistrySettingsEditor } from "../../entity-registry-settings-editor";

@customElement("entity-settings-helper-tab")
@@ -72,28 +72,22 @@ export class EntitySettingsHelperTab extends LitElement {
        ${this._error
          ? html`<ha-alert alert-type="error">${this._error}</ha-alert>`
          : ""}
-        ${this._item === null
-          ? html`<ha-alert alert-type="info"
-              >${this.hass.localize(
-                "ui.dialogs.helper_settings.yaml_not_editable"
-              )}</ha-alert
-            >`
-          : nothing}
        ${!this._componentLoaded
          ? this.hass.localize(
              "ui.dialogs.helper_settings.platform_not_loaded",
              { platform: this.entry.platform }
            )
-          : html`
-              <span @value-changed=${this._valueChanged}>
-                ${dynamicElement(`ha-${this.entry.platform}-form`, {
-                  hass: this.hass,
-                  item: this._item,
-                  entry: this.entry,
-                  disabled: this._item === null,
-                })}
-              </span>
-            `}
+          : this._item === null
+            ? this.hass.localize("ui.dialogs.helper_settings.yaml_not_editable")
+            : html`
+                <span @value-changed=${this._valueChanged}>
+                  ${dynamicElement(`ha-${this.entry.platform}-form`, {
+                    hass: this.hass,
+                    item: this._item,
+                    entry: this.entry,
+                  })}
+                </span>
+              `}
        <entity-registry-settings-editor
          .hass=${this.hass}
          .entry=${this.entry}
@@ -128,9 +122,6 @@ export class EntitySettingsHelperTab extends LitElement {
  }

  private _valueChanged(ev: CustomEvent): void {
-    if (this._item === null) {
-      return;
-    }
    this._error = undefined;
    this._item = ev.detail.value;
  }
@@ -204,10 +195,6 @@ export class EntitySettingsHelperTab extends LitElement {
          display: block;
          padding: 0 !important;
        }
-        ha-alert {
-          display: block;
-          margin-bottom: var(--ha-space-4);
-        }
        .form {
          padding: 20px 24px;
        }
--- a/src/panels/config/entities/entity-registry-settings-editor.ts
+++ b/src/panels/config/entities/entity-registry-settings-editor.ts
@@ -784,7 +784,7 @@ export class EntityRegistrySettingsEditor extends LitElement {
      <ha-labels-picker
        .hass=${this.hass}
        .value=${this._labels}
-        .disabled=${!!this.disabled}
+        .disabled=${this.disabled}
        @value-changed=${this._labelsChanged}
      ></ha-labels-picker>
      ${this._cameraPrefs
--- a/src/panels/config/helpers/forms/ha-counter-form.ts
+++ b/src/panels/config/helpers/forms/ha-counter-form.ts
@@ -17,8 +17,6 @@ class HaCounterForm extends LitElement {

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

-  @property({ type: Boolean }) public disabled = false;
-
  private _item?: Partial<Counter>;

  @state() private _name!: string;
@@ -84,7 +82,6 @@ class HaCounterForm extends LitElement {
            "ui.dialogs.helper_settings.required_error_msg"
          )}
          dialogInitialFocus
-          .disabled=${this.disabled}
        ></ha-textfield>
        <ha-icon-picker
          .hass=${this.hass}
@@ -94,7 +91,6 @@ class HaCounterForm extends LitElement {
          .label=${this.hass!.localize(
            "ui.dialogs.helper_settings.generic.icon"
          )}
-          .disabled=${this.disabled}
        ></ha-icon-picker>
        <ha-textfield
          .value=${this._minimum}
@@ -104,7 +100,6 @@ class HaCounterForm extends LitElement {
          .label=${this.hass!.localize(
            "ui.dialogs.helper_settings.counter.minimum"
          )}
-          .disabled=${this.disabled}
        ></ha-textfield>
        <ha-textfield
          .value=${this._maximum}
@@ -114,7 +109,6 @@ class HaCounterForm extends LitElement {
          .label=${this.hass!.localize(
            "ui.dialogs.helper_settings.counter.maximum"
          )}
-          .disabled=${this.disabled}
        ></ha-textfield>
        <ha-textfield
          .value=${this._initial}
@@ -124,7 +118,6 @@ class HaCounterForm extends LitElement {
          .label=${this.hass!.localize(
            "ui.dialogs.helper_settings.counter.initial"
          )}
-          .disabled=${this.disabled}
        ></ha-textfield>
        <ha-expansion-panel
          header=${this.hass.localize(
@@ -140,14 +133,12 @@ class HaCounterForm extends LitElement {
            .label=${this.hass!.localize(
              "ui.dialogs.helper_settings.counter.step"
            )}
-            .disabled=${this.disabled}
          ></ha-textfield>
          <div class="row">
            <ha-switch
              .checked=${this._restore}
              .configValue=${"restore"}
              @change=${this._valueChanged}
-              .disabled=${this.disabled}
            >
            </ha-switch>
            <div>
--- a/src/panels/config/helpers/forms/ha-input_boolean-form.ts
+++ b/src/panels/config/helpers/forms/ha-input_boolean-form.ts
@@ -14,8 +14,6 @@ class HaInputBooleanForm extends LitElement {

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

-  @property({ type: Boolean }) public disabled = false;
-
  private _item?: InputBoolean;

  @state() private _name!: string;
@@ -61,7 +59,6 @@ class HaInputBooleanForm extends LitElement {
            "ui.dialogs.helper_settings.required_error_msg"
          )}
          dialogInitialFocus
-          .disabled=${this.disabled}
        ></ha-textfield>
        <ha-icon-picker
          .hass=${this.hass}
@@ -71,7 +68,6 @@ class HaInputBooleanForm extends LitElement {
          .label=${this.hass!.localize(
            "ui.dialogs.helper_settings.generic.icon"
          )}
-          .disabled=${this.disabled}
        ></ha-icon-picker>
      </div>
    `;
--- a/src/panels/config/helpers/forms/ha-input_button-form.ts
+++ b/src/panels/config/helpers/forms/ha-input_button-form.ts
@@ -14,8 +14,6 @@ class HaInputButtonForm extends LitElement {

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

-  @property({ type: Boolean }) public disabled = false;
-
  @state() private _name!: string;

  @state() private _icon!: string;
@@ -61,7 +59,6 @@ class HaInputButtonForm extends LitElement {
            "ui.dialogs.helper_settings.required_error_msg"
          )}
          dialogInitialFocus
-          .disabled=${this.disabled}
        ></ha-textfield>
        <ha-icon-picker
          .hass=${this.hass}
@@ -71,7 +68,6 @@ class HaInputButtonForm extends LitElement {
          .label=${this.hass!.localize(
            "ui.dialogs.helper_settings.generic.icon"
          )}
-          .disabled=${this.disabled}
        ></ha-icon-picker>
      </div>
    `;
--- a/src/panels/config/helpers/forms/ha-input_datetime-form.ts
+++ b/src/panels/config/helpers/forms/ha-input_datetime-form.ts
@@ -17,8 +17,6 @@ class HaInputDateTimeForm extends LitElement {

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

-  @property({ type: Boolean }) public disabled = false;
-
  private _item?: InputDateTime;

  @state() private _name!: string;
@@ -75,7 +73,6 @@ class HaInputDateTimeForm extends LitElement {
            "ui.dialogs.helper_settings.required_error_msg"
          )}
          dialogInitialFocus
-          .disabled=${this.disabled}
        ></ha-textfield>
        <ha-icon-picker
          .hass=${this.hass}
@@ -85,7 +82,6 @@ class HaInputDateTimeForm extends LitElement {
          .label=${this.hass!.localize(
            "ui.dialogs.helper_settings.generic.icon"
          )}
-          .disabled=${this.disabled}
        ></ha-icon-picker>
        <br />
        ${this.hass.localize("ui.dialogs.helper_settings.input_datetime.mode")}:
@@ -101,7 +97,6 @@ class HaInputDateTimeForm extends LitElement {
            value="date"
            .checked=${this._mode === "date"}
            @change=${this._modeChanged}
-            .disabled=${this.disabled}
          ></ha-radio>
        </ha-formfield>
        <ha-formfield
@@ -114,7 +109,6 @@ class HaInputDateTimeForm extends LitElement {
            value="time"
            .checked=${this._mode === "time"}
            @change=${this._modeChanged}
-            .disabled=${this.disabled}
          ></ha-radio>
        </ha-formfield>
        <ha-formfield
@@ -127,7 +121,6 @@ class HaInputDateTimeForm extends LitElement {
            value="datetime"
            .checked=${this._mode === "datetime"}
            @change=${this._modeChanged}
-            .disabled=${this.disabled}
          ></ha-radio>
        </ha-formfield>
      </div>
--- a/src/panels/config/helpers/forms/ha-input_number-form.ts
+++ b/src/panels/config/helpers/forms/ha-input_number-form.ts
@@ -18,8 +18,6 @@ class HaInputNumberForm extends LitElement {

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

-  @property({ type: Boolean }) public disabled = false;
-
  private _item?: Partial<InputNumber>;

  @state() private _name!: string;
@@ -91,7 +89,6 @@ class HaInputNumberForm extends LitElement {
            "ui.dialogs.helper_settings.required_error_msg"
          )}
          dialogInitialFocus
-          .disabled=${this.disabled}
        ></ha-textfield>
        <ha-icon-picker
          .hass=${this.hass}
@@ -101,7 +98,6 @@ class HaInputNumberForm extends LitElement {
          .label=${this.hass!.localize(
            "ui.dialogs.helper_settings.generic.icon"
          )}
-          .disabled=${this.disabled}
        ></ha-icon-picker>
        <ha-textfield
          .value=${this._min}
@@ -112,7 +108,6 @@ class HaInputNumberForm extends LitElement {
          .label=${this.hass!.localize(
            "ui.dialogs.helper_settings.input_number.min"
          )}
-          .disabled=${this.disabled}
        ></ha-textfield>
        <ha-textfield
          .value=${this._max}
@@ -123,7 +118,6 @@ class HaInputNumberForm extends LitElement {
          .label=${this.hass!.localize(
            "ui.dialogs.helper_settings.input_number.max"
          )}
-          .disabled=${this.disabled}
        ></ha-textfield>
        <ha-expansion-panel
          header=${this.hass.localize(
@@ -145,7 +139,6 @@ class HaInputNumberForm extends LitElement {
                value="slider"
                .checked=${this._mode === "slider"}
                @change=${this._modeChanged}
-                .disabled=${this.disabled}
              ></ha-radio>
            </ha-formfield>
            <ha-formfield
@@ -158,7 +151,6 @@ class HaInputNumberForm extends LitElement {
                value="box"
                .checked=${this._mode === "box"}
                @change=${this._modeChanged}
-                .disabled=${this.disabled}
              ></ha-radio>
            </ha-formfield>
          </div>
@@ -171,7 +163,6 @@ class HaInputNumberForm extends LitElement {
            .label=${this.hass!.localize(
              "ui.dialogs.helper_settings.input_number.step"
            )}
-            .disabled=${this.disabled}
          ></ha-textfield>

          <ha-textfield
@@ -181,7 +172,6 @@ class HaInputNumberForm extends LitElement {
            .label=${this.hass!.localize(
              "ui.dialogs.helper_settings.input_number.unit_of_measurement"
            )}
-            .disabled=${this.disabled}
          ></ha-textfield>
        </ha-expansion-panel>
      </div>
--- a/src/panels/config/helpers/forms/ha-input_select-form.ts
+++ b/src/panels/config/helpers/forms/ha-input_select-form.ts
@@ -23,8 +23,6 @@ class HaInputSelectForm extends LitElement {

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

-  @property({ type: Boolean }) public disabled = false;
-
  private _item?: InputSelect;

  @state() private _name!: string;
@@ -88,7 +86,6 @@ class HaInputSelectForm extends LitElement {
          )}
          .configValue=${"name"}
          @input=${this._valueChanged}
-          .disabled=${this.disabled}
        ></ha-textfield>
        <ha-icon-picker
          .hass=${this.hass}
@@ -98,18 +95,13 @@ class HaInputSelectForm extends LitElement {
          .label=${this.hass!.localize(
            "ui.dialogs.helper_settings.generic.icon"
          )}
-          .disabled=${this.disabled}
        ></ha-icon-picker>
        <div class="header">
          ${this.hass!.localize(
            "ui.dialogs.helper_settings.input_select.options"
          )}:
        </div>
-        <ha-sortable
-          @item-moved=${this._optionMoved}
-          handle-selector=".handle"
-          .disabled=${this.disabled}
-        >
+        <ha-sortable @item-moved=${this._optionMoved} handle-selector=".handle">
          <ha-list class="options">
            ${this._options.length
              ? repeat(
@@ -132,7 +124,6 @@ class HaInputSelectForm extends LitElement {
                          "ui.dialogs.helper_settings.input_select.remove_option"
                        )}
                        @click=${this._removeOption}
-                        .disabled=${this.disabled}
                        .path=${mdiDelete}
                      ></ha-icon-button>
                    </ha-list-item>
@@ -155,13 +146,8 @@ class HaInputSelectForm extends LitElement {
              "ui.dialogs.helper_settings.input_select.add_option"
            )}
            @keydown=${this._handleKeyAdd}
-            .disabled=${this.disabled}
          ></ha-textfield>
-          <ha-button
-            size="small"
-            appearance="plain"
-            @click=${this._addOption}
-            .disabled=${this.disabled}
+          <ha-button size="small" appearance="plain" @click=${this._addOption}
            >${this.hass!.localize(
              "ui.dialogs.helper_settings.input_select.add"
            )}</ha-button
--- a/src/panels/config/helpers/forms/ha-input_text-form.ts
+++ b/src/panels/config/helpers/forms/ha-input_text-form.ts
@@ -19,8 +19,6 @@ class HaInputTextForm extends LitElement {

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

-  @property({ type: Boolean }) public disabled = false;
-
  private _item?: InputText;

  @state() private _name!: string;
@@ -81,7 +79,6 @@ class HaInputTextForm extends LitElement {
            "ui.dialogs.helper_settings.required_error_msg"
          )}
          dialogInitialFocus
-          .disabled=${this.disabled}
        ></ha-textfield>
        <ha-icon-picker
          .hass=${this.hass}
@@ -91,7 +88,6 @@ class HaInputTextForm extends LitElement {
          .label=${this.hass!.localize(
            "ui.dialogs.helper_settings.generic.icon"
          )}
-          .disabled=${this.disabled}
        ></ha-icon-picker>
        <ha-expansion-panel
          header=${this.hass.localize(
@@ -109,7 +105,6 @@ class HaInputTextForm extends LitElement {
            .label=${this.hass!.localize(
              "ui.dialogs.helper_settings.input_text.min"
            )}
-            .disabled=${this.disabled}
          ></ha-textfield>
          <ha-textfield
            .value=${this._max}
@@ -134,7 +129,6 @@ class HaInputTextForm extends LitElement {
                value="text"
                .checked=${this._mode === "text"}
                @change=${this._modeChanged}
-                .disabled=${this.disabled}
              ></ha-radio>
            </ha-formfield>
            <ha-formfield
@@ -147,7 +141,6 @@ class HaInputTextForm extends LitElement {
                value="password"
                .checked=${this._mode === "password"}
                @change=${this._modeChanged}
-                .disabled=${this.disabled}
              ></ha-radio>
            </ha-formfield>
          </div>
@@ -161,7 +154,6 @@ class HaInputTextForm extends LitElement {
            .helper=${this.hass!.localize(
              "ui.dialogs.helper_settings.input_text.pattern_helper"
            )}
-            .disabled=${this.disabled}
          ></ha-textfield>
        </ha-expansion-panel>
      </div>
--- a/src/panels/config/helpers/forms/ha-schedule-form.ts
+++ b/src/panels/config/helpers/forms/ha-schedule-form.ts
@@ -17,9 +17,9 @@ import "../../../../components/ha-textfield";
 import type { Schedule, ScheduleDay } from "../../../../data/schedule";
 import { weekdays } from "../../../../data/schedule";
 import { TimeZone } from "../../../../data/translation";
+import { showScheduleBlockInfoDialog } from "./show-dialog-schedule-block-info";
 import { haStyle } from "../../../../resources/styles";
 import type { HomeAssistant } from "../../../../types";
-import { showScheduleBlockInfoDialog } from "./show-dialog-schedule-block-info";

 const defaultFullCalendarConfig: CalendarOptions = {
  plugins: [timeGridPlugin, interactionPlugin],
@@ -43,8 +43,6 @@ class HaScheduleForm extends LitElement {

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

-  @property({ type: Boolean }) public disabled = false;
-
  @state() private _name!: string;

  @state() private _icon!: string;
@@ -134,7 +132,6 @@ class HaScheduleForm extends LitElement {
            "ui.dialogs.helper_settings.required_error_msg"
          )}
          dialogInitialFocus
-          .disabled=${this.disabled}
        ></ha-textfield>
        <ha-icon-picker
          .hass=${this.hass}
@@ -144,9 +141,8 @@ class HaScheduleForm extends LitElement {
          .label=${this.hass!.localize(
            "ui.dialogs.helper_settings.generic.icon"
          )}
-          .disabled=${this.disabled}
        ></ha-icon-picker>
-        ${!this.disabled ? html`<div id="calendar"></div>` : nothing}
+        <div id="calendar"></div>
      </div>
    `;
  }
@@ -179,9 +175,7 @@ class HaScheduleForm extends LitElement {
  }

  protected firstUpdated(): void {
-    if (!this.disabled) {
-      this._setupCalendar();
-    }
+    this._setupCalendar();
  }

  private _setupCalendar(): void {
--- a/src/panels/config/helpers/forms/ha-timer-form.ts
+++ b/src/panels/config/helpers/forms/ha-timer-form.ts
@@ -1,18 +1,18 @@
 import type { CSSResultGroup } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import { createDurationData } from "../../../../common/datetime/create_duration_data";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import "../../../../components/ha-checkbox";
-import "../../../../components/ha-duration-input";
-import type { HaDurationData } from "../../../../components/ha-duration-input";
 import "../../../../components/ha-formfield";
 import "../../../../components/ha-icon-picker";
+import "../../../../components/ha-duration-input";
 import "../../../../components/ha-textfield";
-import type { ForDict } from "../../../../data/automation";
 import type { DurationDict, Timer } from "../../../../data/timer";
 import { haStyle } from "../../../../resources/styles";
 import type { HomeAssistant } from "../../../../types";
+import { createDurationData } from "../../../../common/datetime/create_duration_data";
+import type { HaDurationData } from "../../../../components/ha-duration-input";
+import type { ForDict } from "../../../../data/automation";

@customElement("ha-timer-form")
 class HaTimerForm extends LitElement {
@@ -20,8 +20,6 @@ class HaTimerForm extends LitElement {

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

-  @property({ type: Boolean }) public disabled = false;
-
  private _item?: Timer;

  @state() private _name!: string;
@@ -79,7 +77,6 @@ class HaTimerForm extends LitElement {
            "ui.dialogs.helper_settings.required_error_msg"
          )}
          dialogInitialFocus
-          .disabled=${this.disabled}
        ></ha-textfield>
        <ha-icon-picker
          .hass=${this.hass}
@@ -89,13 +86,11 @@ class HaTimerForm extends LitElement {
          .label=${this.hass!.localize(
            "ui.dialogs.helper_settings.generic.icon"
          )}
-          .disabled=${this.disabled}
        ></ha-icon-picker>
        <ha-duration-input
          .configValue=${"duration"}
          .data=${this._duration_data}
          @value-changed=${this._valueChanged}
-          .disabled=${this.disabled}
        ></ha-duration-input>
        <ha-formfield
          .label=${this.hass.localize(
@@ -106,7 +101,6 @@ class HaTimerForm extends LitElement {
            .configValue=${"restore"}
            .checked=${this._restore}
            @click=${this._toggleRestore}
-            .disabled=${this.disabled}
          >
          </ha-checkbox>
        </ha-formfield>
@@ -136,9 +130,6 @@ class HaTimerForm extends LitElement {
  }

  private _toggleRestore() {
-    if (this.disabled) {
-      return;
-    }
    this._restore = !this._restore;
    fireEvent(this, "value-changed", {
      value: { ...this._item, restore: this._restore },
--- a/src/panels/config/info/ha-config-info.ts
+++ b/src/panels/config/info/ha-config-info.ts
@@ -107,8 +107,6 @@ class HaConfigInfo extends LitElement {
    const customUiList: { name: string; url: string; version: string }[] =
      (window as any).CUSTOM_UI_LIST || [];

-    const isDark = this.hass.themes?.darkMode || false;
-
    return html`
      <hass-subpage
        .hass=${this.hass}
@@ -188,7 +186,7 @@ class HaConfigInfo extends LitElement {
                : nothing}
            </ul>
          </ha-card>
-          <ha-card outlined class="ohf ${isDark ? "dark" : ""}">
+          <ha-card outlined class="ohf">
            <div>
              ${this.hass.localize("ui.panel.config.info.proud_part_of")}
            </div>
@@ -348,10 +346,6 @@ class HaConfigInfo extends LitElement {
          max-width: 250px;
        }

-        .ohf.dark img {
-          color-scheme: dark;
-        }
-
        .versions {
          display: flex;
          flex-direction: column;
--- a/src/panels/config/integrations/ha-config-integration-page.ts
+++ b/src/panels/config/integrations/ha-config-integration-page.ts
@@ -790,10 +790,7 @@ class HaConfigIntegrationPage extends SubscribeMixin(LitElement) {
    );
    const timeString = new Date().toISOString().replace(/:/g, "-");
    const logFileName = `home-assistant_${integration}_${timeString}.log`;
-    const signedUrl = await getSignedPath(
-      this.hass,
-      getErrorLogDownloadUrl(this.hass)
-    );
+    const signedUrl = await getSignedPath(this.hass, getErrorLogDownloadUrl);
    fileDownload(signedUrl.path, logFileName);
  }

--- a/src/panels/config/integrations/integration-panels/bluetooth/bluetooth-network-visualization.ts
+++ b/src/panels/config/integrations/integration-panels/bluetooth/bluetooth-network-visualization.ts
@@ -8,7 +8,6 @@ import { css, html, LitElement } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { relativeTime } from "../../../../../common/datetime/relative_time";
-import { getDeviceContext } from "../../../../../common/entity/context/get_device_context";
 import { navigate } from "../../../../../common/navigate";
 import { throttle } from "../../../../../common/util/throttle";
 import "../../../../../components/chart/ha-network-graph";
@@ -195,17 +194,11 @@ export class BluetoothNetworkVisualization extends LitElement {
      ];
      const links: NetworkLink[] = [];
      Object.values(scanners).forEach((scanner) => {
-        const scannerDevice = this._sourceDevices[scanner.source] as
-          | DeviceRegistryEntry
-          | undefined;
-        const area = scannerDevice
-          ? getDeviceContext(scannerDevice, this.hass).area
-          : undefined;
+        const scannerDevice = this._sourceDevices[scanner.source];
        nodes.push({
          id: scanner.source,
          name:
            scannerDevice?.name_by_user || scannerDevice?.name || scanner.name,
-          context: area?.name,
          category: 1,
          value: 5,
          symbol: "circle",
@@ -238,16 +231,10 @@ export class BluetoothNetworkVisualization extends LitElement {
          });
          return;
        }
-        const device = this._sourceDevices[node.address] as
-          | DeviceRegistryEntry
-          | undefined;
-        const area = device
-          ? getDeviceContext(device, this.hass).area
-          : undefined;
+        const device = this._sourceDevices[node.address];
        nodes.push({
          id: node.address,
          name: this._getBluetoothDeviceName(node.address),
-          context: area?.name,
          value: device ? 1 : 0,
          category: device ? 2 : 3,
          symbolSize: 20,
@@ -307,20 +294,15 @@ export class BluetoothNetworkVisualization extends LitElement {
      const btDevice = this._data.find((d) => d.address === address);
      if (btDevice) {
        tooltipText = `<b>${name}</b><br><b>${this.hass.localize("ui.panel.config.bluetooth.address")}:</b> ${address}<br><b>${this.hass.localize("ui.panel.config.bluetooth.rssi")}:</b> ${btDevice.rssi}<br><b>${this.hass.localize("ui.panel.config.bluetooth.source")}:</b> ${btDevice.source}<br><b>${this.hass.localize("ui.panel.config.bluetooth.updated")}:</b> ${relativeTime(new Date(btDevice.time * 1000), this.hass.locale)}`;
-        const device = this._sourceDevices[address];
-        if (device) {
-          const area = getDeviceContext(device, this.hass).area;
-          if (area) {
-            tooltipText += `<br><b>${this.hass.localize("ui.panel.config.bluetooth.area")}: </b>${area.name}`;
-          }
-        }
      } else {
        const device = this._sourceDevices[address];
        if (device) {
          tooltipText = `<b>${name}</b><br><b>${this.hass.localize("ui.panel.config.bluetooth.address")}:</b> ${address}`;
-          const area = getDeviceContext(device, this.hass).area;
-          if (area) {
-            tooltipText += `<br><b>${this.hass.localize("ui.panel.config.bluetooth.area")}: </b>${area.name}`;
+          if (device.area_id) {
+            const area = this.hass.areas[device.area_id];
+            if (area) {
+              tooltipText += `<br><b>${this.hass.localize("ui.panel.config.bluetooth.area")}: </b>${area.name}`;
+            }
          }
        }
      }
--- a/src/panels/config/integrations/integration-panels/zha/zha-network-visualization-page.ts
+++ b/src/panels/config/integrations/integration-panels/zha/zha-network-visualization-page.ts
@@ -19,8 +19,6 @@ import "../../../../../layouts/hass-tabs-subpage";
 import type { HomeAssistant, Route } from "../../../../../types";
 import { formatAsPaddedHex } from "./functions";
 import { zhaTabs } from "./zha-config-dashboard";
-import type { DeviceRegistryEntry } from "../../../../../data/device_registry";
-import { getDeviceContext } from "../../../../../common/entity/context/get_device_context";

@customElement("zha-network-visualization-page")
 export class ZHANetworkVisualizationPage extends LitElement {
@@ -119,11 +117,8 @@ export class ZHANetworkVisualizationPage extends LitElement {
    } else {
      label += `<br><b>${this.hass.localize("ui.panel.config.zha.visualization.device_not_in_db")}</b>`;
    }
-    const haDevice = this.hass.devices[device.device_reg_id] as
-      | DeviceRegistryEntry
-      | undefined;
-    if (haDevice) {
-      const area = getDeviceContext(haDevice, this.hass).area;
+    if (device.area_id) {
+      const area = this.hass.areas[device.area_id];
      if (area) {
        label += `<br><b>${this.hass.localize("ui.panel.config.zha.visualization.area")}: </b>${area.name}`;
      }
@@ -209,17 +204,10 @@ export class ZHANetworkVisualizationPage extends LitElement {
        category = 2; // End Device
      }

-      const haDevice = this.hass.devices[device.device_reg_id] as
-        | DeviceRegistryEntry
-        | undefined;
-      const area = haDevice
-        ? getDeviceContext(haDevice, this.hass).area
-        : undefined;
      // Create node
      nodes.push({
        id: device.ieee,
        name: device.user_given_name || device.name || device.ieee,
-        context: area?.name,
        category,
        value: isCoordinator ? 3 : device.device_type === "Router" ? 2 : 1,
        symbolSize: isCoordinator
--- a/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-network-visualization.ts
+++ b/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-network-visualization.ts
@@ -5,7 +5,6 @@ import type {
 import { css, html, LitElement } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
-import { getDeviceContext } from "../../../../../common/entity/context/get_device_context";
 import { navigate } from "../../../../../common/navigate";
 import { debounce } from "../../../../../common/util/debounce";
 import "../../../../../components/chart/ha-network-graph";
@@ -125,7 +124,7 @@ export class ZWaveJSNetworkVisualization extends SubscribeMixin(LitElement) {
      return tip;
    }
    const { id, name } = data as any;
-    const device = this._devices[id] as DeviceRegistryEntry | undefined;
+    const device = this._devices[id];
    const nodeStatus = this._nodeStatuses[id];
    let tip = `${(params as any).marker} ${name}`;
    tip += `<br><b>${this.hass.localize("ui.panel.config.zwave_js.visualization.node_id")}:</b> ${id}`;
@@ -139,12 +138,6 @@ export class ZWaveJSNetworkVisualization extends SubscribeMixin(LitElement) {
        tip += `<br><b>Z-Wave Plus:</b> ${this.hass.localize("ui.panel.config.zwave_js.visualization.version")} ${nodeStatus.zwave_plus_version}`;
      }
    }
-    if (device) {
-      const area = getDeviceContext(device, this.hass).area;
-      if (area) {
-        tip += `<br><b>${this.hass.localize("ui.panel.config.zwave_js.visualization.area")}:</b> ${area.name}`;
-      }
-    }
    return tip;
  };

@@ -204,16 +197,10 @@ export class ZWaveJSNetworkVisualization extends SubscribeMixin(LitElement) {
        if (node.is_controller_node) {
          controllerNode = node.node_id;
        }
-        const device = this._devices[node.node_id] as
-          | DeviceRegistryEntry
-          | undefined;
-        const area = device
-          ? getDeviceContext(device, this.hass).area
-          : undefined;
+        const device = this._devices[node.node_id];
        nodes.push({
          id: String(node.node_id),
          name: device?.name_by_user ?? device?.name ?? String(node.node_id),
-          context: area?.name,
          value: node.is_controller_node ? 3 : node.is_routing ? 2 : 1,
          category:
            node.status === NodeStatus.Dead
--- a/src/panels/config/labels/dialog-label-detail.ts
+++ b/src/panels/config/labels/dialog-label-detail.ts
@@ -82,7 +82,7 @@ class DialogLabelDetail
          this.hass,
          this._params.entry
            ? this._params.entry.name || this._params.entry.label_id
-            : this.hass!.localize("ui.dialogs.label-detail.new_label")
+            : this.hass!.localize("ui.panel.config.labels.detail.new_label")
        )}
      >
        <div>
@@ -95,9 +95,11 @@ class DialogLabelDetail
              .value=${this._name}
              .configValue=${"name"}
              @input=${this._input}
-              .label=${this.hass!.localize("ui.dialogs.label-detail.name")}
+              .label=${this.hass!.localize(
+                "ui.panel.config.labels.detail.name"
+              )}
              .validationMessage=${this.hass!.localize(
-                "ui.dialogs.label-detail.required_error_msg"
+                "ui.panel.config.labels.detail.required_error_msg"
              )}
              required
            ></ha-textfield>
@@ -106,21 +108,25 @@ class DialogLabelDetail
              .hass=${this.hass}
              .configValue=${"icon"}
              @value-changed=${this._valueChanged}
-              .label=${this.hass!.localize("ui.dialogs.label-detail.icon")}
+              .label=${this.hass!.localize(
+                "ui.panel.config.labels.detail.icon"
+              )}
            ></ha-icon-picker>
            <ha-color-picker
              .value=${this._color}
              .configValue=${"color"}
              .hass=${this.hass}
              @value-changed=${this._valueChanged}
-              .label=${this.hass!.localize("ui.dialogs.label-detail.color")}
+              .label=${this.hass!.localize(
+                "ui.panel.config.labels.detail.color"
+              )}
            ></ha-color-picker>
            <ha-textarea
              .value=${this._description}
              .configValue=${"description"}
              @input=${this._input}
              .label=${this.hass!.localize(
-                "ui.dialogs.label-detail.description"
+                "ui.panel.config.labels.detail.description"
              )}
            ></ha-textarea>
          </div>
@@ -134,7 +140,7 @@ class DialogLabelDetail
                @click=${this._deleteEntry}
                .disabled=${this._submitting}
              >
-                ${this.hass!.localize("ui.common.delete")}
+                ${this.hass!.localize("ui.panel.config.labels.detail.delete")}
              </ha-button>
            `
          : nothing}
@@ -144,8 +150,8 @@ class DialogLabelDetail
          .disabled=${this._submitting || !this._name}
        >
          ${this._params.entry
-            ? this.hass!.localize("ui.common.update")
-            : this.hass!.localize("ui.common.create")}
+            ? this.hass!.localize("ui.panel.config.labels.detail.update")
+            : this.hass!.localize("ui.panel.config.labels.detail.create")}
        </ha-button>
      </ha-dialog>
    `;
--- a/src/panels/config/logs/error-log-card.ts
+++ b/src/panels/config/logs/error-log-card.ts
@@ -415,7 +415,7 @@ class ErrorLogCard extends LitElement {
      const downloadUrl =
        this.provider && this.provider !== "core"
          ? getHassioLogDownloadUrl(this.provider)
-          : getErrorLogDownloadUrl(this.hass);
+          : getErrorLogDownloadUrl;
      const logFileName =
        this.provider && this.provider !== "core"
          ? `${this.provider}_${timeString}.log`
--- a/src/panels/config/logs/system-log-card.ts
+++ b/src/panels/config/logs/system-log-card.ts
@@ -2,6 +2,8 @@ import { mdiDotsVertical, mdiDownload, mdiRefresh, mdiText } from "@mdi/js";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
+import { isComponentLoaded } from "../../../common/config/is_component_loaded";
+import { atLeastVersion } from "../../../common/config/version";
 import { fireEvent } from "../../../common/dom/fire_event";
 import type { LocalizeFunc } from "../../../common/translations/localize";
 import "../../../components/buttons/ha-call-service-button";
@@ -13,6 +15,7 @@ import "../../../components/ha-list-item";
 import "../../../components/ha-spinner";
 import { getSignedPath } from "../../../data/auth";
 import { getErrorLogDownloadUrl } from "../../../data/error_log";
+import { coreLatestLogsUrl } from "../../../data/hassio/supervisor";
 import { domainToName } from "../../../data/integration";
 import type { LoggedError } from "../../../data/system_log";
 import {
@@ -228,7 +231,11 @@ export class SystemLogCard extends LitElement {

  private async _downloadLogs() {
    const timeString = new Date().toISOString().replace(/:/g, "-");
-    const downloadUrl = getErrorLogDownloadUrl(this.hass);
+    const downloadUrl =
+      isComponentLoaded(this.hass, "hassio") &&
+      atLeastVersion(this.hass.config.version, 2025, 10)
+        ? coreLatestLogsUrl
+        : getErrorLogDownloadUrl;
    const logFileName = `home-assistant_${timeString}.log`;
    const signedUrl = await getSignedPath(this.hass, downloadUrl);
    fileDownload(signedUrl.path, logFileName);
--- a/src/panels/config/lovelace/dashboards/ha-config-lovelace-dashboards.ts
+++ b/src/panels/config/lovelace/dashboards/ha-config-lovelace-dashboards.ts
@@ -332,13 +332,13 @@ export class HaConfigLovelaceDashboards extends LitElement {
        });
      }

-      if (this.hass.panels.security) {
+      if (this.hass.panels.safety) {
        result.push({
          icon: "mdi:security",
-          title: this.hass.localize("panel.security"),
+          title: this.hass.localize("panel.safety"),
          show_in_sidebar: false,
          mode: "storage",
-          url_path: "security",
+          url_path: "safety",
          filename: "",
          default: false,
          require_admin: false,
@@ -470,13 +470,13 @@ export class HaConfigLovelaceDashboards extends LitElement {
  }

  private _canDelete(urlPath: string) {
-    return !["lovelace", "energy", "light", "security", "climate"].includes(
+    return !["lovelace", "energy", "light", "safety", "climate"].includes(
      urlPath
    );
  }

  private _canEdit(urlPath: string) {
-    return !["light", "security", "climate"].includes(urlPath);
+    return !["light", "safety", "climate"].includes(urlPath);
  }

  private _handleDelete = async (item: DataTableItem) => {
--- a/src/panels/config/repairs/dialog-repairs-issue-subtitle.ts
+++ b/src/panels/config/repairs/dialog-repairs-issue-subtitle.ts
@@ -41,6 +41,7 @@ class DialogRepairsIssueSubtitle extends LitElement {
    :host {
      display: block;
      font-size: var(--ha-font-size-m);
+      margin-bottom: 8px;
      color: var(--secondary-text-color);
      text-overflow: ellipsis;
      overflow: hidden;
--- a/src/panels/config/repairs/dialog-repairs-issue.ts
+++ b/src/panels/config/repairs/dialog-repairs-issue.ts
@@ -1,14 +1,15 @@
-import { mdiOpenInNew } from "@mdi/js";
+import { mdiClose, mdiOpenInNew } from "@mdi/js";
 import type { CSSResultGroup } from "lit";
 import { css, html, LitElement, nothing } from "lit";
-import { customElement, property, state } from "lit/decorators";
+import { customElement, property, state, query } from "lit/decorators";
 import { fireEvent } from "../../../common/dom/fire_event";
 import { isNavigationClick } from "../../../common/dom/is-navigation-click";
 import "../../../components/ha-alert";
-import "../../../components/ha-wa-dialog";
+import "../../../components/ha-md-dialog";
+import type { HaMdDialog } from "../../../components/ha-md-dialog";
 import "../../../components/ha-button";
 import "../../../components/ha-svg-icon";
-import "../../../components/ha-dialog-footer";
+import "../../../components/ha-dialog-header";
 import "./dialog-repairs-issue-subtitle";
 import "../../../components/ha-markdown";
 import type { RepairsIssue } from "../../../data/repairs";
@@ -25,12 +26,11 @@ class DialogRepairsIssue extends LitElement {

  @state() private _params?: RepairsIssueDialogParams;

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

  public showDialog(params: RepairsIssueDialogParams): void {
    this._params = params;
    this._issue = this._params.issue;
-    this._open = true;
  }

  private _dialogClosed() {
@@ -44,7 +44,7 @@ class DialogRepairsIssue extends LitElement {
  }

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

  protected render() {
@@ -62,19 +62,32 @@ class DialogRepairsIssue extends LitElement {
      ) || this.hass!.localize("ui.panel.config.repairs.dialog.title");

    return html`
-      <ha-wa-dialog
-        .hass=${this.hass}
-        .open=${this._open}
-        header-title=${dialogTitle}
-        aria-describedby="dialog-repairs-issue-description"
+      <ha-md-dialog
+        open
        @closed=${this._dialogClosed}
+        aria-labelledby="dialog-repairs-issue-title"
+        aria-describedby="dialog-repairs-issue-description"
      >
-        <dialog-repairs-issue-subtitle
-          slot="headerSubtitle"
-          .hass=${this.hass}
-          .issue=${this._issue}
-        ></dialog-repairs-issue-subtitle>
-        <div class="dialog-content">
+        <ha-dialog-header slot="headline">
+          <ha-icon-button
+            slot="navigationIcon"
+            .label=${this.hass.localize("ui.common.close") ?? "Close"}
+            .path=${mdiClose}
+            @click=${this.closeDialog}
+          ></ha-icon-button>
+          <span
+            slot="title"
+            id="dialog-repairs-issue-title"
+            .title=${dialogTitle}
+            >${dialogTitle}</span
+          >
+          <dialog-repairs-issue-subtitle
+            slot="subtitle"
+            .hass=${this.hass}
+            .issue=${this._issue}
+          ></dialog-repairs-issue-subtitle>
+        </ha-dialog-header>
+        <div slot="content" class="dialog-content">
          ${this._issue.breaks_in_ha_version
            ? html`
                <ha-alert alert-type="warning">
@@ -109,12 +122,8 @@ class DialogRepairsIssue extends LitElement {
              `
            : ""}
        </div>
-        <ha-dialog-footer slot="footer">
-          <ha-button
-            slot="secondaryAction"
-            appearance="plain"
-            @click=${this._ignoreIssue}
-          >
+        <div slot="actions">
+          <ha-button appearance="plain" @click=${this._ignoreIssue}>
            ${this._issue!.ignored
              ? this.hass!.localize("ui.panel.config.repairs.dialog.unignore")
              : this.hass!.localize("ui.panel.config.repairs.dialog.ignore")}
@@ -122,7 +131,6 @@ class DialogRepairsIssue extends LitElement {
          ${this._issue.learn_more_url
            ? html`
                <ha-button
-                  slot="primaryAction"
                  appearance="filled"
                  rel="noopener noreferrer"
                  href=${learnMoreUrlIsHomeAssistant
@@ -141,8 +149,8 @@ class DialogRepairsIssue extends LitElement {
                </ha-button>
              `
            : ""}
-        </ha-dialog-footer>
-      </ha-wa-dialog>
+        </div>
+      </ha-md-dialog>
    `;
  }

@@ -164,7 +172,7 @@ class DialogRepairsIssue extends LitElement {
        padding-top: 0;
      }
      ha-alert {
-        margin-bottom: var(--ha-space-4);
+        margin-bottom: 16px;
        display: block;
      }
      .dismissed {
--- a/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-conversation.ts
+++ b/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-conversation.ts
@@ -109,26 +109,15 @@ export class AssistPipelineDetailConversation extends LitElement {
  }

  private _supportedLanguagesChanged(ev) {
-    this._supportedLanguages = ev.detail.value;
-
-    if (
-      this._supportedLanguages === "*" ||
-      !this._supportedLanguages?.includes(
-        this.data?.conversation_language || ""
-      ) ||
-      !this.data?.conversation_language
-    ) {
+    if (ev.detail.value === "*") {
      // wait for update of conversation_engine
      setTimeout(() => {
        const value = { ...this.data };
-        if (this._supportedLanguages === "*") {
-          value.conversation_language = "*";
-        } else {
-          value.conversation_language = this._supportedLanguages?.[0] ?? null;
-        }
+        value.conversation_language = "*";
        fireEvent(this, "value-changed", { value });
      }, 0);
    }
+    this._supportedLanguages = ev.detail.value;
  }

  static styles = css`
--- a/src/panels/config/voice-assistants/debug/assist-pipeline-debug.ts
+++ b/src/panels/config/voice-assistants/debug/assist-pipeline-debug.ts
@@ -148,9 +148,7 @@ export class AssistPipelineDebug extends LitElement {
      ).pipeline_runs.reverse();
    } catch (e: any) {
      showAlertDialog(this, {
-        title: this.hass.localize(
-          "ui.panel.config.voice_assistants.debug.error.fetch_runs"
-        ),
+        title: "Failed to fetch pipeline runs",
        text: e.message,
      });
      return;
@@ -178,9 +176,7 @@ export class AssistPipelineDebug extends LitElement {
      ).events;
    } catch (e: any) {
      showAlertDialog(this, {
-        title: this.hass.localize(
-          "ui.panel.config.voice_assistants.debug.error.fetch_events"
-        ),
+        title: "Failed to fetch events",
        text: e.message,
      });
      return;
--- a/src/panels/config/voice-assistants/debug/assist-render-pipeline-events.ts
+++ b/src/panels/config/voice-assistants/debug/assist-render-pipeline-events.ts
@@ -30,26 +30,16 @@ export class AssistPipelineEvents extends LitElement {
    const run = this._processEvents(this.events);
    if (!run) {
      if (this.events.length) {
-        return html`<ha-alert alert-type="error"
-            >${this.hass.localize(
-              "ui.panel.config.voice_assistants.debug.error.showing_run"
-            )}</ha-alert
-          >
+        return html`<ha-alert alert-type="error">Error showing run</ha-alert>
          <ha-card>
            <ha-expansion-panel>
-              <span slot="header"
-                >${this.hass.localize(
-                  "ui.panel.config.voice_assistants.debug.raw"
-                )}</span
-              >
+              <span slot="header">Raw</span>
              <pre>${JSON.stringify(this.events, null, 2)}</pre>
            </ha-expansion-panel>
          </ha-card>`;
      }
      return html`<ha-alert alert-type="warning"
-        >${this.hass.localize(
-          "ui.panel.config.voice_assistants.debug.no_events"
-        )}</ha-alert
+        >There were no events in this run.</ha-alert
      >`;
    }
    return html`
--- a/src/panels/config/voice-assistants/debug/assist-render-pipeline-run.ts
+++ b/src/panels/config/voice-assistants/debug/assist-render-pipeline-run.ts
@@ -11,16 +11,31 @@ import type { HomeAssistant } from "../../../../types";
 import { formatNumber } from "../../../../common/number/format_number";
 import "../../../../components/ha-yaml-editor";
 import { showAlertDialog } from "../../../../dialogs/generic/show-dialog-box";
-import type { LocalizeKeys } from "../../../../common/translations/localize";

-const RUN_DATA = ["pipeline", "language"];
-const WAKE_WORD_DATA = ["engine"];
+const RUN_DATA = {
+  pipeline: "Pipeline",
+  language: "Language",
+};
+const WAKE_WORD_DATA = {
+  engine: "Engine",
+};

-const STT_DATA = ["engine"];
+const STT_DATA = {
+  engine: "Engine",
+};

-const INTENT_DATA = ["engine", "language", "intent_input"];
+const INTENT_DATA = {
+  engine: "Engine",
+  language: "Language",
+  intent_input: "Input",
+};

-const TTS_DATA = ["engine", "language", "voice", "tts_input"];
+const TTS_DATA = {
+  engine: "Engine",
+  language: "Language",
+  voice: "Voice",
+  tts_input: "Input",
+};

 const STAGES: Record<PipelineRun["stage"], number> = {
  ready: 0,
@@ -87,32 +102,24 @@ const renderProgress = (
  return html`${durationString}s ✅`;
 };

-const renderData = (
-  hass: HomeAssistant,
-  data: Record<string, any>,
-  keys: string[]
-) =>
-  keys.map((key) => {
-    const label = hass.localize(
-      `ui.panel.config.voice_assistants.debug.stages.${key}` as LocalizeKeys
-    );
-    return html`
+const renderData = (data: Record<string, any>, keys: Record<string, string>) =>
+  Object.entries(keys).map(
+    ([key, label]) => html`
      <div class="row">
        <div>${label}</div>
        <div>${data[key]}</div>
      </div>
-    `;
-  });
+    `
+  );

 const dataMinusKeysRender = (
-  hass: HomeAssistant,
  data: Record<string, any>,
-  keys: string[]
+  keys: Record<string, string>
 ) => {
  const result = {};
  let render = false;
  for (const key in data) {
-    if (keys.includes(key) || key === "done") {
+    if (key in keys || key === "done") {
      continue;
    }
    render = true;
@@ -120,9 +127,7 @@ const dataMinusKeysRender = (
  }
  return render
    ? html`<ha-expansion-panel>
-        <span slot="header"
-          >${hass.localize("ui.panel.config.voice_assistants.debug.raw")}</span
-        >
+        <span slot="header">Raw</span>
        <ha-yaml-editor readOnly autoUpdate .value=${result}></ha-yaml-editor>
      </ha-expansion-panel>`
    : "";
@@ -134,12 +139,6 @@ export class AssistPipelineDebug extends LitElement {

  @property({ attribute: false }) public pipelineRun!: PipelineRun;

-  private _audioElement?: HTMLAudioElement;
-
-  private get _isPlaying(): boolean {
-    return this._audioElement != null && !this._audioElement.paused;
-  }
-
  protected render(): TemplateResult {
    const lastRunStage: string = this.pipelineRun
      ? ["tts", "intent", "stt", "wake_word"].find(
@@ -178,15 +177,11 @@ export class AssistPipelineDebug extends LitElement {
      <ha-card>
        <div class="card-content">
          <div class="row heading">
-            <div>
-              ${this.hass.localize(
-                "ui.panel.config.voice_assistants.debug.run"
-              )}
-            </div>
+            <div>Run</div>
            <div>${this.pipelineRun.stage}</div>
          </div>

-          ${renderData(this.hass, this.pipelineRun.run, RUN_DATA)}
+          ${renderData(this.pipelineRun.run, RUN_DATA)}
          ${messages.length > 0
            ? html`
                <div class="messages">
@@ -208,39 +203,23 @@ export class AssistPipelineDebug extends LitElement {
            <ha-card>
              <div class="card-content">
                <div class="row heading">
-                  <span
-                    >${this.hass.localize(
-                      "ui.panel.config.voice_assistants.debug.stages.wake_word"
-                    )}</span
-                  >
+                  <span>Wake word</span>
                  ${renderProgress(this.hass, this.pipelineRun, "wake_word")}
                </div>
                ${this.pipelineRun.wake_word
                  ? html`
                      <div class="card-content">
-                        ${renderData(
-                          this.hass,
-                          this.pipelineRun.wake_word,
-                          WAKE_WORD_DATA
-                        )}
+                        ${renderData(this.pipelineRun.wake_word, STT_DATA)}
                        ${this.pipelineRun.wake_word.wake_word_output
                          ? html`<div class="row">
-                                <div>
-                                  ${this.hass.localize(
-                                    "ui.panel.config.voice_assistants.debug.stages.model"
-                                  )}
-                                </div>
+                                <div>Model</div>
                                <div>
                                  ${this.pipelineRun.wake_word.wake_word_output
                                    .ww_id}
                                </div>
                              </div>
                              <div class="row">
-                                <div>
-                                  ${this.hass.localize(
-                                    "ui.panel.config.voice_assistants.debug.stages.timestamp"
-                                  )}
-                                </div>
+                                <div>Timestamp</div>
                                <div>
                                  ${this.pipelineRun.wake_word.wake_word_output
                                    .timestamp}
@@ -248,7 +227,6 @@ export class AssistPipelineDebug extends LitElement {
                              </div>`
                          : ""}
                        ${dataMinusKeysRender(
-                          this.hass,
                          this.pipelineRun.wake_word,
                          WAKE_WORD_DATA
                        )}
@@ -265,11 +243,7 @@ export class AssistPipelineDebug extends LitElement {
            <ha-card>
              <div class="card-content">
                <div class="row heading">
-                  <span
-                    >${this.hass.localize(
-                      "ui.panel.config.voice_assistants.debug.stages.speech_to_text"
-                    )}</span
-                  >
+                  <span>Speech-to-text</span>
                  ${renderProgress(
                    this.hass,
                    this.pipelineRun,
@@ -280,30 +254,18 @@ export class AssistPipelineDebug extends LitElement {
                ${this.pipelineRun.stt
                  ? html`
                      <div class="card-content">
-                        ${renderData(this.hass, this.pipelineRun.stt, STT_DATA)}
+                        ${renderData(this.pipelineRun.stt, STT_DATA)}
                        <div class="row">
-                          <div>
-                            ${this.hass.localize(
-                              "ui.panel.config.voice_assistants.debug.stages.language"
-                            )}
-                          </div>
+                          <div>Language</div>
                          <div>${this.pipelineRun.stt.metadata.language}</div>
                        </div>
                        ${this.pipelineRun.stt.stt_output
                          ? html`<div class="row">
-                              <div>
-                                ${this.hass.localize(
-                                  "ui.panel.config.voice_assistants.debug.stages.output"
-                                )}
-                              </div>
+                              <div>Output</div>
                              <div>${this.pipelineRun.stt.stt_output.text}</div>
                            </div>`
                          : ""}
-                        ${dataMinusKeysRender(
-                          this.hass,
-                          this.pipelineRun.stt,
-                          STT_DATA
-                        )}
+                        ${dataMinusKeysRender(this.pipelineRun.stt, STT_DATA)}
                      </div>
                    `
                  : ""}
@@ -317,28 +279,16 @@ export class AssistPipelineDebug extends LitElement {
            <ha-card>
              <div class="card-content">
                <div class="row heading">
-                  <span
-                    >${this.hass.localize(
-                      "ui.panel.config.voice_assistants.debug.stages.natural_language_processing"
-                    )}</span
-                  >
+                  <span>Natural Language Processing</span>
                  ${renderProgress(this.hass, this.pipelineRun, "intent")}
                </div>
                ${this.pipelineRun.intent
                  ? html`
                      <div class="card-content">
-                        ${renderData(
-                          this.hass,
-                          this.pipelineRun.intent,
-                          INTENT_DATA
-                        )}
+                        ${renderData(this.pipelineRun.intent, INTENT_DATA)}
                        ${this.pipelineRun.intent.intent_output
                          ? html`<div class="row">
-                                <div>
-                                  ${this.hass.localize(
-                                    "ui.panel.config.voice_assistants.debug.stages.response_type"
-                                  )}
-                                </div>
+                                <div>Response type</div>
                                <div>
                                  ${this.pipelineRun.intent.intent_output
                                    .response.response_type}
@@ -347,11 +297,7 @@ export class AssistPipelineDebug extends LitElement {
                              ${this.pipelineRun.intent.intent_output.response
                                .response_type === "error"
                                ? html`<div class="row">
-                                    <div>
-                                      ${this.hass.localize(
-                                        "ui.panel.config.voice_assistants.debug.error.code"
-                                      )}
-                                    </div>
+                                    <div>Error code</div>
                                    <div>
                                      ${this.pipelineRun.intent.intent_output
                                        .response.data.code}
@@ -360,27 +306,18 @@ export class AssistPipelineDebug extends LitElement {
                                : ""}`
                          : ""}
                        <div class="row">
-                          <div>
-                            ${this.hass.localize(
-                              "ui.panel.config.voice_assistants.debug.stages.prefer_local"
-                            )}
-                          </div>
+                          <div>Prefer handling locally</div>
                          <div>
                            ${this.pipelineRun.intent.prefer_local_intents}
                          </div>
                        </div>
                        <div class="row">
-                          <div>
-                            ${this.hass.localize(
-                              "ui.panel.config.voice_assistants.debug.stages.processed_locally"
-                            )}
-                          </div>
+                          <div>Processed locally</div>
                          <div>
                            ${this.pipelineRun.intent.processed_locally}
                          </div>
                        </div>
                        ${dataMinusKeysRender(
-                          this.hass,
                          this.pipelineRun.intent,
                          INTENT_DATA
                        )}
@@ -397,22 +334,14 @@ export class AssistPipelineDebug extends LitElement {
            <ha-card>
              <div class="card-content">
                <div class="row heading">
-                  <span
-                    >${this.hass.localize(
-                      "ui.panel.config.voice_assistants.debug.stages.text_to_speech"
-                    )}</span
-                  >
+                  <span>Text-to-speech</span>
                  ${renderProgress(this.hass, this.pipelineRun, "tts")}
                </div>
                ${this.pipelineRun.tts
                  ? html`
                      <div class="card-content">
-                        ${renderData(this.hass, this.pipelineRun.tts, TTS_DATA)}
-                        ${dataMinusKeysRender(
-                          this.hass,
-                          this.pipelineRun.tts,
-                          TTS_DATA
-                        )}
+                        ${renderData(this.pipelineRun.tts, TTS_DATA)}
+                        ${dataMinusKeysRender(this.pipelineRun.tts, TTS_DATA)}
                      </div>
                    `
                  : ""}
@@ -420,19 +349,8 @@ export class AssistPipelineDebug extends LitElement {
              ${this.pipelineRun?.tts?.tts_output
                ? html`
                    <div class="card-actions">
-                      <ha-button
-                        .variant=${this._isPlaying ? "danger" : "brand"}
-                        @click=${this._isPlaying
-                          ? this._stopTTS
-                          : this._playTTS}
-                      >
-                        ${this._isPlaying
-                          ? this.hass.localize(
-                              "ui.panel.config.voice_assistants.debug.stop_audio"
-                            )
-                          : this.hass.localize(
-                              "ui.panel.config.voice_assistants.debug.play_audio"
-                            )}
+                      <ha-button @click=${this._playTTS}>
+                        Play Audio
                      </ha-button>
                    </div>
                  `
@@ -443,11 +361,7 @@ export class AssistPipelineDebug extends LitElement {
      ${maybeRenderError(this.pipelineRun, "tts", lastRunStage)}
      <ha-card>
        <ha-expansion-panel>
-          <span slot="header"
-            >${this.hass.localize(
-              "ui.panel.config.voice_assistants.debug.raw"
-            )}</span
-          >
+          <span slot="header">Raw</span>
          <ha-yaml-editor
            read-only
            auto-update
@@ -459,48 +373,14 @@ export class AssistPipelineDebug extends LitElement {
  }

  private _playTTS(): void {
-    // Stop any existing audio first
-    this._stopTTS();
-
    const url = this.pipelineRun!.tts!.tts_output!.url;
-    this._audioElement = new Audio(url);
-
-    this._audioElement.addEventListener("error", () => {
-      showAlertDialog(this, {
-        title: this.hass.localize(
-          "ui.panel.config.voice_assistants.debug.error.title"
-        ),
-        text: this.hass.localize(
-          "ui.panel.config.voice_assistants.debug.error.playing_audio"
-        ),
-      });
+    const audio = new Audio(url);
+    audio.addEventListener("error", () => {
+      showAlertDialog(this, { title: "Error", text: "Error playing audio" });
    });
-
-    this._audioElement.addEventListener("play", () => {
-      this.requestUpdate();
+    audio.addEventListener("canplaythrough", () => {
+      audio.play();
    });
-
-    this._audioElement.addEventListener("ended", () => {
-      this.requestUpdate();
-    });
-
-    this._audioElement.addEventListener("canplaythrough", () => {
-      this._audioElement!.play();
-    });
-  }
-
-  private _stopTTS(): void {
-    if (this._audioElement) {
-      this._audioElement.pause();
-      this._audioElement.currentTime = 0;
-      this._audioElement = undefined;
-      this.requestUpdate();
-    }
-  }
-
-  public disconnectedCallback(): void {
-    super.disconnectedCallback();
-    this._stopTTS();
  }

  static styles = css`
--- a/src/panels/config/voice-assistants/dialog-voice-assistant-pipeline-detail.ts
+++ b/src/panels/config/voice-assistants/dialog-voice-assistant-pipeline-detail.ts
@@ -214,7 +214,7 @@ export class DialogVoiceAssistantPipelineDetail extends LitElement {
        <ha-button
          slot="primaryAction"
          @click=${this._updatePipeline}
-          .loading=${this._submitting}
+          .disabled=${this._submitting}
          dialogInitialFocus
        >
          ${this._params.pipeline?.id
--- a/src/panels/developer-tools/template/developer-tools-template.ts
+++ b/src/panels/developer-tools/template/developer-tools-template.ts
@@ -280,11 +280,10 @@ ${type === "object"

        .content.horizontal {
          --code-mirror-max-height: calc(
-            100vh - var(--header-height) -
-              (var(--ha-line-height-normal) * var(--ha-font-size-m) * 3) -
-              (max(16px, var(--safe-area-inset-top)) * 2) -
+            100vh - var(--header-height) - (var(--ha-line-height-normal) * 3) -
+              (1em * 2) - (max(16px, var(--safe-area-inset-top)) * 2) -
              (max(16px, var(--safe-area-inset-bottom)) * 2) -
-              (var(--ha-card-border-width, 1px) * 3) - (1em * 2) - 192px
+              (var(--ha-card-border-width, 1px) * 2) - 179px
          );
        }

--- a/src/panels/history/ha-panel-history.ts
+++ b/src/panels/history/ha-panel-history.ts
@@ -313,14 +313,9 @@ class HaPanelHistory extends LitElement {
      return;
    }

-    const statsStartDate = new Date(this._startDate);
-    // History uses the end datapoint of the statistic, so if we want the
-    // graph to start at 7AM, need to fetch the statistic from 6AM.
-    statsStartDate.setHours(statsStartDate.getHours() - 1);
-
    const statistics = await fetchStatistics(
      this.hass!,
-      statsStartDate,
+      this._startDate,
      this._endDate,
      statisticIds,
      "hour",
--- a/src/panels/light/ha-panel-light.ts
+++ b/src/panels/light/ha-panel-light.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 LIGHT_LOVELACE_VIEW_CONFIG: LovelaceStrategyViewConfig = {
-  strategy: {
-    type: "light",
-  },
+const LIGHT_LOVELACE_CONFIG: LovelaceConfig = {
+  views: [
+    {
+      strategy: {
+        type: "light",
+      },
+    },
+  ],
 };

@customElement("ha-panel-light")
@@ -33,118 +34,60 @@ class PanelLight extends LitElement {
  @state() private _searchParms = new URLSearchParams(window.location.search);

  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.light")}</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(
-      LIGHT_LOVELACE_VIEW_CONFIG,
-      this.hass
-    );
-
-    const config = { views: [viewConfig] };
-    const rawConfig = { views: [LIGHT_LOVELACE_VIEW_CONFIG] };
-
-    if (deepEqual(config, this._lovelace?.config)) {
-      return;
-    }
-
+  private _setLovelace() {
    this._lovelace = {
-      config: config,
-      rawConfig: rawConfig,
+      config: LIGHT_LOVELACE_CONFIG,
+      rawConfig: LIGHT_LOVELACE_CONFIG,
      editMode: false,
      urlPath: "light",
      mode: "generated",
--- a/src/panels/light/strategies/light-view-strategy.ts
+++ b/src/panels/light/strategies/light-view-strategy.ts
@@ -5,7 +5,6 @@ import {
  generateEntityFilter,
  type EntityFilter,
 } from "../../../common/entity/entity_filter";
-import { floorDefaultIcon } from "../../../components/ha-floor-icon";
 import type { LovelaceCardConfig } from "../../../data/lovelace/config/card";
 import type { LovelaceSectionRawConfig } from "../../../data/lovelace/config/section";
 import type { LovelaceViewConfig } from "../../../data/lovelace/config/view";
@@ -61,24 +60,6 @@ const processAreasForLight = (
  return cards;
 };

-const processUnassignedLights = (
-  hass: HomeAssistant,
-  entities: string[]
-): LovelaceCardConfig[] => {
-  const unassignedFilter = generateEntityFilter(hass, {
-    area: null,
-  });
-  const unassignedLights = entities.filter(unassignedFilter);
-  const areaCards: LovelaceCardConfig[] = [];
-  const computeTileCard = computeAreaTileCardConfig(hass, "", false);
-
-  for (const entityId of unassignedLights) {
-    areaCards.push(computeTileCard(entityId));
-  }
-
-  return areaCards;
-};
-
@customElement("light-view-strategy")
 export class LightViewStrategy extends ReactiveElement {
  static async generate(
@@ -117,7 +98,6 @@ export class LightViewStrategy extends ReactiveElement {
              floorCount > 1
                ? floor.name
                : hass.localize("ui.panel.lovelace.strategy.home.areas"),
-            icon: floor.icon || floorDefaultIcon(floor),
          },
        ],
      };
@@ -154,30 +134,10 @@ export class LightViewStrategy extends ReactiveElement {
      }
    }

-    // Process unassigned lights
-    const unassignedCards = processUnassignedLights(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.light.other_lights")
-                : hass.localize("ui.panel.lovelace.strategy.light.lights"),
-          },
-          ...unassignedCards,
-        ],
-      };
-      sections.push(section);
-    }
-
    return {
      type: "sections",
      max_columns: 2,
-      sections: sections,
+      sections: sections || [],
    };
  }
 }
--- a/src/panels/logbook/ha-logbook.ts
+++ b/src/panels/logbook/ha-logbook.ts
@@ -52,8 +52,6 @@ export class HaLogbook extends LitElement {

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

-  @property({ attribute: false }) public stateFilter?: string[];
-
  @property({ type: Boolean }) public narrow = false;

  @property({ type: Boolean, reflect: true }) public virtualize = false;
@@ -167,7 +165,7 @@ export class HaLogbook extends LitElement {
  protected willUpdate(changedProps: PropertyValues): void {
    let changed = changedProps.has("time");

-    for (const key of ["entityIds", "deviceIds", "stateFilter"]) {
+    for (const key of ["entityIds", "deviceIds"]) {
      if (!changedProps.has(key)) {
        continue;
      }
@@ -354,19 +352,9 @@ export class HaLogbook extends LitElement {
      "recent" in this.time
        ? findStartOfRecentTime(new Date(), this.time.recent)
        : undefined;
-
-    let eventsFiltered: LogbookEntry[] | undefined;
-    if (this.stateFilter && this.stateFilter.length > 0) {
-      eventsFiltered = streamMessage.events.filter(
-        (e) => e.state && this.stateFilter?.includes(e.state)
-      );
-    } else {
-      eventsFiltered = [...streamMessage.events];
-    }
-
    // Put newest ones on top. Reverse works in-place so
    // make a copy first.
-    const newEntries = eventsFiltered.reverse();
+    const newEntries = [...streamMessage.events].reverse();
    if (!this._logbookEntries || !this._logbookEntries.length) {
      this._logbookEntries = newEntries;
      return;
--- a/src/panels/lovelace/badges/hui-badge.ts
+++ b/src/panels/lovelace/badges/hui-badge.ts
@@ -2,11 +2,14 @@ import type { PropertyValues } from "lit";
 import { ReactiveElement } from "lit";
 import { customElement, property } from "lit/decorators";
 import { fireEvent } from "../../../common/dom/fire_event";
+import type { MediaQueriesListener } from "../../../common/dom/media_query";
 import "../../../components/ha-svg-icon";
 import type { LovelaceBadgeConfig } from "../../../data/lovelace/config/badge";
 import type { HomeAssistant } from "../../../types";
-import { ConditionalListenerMixin } from "../../../mixins/conditional-listener-mixin";
-import { checkConditionsMet } from "../common/validate-condition";
+import {
+  attachConditionMediaQueriesListeners,
+  checkConditionsMet,
+} from "../common/validate-condition";
 import { createBadgeElement } from "../create-element/create-badge-element";
 import { createErrorBadgeConfig } from "../create-element/create-element-base";
 import type { LovelaceBadge } from "../types";
@@ -19,7 +22,7 @@ declare global {
 }

@customElement("hui-badge")
-export class HuiBadge extends ConditionalListenerMixin(ReactiveElement) {
+export class HuiBadge extends ReactiveElement {
  @property({ type: Boolean }) public preview = false;

  @property({ attribute: false }) public config?: LovelaceBadgeConfig;
@@ -37,16 +40,20 @@ export class HuiBadge extends ConditionalListenerMixin(ReactiveElement) {

  private _element?: LovelaceBadge;

+  private _listeners: MediaQueriesListener[] = [];
+
  protected createRenderRoot() {
    return this;
  }

  public disconnectedCallback() {
    super.disconnectedCallback();
+    this._clearMediaQueries();
  }

  public connectedCallback() {
    super.connectedCallback();
+    this._listenMediaQueries();
    this._updateVisibility();
  }

@@ -130,6 +137,30 @@ export class HuiBadge extends ConditionalListenerMixin(ReactiveElement) {
    }
  }

+  private _clearMediaQueries() {
+    this._listeners.forEach((unsub) => unsub());
+    this._listeners = [];
+  }
+
+  private _listenMediaQueries() {
+    this._clearMediaQueries();
+    if (!this.config?.visibility) {
+      return;
+    }
+    const conditions = this.config.visibility;
+    const hasOnlyMediaQuery =
+      conditions.length === 1 &&
+      conditions[0].condition === "screen" &&
+      !!conditions[0].media_query;
+
+    this._listeners = attachConditionMediaQueriesListeners(
+      this.config.visibility,
+      (matches) => {
+        this._updateVisibility(hasOnlyMediaQuery && matches);
+      }
+    );
+  }
+
  private _updateVisibility(ignoreConditions?: boolean) {
    if (!this._element || !this.hass) {
      return;
--- a/src/panels/lovelace/card-features/hui-media-player-volume-buttons-card-feature.ts
+++ b/src/panels/lovelace/card-features/hui-media-player-volume-buttons-card-feature.ts
@@ -1,126 +0,0 @@
-import { html, LitElement, nothing } from "lit";
-import { customElement, property, state } from "lit/decorators";
-import { computeDomain } from "../../../common/entity/compute_domain";
-import { supportsFeature } from "../../../common/entity/supports-feature";
-import "../../../components/ha-control-number-buttons";
-import { isUnavailableState } from "../../../data/entity";
-import {
-  MediaPlayerEntityFeature,
-  type MediaPlayerEntity,
-} from "../../../data/media-player";
-import type { HomeAssistant } from "../../../types";
-import type { LovelaceCardFeature, LovelaceCardFeatureEditor } from "../types";
-import { cardFeatureStyles } from "./common/card-feature-styles";
-import type {
-  LovelaceCardFeatureContext,
-  MediaPlayerVolumeButtonsCardFeatureConfig,
-} from "./types";
-import { clamp } from "../../../common/number/clamp";
-
-export const supportsMediaPlayerVolumeButtonsCardFeature = (
-  hass: HomeAssistant,
-  context: LovelaceCardFeatureContext
-) => {
-  const stateObj = context.entity_id
-    ? hass.states[context.entity_id]
-    : undefined;
-  if (!stateObj) return false;
-  const domain = computeDomain(stateObj.entity_id);
-  return (
-    domain === "media_player" &&
-    supportsFeature(stateObj, MediaPlayerEntityFeature.VOLUME_SET)
-  );
-};
-
-@customElement("hui-media-player-volume-buttons-card-feature")
-class HuiMediaPlayerVolumeButtonsCardFeature
-  extends LitElement
-  implements LovelaceCardFeature
-{
-  @property({ attribute: false }) public hass?: HomeAssistant;
-
-  @property({ attribute: false }) public context?: LovelaceCardFeatureContext;
-
-  @state() private _config?: MediaPlayerVolumeButtonsCardFeatureConfig;
-
-  private get _stateObj() {
-    if (!this.hass || !this.context || !this.context.entity_id) {
-      return undefined;
-    }
-    return this.hass.states[this.context.entity_id] as
-      | MediaPlayerEntity
-      | undefined;
-  }
-
-  static getStubConfig(): MediaPlayerVolumeButtonsCardFeatureConfig {
-    return {
-      type: "media-player-volume-buttons",
-      step: 5,
-    };
-  }
-
-  public static async getConfigElement(): Promise<LovelaceCardFeatureEditor> {
-    await import(
-      "../editor/config-elements/hui-media-player-volume-buttons-card-feature-editor"
-    );
-    return document.createElement(
-      "hui-media-player-volume-buttons-card-feature-editor"
-    );
-  }
-
-  public setConfig(config: MediaPlayerVolumeButtonsCardFeatureConfig): void {
-    if (!config) {
-      throw new Error("Invalid configuration");
-    }
-    this._config = config;
-  }
-
-  protected render() {
-    if (
-      !this._config ||
-      !this.hass ||
-      !this.context ||
-      !this._stateObj ||
-      !supportsMediaPlayerVolumeButtonsCardFeature(this.hass, this.context)
-    ) {
-      return nothing;
-    }
-
-    const position =
-      this._stateObj.attributes.volume_level != null
-        ? Math.round(this._stateObj.attributes.volume_level * 100)
-        : undefined;
-
-    return html`
-      <ha-control-number-buttons
-        .disabled=${!this._stateObj || isUnavailableState(this._stateObj.state)}
-        .locale=${this.hass.locale}
-        min="0"
-        max="100"
-        .step=${this._config.step ?? 5}
-        .value=${position}
-        unit="%"
-        @value-changed=${this._valueChanged}
-      ></ha-control-number-buttons>
-    `;
-  }
-
-  private _valueChanged(ev: CustomEvent) {
-    ev.stopPropagation();
-
-    this.hass!.callService("media_player", "volume_set", {
-      entity_id: this._stateObj!.entity_id,
-      volume_level: clamp(ev.detail.value, 0, 100) / 100,
-    });
-  }
-
-  static get styles() {
-    return cardFeatureStyles;
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "hui-media-player-volume-buttons-card-feature": HuiMediaPlayerVolumeButtonsCardFeature;
-  }
-}
--- a/src/panels/lovelace/card-features/hui-trend-graph-card-feature.ts
+++ b/src/panels/lovelace/card-features/hui-trend-graph-card-feature.ts
@@ -94,7 +94,7 @@ class HuiHistoryChartCardFeature
    }
    if (!this._coordinates) {
      return html`
-        <div class="container loading">
+        <div class="container">
          <ha-spinner size="small"></ha-spinner>
        </div>
      `;
@@ -153,14 +153,6 @@ class HuiHistoryChartCardFeature
      align-items: flex-end;
      pointer-events: none !important;
    }
-
-    .container.loading {
-      width: 100%;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-    }
-
    hui-graph-base {
      width: 100%;
      --accent-color: var(--feature-color);
--- a/src/panels/lovelace/card-features/types.ts
+++ b/src/panels/lovelace/card-features/types.ts
@@ -50,11 +50,6 @@ export interface MediaPlayerVolumeSliderCardFeatureConfig {
  type: "media-player-volume-slider";
 }

-export interface MediaPlayerVolumeButtonsCardFeatureConfig {
-  type: "media-player-volume-buttons";
-  step?: number;
-}
-
 export interface FanDirectionCardFeatureConfig {
  type: "fan-direction";
 }
@@ -257,7 +252,6 @@ export type LovelaceCardFeatureConfig =
  | LockCommandsCardFeatureConfig
  | LockOpenDoorCardFeatureConfig
  | MediaPlayerPlaybackCardFeatureConfig
-  | MediaPlayerVolumeButtonsCardFeatureConfig
  | MediaPlayerVolumeSliderCardFeatureConfig
  | NumericInputCardFeatureConfig
  | SelectOptionsCardFeatureConfig
--- a/src/panels/lovelace/cards/energy/hui-energy-compare-card.ts
+++ b/src/panels/lovelace/cards/energy/hui-energy-compare-card.ts
@@ -80,44 +80,41 @@ export class HuiEnergyCompareCard

    return html`
      <ha-alert dismissable @alert-dismissed-clicked=${this._stopCompare}>
-        ${this.hass.localize(
-          "ui.panel.lovelace.cards.energy.energy_compare.info",
-          {
-            start: html`<b
-              >${formatDate(
-                this._start!,
-                this.hass.locale,
-                this.hass.config
-              )}${dayDifference > 0
-                ? ` -
+        ${this.hass.localize("ui.panel.energy.compare.info", {
+          start: html`<b
+            >${formatDate(
+              this._start!,
+              this.hass.locale,
+              this.hass.config
+            )}${dayDifference > 0
+              ? ` -
          ${formatDate(
            this._end || endOfDay(new Date()),
            this.hass.locale,
            this.hass.config
          )}`
-                : ""}</b
-            >`,
-            end: html`<b
-                >${formatDate(
-                  this._startCompare,
-                  this.hass.locale,
-                  this.hass.config
-                )}${dayDifference > 0
-                  ? ` -
+              : ""}</b
+          >`,
+          end: html`<b
+              >${formatDate(
+                this._startCompare,
+                this.hass.locale,
+                this.hass.config
+              )}${dayDifference > 0
+                ? ` -
          ${formatDate(this._endCompare, this.hass.locale, this.hass.config)}`
-                  : ""}</b
-              >
-              <button class="link" @click=${this._changeCompareMode}>
-                (${this._compareMode === CompareMode.PREVIOUS
-                  ? this.hass.localize(
-                      "ui.panel.lovelace.cards.energy.energy_compare.compare_previous_year"
-                    )
-                  : this.hass.localize(
-                      "ui.panel.lovelace.cards.energy.energy_compare.compare_previous_period"
-                    )})
-              </button>`,
-          }
-        )}
+                : ""}</b
+            >
+            <button class="link" @click=${this._changeCompareMode}>
+              (${this._compareMode === CompareMode.PREVIOUS
+                ? this.hass.localize(
+                    "ui.panel.energy.compare.compare_previous_year"
+                  )
+                : this.hass.localize(
+                    "ui.panel.energy.compare.compare_previous_period"
+                  )})
+            </button>`,
+        })}
      </ha-alert>
    `;
  }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Aidan Timson	c6c2d47ee3	Add support for error state	2025-10-29 09:03:13 +00:00
Aidan Timson	01ba7571f0	Restore optimised parts code	2025-10-28 16:01:49 +00:00
Aidan Timson	70bb29e242	memo	2025-10-27 16:26:29 +00:00
Aidan Timson	34443a009d	Reorder	2025-10-27 16:21:17 +00:00
Aidan Timson	e1dce358c3	Migrate ha-icon-picker to generic picker	2025-10-27 16:19:49 +00:00
@@ -1 +1 @@
 .21.1
 .21.0
				`@@ -1 +0,0 @@`
				`export const ANY_STATE_VALUE = "__ANY_STATE_IGNORE_ATTRIBUTES__";`