diff --git a/src/components/entity/ha-entity-marker.html b/src/components/entity/ha-entity-marker.html
index 7e180bd329..047034a2a2 100644
--- a/src/components/entity/ha-entity-marker.html
+++ b/src/components/entity/ha-entity-marker.html
@@ -30,6 +30,7 @@
       <template is='dom-if' if='[[icon]]'>
         <iron-icon icon='[[icon]]'></iron-icon>
       </template>
+      <template is='dom-if' if='[[value]]'>[[value]]</template>
       <template is='dom-if' if='[[image]]'>
         <iron-image sizing='cover' class='fit'src='[[image]]'></iron-image>
       </template>
diff --git a/src/components/entity/ha-entity-marker.js b/src/components/entity/ha-entity-marker.js
index ba555a03d8..3cb5266eec 100644
--- a/src/components/entity/ha-entity-marker.js
+++ b/src/components/entity/ha-entity-marker.js
@@ -31,6 +31,11 @@ export default new Polymer({
       type: Object,
       computed: 'computeImage(state)',
     },
+
+    value: {
+      type: String,
+      computed: 'computeValue(state)',
+    },
   },
 
   listeners: {
@@ -49,13 +54,15 @@ export default new Polymer({
   },
 
   computeIcon(state) {
-    return state ?
-      !state.attributes.entity_picture && domainIcon(state.domain) :
-      'home';
+    return !state && 'home';
   },
 
   computeImage(state) {
     return state && state.attributes.entity_picture;
   },
 
+  computeValue(state) {
+    return state &&
+      state.entityDisplay.split(' ').map(part => part.substr(0, 1)).join('');
+  },
 });