Document icon as deprecated.

- Clean up icons that basically match HA 2024.2 defaults

Mostly climate entities that had hvac_mode specific icons defined,
some sensor/binary_sensor classes and buttons that could be class
restart.

Preparation for icon.json support. Issue #1579

custom_components/tuya_local/devices/9in1_airquality_monitor.yaml

@@ -31,7 +31,6 @@ secondary_entities:
         class: measurement
   - entity: sensor
     class: humidity
-    icon: "mdi:water-percent"
     dps:
       - id: 3
         type: integer
@@ -40,7 +39,6 @@ secondary_entities:
         class: measurement
   - entity: sensor
     class: carbon_dioxide
-    icon: "mdi:factory"
     dps:
       - id: 4
         type: integer
@@ -49,7 +47,6 @@ secondary_entities:
         class: measurement
   - entity: sensor
     class: carbon_monoxide
-    icon: "mdi:factory"
     dps:
       - id: 102
         type: integer
@@ -59,7 +56,6 @@ secondary_entities:
   - entity: sensor
     name: HCHO
     class: volatile_organic_compounds
-    icon: "mdi:factory"
     dps:
       - id: 5
         type: integer
@@ -71,7 +67,6 @@ secondary_entities:
             step: 1
   - entity: sensor
     class: volatile_organic_compounds
-    icon: "mdi:factory"
     dps:
       - id: 6
         type: integer
@@ -83,7 +78,6 @@ secondary_entities:
             step: 1
   - entity: sensor
     class: pm25
-    icon: "mdi:factory"
     dps:
       - id: 7
         type: integer
@@ -92,7 +86,6 @@ secondary_entities:
         class: measurement
   - entity: sensor
     class: pm10
-    icon: "mdi:factory"
     dps:
       - id: 9
         type: integer
@@ -112,6 +105,7 @@ secondary_entities:
     name: Charge State
     class: enum
     category: diagnostic
+    deprecated: binary_sensor_plug
     dps:
       - id: 23
         type: boolean
@@ -123,6 +117,13 @@ secondary_entities:
           - dps_val: true
             value: "Charging"
             icon: "mdi:battery-charging"
+  - entity: binary_sensor
+    class: plug
+    category: diagnostic
+    dps:
+      - id: 23
+        type: boolean
+        name: sensor
   - entity: sensor
     name: Alarm Volume
     category: diagnostic

custom_components/tuya_local/devices/AlecoAir_D25_Traditio.yaml

@@ -55,7 +55,6 @@ secondary_entities:
       - id: 4
         type: string
         name: speed
-        icon: "mdi:fan"
         mapping:
           - dps_val: low
             value: 50

custom_components/tuya_local/devices/README.md

@@ -202,9 +202,7 @@ to Home Assistant attribute mapping to something other than a one to one
 copy.
 
 The rules can range from simple value substitution to complex
-relationships involving other attributes. It can also be used to change
-the icon of the entity based on the attribute value. Mapping rules are
-defined in their own section below.
+relationships involving other attributes.
 
 ### `hidden`
 
@@ -287,10 +285,7 @@ rule in the list applies to. This can be used to map specific values from the
 Tuya protocol into attribute values that have specific meaning in Home
 Assistant. For example, climate entities in Home Assistant define modes
 "off", "heat", "cool", "heat_cool", "auto" and "dry". But in the Tuya protocol,
-a simple heater just has a boolean off/on switch. It can also be used to
-change the icon when a specific mode is operational. For example if
-a heater device has a fan-only mode, you could change the icon to "mdi:fan"
-instead of "mdi:radiator" when in that mode.
+a simple heater just has a boolean off/on switch.
 A `dps_val` of `null` can be used to specify a value to be assumed when a
 dp is not being returned by the device, to avoid None in some locations where
 that causes an issue such as entities showing as unavailable. Such a mapping
@@ -364,7 +359,7 @@ across the range.
 
 ### `icon`
 
-*Optional.*
+*Optional. Deprecated since HA 2024.2 (use translation_key and icons.json to define icons)*
 
 This can be used to override the icon. Most useful with a `dps_val` which
 indicates a change from normal operating mode, such as "fan-only",
@@ -372,7 +367,7 @@ indicates a change from normal operating mode, such as "fan-only",
 
 ### `icon_priority`
 
-*Optional. Default 10. Lower numbers mean higher priorities.*
+*Optional. Default 10. Lower numbers mean higher priorities. Deprecated, icons should be defined using icons.json and translation_key since HA 2024.2*
 
 When a number of rules on different attributes define `icon` changes, you
 may need to control which have priority over the others. For example,

custom_components/tuya_local/devices/alecoair_d12_home_dehumidifier.yaml

@@ -158,8 +158,7 @@ secondary_entities:
   - entity: binary_sensor
     name: Tank
     class: problem
-    icon: "mdi:cup-outline"
-    icon-priority: 2
+    icon: "mdi:cup-water"
     category: diagnostic
     dps:
       - id: 11
@@ -168,8 +167,6 @@ secondary_entities:
         mapping:
           - dps_val: 8
             value: true
-            icon: "mdi:cup-water"
-            icon-priority: 1
           - value: false
   - entity: binary_sensor
     name: Fault

