diff --git a/cast/src/launcher/layout/hc-layout.ts b/cast/src/launcher/layout/hc-layout.ts
index ea93d962be..c34a10f874 100644
--- a/cast/src/launcher/layout/hc-layout.ts
+++ b/cast/src/launcher/layout/hc-layout.ts
@@ -88,7 +88,7 @@ class HcLayout extends LitElement {
       font-family: var(--ha-card-header-font-family, inherit);
       font-size: var(--ha-card-header-font-size, var(--ha-font-size-2xl));
       letter-spacing: -0.012em;
-      line-height: 32px;
+      line-height: var(--ha-line-height-condensed);
       padding: 24px 16px 16px;
       display: block;
       margin: 0;
diff --git a/gallery/src/components/page-description.ts b/gallery/src/components/page-description.ts
index e9289f1c89..10ad924be9 100644
--- a/gallery/src/components/page-description.ts
+++ b/gallery/src/components/page-description.ts
@@ -38,12 +38,12 @@ class PageDescription extends HaMarkdown {
       }
       .title {
         font-size: 42px;
-        line-height: 56px;
+        line-height: var(--ha-line-height-condensed);
         padding-bottom: 8px;
       }
       .subtitle {
         font-size: var(--ha-font-size-l);
-        line-height: 24px;
+        line-height: var(--ha-line-height-normal);
       }
       .root {
         max-width: 800px;
diff --git a/gallery/src/ha-gallery.ts b/gallery/src/ha-gallery.ts
index e447aadd57..b4d227488d 100644
--- a/gallery/src/ha-gallery.ts
+++ b/gallery/src/ha-gallery.ts
@@ -252,12 +252,12 @@ class HaGallery extends LitElement {
       .page-footer .header {
         font-size: var(--ha-font-size-l);
         font-weight: var(--ha-font-weight-medium);
-        line-height: 28px;
+        line-height: var(--ha-line-height-normal);
         text-align: center;
       }
 
       .page-footer .secondary {
-        line-height: 23px;
+        line-height: var(--ha-line-height-normal);
         text-align: center;
       }
 
diff --git a/hassio/src/addon-view/config/hassio-addon-config.ts b/hassio/src/addon-view/config/hassio-addon-config.ts
index f819ed738e..dcc845355e 100644
--- a/hassio/src/addon-view/config/hassio-addon-config.ts
+++ b/hassio/src/addon-view/config/hassio-addon-config.ts
@@ -430,7 +430,7 @@ class HassioAddonConfig extends LitElement {
           font-family: var(--ha-card-header-font-family, inherit);
           font-size: var(--ha-card-header-font-size, var(--ha-font-size-2xl));
           letter-spacing: -0.012em;
-          line-height: 48px;
+          line-height: var(--ha-line-height-expanded);
           padding: 12px 16px 16px;
           display: block;
           margin-block: 0px;
diff --git a/hassio/src/components/hassio-card-content.ts b/hassio/src/components/hassio-card-content.ts
index 21027a1007..457df0437f 100644
--- a/hassio/src/components/hassio-card-content.ts
+++ b/hassio/src/components/hassio-card-content.ts
@@ -101,7 +101,7 @@ class HassioCardContent extends LitElement {
       overflow: hidden;
       position: relative;
       height: 2.4em;
-      line-height: 1.2em;
+      line-height: var(--ha-line-height-condensed);
     }
     .icon_image img {
       max-height: 40px;
diff --git a/hassio/src/ingress-view/hassio-ingress-view.ts b/hassio/src/ingress-view/hassio-ingress-view.ts
index 2afea76b1e..74545dc471 100644
--- a/hassio/src/ingress-view/hassio-ingress-view.ts
+++ b/hassio/src/ingress-view/hassio-ingress-view.ts
@@ -354,7 +354,7 @@ class HassioIngressView extends LitElement {
 
     .main-title {
       margin: var(--margin-title);
-      line-height: 20px;
+      line-height: var(--ha-line-height-condensed);
       flex-grow: 1;
     }
 
diff --git a/src/auth/ha-authorize.ts b/src/auth/ha-authorize.ts
index 13e8be0c2a..dcd3ea4108 100644
--- a/src/auth/ha-authorize.ts
+++ b/src/auth/ha-authorize.ts
@@ -94,7 +94,7 @@ export class HaAuthorize extends litLocalizeLiteMixin(LitElement) {
         }
         p {
           font-size: var(--ha-font-size-m);
-          line-height: 20px;
+          line-height: var(--ha-line-height-normal);
         }
         .card-content {
           background: var(
diff --git a/src/auth/ha-pick-auth-provider.ts b/src/auth/ha-pick-auth-provider.ts
index 6787dca43f..2e48d21fb7 100644
--- a/src/auth/ha-pick-auth-provider.ts
+++ b/src/auth/ha-pick-auth-provider.ts
@@ -59,7 +59,7 @@ export class HaPickAuthProvider extends LitElement {
       text-align: center;
       font-size: var(--ha-font-size-m);
       font-weight: var(--ha-font-weight-normal);
-      line-height: 20px;
+      line-height: var(--ha-line-height-normal);
     }
     h3:before {
       border-top: 1px solid var(--divider-color);
diff --git a/src/components/data-table/ha-data-table.ts b/src/components/data-table/ha-data-table.ts
index 5c227dfb9f..2c3cfc28c7 100644
--- a/src/components/data-table/ha-data-table.ts
+++ b/src/components/data-table/ha-data-table.ts
@@ -1016,7 +1016,7 @@ export class HaDataTable extends LitElement {
           -moz-osx-font-smoothing: var(--ha-moz-osx-font-smoothing);
           -webkit-font-smoothing: var(--ha-font-smoothing);
           font-size: 0.875rem;
-          line-height: 1.25rem;
+          line-height: var(--ha-line-height-condensed);
           font-weight: var(--ha-font-weight-normal);
           letter-spacing: 0.0178571429em;
           text-decoration: inherit;
@@ -1136,7 +1136,7 @@ export class HaDataTable extends LitElement {
           -moz-osx-font-smoothing: var(--ha-moz-osx-font-smoothing);
           -webkit-font-smoothing: var(--ha-font-smoothing);
           font-size: 0.875rem;
-          line-height: 1.25rem;
+          line-height: var(--ha-line-height-condensed);
           font-weight: var(--ha-font-weight-normal);
           letter-spacing: 0.0178571429em;
           text-decoration: inherit;
@@ -1257,8 +1257,8 @@ export class HaDataTable extends LitElement {
           font-family: var(--ha-font-family-body);
           -moz-osx-font-smoothing: var(--ha-moz-osx-font-smoothing);
           -webkit-font-smoothing: var(--ha-font-smoothing);
-          font-size: 0.875rem;
-          line-height: 1.375rem;
+          font-size: var(--ha-font-size-s);
+          line-height: var(--ha-line-height-normal);
           font-weight: var(--ha-font-weight-medium);
           letter-spacing: 0.0071428571em;
           text-decoration: inherit;
diff --git a/src/components/entity/state-info.ts b/src/components/entity/state-info.ts
index 15d274bb21..5fa32ac238 100644
--- a/src/components/entity/state-info.ts
+++ b/src/components/entity/state-info.ts
@@ -108,7 +108,7 @@ class StateInfo extends LitElement {
 
     .name.in-dialog,
     :host([secondary-line]) .name {
-      line-height: 20px;
+      line-height: var(--ha-line-height-condensed);
     }
 
     .time-ago,
diff --git a/src/components/ha-badge.ts b/src/components/ha-badge.ts
index a5150fc8b7..0a5ef02ef0 100644
--- a/src/components/ha-badge.ts
+++ b/src/components/ha-badge.ts
@@ -106,7 +106,7 @@ export class HaBadge extends LitElement {
       font-size: var(--ha-badge-font-size, var(--ha-font-size-s));
       font-style: normal;
       font-weight: var(--ha-font-weight-medium);
-      line-height: 16px;
+      line-height: var(--ha-line-height-condensed);
       letter-spacing: 0.1px;
       color: var(--primary-text-color);
     }
diff --git a/src/components/ha-base-time-input.ts b/src/components/ha-base-time-input.ts
index 4b13d4243f..51aab0e0f1 100644
--- a/src/components/ha-base-time-input.ts
+++ b/src/components/ha-base-time-input.ts
@@ -388,7 +388,10 @@ export class HaBaseTimeInput extends LitElement {
         var(--mdc-typography-font-family, var(--ha-font-family-body))
       );
       font-size: var(--mdc-typography-body2-font-size, var(--ha-font-size-s));
-      line-height: var(--mdc-typography-body2-line-height, 1.25rem);
+      line-height: var(
+        --mdc-typography-body2-line-height,
+        var(--ha-line-height-condensed)
+      );
       font-weight: var(
         --mdc-typography-body2-font-weight,
         var(--ha-font-weight-normal)
@@ -406,7 +409,7 @@ export class HaBaseTimeInput extends LitElement {
     }
     ha-input-helper-text {
       padding-top: 8px;
-      line-height: normal;
+      line-height: var(--ha-line-height-condensed);
     }
   `;
 }
diff --git a/src/components/ha-big-number.ts b/src/components/ha-big-number.ts
index e4474dc880..ac72b3a6d6 100644
--- a/src/components/ha-big-number.ts
+++ b/src/components/ha-big-number.ts
@@ -92,7 +92,7 @@ export class HaBigNumber extends LitElement {
         }
         .value .unit {
           font-size: 0.33em;
-          line-height: 1.26;
+          line-height: var(--ha-line-height-condensed);
         }
         /* Accessibility */
         .visually-hidden {
diff --git a/src/components/ha-card.ts b/src/components/ha-card.ts
index 4f403368f8..b0342bdd6d 100644
--- a/src/components/ha-card.ts
+++ b/src/components/ha-card.ts
@@ -43,7 +43,7 @@ export class HaCard extends LitElement {
       font-family: var(--ha-card-header-font-family, inherit);
       font-size: var(--ha-card-header-font-size, var(--ha-font-size-2xl));
       letter-spacing: -0.012em;
-      line-height: 48px;
+      line-height: var(--ha-line-height-expanded);
       padding: 12px 16px 16px;
       display: block;
       margin-block-start: 0px;
diff --git a/src/components/ha-combo-box-item.ts b/src/components/ha-combo-box-item.ts
index 663421d287..4104c038ac 100644
--- a/src/components/ha-combo-box-item.ts
+++ b/src/components/ha-combo-box-item.ts
@@ -21,12 +21,12 @@ export class HaComboBoxItem extends HaMdListItem {
         --state-icon-color: var(--secondary-text-color);
       }
       [slot="headline"] {
-        line-height: 22px;
+        line-height: var(--ha-line-height-normal);
         font-size: var(--ha-font-size-m);
         white-space: nowrap;
       }
       [slot="supporting-text"] {
-        line-height: 18px;
+        line-height: var(--ha-line-height-normal);
         font-size: var(--ha-font-size-s);
         white-space: nowrap;
       }
diff --git a/src/components/ha-dialog-header.ts b/src/components/ha-dialog-header.ts
index 9094fa999f..01e7d9fbf9 100644
--- a/src/components/ha-dialog-header.ts
+++ b/src/components/ha-dialog-header.ts
@@ -54,7 +54,7 @@ export class HaDialogHeader extends LitElement {
         }
         .header-title {
           font-size: var(--ha-font-size-xl);
-          line-height: 28px;
+          line-height: var(--ha-line-height-condensed);
           font-weight: var(--ha-font-weight-normal);
         }
         .header-subtitle {
diff --git a/src/components/ha-filter-blueprints.ts b/src/components/ha-filter-blueprints.ts
index 416a587a90..bdb2816ff3 100644
--- a/src/components/ha-filter-blueprints.ts
+++ b/src/components/ha-filter-blueprints.ts
@@ -211,7 +211,7 @@ export class HaFilterBlueprints extends LitElement {
           font-size: var(--ha-font-size-xs);
           font-weight: var(--ha-font-weight-normal);
           background-color: var(--primary-color);
-          line-height: 16px;
+          line-height: var(--ha-line-height-normal);
           text-align: center;
           padding: 0px 2px;
           color: var(--text-primary-color);
diff --git a/src/components/ha-filter-categories.ts b/src/components/ha-filter-categories.ts
index 242d7544f7..ccccb0912d 100644
--- a/src/components/ha-filter-categories.ts
+++ b/src/components/ha-filter-categories.ts
@@ -306,7 +306,7 @@ export class HaFilterCategories extends SubscribeMixin(LitElement) {
           font-size: var(--ha-font-size-xs);
           font-weight: var(--ha-font-weight-normal);
           background-color: var(--primary-color);
-          line-height: 16px;
+          line-height: var(--ha-line-height-normal);
           text-align: center;
           padding: 0px 2px;
           color: var(--text-primary-color);
diff --git a/src/components/ha-filter-devices.ts b/src/components/ha-filter-devices.ts
index 4d8cdc1982..7beb3c05ea 100644
--- a/src/components/ha-filter-devices.ts
+++ b/src/components/ha-filter-devices.ts
@@ -235,7 +235,7 @@ export class HaFilterDevices extends LitElement {
           font-size: var(--ha-font-size-xs);
           font-weight: var(--ha-font-weight-normal);
           background-color: var(--primary-color);
-          line-height: 16px;
+          line-height: var(--ha-line-height-normal);
           text-align: center;
           padding: 0px 2px;
           color: var(--text-primary-color);
diff --git a/src/components/ha-filter-domains.ts b/src/components/ha-filter-domains.ts
index 90366a269b..4bb6756136 100644
--- a/src/components/ha-filter-domains.ts
+++ b/src/components/ha-filter-domains.ts
@@ -192,7 +192,7 @@ export class HaFilterDomains extends LitElement {
           font-size: var(--ha-font-size-xs);
           font-weight: var(--ha-font-weight-normal);
           background-color: var(--primary-color);
-          line-height: 16px;
+          line-height: var(--ha-line-height-normal);
           text-align: center;
           padding: 0px 2px;
           color: var(--text-primary-color);
diff --git a/src/components/ha-filter-entities.ts b/src/components/ha-filter-entities.ts
index 71fb79ae44..3f078d813c 100644
--- a/src/components/ha-filter-entities.ts
+++ b/src/components/ha-filter-entities.ts
@@ -249,7 +249,7 @@ export class HaFilterEntities extends LitElement {
           font-size: var(--ha-font-size-xs);
           font-weight: var(--ha-font-weight-normal);
           background-color: var(--primary-color);
-          line-height: 16px;
+          line-height: var(--ha-line-height-normal);
           text-align: center;
           padding: 0px 2px;
           color: var(--text-primary-color);
diff --git a/src/components/ha-filter-floor-areas.ts b/src/components/ha-filter-floor-areas.ts
index c4976da4fd..5f4e811b4f 100644
--- a/src/components/ha-filter-floor-areas.ts
+++ b/src/components/ha-filter-floor-areas.ts
@@ -306,7 +306,7 @@ export class HaFilterFloorAreas extends LitElement {
           font-size: var(--ha-font-size-xs);
           font-weight: var(--ha-font-weight-normal);
           background-color: var(--primary-color);
-          line-height: 16px;
+          line-height: var(--ha-line-height-normal);
           text-align: center;
           padding: 0px 2px;
           color: var(--text-primary-color);
diff --git a/src/components/ha-filter-integrations.ts b/src/components/ha-filter-integrations.ts
index 060343e011..233ebcb9fc 100644
--- a/src/components/ha-filter-integrations.ts
+++ b/src/components/ha-filter-integrations.ts
@@ -198,7 +198,7 @@ export class HaFilterIntegrations extends LitElement {
           font-size: var(--ha-font-size-xs);
           font-weight: var(--ha-font-weight-normal);
           background-color: var(--primary-color);
-          line-height: 16px;
+          line-height: var(--ha-line-height-normal);
           text-align: center;
           padding: 0px 2px;
           color: var(--text-primary-color);
diff --git a/src/components/ha-filter-labels.ts b/src/components/ha-filter-labels.ts
index 930ff8762e..aa67b15a0c 100644
--- a/src/components/ha-filter-labels.ts
+++ b/src/components/ha-filter-labels.ts
@@ -236,7 +236,7 @@ export class HaFilterLabels extends SubscribeMixin(LitElement) {
           font-size: var(--ha-font-size-xs);
           font-weight: var(--ha-font-weight-normal);
           background-color: var(--primary-color);
-          line-height: 16px;
+          line-height: var(--ha-line-height-normal);
           text-align: center;
           padding: 0px 2px;
           color: var(--text-primary-color);
diff --git a/src/components/ha-filter-states.ts b/src/components/ha-filter-states.ts
index fe35b5641b..c62bfa5977 100644
--- a/src/components/ha-filter-states.ts
+++ b/src/components/ha-filter-states.ts
@@ -180,7 +180,7 @@ export class HaFilterStates extends LitElement {
           font-size: var(--ha-font-size-xs);
           font-weight: var(--ha-font-weight-normal);
           background-color: var(--primary-color);
-          line-height: 16px;
+          line-height: var(--ha-line-height-normal);
           text-align: center;
           padding: 0px 2px;
           color: var(--text-primary-color);
diff --git a/src/components/ha-label.ts b/src/components/ha-label.ts
index 7d34699f8c..52676c4da1 100644
--- a/src/components/ha-label.ts
+++ b/src/components/ha-label.ts
@@ -34,7 +34,7 @@ class HaLabel extends LitElement {
           align-items: center;
           font-size: var(--ha-font-size-s);
           font-weight: var(--ha-font-weight-medium);
-          line-height: 16px;
+          line-height: var(--ha-line-height-condensed);
           letter-spacing: 0.1px;
           vertical-align: middle;
           height: 32px;
diff --git a/src/components/ha-md-dialog.ts b/src/components/ha-md-dialog.ts
index f62cee329c..61e6ae6a94 100644
--- a/src/components/ha-md-dialog.ts
+++ b/src/components/ha-md-dialog.ts
@@ -155,10 +155,10 @@ export class HaMdDialog extends Dialog {
         --md-dialog-supporting-text-color: var(--primary-text-color);
         --md-sys-color-scrim: #000000;
 
-        --md-dialog-headline-weight: 400;
-        --md-dialog-headline-size: 1.574rem;
-        --md-dialog-supporting-text-size: 1rem;
-        --md-dialog-supporting-text-line-height: 1.5rem;
+        --md-dialog-headline-weight: var(--ha-font-weight-normal);
+        --md-dialog-headline-size: var(--ha-font-size-xl);
+        --md-dialog-supporting-text-size: var(--ha-font-size-m);
+        --md-dialog-supporting-text-line-height: var(--ha-line-height-normal);
       }
 
       :host([type="alert"]) {
diff --git a/src/components/ha-select-box.ts b/src/components/ha-select-box.ts
index 1971ffd280..a87fde5d01 100644
--- a/src/components/ha-select-box.ts
+++ b/src/components/ha-select-box.ts
@@ -156,16 +156,16 @@ export class HaSelectBox extends LitElement {
       color: var(--primary-text-color);
       font-size: var(--ha-font-size-m);
       font-weight: var(--ha-font-weight-normal);
-      line-height: 20px;
+      line-height: var(--ha-line-height-condensed);
       overflow: hidden;
       white-space: nowrap;
       text-overflow: ellipsis;
     }
     .option .content .text .description {
       color: var(--secondary-text-color);
-      font-size: 13px;
+      font-size: var(--ha-font-size-s);
       font-weight: var(--ha-font-weight-normal);
-      line-height: 16px;
+      line-height: var(--ha-line-height-condensed);
     }
     img {
       position: relative;
diff --git a/src/components/ha-sidebar.ts b/src/components/ha-sidebar.ts
index c8e78d0aee..15205ad2fa 100644
--- a/src/components/ha-sidebar.ts
+++ b/src/components/ha-sidebar.ts
@@ -987,7 +987,7 @@ class HaSidebar extends SubscribeMixin(LitElement) {
           left: 26px;
           border-radius: 10px;
           font-size: 0.65em;
-          line-height: 2;
+          line-height: var(--ha-line-height-expanded);
           padding: 0 4px;
         }
 
diff --git a/src/components/ha-textarea.ts b/src/components/ha-textarea.ts
index d531c4746f..378c96e74e 100644
--- a/src/components/ha-textarea.ts
+++ b/src/components/ha-textarea.ts
@@ -30,7 +30,7 @@ export class HaTextArea extends TextAreaBase {
         content: attr(data-value);
         margin-top: 23px;
         margin-bottom: 9px;
-        line-height: 1.5rem;
+        line-height: var(--ha-line-height-normal);
         min-height: 42px;
         padding: 0px 32px 0 16px;
         letter-spacing: var(
diff --git a/src/components/map/ha-map.ts b/src/components/map/ha-map.ts
index c1e12433ac..53a40ce836 100644
--- a/src/components/map/ha-map.ts
+++ b/src/components/map/ha-map.ts
@@ -692,7 +692,7 @@ export class HaMap extends ReactiveElement {
     }
 
     .marker-cluster span {
-      line-height: 30px;
+      line-height: var(--ha-line-height-expanded);
     }
   `;
 }
diff --git a/src/components/media-player/ha-media-player-browse.ts b/src/components/media-player/ha-media-player-browse.ts
index e1c1c840dd..aa7e8ad8b0 100644
--- a/src/components/media-player/ha-media-player-browse.ts
+++ b/src/components/media-player/ha-media-player-browse.ts
@@ -966,7 +966,7 @@ export class HaMediaPlayerBrowse extends LitElement {
         }
         .breadcrumb .title {
           font-size: var(--ha-font-size-4xl);
-          line-height: 1.2;
+          line-height: var(--ha-line-height-condensed);
           font-weight: var(--ha-font-weight-bold);
           margin: 0;
           overflow: hidden;
diff --git a/src/components/tile/ha-tile-info.ts b/src/components/tile/ha-tile-info.ts
index 927b1e889d..df8b7e4db7 100644
--- a/src/components/tile/ha-tile-info.ts
+++ b/src/components/tile/ha-tile-info.ts
@@ -36,14 +36,14 @@ export class HaTileInfo extends LitElement {
     .primary {
       font-size: var(--ha-font-size-m);
       font-weight: var(--ha-font-weight-medium);
-      line-height: 20px;
+      line-height: var(--ha-line-height-normal);
       letter-spacing: 0.1px;
       color: var(--primary-text-color);
     }
     .secondary {
       font-size: var(--ha-font-size-s);
       font-weight: var(--ha-font-weight-normal);
-      line-height: 16px;
+      line-height: var(--ha-line-height-condensed);
       letter-spacing: 0.4px;
       color: var(--primary-text-color);
     }
diff --git a/src/dialogs/more-info/components/ha-more-info-state-header.ts b/src/dialogs/more-info/components/ha-more-info-state-header.ts
index 7c12c21c54..652b2591fc 100644
--- a/src/dialogs/more-info/components/ha-more-info-state-header.ts
+++ b/src/dialogs/more-info/components/ha-more-info-state-header.ts
@@ -76,13 +76,13 @@ export class HaMoreInfoStateHeader extends LitElement {
       font-style: normal;
       font-weight: var(--ha-font-weight-normal);
       font-size: 36px;
-      line-height: 44px;
+      line-height: var(--ha-line-height-condensed);
     }
     .last-changed {
       font-style: normal;
       font-size: var(--ha-font-size-l);
       font-weight: var(--ha-font-weight-medium);
-      line-height: 24px;
+      line-height: var(--ha-line-height-normal);
       letter-spacing: 0.1px;
       padding: 4px 0;
       margin-bottom: 20px;
diff --git a/src/dialogs/more-info/controls/more-info-climate.ts b/src/dialogs/more-info/controls/more-info-climate.ts
index 538dd9d0a7..3b47c52c45 100644
--- a/src/dialogs/more-info/controls/more-info-climate.ts
+++ b/src/dialogs/more-info/controls/more-info-climate.ts
@@ -531,7 +531,7 @@ class MoreInfoClimate extends LitElement {
         .current .label {
           opacity: 0.8;
           font-size: var(--ha-font-size-m);
-          line-height: 16px;
+          line-height: var(--ha-line-height-condensed);
           letter-spacing: 0.4px;
           margin-bottom: 4px;
         }
@@ -539,7 +539,7 @@ class MoreInfoClimate extends LitElement {
         .current .value {
           font-size: var(--ha-font-size-xl);
           font-weight: var(--ha-font-weight-medium);
-          line-height: 28px;
+          line-height: var(--ha-line-height-condensed);
           direction: ltr;
         }
         ha-select {
diff --git a/src/dialogs/more-info/controls/more-info-humidifier.ts b/src/dialogs/more-info/controls/more-info-humidifier.ts
index d9edd1cc42..71407b22a4 100644
--- a/src/dialogs/more-info/controls/more-info-humidifier.ts
+++ b/src/dialogs/more-info/controls/more-info-humidifier.ts
@@ -234,14 +234,14 @@ class MoreInfoHumidifier extends LitElement {
         .current .label {
           opacity: 0.8;
           font-size: var(--ha-font-size-m);
-          line-height: 16px;
+          line-height: var(--ha-line-height-condensed);
           letter-spacing: 0.4px;
           margin-bottom: 4px;
         }
         .current .value {
           font-size: var(--ha-font-size-xl);
           font-weight: var(--ha-font-weight-medium);
-          line-height: 28px;
+          line-height: var(--ha-line-height-condensed);
           direction: ltr;
         }
       `,
diff --git a/src/dialogs/more-info/controls/more-info-lawn_mower.ts b/src/dialogs/more-info/controls/more-info-lawn_mower.ts
index 399e2c348c..117e4c942f 100644
--- a/src/dialogs/more-info/controls/more-info-lawn_mower.ts
+++ b/src/dialogs/more-info/controls/more-info-lawn_mower.ts
@@ -178,7 +178,7 @@ class MoreInfoLawnMower extends LitElement {
 
   static styles = css`
     :host {
-      line-height: 1.5;
+      line-height: var(--ha-line-height-normal);
     }
     .status-subtitle {
       color: var(--secondary-text-color);
diff --git a/src/dialogs/more-info/controls/more-info-vacuum.ts b/src/dialogs/more-info/controls/more-info-vacuum.ts
index 9596678775..5cfc75eb73 100644
--- a/src/dialogs/more-info/controls/more-info-vacuum.ts
+++ b/src/dialogs/more-info/controls/more-info-vacuum.ts
@@ -317,7 +317,7 @@ class MoreInfoVacuum extends LitElement {
 
   static styles = css`
     :host {
-      line-height: 1.5;
+      line-height: var(--ha-line-height-normal);
     }
     .status-subtitle {
       color: var(--secondary-text-color);
diff --git a/src/dialogs/more-info/controls/more-info-water_heater.ts b/src/dialogs/more-info/controls/more-info-water_heater.ts
index 7426d6a193..7d7d59e8ef 100644
--- a/src/dialogs/more-info/controls/more-info-water_heater.ts
+++ b/src/dialogs/more-info/controls/more-info-water_heater.ts
@@ -235,7 +235,7 @@ class MoreInfoWaterHeater extends LitElement {
         .current .label {
           opacity: 0.8;
           font-size: var(--ha-font-size-m);
-          line-height: 16px;
+          line-height: var(--ha-line-height-condensed);
           letter-spacing: 0.4px;
           margin-bottom: 4px;
         }
@@ -243,7 +243,7 @@ class MoreInfoWaterHeater extends LitElement {
         .current .value {
           font-size: var(--ha-font-size-xl);
           font-weight: var(--ha-font-weight-medium);
-          line-height: 28px;
+          line-height: var(--ha-line-height-condensed);
           direction: ltr;
         }
       `,
diff --git a/src/dialogs/more-info/controls/more-info-weather.ts b/src/dialogs/more-info/controls/more-info-weather.ts
index ef700b6638..e357ff8042 100644
--- a/src/dialogs/more-info/controls/more-info-weather.ts
+++ b/src/dialogs/more-info/controls/more-info-weather.ts
@@ -519,7 +519,7 @@ class MoreInfoWeather extends LitElement {
         .state,
         .temp-attribute .temp {
           font-size: var(--ha-font-size-3xl);
-          line-height: 1.2;
+          line-height: var(--ha-line-height-condensed);
         }
 
         .attribute {
diff --git a/src/dialogs/more-info/ha-more-info-dialog.ts b/src/dialogs/more-info/ha-more-info-dialog.ts
index 252364622d..4ae42dd862 100644
--- a/src/dialogs/more-info/ha-more-info-dialog.ts
+++ b/src/dialogs/more-info/ha-more-info-dialog.ts
@@ -680,7 +680,7 @@ export class MoreInfoDialog extends LitElement {
         .title .main {
           color: var(--primary-text-color);
           font-size: var(--ha-font-size-xl);
-          line-height: 24px;
+          line-height: var(--ha-line-height-condensed);
         }
 
         .title .breadcrumb {
diff --git a/src/dialogs/restart/dialog-restart.ts b/src/dialogs/restart/dialog-restart.ts
index 193c4a8f56..bbce32de5b 100644
--- a/src/dialogs/restart/dialog-restart.ts
+++ b/src/dialogs/restart/dialog-restart.ts
@@ -469,7 +469,7 @@ class DialogRestart extends LitElement {
         .section {
           font-size: var(--ha-font-size-m);
           font-weight: var(--ha-font-weight-medium);
-          line-height: 20px;
+          line-height: var(--ha-line-height-condensed);
           margin: 8px 0 4px 0;
           padding-left: var(--mdc-list-side-padding, 20px);
           padding-right: var(--mdc-list-side-padding, 20px);
diff --git a/src/dialogs/voice-assistant-setup/cloud/cloud-step-intro.ts b/src/dialogs/voice-assistant-setup/cloud/cloud-step-intro.ts
index b1bb527500..7777ab3ddd 100644
--- a/src/dialogs/voice-assistant-setup/cloud/cloud-step-intro.ts
+++ b/src/dialogs/voice-assistant-setup/cloud/cloud-step-intro.ts
@@ -162,14 +162,14 @@ export class CloudStepIntro extends LitElement {
       .feature h2 {
         font-size: var(--ha-font-size-l);
         font-weight: var(--ha-font-weight-medium);
-        line-height: 24px;
+        line-height: var(--ha-line-height-normal);
         margin-top: 0;
         margin-bottom: 8px;
       }
       .feature p {
         font-size: var(--ha-font-size-m);
         font-weight: var(--ha-font-weight-normal);
-        line-height: 20px;
+        line-height: var(--ha-line-height-condensed);
         margin: 0;
       }
     `,
diff --git a/src/dialogs/voice-command-dialog/ha-voice-command-dialog.ts b/src/dialogs/voice-command-dialog/ha-voice-command-dialog.ts
index 20842d3204..4d31a44f29 100644
--- a/src/dialogs/voice-command-dialog/ha-voice-command-dialog.ts
+++ b/src/dialogs/voice-command-dialog/ha-voice-command-dialog.ts
@@ -280,7 +280,7 @@ export class HaVoiceCommandDialog extends LitElement {
           );
           --mdc-typography-button-line-height: var(
             --mdc-typography-headline6-line-height,
-            2rem
+            var(--ha-line-height-expanded)
           );
           --button-height: auto;
         }
diff --git a/src/layouts/hass-subpage.ts b/src/layouts/hass-subpage.ts
index 639b0601e4..9859e09325 100644
--- a/src/layouts/hass-subpage.ts
+++ b/src/layouts/hass-subpage.ts
@@ -125,7 +125,7 @@ class HassSubpage extends LitElement {
 
         .main-title {
           margin: var(--margin-title);
-          line-height: 20px;
+          line-height: var(--ha-line-height-normal);
           min-width: 0;
           flex-grow: 1;
           overflow-wrap: break-word;
diff --git a/src/layouts/hass-tabs-subpage-data-table.ts b/src/layouts/hass-tabs-subpage-data-table.ts
index 5e1dfe8e44..98b0af1f01 100644
--- a/src/layouts/hass-tabs-subpage-data-table.ts
+++ b/src/layouts/hass-tabs-subpage-data-table.ts
@@ -785,23 +785,6 @@ export class HaTabsSubpageDataTable extends KeyboardShortcutMixin(LitElement) {
       left: 0;
       content: "";
     }
-    .badge {
-      min-width: 20px;
-      box-sizing: border-box;
-      border-radius: 50%;
-      font-weight: var(--ha-font-weight-normal);
-      background-color: var(--primary-color);
-      line-height: 20px;
-      text-align: center;
-      padding: 0px 4px;
-      color: var(--text-primary-color);
-      position: absolute;
-      right: 0;
-      inset-inline-end: 0;
-      inset-inline-start: initial;
-      top: 4px;
-      font-size: 0.65em;
-    }
     .center {
       display: flex;
       align-items: center;
@@ -825,7 +808,7 @@ export class HaTabsSubpageDataTable extends KeyboardShortcutMixin(LitElement) {
       font-size: var(--ha-font-size-xs);
       font-weight: var(--ha-font-weight-normal);
       background-color: var(--primary-color);
-      line-height: 16px;
+      line-height: var(--ha-line-height-normal);
       text-align: center;
       padding: 0px 2px;
       color: var(--text-primary-color);
diff --git a/src/layouts/hass-tabs-subpage.ts b/src/layouts/hass-tabs-subpage.ts
index 49e4a65f85..3f52ea4ed1 100644
--- a/src/layouts/hass-tabs-subpage.ts
+++ b/src/layouts/hass-tabs-subpage.ts
@@ -304,7 +304,7 @@ class HassTabsSubpage extends LitElement {
         .main-title {
           flex: 1;
           max-height: var(--header-height);
-          line-height: 20px;
+          line-height: var(--ha-line-height-normal);
           color: var(--sidebar-text-color);
           margin: var(--main-title-margin, var(--margin-title));
         }
diff --git a/src/onboarding/onboarding-core-config.ts b/src/onboarding/onboarding-core-config.ts
index 34013bee63..d19a8d29c4 100644
--- a/src/onboarding/onboarding-core-config.ts
+++ b/src/onboarding/onboarding-core-config.ts
@@ -200,7 +200,7 @@ class OnboardingCoreConfig extends LitElement {
 
     p {
       font-size: var(--ha-font-size-m);
-      line-height: 20px;
+      line-height: var(--ha-line-height-condensed);
     }
 
     ha-textfield {
diff --git a/src/onboarding/restore-backup/onboarding-restore-backup-no-cloud-backup.ts b/src/onboarding/restore-backup/onboarding-restore-backup-no-cloud-backup.ts
index 7c1698db45..f77f46f665 100644
--- a/src/onboarding/restore-backup/onboarding-restore-backup-no-cloud-backup.ts
+++ b/src/onboarding/restore-backup/onboarding-restore-backup-no-cloud-backup.ts
@@ -65,7 +65,7 @@ class OnboardingRestoreBackupNoCloudBackup extends LitElement {
         }
         .description {
           font-size: 1rem;
-          line-height: 1.5rem;
+          line-height: var(--ha-line-height-normal);
           margin-top: 24px;
           margin-bottom: 32px;
         }
diff --git a/src/onboarding/restore-backup/onboarding-restore-backup-restore.ts b/src/onboarding/restore-backup/onboarding-restore-backup-restore.ts
index 4050d923c0..f0c13f8dad 100644
--- a/src/onboarding/restore-backup/onboarding-restore-backup-restore.ts
+++ b/src/onboarding/restore-backup/onboarding-restore-backup-restore.ts
@@ -308,7 +308,7 @@ class OnboardingRestoreBackupRestore extends LitElement {
         }
         .description {
           font-size: 1rem;
-          line-height: 1.5rem;
+          line-height: var(--ha-line-height-normal);
           margin-top: 24px;
           margin-bottom: 16px;
         }
@@ -335,7 +335,7 @@ class OnboardingRestoreBackupRestore extends LitElement {
           align-items: center;
           flex-direction: row;
           gap: 8px;
-          line-height: normal;
+          line-height: var(--ha-line-height-condensed);
         }
         h2 {
           font-size: var(--ha-font-size-xl);
diff --git a/src/onboarding/styles.ts b/src/onboarding/styles.ts
index 868ae4e480..21bd844920 100644
--- a/src/onboarding/styles.ts
+++ b/src/onboarding/styles.ts
@@ -7,7 +7,7 @@ export const onBoardingStyles = css`
   h1 {
     font-size: var(--ha-font-size-3xl);
     font-weight: var(--ha-font-weight-normal);
-    line-height: 36px;
+    line-height: var(--ha-line-height-condensed);
     margin-bottom: 8px;
   }
   ha-icon-button-arrow-prev {
@@ -16,7 +16,7 @@ export const onBoardingStyles = css`
   }
   p {
     font-size: 1rem;
-    line-height: 1.5rem;
+    line-height: var(--ha-line-height-normal);
     margin-top: 0;
     margin-bottom: 32px;
   }
diff --git a/src/panels/calendar/ha-full-calendar.ts b/src/panels/calendar/ha-full-calendar.ts
index 3fc8f5d25c..4d9973f86b 100644
--- a/src/panels/calendar/ha-full-calendar.ts
+++ b/src/panels/calendar/ha-full-calendar.ts
@@ -617,7 +617,7 @@ export class HAFullCalendar extends LitElement {
 
         .fc-event {
           border-radius: 4px;
-          line-height: 1.7;
+          line-height: var(--ha-line-height-normal);
           cursor: pointer;
         }
 
diff --git a/src/panels/calendar/ha-panel-calendar.ts b/src/panels/calendar/ha-panel-calendar.ts
index c75deb88da..26097c5aef 100644
--- a/src/panels/calendar/ha-panel-calendar.ts
+++ b/src/panels/calendar/ha-panel-calendar.ts
@@ -319,7 +319,7 @@ class PanelCalendar extends LitElement {
           );
           --mdc-typography-button-line-height: var(
             --mdc-typography-headline6-line-height,
-            2rem
+            var(--ha-line-height-expanded)
           );
           --button-height: 40px;
         }
diff --git a/src/panels/config/backup/components/config/ha-backup-config-agents.ts b/src/panels/config/backup/components/config/ha-backup-config-agents.ts
index 686d6bd0a5..82cd67fe26 100644
--- a/src/panels/config/backup/components/config/ha-backup-config-agents.ts
+++ b/src/panels/config/backup/components/config/ha-backup-config-agents.ts
@@ -314,7 +314,7 @@ class HaBackupConfigAgents extends LitElement {
       align-items: center;
       flex-direction: row;
       gap: 8px;
-      line-height: normal;
+      line-height: var(--ha-line-height-condensed);
     }
     .unencrypted-warning {
       display: flex;
diff --git a/src/panels/config/backup/components/ha-backup-agents-picker.ts b/src/panels/config/backup/components/ha-backup-agents-picker.ts
index 08e409cf42..778eef62cd 100644
--- a/src/panels/config/backup/components/ha-backup-agents-picker.ts
+++ b/src/panels/config/backup/components/ha-backup-agents-picker.ts
@@ -122,7 +122,7 @@ class HaBackupAgentsPicker extends LitElement {
       gap: 16px;
       font-size: var(--ha-font-size-l);
       font-weight: var(--ha-font-weight-normal);
-      line-height: 24px;
+      line-height: var(--ha-line-height-normal);
       letter-spacing: 0.5px;
     }
     span.disabled {
diff --git a/src/panels/config/backup/components/ha-backup-details-restore.ts b/src/panels/config/backup/components/ha-backup-details-restore.ts
index 170a39bf5b..6ee18e8e85 100644
--- a/src/panels/config/backup/components/ha-backup-details-restore.ts
+++ b/src/panels/config/backup/components/ha-backup-details-restore.ts
@@ -133,7 +133,7 @@ class HaBackupDetailsRestore extends LitElement {
       align-items: center;
       flex-direction: row;
       gap: 8px;
-      line-height: normal;
+      line-height: var(--ha-line-height-condensed);
     }
   `;
 }
diff --git a/src/panels/config/backup/components/ha-backup-details-summary.ts b/src/panels/config/backup/components/ha-backup-details-summary.ts
index 2bd0f2d6a3..d855696bbe 100644
--- a/src/panels/config/backup/components/ha-backup-details-summary.ts
+++ b/src/panels/config/backup/components/ha-backup-details-summary.ts
@@ -105,7 +105,7 @@ class HaBackupDetailsSummary extends LitElement {
       align-items: center;
       flex-direction: row;
       gap: 8px;
-      line-height: normal;
+      line-height: var(--ha-line-height-condensed);
     }
   `;
 }
diff --git a/src/panels/config/backup/components/ha-backup-formfield-label.ts b/src/panels/config/backup/components/ha-backup-formfield-label.ts
index cdbe6d98b6..87be97d213 100644
--- a/src/panels/config/backup/components/ha-backup-formfield-label.ts
+++ b/src/panels/config/backup/components/ha-backup-formfield-label.ts
@@ -44,7 +44,7 @@ class SupervisorFormfieldLabel extends LitElement {
       margin-inline-start: initial;
       font-size: var(--ha-font-size-m);
       font-weight: var(--ha-font-weight-normal);
-      line-height: 24px;
+      line-height: var(--ha-line-height-normal);
       letter-spacing: 0.5px;
     }
     .version {
diff --git a/src/panels/config/backup/components/ha-backup-summary-card.ts b/src/panels/config/backup/components/ha-backup-summary-card.ts
index 7de3d55d4e..458e31bd2c 100644
--- a/src/panels/config/backup/components/ha-backup-summary-card.ts
+++ b/src/panels/config/backup/components/ha-backup-summary-card.ts
@@ -128,7 +128,7 @@ class HaBackupSummaryCard extends LitElement {
       font-size: var(--ha-font-size-xl);
       font-style: normal;
       font-weight: var(--ha-font-weight-normal);
-      line-height: 28px;
+      line-height: var(--ha-line-height-condensed);
       color: var(--primary-text-color);
       margin: 0;
       text-overflow: ellipsis;
@@ -139,7 +139,7 @@ class HaBackupSummaryCard extends LitElement {
       font-size: var(--ha-font-size-m);
       font-style: normal;
       font-weight: var(--ha-font-weight-normal);
-      line-height: 20px;
+      line-height: var(--ha-line-height-condensed);
       letter-spacing: 0.25px;
       color: var(--secondary-text-color);
       margin: 0;
diff --git a/src/panels/config/backup/dialogs/dialog-backup-onboarding.ts b/src/panels/config/backup/dialogs/dialog-backup-onboarding.ts
index 89d07ab6b3..668d310fed 100644
--- a/src/panels/config/backup/dialogs/dialog-backup-onboarding.ts
+++ b/src/panels/config/backup/dialogs/dialog-backup-onboarding.ts
@@ -583,7 +583,7 @@ class DialogBackupOnboarding extends LitElement implements HassDialog {
           font-family: var(--ha-font-family-code);
           font-style: normal;
           font-weight: var(--ha-font-weight-normal);
-          line-height: 28px;
+          line-height: var(--ha-line-height-condensed);
           text-align: center;
         }
         .encryption-key ha-icon-button {
diff --git a/src/panels/config/backup/dialogs/dialog-change-backup-encryption-key.ts b/src/panels/config/backup/dialogs/dialog-change-backup-encryption-key.ts
index 15924da7ae..330cadb6b0 100644
--- a/src/panels/config/backup/dialogs/dialog-change-backup-encryption-key.ts
+++ b/src/panels/config/backup/dialogs/dialog-change-backup-encryption-key.ts
@@ -317,7 +317,7 @@ class DialogChangeBackupEncryptionKey extends LitElement implements HassDialog {
           font-family: var(--ha-font-family-code);
           font-style: normal;
           font-weight: var(--ha-font-weight-normal);
-          line-height: 28px;
+          line-height: var(--ha-line-height-condensed);
           text-align: center;
         }
         .encryption-key ha-icon-button {
diff --git a/src/panels/config/backup/dialogs/dialog-set-backup-encryption-key.ts b/src/panels/config/backup/dialogs/dialog-set-backup-encryption-key.ts
index 1fb8948f97..c96e6c4915 100644
--- a/src/panels/config/backup/dialogs/dialog-set-backup-encryption-key.ts
+++ b/src/panels/config/backup/dialogs/dialog-set-backup-encryption-key.ts
@@ -235,7 +235,7 @@ class DialogSetBackupEncryptionKey extends LitElement implements HassDialog {
           font-family: var(--ha-font-family-code);
           font-style: normal;
           font-weight: var(--ha-font-weight-normal);
-          line-height: 28px;
+          line-height: var(--ha-line-height-condensed);
           text-align: center;
         }
         .encryption-key ha-icon-button {
diff --git a/src/panels/config/backup/dialogs/dialog-show-backup-encryption-key.ts b/src/panels/config/backup/dialogs/dialog-show-backup-encryption-key.ts
index 8d3350f2f9..f9f57320e6 100644
--- a/src/panels/config/backup/dialogs/dialog-show-backup-encryption-key.ts
+++ b/src/panels/config/backup/dialogs/dialog-show-backup-encryption-key.ts
@@ -157,7 +157,7 @@ class DialogShowBackupEncryptionKey extends LitElement implements HassDialog {
           font-family: var(--ha-font-family-code);
           font-style: normal;
           font-weight: var(--ha-font-weight-normal);
-          line-height: 28px;
+          line-height: var(--ha-line-height-condensed);
           text-align: center;
         }
         .encryption-key ha-icon-button {
diff --git a/src/panels/config/backup/ha-config-backup-details.ts b/src/panels/config/backup/ha-config-backup-details.ts
index 3d893d2981..ae308a4c42 100644
--- a/src/panels/config/backup/ha-config-backup-details.ts
+++ b/src/panels/config/backup/ha-config-backup-details.ts
@@ -400,7 +400,7 @@ class HaConfigBackupDetails extends LitElement {
       align-items: center;
       flex-direction: row;
       gap: 8px;
-      line-height: normal;
+      line-height: var(--ha-line-height-condensed);
     }
     .dot {
       display: block;
diff --git a/src/panels/config/backup/ha-config-backup-location.ts b/src/panels/config/backup/ha-config-backup-location.ts
index 802f5e03dc..5debf93ae5 100644
--- a/src/panels/config/backup/ha-config-backup-location.ts
+++ b/src/panels/config/backup/ha-config-backup-location.ts
@@ -377,7 +377,7 @@ class HaConfigBackupDetails extends LitElement {
       align-items: center;
       flex-direction: row;
       gap: 8px;
-      line-height: normal;
+      line-height: var(--ha-line-height-condensed);
     }
     .dot {
       display: block;
diff --git a/src/panels/config/hardware/dialog-hardware-available.ts b/src/panels/config/hardware/dialog-hardware-available.ts
index 0b0d90dd57..aad0e73ae2 100644
--- a/src/panels/config/hardware/dialog-hardware-available.ts
+++ b/src/panels/config/hardware/dialog-hardware-available.ts
@@ -196,7 +196,7 @@ class DialogHardwareAvailable extends LitElement implements HassDialog {
         pre {
           padding: 16px;
           overflow: auto;
-          line-height: 1.45;
+          line-height: var(--ha-line-height-normal);
           font-family: var(--ha-font-family-code);
         }
         code {
diff --git a/src/panels/config/info/ha-config-info.ts b/src/panels/config/info/ha-config-info.ts
index 5f51a8dfd4..943e7dd33e 100644
--- a/src/panels/config/info/ha-config-info.ts
+++ b/src/panels/config/info/ha-config-info.ts
@@ -317,7 +317,7 @@ class HaConfigInfo extends LitElement {
         .header p {
           font-size: var(--ha-font-size-xl);
           font-weight: var(--ha-font-weight-normal);
-          line-height: 28px;
+          line-height: var(--ha-line-height-condensed);
           text-align: center;
           margin: 24px;
         }
diff --git a/src/panels/config/integrations/ha-config-integrations-dashboard.ts b/src/panels/config/integrations/ha-config-integrations-dashboard.ts
index 19a9e63cb9..df76f02b9d 100644
--- a/src/panels/config/integrations/ha-config-integrations-dashboard.ts
+++ b/src/panels/config/integrations/ha-config-integrations-dashboard.ts
@@ -1063,20 +1063,18 @@ class HaConfigIntegrationsDashboard extends KeyboardShortcutMixin(
         }
         .badge {
           min-width: 20px;
-          box-sizing: border-box;
+          min-height: 20px;
           border-radius: 50%;
           font-weight: var(--ha-font-weight-normal);
           background-color: var(--primary-color);
-          line-height: 20px;
-          text-align: center;
-          padding: 0px 4px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
           color: var(--text-primary-color);
           position: absolute;
           right: 0px;
-          inset-inline-end: 0px;
-          inset-inline-start: initial;
           top: 4px;
-          font-size: 0.65em;
+          font-size: var(--ha-font-size-s);
         }
         .menu-badge-container {
           position: relative;
diff --git a/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-node-config.ts b/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-node-config.ts
index 6b71cc608d..1d98a00eb7 100644
--- a/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-node-config.ts
+++ b/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-node-config.ts
@@ -618,7 +618,7 @@ class ZWaveJSNodeConfig extends LitElement {
           padding-right: 24px;
           padding-inline-end: 24px;
           padding-inline-start: initial;
-          line-height: 1.5em;
+          line-height: var(--ha-line-height-normal);
         }
 
         .prefix span {
diff --git a/src/panels/config/logs/error-log-card.ts b/src/panels/config/logs/error-log-card.ts
index 1c899b1e83..e14cebf249 100644
--- a/src/panels/config/logs/error-log-card.ts
+++ b/src/panels/config/logs/error-log-card.ts
@@ -778,7 +778,7 @@ class ErrorLogCard extends LitElement {
       font-family: var(--ha-card-header-font-family, inherit);
       font-size: var(--ha-card-header-font-size, var(--ha-font-size-2xl));
       letter-spacing: -0.012em;
-      line-height: 48px;
+      line-height: var(--ha-line-height-expanded);
       display: block;
       margin-block-start: 0px;
       font-weight: var(--ha-font-weight-normal);
diff --git a/src/panels/config/logs/system-log-card.ts b/src/panels/config/logs/system-log-card.ts
index 881b31fb7d..bef4875a12 100644
--- a/src/panels/config/logs/system-log-card.ts
+++ b/src/panels/config/logs/system-log-card.ts
@@ -268,7 +268,7 @@ export class SystemLogCard extends LitElement {
       font-family: var(--ha-card-header-font-family, inherit);
       font-size: var(--ha-card-header-font-size, var(--ha-font-size-2xl));
       letter-spacing: -0.012em;
-      line-height: 48px;
+      line-height: var(--ha-line-height-expanded);
       display: block;
       margin-block-start: 0px;
       font-weight: var(--ha-font-weight-normal);
diff --git a/src/panels/config/network/supervisor-network.ts b/src/panels/config/network/supervisor-network.ts
index 6decf94b54..089bfdad70 100644
--- a/src/panels/config/network/supervisor-network.ts
+++ b/src/panels/config/network/supervisor-network.ts
@@ -832,7 +832,7 @@ export class HassioNetwork extends LitElement {
         }
 
         sl-tab-group {
-          line-height: 24px;
+          line-height: var(--ha-line-height-normal);
         }
         sl-tab {
           flex: 1;
diff --git a/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-config.ts b/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-config.ts
index 548abdf687..98d405c448 100644
--- a/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-config.ts
+++ b/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-config.ts
@@ -96,7 +96,7 @@ export class AssistPipelineDetailConfig extends LitElement {
     h3 {
       font-size: var(--ha-font-size-xl);
       font-weight: var(--ha-font-weight-normal);
-      line-height: 28px;
+      line-height: var(--ha-line-height-condensed);
       margin-top: 0;
       margin-bottom: 4px;
     }
diff --git 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
index 6e2741fabc..a8d59aa72d 100644
--- 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
@@ -133,7 +133,7 @@ export class AssistPipelineDetailConversation extends LitElement {
     h3 {
       font-size: var(--ha-font-size-xl);
       font-weight: var(--ha-font-weight-normal);
-      line-height: 28px;
+      line-height: var(--ha-line-height-condensed);
       margin-top: 0;
       margin-bottom: 4px;
     }
diff --git a/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-stt.ts b/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-stt.ts
index cbd3bfd620..7f4867a96a 100644
--- a/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-stt.ts
+++ b/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-stt.ts
@@ -93,7 +93,7 @@ export class AssistPipelineDetailSTT extends LitElement {
     h3 {
       font-size: var(--ha-font-size-xl);
       font-weight: var(--ha-font-weight-normal);
-      line-height: 28px;
+      line-height: var(--ha-line-height-condensed);
       margin-top: 0;
       margin-bottom: 4px;
     }
diff --git a/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-tts.ts b/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-tts.ts
index 61d86cd84e..7a0dd73646 100644
--- a/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-tts.ts
+++ b/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-tts.ts
@@ -140,7 +140,7 @@ export class AssistPipelineDetailTTS extends LitElement {
     h3 {
       font-size: var(--ha-font-size-xl);
       font-weight: var(--ha-font-weight-normal);
-      line-height: 28px;
+      line-height: var(--ha-line-height-condensed);
       margin-top: 0;
       margin-bottom: 4px;
     }
diff --git a/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-wakeword.ts b/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-wakeword.ts
index feaecc0185..e36cb25f32 100644
--- a/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-wakeword.ts
+++ b/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-wakeword.ts
@@ -147,7 +147,7 @@ export class AssistPipelineDetailWakeWord extends LitElement {
     h3 {
       font-size: var(--ha-font-size-xl);
       font-weight: var(--ha-font-weight-normal);
-      line-height: 28px;
+      line-height: var(--ha-line-height-condensed);
       margin-top: 0;
       margin-bottom: 4px;
     }
diff --git a/src/panels/config/voice-assistants/cloud-discover.ts b/src/panels/config/voice-assistants/cloud-discover.ts
index a9656707ce..5ed735f805 100644
--- a/src/panels/config/voice-assistants/cloud-discover.ts
+++ b/src/panels/config/voice-assistants/cloud-discover.ts
@@ -128,7 +128,7 @@ export class CloudDiscover extends LitElement {
     .header {
       font-size: var(--ha-font-size-3xl);
       font-weight: var(--ha-font-weight-normal);
-      line-height: 36px;
+      line-height: var(--ha-line-height-condensed);
       text-align: center;
       max-width: 600px;
       margin: 0 auto 8px auto;
@@ -136,7 +136,7 @@ export class CloudDiscover extends LitElement {
     @media (min-width: 800px) {
       .header {
         font-size: var(--ha-font-size-4xl);
-        line-height: 40px;
+        line-height: var(--ha-line-height-condensed);
         margin-bottom: 16px;
       }
     }
@@ -178,14 +178,14 @@ export class CloudDiscover extends LitElement {
     .feature h2 {
       font-size: var(--ha-font-size-l);
       font-weight: var(--ha-font-weight-medium);
-      line-height: 24px;
+      line-height: var(--ha-line-height-normal);
       margin-top: 0;
       margin-bottom: 8px;
     }
     .feature p {
       font-size: var(--ha-font-size-m);
       font-weight: var(--ha-font-weight-normal);
-      line-height: 20px;
+      line-height: var(--ha-line-height-condensed);
       margin: 0;
     }
     .more {
diff --git a/src/panels/config/voice-assistants/dialog-expose-entity.ts b/src/panels/config/voice-assistants/dialog-expose-entity.ts
index 1b867aa20c..ed1f790fa4 100644
--- a/src/panels/config/voice-assistants/dialog-expose-entity.ts
+++ b/src/panels/config/voice-assistants/dialog-expose-entity.ts
@@ -207,8 +207,8 @@ class DialogExposeEntity extends LitElement {
         }
         .subtitle {
           color: var(--secondary-text-color);
-          font-size: 1rem;
-          line-height: normal;
+          font-size: var(--ha-font-size-m);
+          line-height: var(--ha-line-height-condensed);
         }
         lit-virtualizer {
           width: 100%;
diff --git a/src/panels/config/voice-assistants/entity-voice-settings.ts b/src/panels/config/voice-assistants/entity-voice-settings.ts
index 4f2946eeb1..7b19480675 100644
--- a/src/panels/config/voice-assistants/entity-voice-settings.ts
+++ b/src/panels/config/voice-assistants/entity-voice-settings.ts
@@ -424,7 +424,7 @@ export class EntityVoiceSettings extends SubscribeMixin(LitElement) {
         .description {
           color: var(--secondary-text-color);
           font-size: var(--ha-font-size-m);
-          line-height: 20px;
+          line-height: var(--ha-line-height-condensed);
           margin-top: 0;
           margin-bottom: 16px;
         }
diff --git a/src/panels/developer-tools/event/events-list.ts b/src/panels/developer-tools/event/events-list.ts
index f0f61f8369..ee784c0e75 100644
--- a/src/panels/developer-tools/event/events-list.ts
+++ b/src/panels/developer-tools/event/events-list.ts
@@ -64,7 +64,7 @@ class EventsList extends LitElement {
 
     li {
       list-style: none;
-      line-height: 2em;
+      line-height: var(--ha-line-height-expanded);
     }
 
     a {
diff --git a/src/panels/developer-tools/ha-panel-developer-tools.ts b/src/panels/developer-tools/ha-panel-developer-tools.ts
index 5cc477831a..a3cef59da7 100644
--- a/src/panels/developer-tools/ha-panel-developer-tools.ts
+++ b/src/panels/developer-tools/ha-panel-developer-tools.ts
@@ -151,7 +151,7 @@ class PanelDeveloperTools extends LitElement {
         }
         .main-title {
           margin: var(--margin-title);
-          line-height: 20px;
+          line-height: var(--ha-line-height-normal);
           flex-grow: 1;
         }
         developer-tools-router {
diff --git a/src/panels/energy/ha-panel-energy.ts b/src/panels/energy/ha-panel-energy.ts
index 1fada09117..e0f692b5c8 100644
--- a/src/panels/energy/ha-panel-energy.ts
+++ b/src/panels/energy/ha-panel-energy.ts
@@ -520,7 +520,7 @@ class PanelEnergy extends LitElement {
         }
         .main-title {
           margin: var(--margin-title);
-          line-height: 20px;
+          line-height: var(--ha-line-height-normal);
           flex-grow: 1;
         }
         hui-view-container {
diff --git a/src/panels/logbook/ha-logbook-renderer.ts b/src/panels/logbook/ha-logbook-renderer.ts
index 56bc0d7a92..43a4a6af10 100644
--- a/src/panels/logbook/ha-logbook-renderer.ts
+++ b/src/panels/logbook/ha-logbook-renderer.ts
@@ -586,7 +586,7 @@ class HaLogbookRenderer extends LitElement {
           position: relative;
           display: flex;
           width: 100%;
-          line-height: 2em;
+          line-height: var(--ha-line-height-expanded);
           padding: 8px 16px;
           box-sizing: border-box;
           border-top: 1px solid var(--divider-color);
@@ -637,7 +637,7 @@ class HaLogbookRenderer extends LitElement {
 
         .secondary {
           font-size: var(--ha-font-size-s);
-          line-height: 1.7;
+          line-height: var(--ha-line-height-normal);
         }
 
         .secondary a {
@@ -700,7 +700,7 @@ class HaLogbookRenderer extends LitElement {
         }
 
         .narrow .entry {
-          line-height: 1.5;
+          line-height: var(--ha-line-height-normal);
         }
 
         .narrow .icon-message state-badge {
diff --git a/src/panels/lovelace/card-features/common/card-feature-styles.ts b/src/panels/lovelace/card-features/common/card-feature-styles.ts
index e8293034d6..799570cc99 100644
--- a/src/panels/lovelace/card-features/common/card-feature-styles.ts
+++ b/src/panels/lovelace/card-features/common/card-feature-styles.ts
@@ -6,7 +6,7 @@ export const cardFeatureStyles = css`
     --control-select-menu-height: var(--feature-height);
     --control-select-menu-border-radius: var(--feature-border-radius);
     --control-select-menu-focus-color: var(--feature-color);
-    line-height: 1.2;
+    line-height: var(--ha-line-height-condensed);
     display: block;
     width: 100%;
   }
diff --git a/src/panels/lovelace/cards/hui-calendar-card.ts b/src/panels/lovelace/cards/hui-calendar-card.ts
index 9c7ba23068..b549c05596 100644
--- a/src/panels/lovelace/cards/hui-calendar-card.ts
+++ b/src/panels/lovelace/cards/hui-calendar-card.ts
@@ -223,7 +223,7 @@ export class HuiCalendarCard extends LitElement implements LovelaceCard {
     .header {
       color: var(--ha-card-header-color, var(--primary-text-color));
       font-size: var(--ha-card-header-font-size, var(--ha-font-size-2xl));
-      line-height: 1.2;
+      line-height: var(--ha-line-height-condensed);
       padding-top: 16px;
       padding-left: 8px;
       padding-inline-start: 8px;
diff --git a/src/panels/lovelace/cards/hui-clock-card.ts b/src/panels/lovelace/cards/hui-clock-card.ts
index 8e524f1e17..93c7a46224 100644
--- a/src/panels/lovelace/cards/hui-clock-card.ts
+++ b/src/panels/lovelace/cards/hui-clock-card.ts
@@ -206,7 +206,7 @@ export class HuiClockCard extends LitElement implements LovelaceCard {
       color: var(--primary-text-color);
       font-size: var(--ha-font-size-m);
       font-weight: var(--ha-font-weight-normal);
-      line-height: 18px;
+      line-height: var(--ha-line-height-condensed);
       overflow: hidden;
       text-align: center;
       text-overflow: ellipsis;
@@ -216,12 +216,12 @@ export class HuiClockCard extends LitElement implements LovelaceCard {
 
     .time-wrapper.size-medium .time-title {
       font-size: var(--ha-font-size-l);
-      line-height: 21px;
+      line-height: var(--ha-line-height-condensed);
     }
 
     .time-wrapper.size-large .time-title {
       font-size: var(--ha-font-size-2xl);
-      line-height: 28px;
+      line-height: var(--ha-line-height-condensed);
     }
 
     .time-parts {
diff --git a/src/panels/lovelace/cards/hui-entity-card.ts b/src/panels/lovelace/cards/hui-entity-card.ts
index ba587f695e..826520a080 100644
--- a/src/panels/lovelace/cards/hui-entity-card.ts
+++ b/src/panels/lovelace/cards/hui-entity-card.ts
@@ -301,7 +301,7 @@ export class HuiEntityCard extends LitElement implements LovelaceCard {
           overflow: hidden;
           white-space: nowrap;
           text-overflow: ellipsis;
-          line-height: 28px;
+          line-height: var(--ha-line-height-expanded);
         }
 
         .value {
diff --git a/src/panels/lovelace/cards/hui-heading-card.ts b/src/panels/lovelace/cards/hui-heading-card.ts
index 0f409c7c01..4f6c62f243 100644
--- a/src/panels/lovelace/cards/hui-heading-card.ts
+++ b/src/panels/lovelace/cards/hui-heading-card.ts
@@ -179,7 +179,10 @@ export class HuiHeadingCard extends LitElement implements LovelaceCard {
         --ha-heading-card-title-font-weight,
         var(--ha-font-weight-normal)
       );
-      line-height: var(--ha-heading-card-title-line-height, 24px);
+      line-height: var(
+        --ha-heading-card-title-line-height,
+        var(--ha-line-height-normal)
+      );
       letter-spacing: 0.1px;
       --mdc-icon-size: 18px;
     }
@@ -207,7 +210,10 @@ export class HuiHeadingCard extends LitElement implements LovelaceCard {
         --ha-heading-card-subtitle-font-weight,
         var(--ha-font-weight-medium)
       );
-      line-height: var(--ha-heading-card-subtitle-line-height, 20px);
+      line-height: var(
+        --ha-heading-card-subtitle-line-height,
+        var(--ha-line-height-condensed)
+      );
     }
     .badges {
       display: flex;
diff --git a/src/panels/lovelace/cards/hui-humidifier-card.ts b/src/panels/lovelace/cards/hui-humidifier-card.ts
index edbe0b782b..39df5b5e8d 100644
--- a/src/panels/lovelace/cards/hui-humidifier-card.ts
+++ b/src/panels/lovelace/cards/hui-humidifier-card.ts
@@ -211,7 +211,7 @@ export class HuiHumidifierCard extends LitElement implements LovelaceCard {
     .title {
       width: 100%;
       font-size: var(--ha-font-size-l);
-      line-height: 36px;
+      line-height: var(--ha-line-height-expanded);
       padding: 8px 30px 8px 30px;
       margin: 0;
       text-align: center;
diff --git a/src/panels/lovelace/cards/hui-picture-glance-card.ts b/src/panels/lovelace/cards/hui-picture-glance-card.ts
index 5a4bf91c6b..9d3aab17d2 100644
--- a/src/panels/lovelace/cards/hui-picture-glance-card.ts
+++ b/src/panels/lovelace/cards/hui-picture-glance-card.ts
@@ -362,7 +362,7 @@ class HuiPictureGlanceCard extends LitElement implements LovelaceCard {
       text-overflow: ellipsis;
       overflow: hidden;
       font-size: var(--ha-font-size-l);
-      line-height: 40px;
+      line-height: var(--ha-line-height-expanded);
       color: var(--ha-picture-card-text-color, white);
       align-self: center;
     }
diff --git a/src/panels/lovelace/cards/hui-plant-status-card.ts b/src/panels/lovelace/cards/hui-plant-status-card.ts
index 6bd74b4f5b..e9f5fa7abf 100644
--- a/src/panels/lovelace/cards/hui-plant-status-card.ts
+++ b/src/panels/lovelace/cards/hui-plant-status-card.ts
@@ -183,9 +183,7 @@ class HuiPlantStatusCard extends LitElement implements LovelaceCard {
       -moz-osx-font-smoothing: var(--ha-moz-osx-font-smoothing);
       font-size: var(--ha-font-size-2xl);
       font-weight: var(--ha-font-weight-normal);
-      line-height: var(--ha-line-height-condensed);
-
-      line-height: 40px;
+      line-height: var(--ha-line-height-normal);
       padding: 8px 16px;
     }
 
diff --git a/src/panels/lovelace/cards/hui-stack-card.ts b/src/panels/lovelace/cards/hui-stack-card.ts
index 8f881f309c..9d68bca045 100644
--- a/src/panels/lovelace/cards/hui-stack-card.ts
+++ b/src/panels/lovelace/cards/hui-stack-card.ts
@@ -101,7 +101,7 @@ export abstract class HuiStackCard<T extends StackCardConfig = StackCardConfig>
       margin-block-start: 0px;
       margin-block-end: 0px;
       letter-spacing: -0.012em;
-      line-height: 32px;
+      line-height: var(--ha-line-height-condensed);
       display: block;
       padding: 24px 16px 16px;
     }
diff --git a/src/panels/lovelace/cards/hui-statistic-card.ts b/src/panels/lovelace/cards/hui-statistic-card.ts
index fd040e1b15..bdb8defd0b 100644
--- a/src/panels/lovelace/cards/hui-statistic-card.ts
+++ b/src/panels/lovelace/cards/hui-statistic-card.ts
@@ -369,7 +369,7 @@ export class HuiStatisticCard extends LitElement implements LovelaceCard {
 
         .name {
           color: var(--secondary-text-color);
-          line-height: 40px;
+          line-height: var(--ha-line-height-expanded);
           font-size: var(--ha-font-size-l);
           font-weight: var(--ha-font-weight-medium);
           overflow: hidden;
@@ -388,7 +388,7 @@ export class HuiStatisticCard extends LitElement implements LovelaceCard {
           overflow: hidden;
           white-space: nowrap;
           text-overflow: ellipsis;
-          line-height: 28px;
+          line-height: var(--ha-line-height-expanded);
         }
 
         .value {
diff --git a/src/panels/lovelace/cards/hui-thermostat-card.ts b/src/panels/lovelace/cards/hui-thermostat-card.ts
index 5d1aebb00d..8bd478e90e 100644
--- a/src/panels/lovelace/cards/hui-thermostat-card.ts
+++ b/src/panels/lovelace/cards/hui-thermostat-card.ts
@@ -203,7 +203,7 @@ export class HuiThermostatCard extends LitElement implements LovelaceCard {
     .title {
       width: 100%;
       font-size: var(--ha-font-size-l);
-      line-height: 36px;
+      line-height: var(--ha-line-height-expanded);
       padding: 8px 30px 8px 30px;
       margin: 0;
       text-align: center;
diff --git a/src/panels/lovelace/cards/hui-weather-forecast-card.ts b/src/panels/lovelace/cards/hui-weather-forecast-card.ts
index 4e74c43410..4400c0539c 100644
--- a/src/panels/lovelace/cards/hui-weather-forecast-card.ts
+++ b/src/panels/lovelace/cards/hui-weather-forecast-card.ts
@@ -536,7 +536,7 @@ class HuiWeatherForecastCard extends LitElement implements LovelaceCard {
         .state,
         .temp-attribute .temp {
           font-size: var(--ha-font-size-3xl);
-          line-height: 1.2;
+          line-height: var(--ha-line-height-condensed);
         }
 
         .name,
diff --git a/src/panels/lovelace/components/hui-card-options.ts b/src/panels/lovelace/components/hui-card-options.ts
index f3c0429d4b..873ee0ef52 100644
--- a/src/panels/lovelace/components/hui-card-options.ts
+++ b/src/panels/lovelace/components/hui-card-options.ts
@@ -227,7 +227,7 @@ export class HuiCardOptions extends LitElement {
         .position-badge {
           display: block;
           width: 24px;
-          line-height: 24px;
+          line-height: var(--ha-line-height-normal);
           box-sizing: border-box;
           border-radius: 50%;
           font-weight: var(--ha-font-weight-medium);
diff --git a/src/panels/lovelace/editor/badge-editor/hui-badge-picker.ts b/src/panels/lovelace/editor/badge-editor/hui-badge-picker.ts
index 1b83caf377..7efb3f8032 100644
--- a/src/panels/lovelace/editor/badge-editor/hui-badge-picker.ts
+++ b/src/panels/lovelace/editor/badge-editor/hui-badge-picker.ts
@@ -510,7 +510,7 @@ export class HuiBadgePicker extends LitElement {
           font-size: var(--ha-font-size-l);
           font-weight: var(--ha-font-weight-bold);
           letter-spacing: -0.012em;
-          line-height: 20px;
+          line-height: var(--ha-line-height-condensed);
           padding: 12px 16px;
           display: block;
           text-align: center;
diff --git a/src/panels/lovelace/editor/card-editor/hui-card-picker.ts b/src/panels/lovelace/editor/card-editor/hui-card-picker.ts
index 2f4ea47399..a59bc30d9d 100644
--- a/src/panels/lovelace/editor/card-editor/hui-card-picker.ts
+++ b/src/panels/lovelace/editor/card-editor/hui-card-picker.ts
@@ -515,7 +515,7 @@ export class HuiCardPicker extends LitElement {
           font-size: var(--ha-font-size-l);
           font-weight: var(--ha-font-weight-bold);
           letter-spacing: -0.012em;
-          line-height: 20px;
+          line-height: var(--ha-line-height-condensed);
           padding: 12px 16px;
           display: block;
           text-align: center;
diff --git a/src/panels/lovelace/hui-root.ts b/src/panels/lovelace/hui-root.ts
index 11d0616944..ce20a65c2e 100644
--- a/src/panels/lovelace/hui-root.ts
+++ b/src/panels/lovelace/hui-root.ts
@@ -1033,7 +1033,7 @@ class HUIRoot extends LitElement {
         }
         .main-title {
           margin: var(--margin-title);
-          line-height: 20px;
+          line-height: var(--ha-line-height-normal);
           flex-grow: 1;
         }
         .action-items {
diff --git a/src/panels/lovelace/strategies/areas/editor/hui-areas-dashboard-strategy-editor.ts b/src/panels/lovelace/strategies/areas/editor/hui-areas-dashboard-strategy-editor.ts
index be733ee9a8..6edf10b22c 100644
--- a/src/panels/lovelace/strategies/areas/editor/hui-areas-dashboard-strategy-editor.ts
+++ b/src/panels/lovelace/strategies/areas/editor/hui-areas-dashboard-strategy-editor.ts
@@ -205,7 +205,7 @@ export class HuiAreasDashboardStrategyEditor
         .toolbar p {
           margin: 0;
           font-size: var(--ha-font-size-l);
-          line-height: 24px;
+          line-height: var(--ha-line-height-normal);
           font-weight: var(--ha-font-weight-normal);
           padding: 6px 4px;
         }
diff --git a/src/panels/lovelace/views/hui-sections-view.ts b/src/panels/lovelace/views/hui-sections-view.ts
index b0f6d11951..b7055d2ce1 100644
--- a/src/panels/lovelace/views/hui-sections-view.ts
+++ b/src/panels/lovelace/views/hui-sections-view.ts
@@ -532,7 +532,7 @@ export class SectionsView extends LitElement implements LovelaceViewElement {
       color: var(--primary-text-color);
       font-size: var(--ha-font-size-l);
       font-weight: var(--ha-font-weight-normal);
-      line-height: 24px;
+      line-height: var(--ha-line-height-normal);
       text-align: center;
     }
 
@@ -619,7 +619,7 @@ export class SectionsView extends LitElement implements LovelaceViewElement {
       color: var(--primary-text-color);
       font-size: var(--ha-font-size-l);
       font-weight: var(--ha-font-weight-normal);
-      line-height: 24px;
+      line-height: var(--ha-line-height-normal);
       --mdc-icon-size: 18px;
       display: flex;
       align-items: center;
@@ -631,7 +631,7 @@ export class SectionsView extends LitElement implements LovelaceViewElement {
       color: var(--secondary-text-color);
       font-size: var(--ha-font-size-m);
       font-weight: var(--ha-font-weight-normal);
-      line-height: 20px;
+      line-height: var(--ha-line-height-condensed);
     }
   `;
 }
diff --git a/src/panels/todo/ha-panel-todo.ts b/src/panels/todo/ha-panel-todo.ts
index 62c5cc649d..fe79b63ef1 100644
--- a/src/panels/todo/ha-panel-todo.ts
+++ b/src/panels/todo/ha-panel-todo.ts
@@ -413,7 +413,7 @@ class PanelTodo extends LitElement {
           );
           --mdc-typography-button-line-height: var(
             --mdc-typography-headline6-line-height,
-            2rem
+            var(--ha-line-height-expanded)
           );
           --button-height: 40px;
         }
diff --git a/src/state-control/state-control-circular-slider-style.ts b/src/state-control/state-control-circular-slider-style.ts
index e9c3e17318..23d27f6eac 100644
--- a/src/state-control/state-control-circular-slider-style.ts
+++ b/src/state-control/state-control-circular-slider-style.ts
@@ -24,7 +24,7 @@ export const stateControlCircularSliderStyle = css`
     justify-content: center;
     pointer-events: none;
     font-size: var(--ha-font-size-l);
-    line-height: 1.5;
+    line-height: var(--ha-line-height-normal);
     letter-spacing: 0.1px;
     gap: 8px;
     --mdc-icon-size: 16px;
@@ -42,7 +42,7 @@ export const stateControlCircularSliderStyle = css`
     -webkit-line-clamp: 2;
     -webkit-box-orient: vertical;
     overflow: hidden;
-    line-height: 1.5;
+    line-height: var(--ha-line-height-normal);
     min-height: 1.5em;
     white-space: nowrap;
   }
diff --git a/src/state-summary/state-card-climate.ts b/src/state-summary/state-card-climate.ts
index 8c32836566..59c5bb3185 100644
--- a/src/state-summary/state-card-climate.ts
+++ b/src/state-summary/state-card-climate.ts
@@ -36,7 +36,7 @@ class StateCardClimate extends LitElement {
       haStyle,
       css`
         :host {
-          line-height: 1.5;
+          line-height: var(--ha-line-height-normal);
         }
 
         ha-climate-state {
diff --git a/src/state-summary/state-card-cover.ts b/src/state-summary/state-card-cover.ts
index d83737df0c..adb976d2d4 100644
--- a/src/state-summary/state-card-cover.ts
+++ b/src/state-summary/state-card-cover.ts
@@ -44,7 +44,7 @@ class StateCardCover extends LitElement {
       haStyle,
       css`
         :host {
-          line-height: 1.5;
+          line-height: var(--ha-line-height-normal);
         }
       `,
     ];
diff --git a/src/state-summary/state-card-humidifier.ts b/src/state-summary/state-card-humidifier.ts
index e691ce7956..61acfb5ace 100644
--- a/src/state-summary/state-card-humidifier.ts
+++ b/src/state-summary/state-card-humidifier.ts
@@ -38,7 +38,7 @@ class StateCardHumidifier extends LitElement {
       haStyle,
       css`
         :host {
-          line-height: 1.5;
+          line-height: var(--ha-line-height-normal);
         }
 
         ha-humidifier-state {
diff --git a/src/state-summary/state-card-media_player.ts b/src/state-summary/state-card-media_player.ts
index b5101cf28a..57f279d2b8 100644
--- a/src/state-summary/state-card-media_player.ts
+++ b/src/state-summary/state-card-media_player.ts
@@ -45,7 +45,7 @@ class StateCardMediaPlayer extends LitElement {
       haStyle,
       css`
         :host {
-          line-height: 1.5;
+          line-height: var(--ha-line-height-normal);
         }
 
         .state {
diff --git a/src/state-summary/state-card-water_heater.ts b/src/state-summary/state-card-water_heater.ts
index 2fe2204b6c..14a2ceb6b5 100644
--- a/src/state-summary/state-card-water_heater.ts
+++ b/src/state-summary/state-card-water_heater.ts
@@ -37,7 +37,7 @@ class StateCardWaterHeater extends LitElement {
       haStyle,
       css`
         :host {
-          line-height: 1.5;
+          line-height: var(--ha-line-height-normal);
         }
 
         ha-water_heater-state {