diff --git a/src/components/ha-base-time-input.ts b/src/components/ha-base-time-input.ts
index 493e939e14..86485f05e0 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, Roboto, sans-serif)
       );
       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-normal)
+      );
       font-weight: var(
         --mdc-typography-body2-font-weight,
         var(--ha-font-weight-normal)
diff --git a/src/dialogs/config-flow/styles.ts b/src/dialogs/config-flow/styles.ts
index 0be98e0deb..ae34fe5d5a 100644
--- a/src/dialogs/config-flow/styles.ts
+++ b/src/dialogs/config-flow/styles.ts
@@ -15,7 +15,10 @@ export const configFlowContentStyles = css`
       var(--mdc-typography-font-family, Roboto, sans-serif)
     );
     font-size: var(--mdc-typography-headline6-font-size, var(--ha-font-size-l));
-    line-height: var(--mdc-typography-headline6-line-height, 2rem);
+    line-height: var(
+      --mdc-typography-headline6-line-height,
+      var(--ha-line-height-expanded)
+    );
     font-weight: var(
       --mdc-typography-headline6-font-weight,
       var(--ha-font-weight-semibold)
diff --git a/src/panels/config/integrations/dialog-add-integration.ts b/src/panels/config/integrations/dialog-add-integration.ts
index f5f2415e7b..9ecd36a046 100644
--- a/src/panels/config/integrations/dialog-add-integration.ts
+++ b/src/panels/config/integrations/dialog-add-integration.ts
@@ -775,7 +775,10 @@ class AddIntegrationDialog extends LitElement {
           --mdc-typography-headline6-font-size,
           var(--ha-font-size-l)
         );
-        line-height: var(--mdc-typography-headline6-line-height, 2rem);
+        line-height: var(
+          --mdc-typography-headline6-line-height,
+          var(--ha-line-height-expanded)
+        );
         font-weight: var(
           --mdc-typography-headline6-font-weight,
           var(--ha-font-weight-semibold)
diff --git a/src/panels/lovelace/cards/hui-calendar-card.ts b/src/panels/lovelace/cards/hui-calendar-card.ts
index 0c443554ee..b549c05596 100644
--- a/src/panels/lovelace/cards/hui-calendar-card.ts
+++ b/src/panels/lovelace/cards/hui-calendar-card.ts
@@ -222,7 +222,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, 24px);
+      font-size: var(--ha-card-header-font-size, var(--ha-font-size-2xl));
       line-height: var(--ha-line-height-condensed);
       padding-top: 16px;
       padding-left: 8px;