custom_components/tuya_local/devices/arlec_pa1123bkha_portable_air_conditioner.yaml

@@ -11,21 +11,16 @@ primary_entity:
       mapping:
         - dps_val: false
           value: "off"
-          icon: "mdi:hvac-off"
         - dps_val: true
           constraint: mode
           conditions:
             - dps_val: "1"
-              icon: "mdi:snowflake"
               value: cool
             - dps_val: "2"
-              icon: "mdi:fire"
               value: heat
             - dps_val: "3"
-              icon: "mdi:water"
               value: dry
             - dps_val: "4"
-              icon: "mdi:fan"
               value: fan_only
     - id: 2
       type: integer

custom_components/tuya_local/devices/arlec_pb88uha_s2_switch.yaml

@@ -109,12 +109,8 @@ secondary_entities:
   - entity: lock
     category: config
     name: Child lock
+    icon: "mdi:hand-back-right-off"
     dps:
       - id: 41
         name: lock
         type: boolean
-        mapping:
-          - dps_val: true
-            icon: "mdi:lock"
-          - dps_val: false
-            icon: "mdi:lock-open"

custom_components/tuya_local/devices/arlec_thermostat_smartplug.yaml

@@ -8,7 +8,6 @@ primary_entity:
     - id: 9
       type: boolean
       name: hvac_mode
-      icon: "mdi:thermostat-box"
       mapping:
         - dps_val: false
           value: "off"
@@ -99,12 +98,12 @@ primary_entity:
       name: fault_code
 secondary_entities:
   - entity: switch
+    class: switch
     name: Manual Switch
     dps:
       - id: 2
         type: boolean
         name: switch
-        icon: mdi:light-switch
   - entity: number
     name: Timer
     category: config

custom_components/tuya_local/devices/atorch_at2pl_breaker.yaml

@@ -316,7 +316,7 @@ secondary_entities:
   - entity: number
     name: Leakage current
     category: config
-    icon: "mdi:"
+    class: current
     dps:
       - id: 124
         type: integer

custom_components/tuya_local/devices/atorch_s1wp.yaml

@@ -189,7 +189,7 @@ secondary_entities:
   - entity: button
     name: Reset data
     category: diagnostic
-    icon: "mdi:autorenew"
+    class: restart
     dps:
       - id: 113
         type: boolean
@@ -198,7 +198,7 @@ secondary_entities:
   - entity: button
     name: Reset Wi-Fi
     category: diagnostic
-    icon: "mdi:autorenew"
+    class: restart
     dps:
       - id: 114
         type: boolean
@@ -207,7 +207,7 @@ secondary_entities:
   - entity: button
     name: Factory reset
     category: diagnostic
-    icon: "mdi:autorenew"
+    class: restart
     dps:
       - id: 115
         type: boolean

custom_components/tuya_local/devices/aubess_rainpoint_irrigation_system.yaml

@@ -19,7 +19,6 @@ secondary_entities:
       - id: 106
         name: sensor
         type: string
-        icon_priority: 1
         mapping:
           - dps_val: "0"
             value: Unknown

custom_components/tuya_local/devices/awow_th213_thermostat.yaml

@@ -65,9 +65,7 @@ primary_entity:
       mapping:
         - dps_val: true
           value: heating
-          icon: "mdi:thermometer"
         - dps_val: false
-          icon: "mdi:thermometer-off"
           constraint: hvac_mode
           conditions:
             - dps_val: true

custom_components/tuya_local/devices/awow_th213v2_thermostat.yaml

@@ -43,9 +43,7 @@ primary_entity:
       mapping:
         - dps_val: true
           value: heating
-          icon: "mdi:thermometer"
         - dps_val: false
-          icon: "mdi:thermometer-off"
           constraint: hvac_mode
           conditions:
             - dps_val: true

custom_components/tuya_local/devices/beca_bhp6000_thermostat_c.yaml

@@ -33,19 +33,14 @@ primary_entity:
       mapping:
         - dps_val: 1
           value: cool
-          icon: "mdi:snowflake"
         - dps_val: 2
           value: heat
-          icon: "mdi:fire"
         - dps_val: 3
           value: "off"
-          icon: "mdi:hvac-off"
         - dps_val: 4
           value: heat_cool
-          icon: "mdi:fire-alert"
         - dps_val: 5
           value: auto
-          icon: "mdi:hvac"
     - id: 6
       name: fan_mode
       type: boolean

custom_components/tuya_local/devices/beca_bhp6000_thermostat_f.yaml

@@ -34,19 +34,14 @@ primary_entity:
       mapping:
         - dps_val: 1
           value: cool
-          icon: "mdi:snowflake"
         - dps_val: 2
           value: heat
-          icon: "mdi:fire"
         - dps_val: 3
           value: "off"
-          icon: "mdi:hvac-off"
         - dps_val: 4
           value: heat_cool
-          icon: "mdi:fire-alert"
         - dps_val: 5
           value: auto
-          icon: "mdi:hvac"
     - id: 6
       name: fan_mode
       type: boolean

custom_components/tuya_local/devices/beca_bhp6000_thermostat_mapped.yaml

@@ -364,19 +364,14 @@ primary_entity:
       mapping:
         - dps_val: 1
           value: cool
