diff --git a/src/common/const.ts b/src/common/const.ts
index 64811ef272..6e9d669bc5 100644
--- a/src/common/const.ts
+++ b/src/common/const.ts
@@ -1,7 +1,6 @@
 /** Constants to be used in the frontend. */
 
 import {
-  mdiAccount,
   mdiAirFilter,
   mdiAlert,
   mdiAngleAcute,
@@ -48,7 +47,6 @@ import {
   mdiProgressClock,
   mdiRayVertex,
   mdiRemote,
-  mdiRobot,
   mdiRobotVacuum,
   mdiScriptText,
   mdiSineWave,
@@ -59,15 +57,12 @@ import {
   mdiThermostat,
   mdiTimerOutline,
   mdiTransmissionTower,
-  mdiVideo,
   mdiWater,
   mdiWaterPercent,
-  mdiWeatherCloudy,
   mdiWeatherPouring,
   mdiWeatherRainy,
   mdiWeatherWindy,
   mdiWeight,
-  mdiWhiteBalanceSunny,
   mdiWifi,
 } from "@mdi/js";
 
@@ -82,9 +77,7 @@ export const DEFAULT_DOMAIN_ICON = mdiBookmark;
 export const FIXED_DOMAIN_ICONS = {
   alert: mdiAlert,
   air_quality: mdiAirFilter,
-  automation: mdiRobot,
   calendar: mdiCalendar,
-  camera: mdiVideo,
   climate: mdiThermostat,
   configurator: mdiCog,
   conversation: mdiMicrophoneMessage,
@@ -105,7 +98,6 @@ export const FIXED_DOMAIN_ICONS = {
   notify: mdiCommentAlert,
   number: mdiRayVertex,
   persistent_notification: mdiBell,
-  person: mdiAccount,
   plant: mdiFlower,
   proximity: mdiAppleSafari,
   remote: mdiRemote,
@@ -116,13 +108,10 @@ export const FIXED_DOMAIN_ICONS = {
   sensor: mdiEye,
   siren: mdiBullhorn,
   simple_alarm: mdiBell,
-  sun: mdiWhiteBalanceSunny,
   text: mdiFormTextbox,
   timer: mdiTimerOutline,
   updater: mdiCloudUpload,
   vacuum: mdiRobotVacuum,
-  water_heater: mdiThermometer,
-  weather: mdiWeatherCloudy,
   zone: mdiMapMarkerRadius,
 };
 
diff --git a/src/common/entity/domain_icon.ts b/src/common/entity/domain_icon.ts
index b334b4570e..fe4a911c79 100644
--- a/src/common/entity/domain_icon.ts
+++ b/src/common/entity/domain_icon.ts
@@ -30,6 +30,8 @@ import {
   mdiPowerPlug,
   mdiPowerPlugOff,
   mdiRestart,
+  mdiRobot,
+  mdiRobotOff,
   mdiSpeaker,
   mdiSpeakerOff,
   mdiSpeakerPause,
@@ -41,7 +43,12 @@ import {
   mdiTelevisionPlay,
   mdiToggleSwitchVariant,
   mdiToggleSwitchVariantOff,
+  mdiVideo,
+  mdiVideoOff,
+  mdiWaterBoiler,
+  mdiWaterBoilerOff,
   mdiWeatherNight,
+  mdiWhiteBalanceSunny,
 } from "@mdi/js";
 import { HassEntity } from "home-assistant-js-websocket";
 import { UpdateEntity, updateIsInstalling } from "../../data/update";
@@ -83,6 +90,9 @@ export const domainIconWithoutDefault = (
     case "alarm_control_panel":
       return alarmPanelIcon(compareState);
 
+    case "automation":
+      return compareState === "off" ? mdiRobotOff : mdiRobot;
+
     case "binary_sensor":
       return binarySensorIcon(compareState, stateObj);
 
@@ -96,6 +106,9 @@ export const domainIconWithoutDefault = (
           return mdiGestureTapButton;
       }
 
+    case "camera":
+      return compareState === "off" ? mdiVideoOff : mdiVideo;
+
     case "cover":
       return coverIcon(compareState, stateObj);
 
@@ -221,7 +234,7 @@ export const domainIconWithoutDefault = (
 
     case "sun":
       return stateObj?.state === "above_horizon"
-        ? FIXED_DOMAIN_ICONS[domain]
+        ? mdiWhiteBalanceSunny
         : mdiWeatherNight;
 
     case "switch_as_x":
@@ -237,6 +250,9 @@ export const domainIconWithoutDefault = (
           : mdiPackageUp
         : mdiPackage;
 
+    case "water_heater":
+      return compareState === "off" ? mdiWaterBoilerOff : mdiWaterBoiler;
+
     case "weather":
       return weatherIcon(stateObj?.state);
   }