diff --git a/src/components/entity/ha-state-label-badge.js b/src/components/entity/ha-state-label-badge.js
index bb5989f1e0..4d143c0f85 100644
--- a/src/components/entity/ha-state-label-badge.js
+++ b/src/components/entity/ha-state-label-badge.js
@@ -76,6 +76,8 @@ export default new Polymer({
 
   computeIcon(state) {
     switch (state.domain) {
+    case 'device_tracker':
+      return !state.attributes.entity_picture && domainIcon(state.domain);
     case 'scene':
     case 'script':
       return domainIcon(state.domain);
@@ -104,7 +106,7 @@ export default new Polymer({
     case 'script':
       return state.domain;
     case 'sensor':
-      return !state.attributes.unit_of_measurement && state.state;
+      return state.attributes.unit_of_measurement || state.state;
     case 'device_tracker':
       return state.state === 'home' ? 'Home' : 'Away';
     default:
diff --git a/src/components/ha-zone-cards.html b/src/components/ha-zone-cards.html
index 861ed0975a..8276f15aea 100644
--- a/src/components/ha-zone-cards.html
+++ b/src/components/ha-zone-cards.html
@@ -11,7 +11,7 @@
     }
 
     .badges {
-      margin-top: 8px;
+      margin-top: 16px;
       margin-left: 8px;
       font-size: 80%;
       text-align: center;