diff --git a/src/common/const.ts b/src/common/const.ts
index 07ada9c7e3..64811ef272 100644
--- a/src/common/const.ts
+++ b/src/common/const.ts
@@ -24,7 +24,6 @@ import {
   mdiDatabase,
   mdiEarHearing,
   mdiEye,
-  mdiFan,
   mdiFlash,
   mdiFlower,
   mdiFormatListBulleted,
@@ -91,7 +90,6 @@ export const FIXED_DOMAIN_ICONS = {
   conversation: mdiMicrophoneMessage,
   counter: mdiCounter,
   demo: mdiHomeAssistant,
-  fan: mdiFan,
   google_assistant: mdiGoogleAssistant,
   group: mdiGoogleCirclesCommunities,
   homeassistant: mdiHomeAssistant,
diff --git a/src/common/entity/domain_icon.ts b/src/common/entity/domain_icon.ts
index 38295a7612..b334b4570e 100644
--- a/src/common/entity/domain_icon.ts
+++ b/src/common/entity/domain_icon.ts
@@ -15,6 +15,8 @@ import {
   mdiCheckCircleOutline,
   mdiClock,
   mdiCloseCircleOutline,
+  mdiFan,
+  mdiFanOff,
   mdiGestureTapButton,
   mdiLanConnect,
   mdiLanDisconnect,
@@ -108,6 +110,9 @@ export const domainIconWithoutDefault = (
       }
       return compareState === "not_home" ? mdiAccountArrowRight : mdiAccount;
 
+    case "fan":
+      return compareState === "off" ? mdiFanOff : mdiFan;
+
     case "humidifier":
       return compareState === "off" ? mdiAirHumidifierOff : mdiAirHumidifier;