diff --git a/lib/extension/homeassistant.js b/lib/extension/homeassistant.js
index c889f6f65..fc7c34bfd 100644
--- a/lib/extension/homeassistant.js
+++ b/lib/extension/homeassistant.js
@@ -1105,8 +1105,6 @@ const manualMaping = {
     'HS1CG-M': [cfg.binary_sensor_gas],
     'HS1CG_M': [cfg.binary_sensor_gas],
     'LVS-SN10ZW_SN11': [cfg.sensor_battery, cfg.binary_sensor_occupancy],
-    'S1': [cfg.switch, cfg.sensor_power],
-    'S2': [switchEndpoint('l1'), switchEndpoint('l2'), cfg.sensor_power],
     'ZWallRemote0': [cfg.sensor_click, cfg.sensor_action],
     'D1': [cfg.light_brightness, cfg.sensor_power],
     'J1': [cfg.cover_position_tilt, cfg.sensor_power],
@@ -1469,6 +1467,7 @@ class HomeAssistant extends Extension {
                             illuminance: {device_class: 'illuminance'},
                             soil_moisture: {icon: 'mdi:water-percent'},
                             pressure: {device_class: 'pressure'},
+                            power: {icon: 'mdi:flash'},
                         };
 
                         assert(!expose.endpoint, `Endpoint not supported for numeric type`);
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 6a015361c..a773e5670 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -15837,9 +15837,9 @@
       }
     },
     "zigbee-herdsman-converters": {
-      "version": "12.0.203",
-      "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-12.0.203.tgz",
-      "integrity": "sha512-Iy28X1/ULrpTBA2KFVvpSapRRHOsMZyniWuR5wzoVW4gvevdXwRV8u6z1V047w2P4jjSbNxxH1pTbEHFowfKPA==",
+      "version": "12.0.204",
+      "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-12.0.204.tgz",
+      "integrity": "sha512-M9/FBLGq/CfXq/PBc66hsmARHZy6TCn/BrVhoIYe5hpEMdlIrRJ4VnfalOXeq7cHQetXslNJma4qvcxfc9ekng==",
       "requires": {
         "axios": "^0.20.0",
         "buffer-crc32": "^0.2.13",
diff --git a/package.json b/package.json
index c78c04855..50f0a2065 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "winston-syslog": "^2.4.4",
     "ws": "^7.3.1",
     "zigbee-herdsman": "0.13.14",
-    "zigbee-herdsman-converters": "12.0.203",
+    "zigbee-herdsman-converters": "12.0.204",
     "zigbee2mqtt-frontend": "0.2.26"
   },
   "devDependencies": {