-          icon: "mdi:snowflake"
         - dps_val: 2
           value: heat
-          icon: "mdi:fire"
         - dps_val: 3
           value: "off"
-          icon: "mdi:hvac-off"
         - dps_val: 4
           value: heat_cool
-          icon: "mdi:fire-alert"
         - dps_val: 5
           value: auto
-          icon: "mdi:hvac"
     - id: 6
       name: fan_mode
       type: boolean

custom_components/tuya_local/devices/beca_zht002_thermostat_c.yaml

@@ -4,7 +4,6 @@ products:
     name: MOES Zigbee Thermostat
 primary_entity:
   entity: climate
-  icon: "mdi:thermostat"
   dps:
     - id: 1
       name: hvac_mode

custom_components/tuya_local/devices/breville_easyair_purifier.yaml

@@ -39,6 +39,7 @@ secondary_entities:
         type: boolean
   - entity: sensor
     name: Filter days left
+    class: duration
     category: diagnostic
     icon: "mdi:air-filter"
     dps:

custom_components/tuya_local/devices/breville_lad208_dehumidifier.yaml

@@ -44,7 +44,6 @@ primary_entity:
 secondary_entities:
   - entity: fan
     name: Fan
-    icon: "mdi:fan"
     category: config
     dps:
       - id: 1
@@ -184,13 +183,6 @@ secondary_entities:
       - id: 105
         type: boolean
         name: sensor
-        mapping:
-          - dps_val: false
-            icon: "mdi:snowflake"
-            value: false
-          - dps_val: true
-            icon: "mdi:snowflake-melt"
-            value: true
   - entity: binary_sensor
     class: problem
     name: Fault

custom_components/tuya_local/devices/breville_smart_air_viral_protect_plus.yaml

@@ -4,11 +4,11 @@ products:
 primary_entity:
   entity: fan
   translation_key: fan_with_presets
+  icon: "mdi:air-purifier"
   dps:
     - id: 1
       name: switch
       type: boolean
-      icon: "mdi:air-purifier"
     - id: 3
       type: string
       name: preset_mode

custom_components/tuya_local/devices/breville_smartairconnect_purifier.yaml

@@ -55,6 +55,7 @@ secondary_entities:
   - entity: sensor
     name: Filter days left
     category: diagnostic
+    class: duration
     icon: "mdi:air-filter"
     dps:
       - id: 16

custom_components/tuya_local/devices/carson_cb.yaml

@@ -14,21 +14,16 @@ primary_entity:
       mapping:
         - dps_val: false
           value: "off"
-          icon: "mdi:hvac-off"
         - dps_val: true
           constraint: mode
           conditions:
             - dps_val: COOL
-              icon: "mdi:snowflake"
               value: cool
             - dps_val: FAN
-              icon: "mdi:fan"
               value: fan_only
             - dps_val: DRY
-              icon: "mdi:water"
               value: dry
             - dps_val: HEAT
-              icon: "mdi:fire"
               value: heat
     - id: 2
       name: temperature

custom_components/tuya_local/devices/ceres_plus_petfeeder.yaml

@@ -120,7 +120,6 @@ secondary_entities:
         optional: true
   - entity: sensor
     class: battery
-    icon: "mdi:battery"
     category: diagnostic
     dps:
       - id: 238

custom_components/tuya_local/devices/cooper_hunter_air_conditioner.yaml

@@ -12,24 +12,18 @@ primary_entity:
       mapping:
         - dps_val: false
           value: "off"
-          icon: "mdi:hvac-off"
         - dps_val: true
           constraint: mode
           conditions:
             - dps_val: auto
-              icon: "mdi:hvac"
               value: heat_cool
             - dps_val: cold
-              icon: "mdi:snowflake"
               value: cool
             - dps_val: hot
-              icon: "mdi:fire"
               value: heat
             - dps_val: wet
-              icon: "mdi:water-off"
               value: dry
             - dps_val: wind
-              icon: "mdi:fan"
               value: fan_only
 
     - id: 2
@@ -178,7 +172,7 @@ secondary_entities:
   - entity: lock
     name: Child lock
     category: config
-    icon: "mdi:lock"
+    icon: "mdi:hand-right-back-off"
     dps:
       - id: 14
         name: lock
@@ -225,7 +219,7 @@ secondary_entities:
   - entity: binary_sensor
     name: Defrosting
     category: diagnostic
-    icon: "mdi:snowflake"
+    class: cold
     dps:
       - id: 181
         name: sensor

custom_components/tuya_local/devices/costway_portable_ac.yaml

@@ -11,18 +11,14 @@ primary_entity:
       mapping:
         - dps_val: false
           value: "off"
-          icon: "mdi:hvac-off"
         - dps_val: true
           constraint: mode
           conditions:
             - dps_val: cold
-              icon: "mdi:snowflake"
               value: cool
             - dps_val: wind
-              icon: "mdi:fan"
               value: fan_only
             - dps_val: wet
-              icon: "mdi:water"
               value: dry
     - id: 2
       type: integer

custom_components/tuya_local/devices/devola_patio_heater.yaml

@@ -8,10 +8,8 @@ primary_entity:
       mapping:
         - dps_val: false
           value: "off"
