diff --git a/src/components/ha-control-number-buttons.ts b/src/components/ha-control-number-buttons.ts
index c68ddd9754..1311b244b3 100644
--- a/src/components/ha-control-number-buttons.ts
+++ b/src/components/ha-control-number-buttons.ts
@@ -1,3 +1,4 @@
+import { ResizeController } from "@lit-labs/observers/resize-controller";
 import { mdiMinus, mdiPlus } from "@mdi/js";
 import {
   CSSResultGroup,
@@ -49,6 +50,13 @@ export class HaControlNumberButton extends LitElement {
 
   @query("#input") _input!: HTMLDivElement;
 
+  private _hideUnit = new ResizeController(this, {
+    callback: (entries) => {
+      const width = entries[0]?.contentRect.width;
+      return width < 100;
+    },
+  });
+
   private boundedValue(value: number) {
     const clamped = conditionalClamp(value, this.min, this.max);
     return Math.round(clamped / this._step) * this._step;
@@ -145,7 +153,10 @@ export class HaControlNumberButton extends LitElement {
           ?disabled=${this.disabled}
           @keydown=${this._handleKeyDown}
         >
-          ${value} ${unit ? html`<span class="unit">${unit}</span>` : nothing}
+          ${value}
+          ${unit && !this._hideUnit.value
+            ? html`<span class="unit">${unit}</span>`
+            : nothing}
         </div>
         <button
           class="button minus"
diff --git a/src/panels/calendar/ha-panel-calendar.ts b/src/panels/calendar/ha-panel-calendar.ts
index 040576c3e9..4e60d13eea 100644
--- a/src/panels/calendar/ha-panel-calendar.ts
+++ b/src/panels/calendar/ha-panel-calendar.ts
@@ -64,8 +64,7 @@ class PanelCalendar extends LitElement {
   private _end?: Date;
 
   private _showPaneController = new ResizeController(this, {
-    callback: (entries: ResizeObserverEntry[]) =>
-      entries[0]?.contentRect.width > 750,
+    callback: (entries) => entries[0]?.contentRect.width > 750,
   });
 
   private _mql?: MediaQueryList;
diff --git a/src/panels/todo/ha-panel-todo.ts b/src/panels/todo/ha-panel-todo.ts
index 43efd5d305..345df4010c 100644
--- a/src/panels/todo/ha-panel-todo.ts
+++ b/src/panels/todo/ha-panel-todo.ts
@@ -68,8 +68,7 @@ class PanelTodo extends LitElement {
   private _headerHeight = 56;
 
   private _showPaneController = new ResizeController(this, {
-    callback: (entries: ResizeObserverEntry[]) =>
-      entries[0]?.contentRect.width > 750,
+    callback: (entries) => entries[0]?.contentRect.width > 750,
   });
 
   private _mql?: MediaQueryList;
diff --git a/src/state-control/climate/ha-state-control-climate-humidity.ts b/src/state-control/climate/ha-state-control-climate-humidity.ts
index e5123e9326..8db1290d43 100644
--- a/src/state-control/climate/ha-state-control-climate-humidity.ts
+++ b/src/state-control/climate/ha-state-control-climate-humidity.ts
@@ -1,6 +1,7 @@
 import { mdiMinus, mdiPlus, mdiWaterPercent } from "@mdi/js";
 import { CSSResultGroup, LitElement, PropertyValues, html } from "lit";
 import { customElement, property, state } from "lit/decorators";
+import { classMap } from "lit/directives/class-map";
 import { styleMap } from "lit/directives/style-map";
 import { stateActive } from "../../common/entity/state_active";
 import { domainStateColorProperties } from "../../common/entity/state_color";
@@ -15,7 +16,10 @@ import { ClimateEntity, ClimateEntityFeature } from "../../data/climate";
 import { UNAVAILABLE } from "../../data/entity";
 import { computeCssVariable } from "../../resources/css-variables";
 import { HomeAssistant } from "../../types";
-import { stateControlCircularSliderStyle } from "../state-control-circular-slider-style";
+import {
+  createStateControlCircularSliderController,
+  stateControlCircularSliderStyle,
+} from "../state-control-circular-slider-style";
 
 @customElement("ha-state-control-climate-humidity")
 export class HaStateControlClimateHumidity extends LitElement {
@@ -28,6 +32,8 @@ export class HaStateControlClimateHumidity extends LitElement {
 
   @state() private _targetHumidity?: number;
 
+  private _sizeController = createStateControlCircularSliderController(this);
+
   protected willUpdate(changedProp: PropertyValues): void {
     super.willUpdate(changedProp);
     if (changedProp.has("stateObj")) {
@@ -169,6 +175,10 @@ export class HaStateControlClimateHumidity extends LitElement {
     const targetHumidity = this._targetHumidity;
     const currentHumidity = this.stateObj.attributes.current_humidity;
 
+    const containerSizeClass = this._sizeController.value
+      ? { [this._sizeController.value]: true }
+      : {};
+
     if (
       supportsTargetHumidity &&
       targetHumidity != null &&
@@ -176,7 +186,7 @@ export class HaStateControlClimateHumidity extends LitElement {
     ) {
       return html`
         <div
-          class="container"
+          class="container${classMap(containerSizeClass)}"
           style=${styleMap({
             "--state-color": stateColor,
           })}
@@ -204,7 +214,7 @@ export class HaStateControlClimateHumidity extends LitElement {
     }
 
     return html`
-      <div class="container">
+      <div class="container${classMap(containerSizeClass)}">
         <ha-control-circular-slider
           .current=${this.stateObj.attributes.current_humidity}
           .min=${this._min}
diff --git a/src/state-control/climate/ha-state-control-climate-temperature.ts b/src/state-control/climate/ha-state-control-climate-temperature.ts
index cfcdb4ad88..2c2638e91c 100644
--- a/src/state-control/climate/ha-state-control-climate-temperature.ts
+++ b/src/state-control/climate/ha-state-control-climate-temperature.ts
@@ -22,7 +22,10 @@ import {
 } from "../../data/climate";
 import { UNAVAILABLE } from "../../data/entity";
 import { HomeAssistant } from "../../types";
-import { stateControlCircularSliderStyle } from "../state-control-circular-slider-style";
+import {
+  createStateControlCircularSliderController,
+  stateControlCircularSliderStyle,
+} from "../state-control-circular-slider-style";
 
 type Target = "value" | "low" | "high";
 
@@ -49,6 +52,8 @@ export class HaStateControlClimateTemperature extends LitElement {
 
   @state() private _selectTargetTemperature: Target = "low";
 
+  private _sizeController = createStateControlCircularSliderController(this);
+
   protected willUpdate(changedProp: PropertyValues): void {
     super.willUpdate(changedProp);
     if (changedProp.has("stateObj")) {
@@ -285,6 +290,10 @@ export class HaStateControlClimateTemperature extends LitElement {
       );
     }
 
+    const containerSizeClass = this._sizeController.value
+      ? { [this._sizeController.value]: true }
+      : {};
+
     if (
       supportsTargetTemperature &&
       this._targetTemperature.value != null &&
@@ -302,7 +311,7 @@ export class HaStateControlClimateTemperature extends LitElement {
 
       return html`
         <div
-          class="container"
+          class="container${classMap(containerSizeClass)}"
           style=${styleMap({
             "--state-color": stateColor,
             "--action-color": actionColor,
@@ -340,7 +349,7 @@ export class HaStateControlClimateTemperature extends LitElement {
     ) {
       return html`
         <div
-          class="container"
+          class="container${classMap(containerSizeClass)}"
           style=${styleMap({
             "--low-color": lowColor,
             "--high-color": highColor,
@@ -395,7 +404,9 @@ export class HaStateControlClimateTemperature extends LitElement {
 
     return html`
       <div
-        class="container"
+        class="container${classMap({
+          [this._sizeController.value ?? ""]: true,
+        })}"
         style=${styleMap({
           "--state-color": stateColor,
         })}
@@ -450,15 +461,12 @@ export class HaStateControlClimateTemperature extends LitElement {
         .dual button.selected {
           opacity: 1;
         }
-        @container container (max-width: 250px) {
-          .dual {
-            gap: 16px;
-          }
+        .container.md .dual {
+          gap: 16px;
         }
-        @container container (max-width: 190px) {
-          .dual {
-            gap: 8px;
-          }
+        .container.sm .dual,
+        .container.xs .dual {
+          gap: 8px;
         }
         ha-control-circular-slider {
           --control-circular-slider-low-color: var(
diff --git a/src/state-control/humidifier/ha-state-control-humidifier-humidity.ts b/src/state-control/humidifier/ha-state-control-humidifier-humidity.ts
index ec3aa1ec7b..1caf6611c1 100644
--- a/src/state-control/humidifier/ha-state-control-humidifier-humidity.ts
+++ b/src/state-control/humidifier/ha-state-control-humidifier-humidity.ts
@@ -1,6 +1,7 @@
 import { mdiMinus, mdiPlus, mdiWaterPercent } from "@mdi/js";
 import { CSSResultGroup, LitElement, PropertyValues, html } from "lit";
 import { customElement, property, state } from "lit/decorators";
+import { classMap } from "lit/directives/class-map";
 import { styleMap } from "lit/directives/style-map";
 import { stateActive } from "../../common/entity/state_active";
 import { stateColorCss } from "../../common/entity/state_color";
@@ -17,7 +18,10 @@ import {
   HumidifierEntityDeviceClass,
 } from "../../data/humidifier";
 import { HomeAssistant } from "../../types";
-import { stateControlCircularSliderStyle } from "../state-control-circular-slider-style";
+import {
+  createStateControlCircularSliderController,
+  stateControlCircularSliderStyle,
+} from "../state-control-circular-slider-style";
 
 @customElement("ha-state-control-humidifier-humidity")
 export class HaStateControlHumidifierHumidity extends LitElement {
@@ -30,6 +34,8 @@ export class HaStateControlHumidifierHumidity extends LitElement {
 
   @state() private _targetHumidity?: number;
 
+  private _sizeController = createStateControlCircularSliderController(this);
+
   protected willUpdate(changedProp: PropertyValues): void {
     super.willUpdate(changedProp);
     if (changedProp.has("stateObj")) {
@@ -178,6 +184,10 @@ export class HaStateControlHumidifierHumidity extends LitElement {
     const targetHumidity = this._targetHumidity;
     const currentHumidity = this.stateObj.attributes.current_humidity;
 
+    const containerSizeClass = this._sizeController.value
+      ? { [this._sizeController.value]: true }
+      : {};
+
     if (targetHumidity != null && this.stateObj.state !== UNAVAILABLE) {
       const inverted =
         this.stateObj.attributes.device_class ===
@@ -185,7 +195,7 @@ export class HaStateControlHumidifierHumidity extends LitElement {
 
       return html`
         <div
-          class="container"
+          class="container${classMap(containerSizeClass)}"
           style=${styleMap({
             "--state-color": stateColor,
             "--action-color": actionColor,
@@ -216,7 +226,7 @@ export class HaStateControlHumidifierHumidity extends LitElement {
 
     return html`
       <div
-        class="container"
+        class="container${classMap(containerSizeClass)}"
         style=${styleMap({
           "--action-color": actionColor,
         })}
diff --git a/src/state-control/state-control-circular-slider-style.ts b/src/state-control/state-control-circular-slider-style.ts
index 71bb4a89cf..8928960380 100644
--- a/src/state-control/state-control-circular-slider-style.ts
+++ b/src/state-control/state-control-circular-slider-style.ts
@@ -1,4 +1,5 @@
-import { css } from "lit";
+import { ResizeController } from "@lit-labs/observers/resize-controller";
+import { ReactiveControllerHost, css } from "lit";
 
 export const stateControlCircularSliderStyle = css`
   /* Layout elements */
@@ -70,39 +71,50 @@ export const stateControlCircularSliderStyle = css`
     --md-outlined-icon-button-icon-size: 24px;
   }
 
-  @container container (max-width: 250px) {
-    ha-big-number {
-      font-size: 44px;
-    }
-    .buttons {
-      gap: 16px;
-    }
-    .info {
-      margin-top: 12px;
-      gap: 6px;
-    }
-    .buttons {
-      display: none;
-    }
-    ha-control-circular-slider {
-      margin-bottom: -16px;
-    }
+  .container.md ha-big-number {
+    font-size: 44px;
   }
-  @container container (max-width: 190px) {
-    ha-big-number {
-      font-size: 32px;
-    }
-    .info {
-      font-size: 14px;
-      gap: 2px;
-      --mdc-icon-size: 14px;
-    }
+  .container.md .info {
+    margin-top: 12px;
+    gap: 6px;
+  }
+  .container.md .buttons {
+    display: none;
+  }
+  .container.md ha-control-circular-slider {
+    margin-bottom: -16px;
   }
 
-  @container container (max-width: 130px) {
-    .label {
-      display: none;
-    }
+  .container.sm ha-big-number {
+    font-size: 32px;
+  }
+  .container.sm .info {
+    margin-top: 12px;
+    font-size: 14px;
+    gap: 2px;
+    --mdc-icon-size: 14px;
+  }
+  .container.sm .buttons {
+    display: none;
+  }
+  .container.sm ha-control-circular-slider {
+    margin-bottom: -16px;
+  }
+
+  .container.xs ha-big-number {
+    font-size: 32px;
+  }
+  .container.xs .info {
+    margin-top: 12px;
+  }
+  .container.xs .buttons {
+    display: none;
+  }
+  .container.xs ha-control-circular-slider {
+    margin-bottom: -16px;
+  }
+  .container.xs .label {
+    display: none;
   }
 
   /* Slider */
@@ -127,3 +139,19 @@ export const stateControlCircularSliderStyle = css`
     pointer-events: none;
   }
 `;
+
+export const createStateControlCircularSliderController = (
+  element: ReactiveControllerHost & Element
+) =>
+  new ResizeController(element, {
+    callback: (entries) => {
+      const width = entries[0]?.contentRect.width;
+      return width < 130
+        ? "xs"
+        : width < 190
+          ? "sm"
+          : width < 250
+            ? "md"
+            : "lg";
+    },
+  });
diff --git a/src/state-control/water_heater/ha-state-control-water_heater-temperature.ts b/src/state-control/water_heater/ha-state-control-water_heater-temperature.ts
index 8fcaad4647..18d52c0f4b 100644
--- a/src/state-control/water_heater/ha-state-control-water_heater-temperature.ts
+++ b/src/state-control/water_heater/ha-state-control-water_heater-temperature.ts
@@ -1,6 +1,7 @@
 import { mdiMinus, mdiPlus } from "@mdi/js";
 import { CSSResultGroup, LitElement, PropertyValues, html } from "lit";
 import { customElement, property, state } from "lit/decorators";
+import { classMap } from "lit/directives/class-map";
 import { styleMap } from "lit/directives/style-map";
 import { UNIT_F } from "../../common/const";
 import { stateActive } from "../../common/entity/state_active";
@@ -18,7 +19,10 @@ import {
   WaterHeaterEntityFeature,
 } from "../../data/water_heater";
 import { HomeAssistant } from "../../types";
-import { stateControlCircularSliderStyle } from "../state-control-circular-slider-style";
+import {
+  createStateControlCircularSliderController,
+  stateControlCircularSliderStyle,
+} from "../state-control-circular-slider-style";
 
 @customElement("ha-state-control-water_heater-temperature")
 export class HaStateControlWaterHeaterTemperature extends LitElement {
@@ -31,6 +35,8 @@ export class HaStateControlWaterHeaterTemperature extends LitElement {
 
   @state() private _targetTemperature?: number;
 
+  private _sizeController = createStateControlCircularSliderController(this);
+
   protected willUpdate(changedProp: PropertyValues): void {
     super.willUpdate(changedProp);
     if (changedProp.has("stateObj")) {
@@ -174,6 +180,10 @@ export class HaStateControlWaterHeaterTemperature extends LitElement {
     const stateColor = stateColorCss(this.stateObj);
     const active = stateActive(this.stateObj);
 
+    const containerSizeClass = this._sizeController.value
+      ? { [this._sizeController.value]: true }
+      : {};
+
     if (
       supportsTargetTemperature &&
       this._targetTemperature != null &&
@@ -181,7 +191,7 @@ export class HaStateControlWaterHeaterTemperature extends LitElement {
     ) {
       return html`
         <div
-          class="container"
+          class="container${classMap(containerSizeClass)}"
           style=${styleMap({
             "--state-color": stateColor,
           })}
@@ -211,7 +221,7 @@ export class HaStateControlWaterHeaterTemperature extends LitElement {
 
     return html`
       <div
-        class="container"
+        class="container${classMap(containerSizeClass)}"
         style=${styleMap({
           "--state-color": stateColor,
         })}