diff --git a/src/components/entity/ha-state-label-badge.js b/src/components/entity/ha-state-label-badge.js
index c59ef1e665..c3f7dde5f4 100644
--- a/src/components/entity/ha-state-label-badge.js
+++ b/src/components/entity/ha-state-label-badge.js
@@ -41,6 +41,7 @@ export default new Polymer({
     switch (state.domain) {
     case 'scene':
       return 'green';
+    case 'binary_sensor':
     case 'script':
       return state.state === 'on' ? 'blue' : 'grey';
     case 'updater':
@@ -52,6 +53,7 @@ export default new Polymer({
 
   computeValue(state) {
     switch (state.domain) {
+    case 'binary_sensor':
     case 'device_tracker':
     case 'updater':
     case 'sun':
@@ -78,12 +80,12 @@ export default new Polymer({
       }
       // state == 'disarmed'
       return 'mdi:lock-open';
+    case 'binary_sensor':
     case 'device_tracker':
     case 'scene':
+    case 'updater':
     case 'script':
       return domainIcon(state.domain, state.state);
-    case 'updater':
-      return domainIcon(state.domain);
     case 'sun':
       return state.state === 'above_horizon' ?
         domainIcon(state.domain) : 'mdi:brightness-3';
diff --git a/src/components/ha-zone-cards.js b/src/components/ha-zone-cards.js
index ebe5403801..9f16769768 100644
--- a/src/components/ha-zone-cards.js
+++ b/src/components/ha-zone-cards.js
@@ -16,8 +16,9 @@ const PRIORITY = {
   alarm_control_panel: 3,
   camera: 4,
   sensor: 5,
-  scene: 6,
-  script: 7,
+  binary_sensor: 6,
+  scene: 7,
+  script: 8,
   thermostat: 40,
   media_player: 50,
 };
diff --git a/src/util/domain-icon.js b/src/util/domain-icon.js
index bf799e4d45..260340e556 100644
--- a/src/util/domain-icon.js
+++ b/src/util/domain-icon.js
@@ -5,6 +5,9 @@ export default function domainIcon(domain, state) {
   case 'alarm_control_panel':
     return state && state === 'disarmed' ? 'mdi:lock-open' : 'mdi:lock';
 
+  case 'binary_sensor':
+    return state && state === 'off' ? 'mdi:radiobox-blank' : 'mdi:radiobox-marked';
+
   case 'camera':
     return 'mdi:video';