diff --git a/src/components/ha-header-bar.ts b/src/components/ha-header-bar.ts
index 2d55a1998d..3bb3ed1bd6 100644
--- a/src/components/ha-header-bar.ts
+++ b/src/components/ha-header-bar.ts
@@ -33,7 +33,7 @@ export class HaHeaderBar extends LitElement {
       unsafeCSS(topAppBarStyles),
       css`
         .mdc-top-app-bar__row {
-          height: var(--header-bar-height, 64px);
+          height: var(--header-height);
         }
         .mdc-top-app-bar {
           position: static;
diff --git a/src/dialogs/more-info/ha-more-info-dialog.ts b/src/dialogs/more-info/ha-more-info-dialog.ts
index 456abaebe7..8512a382e1 100644
--- a/src/dialogs/more-info/ha-more-info-dialog.ts
+++ b/src/dialogs/more-info/ha-more-info-dialog.ts
@@ -478,7 +478,7 @@ export class MoreInfoDialog extends LitElement {
 
         @media all and (max-width: 450px) {
           .child-view > * {
-            min-height: calc(100vh - 56px);
+            min-height: calc(100vh - var(--header-height));
           }
         }
 
diff --git a/src/dialogs/more-info/ha-more-info-info.ts b/src/dialogs/more-info/ha-more-info-info.ts
index 858d0110bc..f789ad64a7 100644
--- a/src/dialogs/more-info/ha-more-info-info.ts
+++ b/src/dialogs/more-info/ha-more-info-info.ts
@@ -90,7 +90,7 @@ export class MoreInfoInfo extends LitElement {
 
       @media all and (max-width: 450px) {
         .container {
-          min-height: calc(100vh - 56px);
+          min-height: calc(100vh - var(--header-height));
         }
       }
 
diff --git a/src/dialogs/notifications/notification-drawer.ts b/src/dialogs/notifications/notification-drawer.ts
index 15b39e54e0..ccbb0b2533 100644
--- a/src/dialogs/notifications/notification-drawer.ts
+++ b/src/dialogs/notifications/notification-drawer.ts
@@ -152,7 +152,6 @@ export class HuiNotificationDrawer extends LitElement {
       --mdc-theme-primary: var(--primary-background-color);
       border-bottom: 1px solid var(--divider-color);
       display: block;
-      --header-bar-height: var(--header-height);
     }
 
     .notifications {
diff --git a/src/dialogs/quick-bar/ha-quick-bar.ts b/src/dialogs/quick-bar/ha-quick-bar.ts
index 12b72f9b1d..b9c53375d0 100644
--- a/src/dialogs/quick-bar/ha-quick-bar.ts
+++ b/src/dialogs/quick-bar/ha-quick-bar.ts
@@ -755,6 +755,9 @@ export class QuickBar extends LitElement {
       haStyleScrollbar,
       haStyleDialog,
       css`
+        mwc-list {
+          --mdc-list-vertical-padding: 0;
+        }
         .heading {
           display: flex;
           align-items: center;
diff --git a/src/panels/config/automation/ha-automation-trace.ts b/src/panels/config/automation/ha-automation-trace.ts
index 682bb01f7c..8ff9e0da71 100644
--- a/src/panels/config/automation/ha-automation-trace.ts
+++ b/src/panels/config/automation/ha-automation-trace.ts
@@ -520,7 +520,7 @@ export class HaAutomationTrace extends LitElement {
         }
 
         .main {
-          height: calc(100% - 56px);
+          height: calc(100% - var(--header-height));
           display: flex;
           background-color: var(--card-background-color);
           direction: ltr;
diff --git a/src/panels/config/script/ha-script-trace.ts b/src/panels/config/script/ha-script-trace.ts
index c8082dace5..5f7f1980b2 100644
--- a/src/panels/config/script/ha-script-trace.ts
+++ b/src/panels/config/script/ha-script-trace.ts
@@ -508,7 +508,7 @@ export class HaScriptTrace extends LitElement {
         }
 
         .main {
-          height: calc(100% - 56px);
+          height: calc(100% - var(--header-height));
           display: flex;
           background-color: var(--card-background-color);
         }