diff --git a/src/power-flow-card-plus.ts b/src/power-flow-card-plus.ts
index 4eaa73a2..7912133f 100644
--- a/src/power-flow-card-plus.ts
+++ b/src/power-flow-card-plus.ts
@@ -461,6 +461,15 @@ export class PowerFlowCardPlus extends LitElement {
     }
     if (entities.battery?.icon !== undefined) battery.icon = entities.battery?.icon;
 
+    // override icon of battery entity if use_metadata is true
+    const batteryUseMetadataIcon = entities.battery?.use_metadata;
+    if (batteryUseMetadataIcon) {
+      const metadataIcon = computeFieldIcon(this.hass, entities.battery, "NO_ICON_METADATA");
+      if (metadataIcon !== "NO_ICON_METADATA") {
+        battery.icon = metadataIcon;
+      }
+    }
+
     // Compute durations
     const newDur: NewDur = {
       batteryGrid: computeFlowRate(this._config, grid.state.toBattery ?? battery.state.toGrid ?? 0, totalLines),