diff --git a/src/cards/ha-domain-card.html b/src/cards/ha-domain-card.html
index 916e503205..b5082eb590 100644
--- a/src/cards/ha-domain-card.html
+++ b/src/cards/ha-domain-card.html
@@ -36,7 +36,7 @@
       </div>
       <div class='states'>
         <template is='dom-repeat' items="[[states]]">
-          <div class='state' on-click='entityTapped'>
+          <div class='state' on-tap='entityTapped'>
             <state-card-content class="state-card" state-obj="[[item]]"></state-card-content>
           </div>
         </template>
diff --git a/src/components/entity/ha-entity-marker.js b/src/components/entity/ha-entity-marker.js
index 82440cc73e..9944f60833 100644
--- a/src/components/entity/ha-entity-marker.js
+++ b/src/components/entity/ha-entity-marker.js
@@ -40,7 +40,7 @@ export default new Polymer({
   },
 
   listeners: {
-    'click': 'badgeTap',
+    'tap': 'badgeTap',
   },
 
   badgeTap(ev) {
diff --git a/src/components/ha-sidebar.html b/src/components/ha-sidebar.html
index d88730b08f..a8d23b91b0 100644
--- a/src/components/ha-sidebar.html
+++ b/src/components/ha-sidebar.html
@@ -69,30 +69,30 @@
         <div class="title">Home Assistant</div>
       </paper-toolbar>
       <div class='menu'>
-        <paper-icon-item on-click='menuClicked' data-panel='states'>
+        <paper-icon-item on-tap='menuClicked' data-panel='states'>
           <iron-icon item-icon icon='mdi:apps'></iron-icon> States
         </paper-icon-item>
 
-        <paper-icon-item on-click='menuClicked' data-panel='map'>
+        <paper-icon-item on-tap='menuClicked' data-panel='map'>
           <iron-icon item-icon icon='mdi:account-location'></iron-icon>
           Map
         </paper-icon-item>
 
         <template is='dom-if' if='[[hasHistoryComponent]]'>
-          <paper-icon-item on-click='menuClicked' data-panel='history'>
+          <paper-icon-item on-tap='menuClicked' data-panel='history'>
             <iron-icon item-icon icon='mdi:poll-box'></iron-icon>
             History
           </paper-icon-item>
         </template>
 
         <template is='dom-if' if='[[hasLogbookComponent]]'>
-          <paper-icon-item on-click='menuClicked' data-panel='logbook'>
+          <paper-icon-item on-tap='menuClicked' data-panel='logbook'>
             <iron-icon item-icon icon='mdi:format-list-bulleted-type'></iron-icon>
             Logbook
           </paper-icon-item>
         </template>
 
-        <paper-icon-item on-click='menuClicked' data-panel='logout' class='logout'>
+        <paper-icon-item on-tap='menuClicked' data-panel='logout' class='logout'>
           <iron-icon item-icon icon='mdi:exit-to-app'></iron-icon>
           Log Out
         </paper-icon-item>
@@ -106,19 +106,19 @@
         <div class='dev-tools layout horizontal justified'>
           <paper-icon-button
             icon='mdi:remote' data-panel='devService'
-            on-click='handleDevClick'></paper-icon-button>
+            on-tap='handleDevClick'></paper-icon-button>
           <paper-icon-button
             icon='mdi:code-tags' data-panel='devState'
-            on-click='handleDevClick'></paper-icon-button>
+            on-tap='handleDevClick'></paper-icon-button>
           <paper-icon-button
             icon='mdi:nfc' data-panel='devEvent'
-            on-click='handleDevClick'></paper-icon-button>
+            on-tap='handleDevClick'></paper-icon-button>
           <paper-icon-button
             icon='mdi:file-xml' data-panel='devTemplate'
-            on-click='handleDevClick'></paper-icon-button>
+            on-tap='handleDevClick'></paper-icon-button>
           <paper-icon-button
             icon='mdi:information-outline' data-panel='devInfo'
-            on-click='handleDevClick'></paper-icon-button>
+            on-tap='handleDevClick'></paper-icon-button>
         </div>
       </div>
     </paper-header-panel>
diff --git a/src/dialogs/ha-voice-command-dialog.js b/src/dialogs/ha-voice-command-dialog.js
index a86354fbd4..10c15d9bdc 100644
--- a/src/dialogs/ha-voice-command-dialog.js
+++ b/src/dialogs/ha-voice-command-dialog.js
@@ -45,13 +45,6 @@ export default new Polymer({
       computed: 'computeShowListenInterface(isListening, isTransmitting)',
       observer: 'showListenInterfaceChanged',
     },
-
-    _boundOnBackdropTap: {
-      type: Function,
-      value: function bindBackdropTap() {
-        return this._onBackdropTap.bind(this);
-      },
-    },
   },
 
   computeShowListenInterface(isListening, isTransmitting) {
@@ -59,10 +52,7 @@ export default new Polymer({
   },
 
   dialogOpenChanged(newVal) {
-    if (newVal) {
-      this.$.dialog.backdropElement.addEventListener('click',
-                                                     this._boundOnBackdropTap);
-    } else if (!newVal && this.isListening) {
+    if (!newVal && this.isListening) {
       voiceActions.stop();
     }
   },
@@ -74,12 +64,4 @@ export default new Polymer({
       this.dialogOpen = true;
     }
   },
-
-  _onBackdropTap() {
-    this.$.dialog.backdropElement.removeEventListener('click',
-                                                      this._boundOnBackdropTap);
-    if (this.isListening) {
-      voiceActions.stop();
-    }
-  },
 });
diff --git a/src/layouts/login-form.js b/src/layouts/login-form.js
index a6981f175b..8672c21ede 100644
--- a/src/layouts/login-form.js
+++ b/src/layouts/login-form.js
@@ -48,7 +48,7 @@ export default new Polymer({
 
   listeners: {
     'keydown': 'passwordKeyDown',
-    'loginButton.click': 'validatePassword',
+    'loginButton.tap': 'validatePassword',
   },
 
   observers: [
diff --git a/src/layouts/partial-dev-call-service.html b/src/layouts/partial-dev-call-service.html
index 3494f0ccdc..48d4f8002c 100644
--- a/src/layouts/partial-dev-call-service.html
+++ b/src/layouts/partial-dev-call-service.html
@@ -40,7 +40,7 @@
               <paper-input label="Domain" autofocus value='{{domain}}'></paper-input>
               <paper-input label="Service" value='{{service}}'></paper-input>
               <paper-textarea label="Service Data (JSON, optional)" value='{{serviceData}}'></paper-textarea>
-              <paper-button on-click='callService' raised>Call Service</paper-button>
+              <paper-button on-tap='callService' raised>Call Service</paper-button>
             </div>
             <div class='description'>[[description]]</div>
           </div>
diff --git a/src/layouts/partial-dev-fire-event.html b/src/layouts/partial-dev-fire-event.html
index f11a0a3e9f..e1ed53a1db 100644
--- a/src/layouts/partial-dev-fire-event.html
+++ b/src/layouts/partial-dev-fire-event.html
@@ -34,7 +34,7 @@
           <div class='ha-form flex'>
             <paper-input label="Event Type" autofocus required value='{{eventType}}'></paper-input>
             <paper-textarea label="Event Data (JSON, optional)" value='{{eventData}}'></paper-textarea>
-            <paper-button on-click='fireEvent' raised>Fire Event</paper-button>
+            <paper-button on-tap='fireEvent' raised>Fire Event</paper-button>
           </div>
 
           <div>
diff --git a/src/layouts/partial-dev-set-state.html b/src/layouts/partial-dev-set-state.html
index 7a3f9fa8d7..63e1a0200b 100644
--- a/src/layouts/partial-dev-set-state.html
+++ b/src/layouts/partial-dev-set-state.html
@@ -36,7 +36,7 @@
             <paper-input label="Entity ID" autofocus required value='{{entityId}}'></paper-input>
             <paper-input label="State" required value='{{state}}'></paper-input>
             <paper-textarea label="State attributes (JSON, optional)" value='{{stateAttributes}}'></paper-textarea>
-            <paper-button on-click='handleSetState' raised>Set State</paper-button>
+            <paper-button on-tap='handleSetState' raised>Set State</paper-button>
           </div>
 
           <div class='sidebar'>
diff --git a/src/layouts/partial-history.html b/src/layouts/partial-history.html
index b57f1a96f0..c0ba48f32f 100644
--- a/src/layouts/partial-history.html
+++ b/src/layouts/partial-history.html
@@ -31,7 +31,7 @@
       <span header-title>History</span>
 
       <paper-icon-button icon="mdi:refresh" header-buttons
-        on-click="handleRefreshClick"></paper-icon-button>
+        on-tap="handleRefreshClick"></paper-icon-button>
 
       <div class$="[[computeContentClasses(narrow)]]">
         <paper-input label='Showing entries for' id='datePicker'
diff --git a/src/layouts/partial-logbook.html b/src/layouts/partial-logbook.html
index 75d8c0c3ad..540d67c933 100644
--- a/src/layouts/partial-logbook.html
+++ b/src/layouts/partial-logbook.html
@@ -25,7 +25,7 @@
       <span header-title>Logbook</span>
 
       <paper-icon-button icon="mdi:refresh" header-buttons
-        on-click="handleRefresh"></paper-icon-button>
+        on-tap="handleRefresh"></paper-icon-button>
 
       <div>
         <div class='selected-date-container'>
diff --git a/src/layouts/partial-zone.html b/src/layouts/partial-zone.html
index aa20e2d09b..19470ab2ee 100644
--- a/src/layouts/partial-zone.html
+++ b/src/layouts/partial-zone.html
@@ -24,11 +24,11 @@
         <paper-icon-button
           icon="mdi:refresh"
           class$="[[computeRefreshButtonClass(isFetching)]]"
-          on-click="handleRefresh" hidden$="[[isStreaming]]"
+          on-tap="handleRefresh" hidden$="[[isStreaming]]"
         ></paper-icon-button>
         <paper-icon-button
           icon="mdi:microphone" hidden$='[[!canListen]]'
-          on-click="handleListenClick"></paper-icon-button>
+          on-tap="handleListenClick"></paper-icon-button>
       </paper-toolbar>
 
       <div class='fit'>
diff --git a/src/more-infos/more-info-configurator.html b/src/more-infos/more-info-configurator.html
index 500011975c..7635c83f5b 100644
--- a/src/more-infos/more-info-configurator.html
+++ b/src/more-infos/more-info-configurator.html
@@ -46,7 +46,7 @@
         </template>
 
         <p class='submit'>
-          <paper-button raised on-click='submitClicked'
+          <paper-button raised on-tap='submitClicked'
                         hidden$='[[isConfiguring]]'>[[submitCaption]]</paper-button>
 
           <loading-box hidden$='[[!isConfiguring]]'>Configuring</loading-box>