-          icon: "mdi:fire-off"
         - dps_val: true
           value: heat
-          icon: "mdi:fire"
     - id: 2
       type: integer
       name: temperature

custom_components/tuya_local/devices/duux_blizzard_portable_aircon.yaml

@@ -15,16 +15,12 @@ primary_entity:
           constraint: mode
           conditions:
             - dps_val: auto
-              icon: "mdi:hvac"
               value: auto
             - dps_val: cool
-              icon: "mdi:snowflake"
               value: cool
             - dps_val: dry
-              icon: "mdi:water-off"
               value: dry
             - dps_val: fan
-              icon: "mdi:fan"
               value: fan_only
     - id: 2
       type: string

custom_components/tuya_local/devices/eanons_humidifier.yaml

@@ -20,11 +20,6 @@ primary_entity:
     - id: 10
       name: switch
       type: boolean
-      mapping:
-        - dps_val: true
-          icon: "mdi:air-humidifier"
-        - dps_val: false
-          icon: "mdi:air-humidifier-off"
     - id: 12
       name: mode
       type: string

custom_components/tuya_local/devices/eberg_cooly_c35hd.yaml

@@ -8,21 +8,16 @@ primary_entity:
       mapping:
         - dps_val: false
           value: "off"
-          icon: "mdi:hvac-off"
         - dps_val: true
           constraint: mode
           conditions:
             - dps_val: "1"
-              icon: "mdi:fire"
               value: heat
             - dps_val: "2"
-              icon: "mdi:water"
               value: dry
             - dps_val: "3"
-              icon: "mdi:snowflake"
               value: cool
             - dps_val: "4"
-              icon: "mdi:fan"
               value: fan_only
     - id: 4
       name: unknown_4

custom_components/tuya_local/devices/eberg_qubo_q40hd_heatpump.yaml

@@ -8,18 +8,14 @@ primary_entity:
       mapping:
         - dps_val: false
           value: "off"
-          icon: "mdi:hvac-off"
         - dps_val: true
           constraint: mode
           conditions:
             - dps_val: cold
-              icon: "mdi:snowflake"
               value: cool
             - dps_val: hot
-              icon: "mdi:fire"
               value: heat
             - dps_val: dehumidify
-              icon: "mdi:water-percent"
               value: dry
     - id: 2
       name: temperature

custom_components/tuya_local/devices/electriq_12wminv_heatpump.yaml

@@ -8,24 +8,18 @@ primary_entity:
       mapping:
         - dps_val: false
           value: "off"
-          icon: "mdi:hvac-off"
         - dps_val: true
           constraint: mode
           conditions:
             - dps_val: cold
-              icon: "mdi:snowflake"
               value: cool
             - dps_val: wind
-              icon: "mdi:fan"
               value: fan_only
             - dps_val: wet
-              icon: "mdi:water"
               value: dry
             - dps_val: hot
-              icon: "mdi:fire"
               value: heat
             - dps_val: auto
-              icon: "mdi:hvac"
               value: heat_cool
     - id: 2
       name: temperature

custom_components/tuya_local/devices/electriq_airflex15w_heatpump.yaml

@@ -10,25 +10,19 @@ primary_entity:
       mapping:
         - dps_val: false
           value: "off"
-          icon: "mdi:hvac-off"
         - dps_val: true
           constraint: preset_mode
           conditions:
             - dps_val: "0"  # auto
               value: heat_cool
-              icon: "mdi:hvac"
             - dps_val: "1"  # cold
               value: cool
-              icon: "mdi:snowflake"
             - dps_val: "2"  # hot
               value: heat
-              icon: "mdi:fire"
             - dps_val: "3"  # wet
               value: dry
-              icon: "mdi:water"
             - dps_val: "5"  # fan
               value: fan_only
-              icon: "mdi:fan"
     - id: 2
       type: integer
       name: temperature

custom_components/tuya_local/devices/electriq_desd9lw_dehumidifier.yaml

@@ -7,23 +7,18 @@ primary_entity:
       type: boolean
       mapping:
         - dps_val: false
-          icon: "mdi:air-humidifier-off"
           value: "off"
         - dps_val: true
           constraint: mode
           conditions:
             - dps_val: "Auto"
               value: "auto"
-              icon: "mdi:air-humidifier"
             - dps_val: "Heater"
               value: "heat"
-              icon: "mdi:fire"
             - dps_val: "Dehumidity"
               value: "dry"
-              icon: "mdi:water"
             - dps_val: "Fan"
               value: "fan_only"
-              icon: "mdi:fan"
     - id: 2
       type: integer
       name: humidity

custom_components/tuya_local/devices/electriq_ecosilent14hpw_aircon.yaml

@@ -11,22 +11,16 @@ primary_entity:
           conditions:
             - dps_val: "cool"
               value: cool
-              icon: "mdi:snowflake"
             - dps_val: "fan"
               value: fan_only
-              icon: "mdi:fan"
             - dps_val: "heat"
               value: heat
-              icon: "mdi:fire"
             - dps_val: "smart_cool"
               value: auto
-              icon: "mdi:hvac"
             - dps_val: "dry"
               value: dry
-              icon: "mdi:water"
         - dps_val: false
           value: "off"
-          icon: "mdi:hvac-off"
     - id: 2
       name: temperature
       type: integer

