diff --git a/src/util/state-icon.js b/src/util/state-icon.js
index f2834daf1f..1a48f11a8b 100644
--- a/src/util/state-icon.js
+++ b/src/util/state-icon.js
@@ -13,6 +13,12 @@ function binarySensorIcon(state) {
       return activated ? 'mdi:water-off' : 'mdi:water';
     case 'safety':
     case 'gas':
+    case 'light':
+      return activated ? 'mdi:brightness-5' : 'mdi:brightness-7'
+    case 'sound':
+      return activated ? 'mdi:bell-off' : 'mdi:bell-ring'
+    case 'vibration':
+      return activated ? 'mdi:crop-portrait' : 'mdi:vibrate'
     case 'smoke':
     case 'power':
       return activated ? 'mdi:verified' : 'mdi:alert';