From fefa4e6d5cc9ecb60b3519083f3ab057743f3e9f Mon Sep 17 00:00:00 2001
From: William Scanlon <scanlonw1@gmail.com>
Date: Tue, 1 Mar 2016 11:39:08 -0500
Subject: [PATCH] Display error icon if unavailable

---
 src/components/entity/state-badge.html | 8 +-------
 src/util/state-icon.js                 | 5 +++++
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/components/entity/state-badge.html b/src/components/entity/state-badge.html
index fabce4dd11..fd186a2104 100644
--- a/src/components/entity/state-badge.html
+++ b/src/components/entity/state-badge.html
@@ -28,17 +28,11 @@
     color: #DCC91F;
   }
 
-  /* Color the icon if entity is offline */
-  ha-state-icon[data-domain=light][data-online=offline],
-  ha-state-icon[data-domain=switch][data-online=offline],
-  ha-state-icon[data-domain=binary_sensor][data-online=offline] {
-    color: #D3D3D3;
-  }
   </style>
 
   <template>
     <ha-state-icon id='icon' state-obj='[[stateObj]]'
-      data-domain$='[[stateObj.domain]]' data-state$='[[stateObj.state]]' data-online$='[[stateObj.online]]'>
+      data-domain$='[[stateObj.domain]]' data-state$='[[stateObj.state]]'>
     </ha-state-icon>
   </template>
 </dom-module>
diff --git a/src/util/state-icon.js b/src/util/state-icon.js
index fceebd6fe9..ee50b8d2da 100644
--- a/src/util/state-icon.js
+++ b/src/util/state-icon.js
@@ -6,6 +6,9 @@ const { util: { temperatureUnits } } = hass;
 
 function binarySensorIcon(state) {
   const activated = state.state && state.state === 'off';
+  if (state.state && state.state === 'unavailable') {
+    return 'mdi:alert-circle-outline';
+  }
   switch (state.attributes.sensor_class) {
     case 'opening':
       return activated ? 'mdi:crop-square' : 'mdi:exit-to-app';
@@ -33,6 +36,8 @@ function binarySensorIcon(state) {
 export default function stateIcon(state) {
   if (!state) {
     return defaultIcon;
+  } else if (state.state && state.state === 'unavailable') {
+    return 'mdi:alert-circle-outline';
   } else if (state.attributes.icon) {
     return state.attributes.icon;
   }