custom_components/tuya_local/devices/etop_fcu_thermostat.yaml

@@ -136,7 +136,7 @@ secondary_entities:
   - entity: switch
     name: "Child Lock"
     category: config
-    icon: "mdi:lock"
+    icon: "mdi:hand-back-right-off"
     dps:
       - id: 7
         name: switch

custom_components/tuya_local/devices/etop_ht_thermostat.yaml

@@ -33,7 +33,12 @@ primary_entity:
       name: hvac_action
       mapping:
         - dps_val: no_heating
-          value: "off"
+          constraint: hvac_mode
+          conditions:
+            - dps_val: false
+              value: "off"
+            - dps_val: true
+              value: idle
         - dps_val: heating
           value: heating
     - id: 24
@@ -97,15 +102,15 @@ secondary_entities:
           - dps_val: false
             icon: "mdi:hand-back-right"
   - entity: number
-    name: "Setpoint min."
+    name: "Setpoint min"
     category: config
+    icon: "mdi:thermometer-low"
     class: temperature
     mode: slider
     dps:
       - id: 26
         name: value
         type: integer
-        icon: "mdi:thermometer-low"
         unit: C
         range:
           min: 0
@@ -114,7 +119,8 @@ secondary_entities:
           - scale: 10
             step: 5
   - entity: number
-    name: "Setpoint max."
+    name: "Setpoint max"
+    icon: "mdi:thermometer-high"
     category: config
     class: temperature
     mode: slider
@@ -122,7 +128,6 @@ secondary_entities:
       - id: 19
         type: integer
         name: value
-        icon: "mdi:thermometer-high"
         unit: C
         range:
           min: 50

custom_components/tuya_local/devices/eurom_600_heater.yaml

@@ -9,11 +9,9 @@ primary_entity:
         - dps_val: false
           value: "off"
           icon: "mdi:radiator-disabled"
-          icon_priority: 1
         - dps_val: true
           value: "heat"
           icon: "mdi:radiator"
-          icon_priority: 3
       name: hvac_mode
     - id: 2
       type: integer

custom_components/tuya_local/devices/eurom_600_heater_v2.yaml

@@ -8,11 +8,9 @@ primary_entity:
         - dps_val: false
           value: "off"
           icon: "mdi:radiator-disabled"
-          icon_priority: 1
         - dps_val: true
           value: "heat"
           icon: "mdi:radiator"
-          icon_priority: 3
       name: hvac_mode
     - id: 2
       type: integer

custom_components/tuya_local/devices/fersk_vind_2_climate.yaml

@@ -8,21 +8,16 @@ primary_entity:
       mapping:
         - dps_val: false
           value: "off"
-          icon: "mdi:hvac-off"
         - dps_val: true
           constraint: mode
           conditions:
             - dps_val: COOL
-              icon: "mdi:snowflake"
               value: cool
             - dps_val: FAN
-              icon: "mdi:fan"
               value: fan_only
             - dps_val: DRY
-              icon: "mdi:water"
               value: dry
             - dps_val: HEAT
-              icon: "mdi:fire"
               value: heat
     - id: 2
       name: temperature

custom_components/tuya_local/devices/fisher_summer_air_conditioner.yaml

@@ -4,7 +4,6 @@ products:
     name: Fisher Summer Air Conditioner
 primary_entity:
   entity: climate
-  icon: "mdi:air-conditioner"
   translation_key: aircon_extra
   dps:
     - id: 1
@@ -13,25 +12,19 @@ primary_entity:
       mapping:
         - dps_val: false
           value: "off"
-          icon: "mdi:hvac-off"
         - dps_val: true
           constraint: mode
           conditions:
             - dps_val: auto
-              icon: mdi:thermostat-auto
               value: heat_cool
             - dps_val: cold
-              icon: "mdi:snowflake"
               value: cool
             - dps_val: wind
-              icon: "mdi:fan"
               value: fan_only
             - dps_val: wet
-              icon: "mdi:water"
               value: dry
             - dps_val: hot
               value: heat
-              icon: "mdi:heat-wave"
     - id: 2
       name: temperature
       type: integer

custom_components/tuya_local/devices/garza_irrigation_system.yaml

@@ -26,13 +26,10 @@ secondary_entities:
         unit: "%"
         mapping:
           - dps_val: 0
-            icon: "mdi:battery-10"
-            value: 0
+            value: 10
           - dps_val: 1
-            icon: "mdi:battery-60"
             value: 50
           - dps_val: 2
-            icon: "mdi:battery"
             value: 100
   - entity: sensor
     name: Water flow

custom_components/tuya_local/devices/geyserwise_water_heater.yaml

@@ -118,7 +118,7 @@ secondary_entities:
   - entity: number
     name: Overnight temperature
     category: config
-    icon: "mdi:thermometer"
+    class: temperature
     dps:
       - id: 103
         type: integer
@@ -130,7 +130,7 @@ secondary_entities:
   - entity: number
     name: Morning temperature
     category: config
-    icon: "mdi:thermometer"
+    class: temperature
     dps:
       - id: 104
         type: integer
@@ -142,7 +142,7 @@ secondary_entities:
   - entity: number
     name: Afternoon temperature
     category: config
