diff --git a/src/common/entity/binary_sensor_icon.ts b/src/common/entity/binary_sensor_icon.ts
index c1eb694afe8d..5e89af2447bc 100644
--- a/src/common/entity/binary_sensor_icon.ts
+++ b/src/common/entity/binary_sensor_icon.ts
@@ -16,9 +16,13 @@ export const binarySensorIcon = (state: HassEntity) => {
     case "garage_door":
       return activated ? "hass:garage" : "hass:garage-open";
     case "gas":
+      return activated ? "hass:shield-check" : "hass:alert";
     case "power":
+      return activated ? "hass:power-off" : "hass:power";
     case "problem":
+      return activated ? "hass:check-circle" : "hass:alert-circle";
     case "safety":
+      return activated ? "hass:check-circle" : "hass:alert-circle";
     case "smoke":
       return activated ? "hass:shield-check" : "hass:alert";
     case "heat":