diff --git a/src/panels/map/ha-panel-map.js b/src/panels/map/ha-panel-map.js
index bf62930e59..110dffd636 100644
--- a/src/panels/map/ha-panel-map.js
+++ b/src/panels/map/ha-panel-map.js
@@ -34,10 +34,12 @@ class HaPanelMap extends LocalizeMixin(PolymerElement) {
       <app-toolbar>
         <ha-menu-button hass="[[hass]]" narrow="[[narrow]]"></ha-menu-button>
         <div main-title>[[localize('panel.map')]]</div>
-        <paper-icon-button
-          icon="hass:settings"
-          on-click="openZonesEditor"
-        ></paper-icon-button>
+        <template is="dom-if" if="[[!computeDemo()]]">
+          <paper-icon-button
+            icon="hass:pencil"
+            on-click="openZonesEditor"
+          ></paper-icon-button>
+        </template>
       </app-toolbar>
 
       <div id="map"></div>
@@ -72,6 +74,10 @@ class HaPanelMap extends LocalizeMixin(PolymerElement) {
     }
   }
 
+  computeDemo() {
+    return __DEMO__;
+  }
+
   openZonesEditor() {
     navigate(this, "/config/zone");
   }