diff --git a/src/util/state-icon.js b/src/util/state-icon.js
index fceebd6fe9..61961c19ed 100644
--- a/src/util/state-icon.js
+++ b/src/util/state-icon.js
@@ -11,14 +11,14 @@ function binarySensorIcon(state) {
       return activated ? 'mdi:crop-square' : 'mdi:exit-to-app';
     case 'moisture':
       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:music-note-off' : 'mdi:music-note';
     case 'vibration':
       return activated ? 'mdi:crop-portrait' : 'mdi:vibrate';
+    case 'safety':
+    case 'gas':
     case 'smoke':
     case 'power':
       return activated ? 'mdi:verified' : 'mdi:alert';