diff --git a/src/panels/lovelace/heading-badges/hui-button-heading-badge.ts b/src/panels/lovelace/heading-badges/hui-button-heading-badge.ts
index 6a43fd4f77..f8d45b18fa 100644
--- a/src/panels/lovelace/heading-badges/hui-button-heading-badge.ts
+++ b/src/panels/lovelace/heading-badges/hui-button-heading-badge.ts
@@ -112,7 +112,7 @@ export class HuiButtonHeadingBadge
       width: auto;
       height: var(--ha-heading-badge-size, 26px);
       min-width: var(--ha-heading-badge-size, 26px);
-      font-size: var(--ha-heading-badge-font-size, var(--ha-font-size-m));
+      font-size: var(--ha-heading-badge-font-size, var(--ha-font-size-s));
       font-weight: var(--ha-font-weight-medium);
     }
     ha-control-button.with-text {
@@ -135,6 +135,9 @@ export class HuiButtonHeadingBadge
       padding: 0 var(--ha-space-1);
       line-height: 1;
     }
+    ha-icon {
+      line-height: 1;
+    }
   `;
 }