-    icon: "mdi:thermometer"
+    class: temperature
     dps:
       - id: 105
         type: integer
@@ -154,7 +154,7 @@ secondary_entities:
   - entity: number
     name: Evening temperature
     category: config
-    icon: "mdi:thermometer"
+    class: temperature
     dps:
       - id: 106
         type: integer
@@ -166,6 +166,7 @@ secondary_entities:
   - entity: number
     name: Anti-freeze temperature
     category: config
+    class: temperature
     icon: "mdi:snowflake-thermometer"
     dps:
       - id: 107

custom_components/tuya_local/devices/greenmigo_alpha_q25_pro_wifi.yaml

@@ -15,7 +15,7 @@ primary_entity:
           icon_priority: 1
         - dps_val: true
           icon: "mdi:air-humidifier"
-          icon_priority: 3
+          icon_priority: 4
     - id: 2
       name: humidity
       type: integer
@@ -35,13 +35,13 @@ primary_entity:
         - dps_val: Laundrydrying
           value: laundry
           icon: "mdi:tshirt-crew-outline"
-          icon_priority: 1
+          icon_priority: 3
         - dps_val: Sleeping
           value: sleep
         - dps_val: Purifying
           value: purify
           icon: "mdi:air-purifier"
-          icon_priority: 1
+          icon_priority: 3
     - id: 6
       type: integer
       name: current_humidity

custom_components/tuya_local/devices/hellnar_heatpump.yaml

@@ -8,24 +8,18 @@ primary_entity:
       mapping:
         - dps_val: false
           value: "off"
-          icon: "mdi:hvac-off"
         - dps_val: true
           constraint: mode
           conditions:
             - dps_val: auto
-              icon: "mdi:hvac"
               value: heat_cool
             - dps_val: cold
-              icon: "mdi:snowflake"
               value: cool
             - dps_val: hot
-              icon: "mdi:fire"
               value: heat
             - dps_val: wind
-              icon: "mdi:fan"
               value: fan_only
             - dps_val: wet
-              icon: "mdi:water"
               value: dry
     - id: 2
       name: temperature

custom_components/tuya_local/devices/holman_wx1_taptimer.yaml

@@ -59,13 +59,10 @@ secondary_entities:
         unit: "%"
         mapping:
           - dps_val: 0
-            icon: "mdi:battery-10"
-            value: 0
+            value: 10
           - dps_val: 1
-            icon: "mdi:battery-60"
             value: 50
           - dps_val: 2
-            icon: "mdi:battery"
             value: 100
   - entity: sensor
     name: Status

custom_components/tuya_local/devices/holman_wx2_taptimer.yaml

@@ -67,13 +67,10 @@ secondary_entities:
         unit: "%"
         mapping:
           - dps_val: 0
-            icon: "mdi:battery-10"
-            value: 0
+            value: 10
           - dps_val: 1
-            icon: "mdi:battery-60"
             value: 50
           - dps_val: 2
-            icon: "mdi:battery"
             value: 100
   - entity: sensor
     name: Timer status 1

custom_components/tuya_local/devices/honeywell_dehumidifier.yaml

@@ -8,13 +8,6 @@ primary_entity:
     - id: 1
       name: switch
       type: boolean
-      mapping:
-        - dps_val: false
-          icon: "mdi:air-humidifier-off"
-          icon_priority: 1
-        - dps_val: true
-          icon: "mdi:air-humidifier"
-          icon_priority: 4
     - id: 6
       name: humidity
       type: integer

custom_components/tuya_local/devices/inventor_atmospherexl_dehumidifier.yaml

@@ -18,13 +18,6 @@ primary_entity:
     - id: 1
       name: main_switch
       type: boolean
-      mapping:
-        - dps_val: false
-          icon: "mdi:air-humidifier-off"
-          icon_priority: 1
-        - dps_val: true
-          icon: "mdi:air-humidifier"
-          icon_priority: 3
     - id: 3
       type: string
       name: humidity

custom_components/tuya_local/devices/jiahong_et72w_thermostat.yaml

@@ -12,13 +12,10 @@ primary_entity:
           constraint: mode
           conditions:
             - dps_val: "Smart"
-              icon: "mdi:calendar-sync"
               value: auto
             - dps_val: "Manual"
-              icon: "mdi:fire"
               value: heat
             - dps_val: "Anti_frozen"
-              icon: "mdi:snowflake"
               value: cool
     - id: 102
       type: integer

custom_components/tuya_local/devices/kogan_kawfpac09ya_airconditioner.yaml

@@ -10,18 +10,14 @@ primary_entity:
       mapping:
         - dps_val: false
           value: "off"
-          icon: "mdi:hvac-off"
         - dps_val: true
           constraint: mode
           conditions:
             - dps_val: COOL
-              icon: "mdi:snowflake"
               value: cool
             - dps_val: FAN
-              icon: "mdi:fan"
               value: fan_only
             - dps_val: DRY
-              icon: "mdi:water"
               value: dry
     - id: 2
       type: integer

custom_components/tuya_local/devices/kogan_kawfpac16pya_airconditioner.yaml

@@ -11,21 +11,16 @@ primary_entity:
       mapping:
         - dps_val: false
           value: "off"
