diff --git a/src/components/battery.ts b/src/components/battery.ts
index 2834094..c35944f 100644
--- a/src/components/battery.ts
+++ b/src/components/battery.ts
@@ -58,11 +58,6 @@ export const batteryElement = (
         : null}
       <ha-icon
         .icon=${battery.icon}
-        style=${entities.battery?.display_state === "two_way"
-          ? "padding-top: 0px; padding-bottom: 2px;"
-          : entities.battery?.display_state === "one_way_no_zero" && battery.state.toBattery === 0 && battery.state.fromBattery === 0
-          ? "padding-top: 2px; padding-bottom: 0px;"
-          : "padding-top: 2px; padding-bottom: 2px;"}
         @click=${(e: { stopPropagation: () => void }) => {
           main.openDetails(e, entities.battery?.state_of_charge!);
         }}
diff --git a/src/components/individualLeftBottomElement.ts b/src/components/individualLeftBottomElement.ts
index 380509f..b79682b 100644
--- a/src/components/individualLeftBottomElement.ts
+++ b/src/components/individualLeftBottomElement.ts
@@ -66,11 +66,6 @@ export const individualLeftBottomElement = (
       <ha-icon
         id="individual-left-bottom-icon"
         .icon=${individualObj?.icon}
-        style="${individualObj?.secondary?.has ? "padding-top: 2px;" : "padding-top: 0px;"}
-                          ${individualObj?.field?.display_zero_state !== false ||
-        (individualObj?.state || 0) > (individualObj.displayZeroTolerance ?? 0)
-          ? "padding-bottom: 2px;"
-          : "padding-bottom: 0px;"}"
       ></ha-icon>
       ${individualObj?.field?.display_zero_state !== false || (individualObj?.state || 0) > (individualObj.displayZeroTolerance ?? 0)
         ? html` <span class="individual-bottom individual-left-top"
diff --git a/src/components/individualLeftTopElement.ts b/src/components/individualLeftTopElement.ts
index ec30d58..7d39394 100644
--- a/src/components/individualLeftTopElement.ts
+++ b/src/components/individualLeftTopElement.ts
@@ -38,14 +38,7 @@ export const individualLeftTopElement = (
       }}
     >
       ${individualSecondarySpan(main.hass, main, templatesObj, individualObj, 0, "left-top")}
-      <ha-icon
-        id="individual-left-top-icon"
-        .icon=${individualObj.icon}
-        style="${individualObj?.secondary?.has ? "padding-top: 2px;" : "padding-top: 0px;"}
-      ${individualObj?.field?.display_zero_state !== false || (individualObj.state || 0) > (individualObj.displayZeroTolerance ?? 0)
-          ? "padding-bottom: 2px;"
-          : "padding-bottom: 0px;"}"
-      ></ha-icon>
+      <ha-icon id="individual-left-top-icon" .icon=${individualObj.icon}></ha-icon>
       ${individualObj?.field?.display_zero_state !== false || (individualObj.state || 0) > (individualObj.displayZeroTolerance ?? 0)
         ? html` <span class="individual-top individual-left-top">
             ${individualObj?.showDirection
diff --git a/src/components/individualRightBottomElement.ts b/src/components/individualRightBottomElement.ts
index 3b58d9f..6b01f5e 100644
--- a/src/components/individualRightBottomElement.ts
+++ b/src/components/individualRightBottomElement.ts
@@ -46,14 +46,7 @@ export const individualRightBottomElement = (
       }}
     >
       ${individualSecondarySpan(main.hass, main, templatesObj, individualObj, 3, "right-bottom")}
-      <ha-icon
-        id="individual-right-bottom-icon"
-        .icon=${individualObj.icon}
-        style="${individualObj?.secondary?.has ? "padding-top: 2px;" : "padding-top: 0px;"}
-      ${individualObj?.field?.display_zero_state !== false || (individualObj.state || 0) > (individualObj.displayZeroTolerance ?? 0)
-          ? "padding-bottom: 2px;"
-          : "padding-bottom: 0px;"}"
-      ></ha-icon>
+      <ha-icon id="individual-right-bottom-icon" .icon=${individualObj.icon}></ha-icon>
       ${individualObj?.field?.display_zero_state !== false || (individualObj.state || 0) > (individualObj.displayZeroTolerance ?? 0)
         ? html` <span class="individual-bottom individual-right-bottom">
             ${individualObj?.showDirection
diff --git a/src/components/individualRightTopElement.ts b/src/components/individualRightTopElement.ts
index 365cba3..90d4dcc 100644
--- a/src/components/individualRightTopElement.ts
+++ b/src/components/individualRightTopElement.ts
@@ -50,10 +50,7 @@ export const individualRightTopElement = (
       <ha-icon
         id="individual-right-top-icon"
         .icon=${individualObj.icon}
-        style="${individualObj?.secondary?.has ? "padding-top: 2px;" : "padding-top: 0px;"}
-      ${individualObj?.field?.display_zero_state !== false || (individualObj.state || 0) > (individualObj.displayZeroTolerance ?? 0)
-          ? "padding-bottom: 2px;"
-          : "padding-bottom: 0px;"}"
+        
       ></ha-icon>
       ${individualObj?.field?.display_zero_state !== false || (individualObj.state || 0) > (individualObj.displayZeroTolerance ?? 0)
         ? html` <span class="individual-top individual-right-top">
diff --git a/src/components/nonFossil.ts b/src/components/nonFossil.ts
index f907f9e..89dfc53 100644
--- a/src/components/nonFossil.ts
+++ b/src/components/nonFossil.ts
@@ -38,15 +38,7 @@ export const nonFossilElement = (
           }}
         >
           ${generalSecondarySpan(main.hass, main, templatesObj, nonFossil, "low-carbon")}
-          <ha-icon
-            .icon=${nonFossil.icon}
-            class="low-carbon"
-            style="${nonFossil.secondary.has ? "padding-top: 2px;" : "padding-top: 0px;"}
-            ${entities.fossil_fuel_percentage?.display_zero_state !== false ||
-            (nonFossil.state.power || 0) > (entities.fossil_fuel_percentage?.display_zero_tolerance || 0)
-              ? "padding-bottom: 2px;"
-              : "padding-bottom: 0px;"}"
-          ></ha-icon>
+          <ha-icon .icon=${nonFossil.icon} class="low-carbon"></ha-icon>
           ${entities.fossil_fuel_percentage?.display_zero_state !== false ||
           (nonFossil.state.power || 0) > (entities.fossil_fuel_percentage?.display_zero_tolerance || 0)
             ? html`
diff --git a/src/components/solar.ts b/src/components/solar.ts
index 9283cef..0303d45 100644
--- a/src/components/solar.ts
+++ b/src/components/solar.ts
@@ -31,12 +31,7 @@ export const solarElement = (
       }}
     >
       ${generalSecondarySpan(main.hass, main, templatesObj, solar, "solar")}
-      <ha-icon
-        id="solar-icon"
-        .icon=${solar.icon}
-        style="${solar.secondary.has ? "padding-top: 2px;" : "padding-top: 0px;"}
-      ${entities.solar?.display_zero_state !== false || (solar.state.total || 0) > 0 ? "padding-bottom: 2px;" : "padding-bottom: 0px;"}"
-      ></ha-icon>
+      <ha-icon id="solar-icon" .icon=${solar.icon}></ha-icon>
       ${entities.solar?.display_zero_state !== false || (solar.state.total || 0) > 0
         ? html` <span class="solar"> ${displayValue(main.hass, solar.state.total as number)}</span>`
         : ""}
diff --git a/src/style.ts b/src/style.ts
index 2d4993d..4610bc1 100644
--- a/src/style.ts
+++ b/src/style.ts
@@ -88,6 +88,7 @@ export const styles = css`
     position: relative;
     text-decoration: none;
     color: var(--primary-text-color);
+    gap: 2px;
     // background-color: var(--card-background-color); /* hide overflowing lines behind background */
   }