diff --git a/src/common/entity/domain_icon.ts b/src/common/entity/domain_icon.ts
index e555b0e286..836c5024dc 100644
--- a/src/common/entity/domain_icon.ts
+++ b/src/common/entity/domain_icon.ts
@@ -77,6 +77,11 @@ export const domainIcon = (
         return "hass:calendar";
       }
       break;
+
+    case "sun":
+      return stateObj?.state === "above_horizon"
+        ? FIXED_DOMAIN_ICONS[domain]
+        : "hass:weather-night";
   }
 
   if (domain in FIXED_DOMAIN_ICONS) {
diff --git a/src/components/entity/ha-state-label-badge.ts b/src/components/entity/ha-state-label-badge.ts
index b38259b210..61d68fc1c1 100644
--- a/src/components/entity/ha-state-label-badge.ts
+++ b/src/components/entity/ha-state-label-badge.ts
@@ -154,11 +154,8 @@ export class HaStateLabelBadge extends LitElement {
       case "device_tracker":
       case "updater":
       case "person":
-        return stateIcon(state);
       case "sun":
-        return state.state === "above_horizon"
-          ? domainIcon(domain)
-          : "hass:brightness-3";
+        return stateIcon(state);
       case "timer":
         return state.state === "active"
           ? "hass:timer-outline"