-          icon: "mdi:hvac-off"
         - dps_val: true
           constraint: mode
           conditions:
             - dps_val: COOL
-              icon: "mdi:snowflake"
               value: cool
             - dps_val: FAN
-              icon: "mdi:fan"
               value: fan_only
             - dps_val: DRY
-              icon: "mdi:water"
               value: dry
             - dps_val: Heat
-              icon: "mdi:heat-wave"
               value: heat
     - id: 2
       name: temperature

custom_components/tuya_local/devices/minco_mh1823d_thermostat.yaml

@@ -33,26 +33,19 @@ primary_entity:
       name: hvac_action
       mapping:
         - dps_val: stop
-          icon: "mdi:thermometer-off"
           constraint: hvac_mode
           conditions:
             - dps_val: false
               value: "off"
-              icon_priority: 1
             - dps_val: true
               value: idle
-              icon_priority: 3
         - dps_val: start
           constraint: hvac_mode
           conditions:
             - dps_val: false
               value: "off"
-              icon: "mdi:thermometer-off"
-              icon_priority: 1
             - dps_val: true
               value: heating
-              icon: "mdi:thermometer"
-              icon_priority: 3
     - id: 12
       type: boolean
       name: unknown_12
@@ -125,7 +118,6 @@ secondary_entities:
             value: External
   - entity: select
     name: Temperature unit
-    icon: "mdi:temperature-celsius"
     category: config
     dps:
       - id: 19

custom_components/tuya_local/devices/mirabella_power_strip.yaml

@@ -137,6 +137,6 @@ secondary_entities:
         type: boolean
         mapping:
           - dps_val: true
-            icon: "mdi:lock"
+            icon: "mdi:hand-back-right-off"
           - dps_val: false
-            icon: "mdi:lock-open"
+            icon: "mdi:hand-back-right"

custom_components/tuya_local/devices/neatsvor_x600_vacuum.yaml

@@ -199,7 +199,7 @@ secondary_entities:
   - entity: button
     name: Side brush reset
     category: diagnostic
-    icon: "mdi:autorenew"
+    class: restart
     dps:
       - id: 18
         type: boolean
@@ -221,7 +221,7 @@ secondary_entities:
   - entity: button
     name: Main brush reset
     category: diagnostic
-    icon: "mdi:autorenew"
+    class: restart
     dps:
       - id: 20
         type: boolean
@@ -243,7 +243,7 @@ secondary_entities:
   - entity: button
     name: Filter reset
     category: diagnostic
-    icon: "mdi:autorenew"
+    class: restart
     dps:
       - id: 22
         type: boolean
@@ -265,7 +265,7 @@ secondary_entities:
   - entity: button
     name: Mop reset
     category: diagnostic
-    icon: "mdi:autorenew"
+    class: restart
     dps:
       - id: 24
         type: boolean

custom_components/tuya_local/devices/phw218_waterquality_monitor.yaml

@@ -117,7 +117,7 @@ secondary_entities:
   - entity: number
     name: High pH warning
     category: config
-    icon: "mdi:pH"
+    icon: "mdi:ph"
     dps:
       - id: 107
         type: integer
@@ -130,7 +130,7 @@ secondary_entities:
   - entity: number
     name: Low pH warning
     category: config
-    icon: "mdi:pH"
+    icon: "mdi:ph"
     dps:
       - id: 108
         type: integer

custom_components/tuya_local/devices/proscenic_m9_vacuum.yaml

@@ -261,7 +261,7 @@ secondary_entities:
   - entity: button
     name: Side brush reset
     category: diagnostic
-    icon: "mdi:autorenew"
+    class: restart
     dps:
       - id: 18
         type: boolean
@@ -283,7 +283,7 @@ secondary_entities:
   - entity: button
     name: Main brush reset
     category: diagnostic
-    icon: "mdi:autorenew"
+    class: restart
     dps:
       - id: 20
         type: boolean
@@ -305,7 +305,7 @@ secondary_entities:
   - entity: button
     name: Filter reset
     category: diagnostic
-    icon: "mdi:autorenew"
+    class: restart
     dps:
       - id: 22
         type: boolean
@@ -327,7 +327,7 @@ secondary_entities:
   - entity: button
     name: Mop reset
     category: diagnostic
-    icon: "mdi:autorenew"
+    class: restart
     dps:
       - id: 24
         type: boolean
@@ -530,7 +530,7 @@ secondary_entities:
   - entity: button
     name: Sensor reset
     category: diagnostic
-    icon: "mdi:autorenew"
+    class: restart
     dps:
       - id: 140
         type: boolean

custom_components/tuya_local/devices/rotenso_ronix_heatpump.yaml

@@ -17,19 +17,14 @@ primary_entity:
           conditions:
             - dps_val: cold
               value: cool
-              icon: "mdi:snowflake"
             - dps_val: hot
               value: heat
-              icon: "mdi:fire"
             - dps_val: wet
               value: dry
-              icon: "mdi:water"
             - dps_val: wind
               value: fan_only
-              icon: "mdi:fan"
             - dps_val: auto
               value: heat_cool
-              icon: "mdi:hvac"
     - id: 2
       type: integer
       name: temperature

custom_components/tuya_local/devices/royal_airconditioner.yaml

@@ -11,25 +11,19 @@ primary_entity:
       mapping:
         - dps_val: false
           value: "off"
-          icon: "mdi:hvac-off"
         - dps_val: true
           constraint: mode
           conditions:
             - dps_val: auto
-              icon: mdi:thermostat-auto
               value: heat_cool
             - dps_val: cold
-              icon: "mdi:snowflake"
               value: cool
             - dps_val: wind
-              icon: "mdi:fan"
               value: fan_only
             - dps_val: wet
-              icon: "mdi:water"
               value: dry
             - dps_val: hot
               value: heat
-              icon: "mdi:heat-wave"
     - id: 2
       name: temperature
       type: integer

custom_components/tuya_local/devices/sencor_air_conditioner.yaml

@@ -6,7 +6,6 @@ products:
 primary_entity:
   entity: climate
   translation_key: aircon_extra
-  icon: "mdi:air-conditioner"
   dps:
     - id: 1
       name: hvac_mode
@@ -14,18 +13,14 @@ primary_entity:
       mapping:
         - dps_val: false
           value: "off"
-          icon: "mdi:hvac-off"
         - dps_val: true
           constraint: mode
           conditions:
             - dps_val: "0"
-              icon: "mdi:snowflake"
               value: cool
             - dps_val: "3"
-              icon: "mdi:fan"
               value: fan_only
             - dps_val: "2"
-              icon: "mdi:water"
               value: dry
     - id: 2
       name: temperature

custom_components/tuya_local/devices/smartmi_e1_purifier.yaml

@@ -10,11 +10,6 @@ primary_entity:
     - id: 1
       name: switch
       type: boolean
-      mapping:
-        - dps_val: true
-          icon: "mdi:air-purifier"
-        - dps_val: false
-          icon: "mdi:air-purifier-off"
     - id: 3
       name: preset_mode
       type: string

custom_components/tuya_local/devices/starlight_heatpump.yaml

@@ -9,24 +9,18 @@ primary_entity:
       mapping:
         - dps_val: false
           value: "off"
-          icon: "mdi:hvac-off"
         - dps_val: true
           constraint: mode
           conditions:
             - dps_val: auto
-              icon: "mdi:hvac"
               value: heat_cool
             - dps_val: cold
-              icon: "mdi:snowflake"
               value: cool
             - dps_val: hot
-              icon: "mdi:fire"
               value: heat
             - dps_val: wind
-              icon: "mdi:fan"
               value: fan_only
             - dps_val: wet
-              icon: "mdi:water"
               value: dry
     - id: 2
       name: temperature

custom_components/tuya_local/devices/t5e_wf_thermostat.yaml

@@ -8,22 +8,13 @@ primary_entity:
       mapping:
         - dps_val: false
           value: "off"
-          constraint: temp_mode
-          conditions:
-            - dps_val: cold
-              icon: "mdi:snowflake-off"
-            - dps_val: hot
-              icon: "mdi:fire-off"
-          icon_priority: 1
         - dps_val: true
           constraint: temp_mode
           conditions:
             - dps_val: cold
               value: cool
-              icon: "mdi:snowflake"
             - dps_val: hot
               value: heat
-              icon: "mdi:fire"
     - id: 2
       type: string
       name: temp_mode
@@ -40,7 +31,7 @@ primary_entity:
             - dps_val: hot
               value: heating
         - dps_val: auxiliary_heat
-          value: heating
+          value: preheating
         - dps_val: cold
           value: cooling
         - dps_val: comfortable

custom_components/tuya_local/devices/woods_cortina_airconditioner.yaml

@@ -11,22 +11,17 @@ primary_entity:
       mapping:
         - value: "off"
           dps_val: false
-          icon: "mdi:hvac-off"
         - dps_val: true
           constraint: mode
           conditions:
             - value: cool
               dps_val: "0"
-              icon: "mdi:snowflake"
             - value: dry
               dps_val: "2"
-              icon: "mdi:water"
             - value: fan_only
               dps_val: "3"
-              icon: "mdi:fan"
             - value: heat_cool
               dps_val: "4"  # This is Woods ECO mode
-              icon: "mdi:thermostat-auto"
     - id: 2
       type: integer
       name: temperature

custom_components/tuya_local/devices/woods_milan_airconditioner.yaml

@@ -11,25 +11,19 @@ primary_entity:
       mapping:
         - dps_val: false
           value: "off"
-          icon: "mdi:hvac-off"
         - dps_val: true
           constraint: mode
           conditions:
             - dps_val: auto
-              icon: mdi:thermostat-auto
               value: heat_cool
             - dps_val: cold
-              icon: "mdi:snowflake"
               value: cool
             - dps_val: wind
-              icon: "mdi:fan"
               value: fan_only
             - dps_val: wet
-              icon: "mdi:water"
               value: dry
             - dps_val: hot
               value: heat
-              icon: "mdi:heat-wave"
     - id: 2
       name: temperature
       type: integer

custom_components/tuya_local/devices/zemismart_roller_shade.yaml

@@ -140,7 +140,7 @@ secondary_entities:
         optional: true
   - entity: button
     name: All limits reset
-    icon: "mdi:refresh"
+    class: restart
     category: config
     dps:
       - id: 102