diff --git a/homeassistant/components/http/frontend.py b/homeassistant/components/http/frontend.py
index a1c01f9dd60..637bb09bbe6 100644
--- a/homeassistant/components/http/frontend.py
+++ b/homeassistant/components/http/frontend.py
@@ -1,2 +1,2 @@
 """ DO NOT MODIFY. Auto-generated by build_polymer script """
-VERSION = "e40dd5a3de19a9351e55be788b5bb526"
+VERSION = "58011acca6d6fb5ec54edf5714b8c476"
diff --git a/homeassistant/components/http/www_static/frontend.html b/homeassistant/components/http/www_static/frontend.html
index 40656ddead7..d4a0e5a0127 100644
--- a/homeassistant/components/http/www_static/frontend.html
+++ b/homeassistant/components/http/www_static/frontend.html
@@ -10300,7 +10300,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
       <template if="{{!state_unknown}}">
         <template if="{{state == 'on' || state == 'off'}}">
           <div class="state toggle" self-center="" flex="">
-            <paper-toggle-button id="toggleButton" on-change="{{toggle}}">
+            <paper-toggle-button checked="{{toggleChecked}}">
             </paper-toggle-button>
           </div>
         </template>
@@ -10329,17 +10329,28 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
     cb_turn_off: null,
     cb_edit: null,
     state_unknown: false,
+    toggleChecked: -1,
 
     // computed
     domain: "",
     entity_id: "",
 
+    toggleCheckedChanged: function(oldVal, newVal) {
+      // to filter out init
+      if(oldVal === -1) {
+        return;
+      }
+
+      if(newVal && this.state == "off") {
+        this.turn_on();
+      } else if(!newVal && this.state == "on") {
+        this.turn_off();
+      }
+    },
+
     stateChanged: function(oldVal, newVal) {
       this.state_unknown = newVal == null;
-
-      if(this.$.toggleButton) {
-        this.$.toggleButton.checked = this.state == 'on';
-      }
+      this.toggleChecked = newVal == "on"
     },
 
     entityChanged: function(oldVal, newVal) {
@@ -10358,29 +10369,27 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
       this.last_changed_from_now = moment(this.last_changed, "HH:mm:ss DD-MM-YYYY").fromNow()
     },
 
-    toggle: function(ev) {
-      if(this.state == "off") {
-        this.turn_on();
-      } else {
-        this.turn_off();
-      }
-
-      // unset state while we wait for an update
-      var delayUnsetSate = function() {
-        this.state = null;
-      }
-      setTimeout(delayUnsetSate.bind(this), 500);
-    },
-
     turn_on: function() {
       if(this.cb_turn_on) {
         this.cb_turn_on(this.entity);
+
+        // unset state while we wait for an update
+        var delayUnsetSate = function() {
+          this.state = null;
+        }
+        setTimeout(delayUnsetSate.bind(this), 500);      
       }
     },
 
     turn_off: function() {
       if(this.cb_turn_off) {
         this.cb_turn_off(this.entity);
+
+        // unset state while we wait for an update
+        var delayUnsetSate = function() {
+          this.state = null;
+        }
+        setTimeout(delayUnsetSate.bind(this), 500);      
       }
     },
 
@@ -10440,7 +10449,6 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
     raw_states: [],
     states: [],
     filter: null,
-    filter_state: null,
     filter_substates: null,
 
     filterChanged: function(oldVal, newVal) {
diff --git a/homeassistant/components/http/www_static/polymer/state-card.html b/homeassistant/components/http/www_static/polymer/state-card.html
index 74c7b5a3d1d..6084a2ed968 100755
--- a/homeassistant/components/http/www_static/polymer/state-card.html
+++ b/homeassistant/components/http/www_static/polymer/state-card.html
@@ -98,9 +98,7 @@
       <template if="{{!state_unknown}}">
         <template if="{{state == 'on' || state == 'off'}}">
           <div class='state toggle' self-center flex>
-            <paper-toggle-button
-              id="toggleButton"
-              on-change="{{toggle}}">
+            <paper-toggle-button checked="{{toggleChecked}}">
             </paper-toggle-button>
           </div>
         </template>
@@ -129,17 +127,28 @@
     cb_turn_off: null,
     cb_edit: null,
     state_unknown: false,
+    toggleChecked: -1,
 
     // computed
     domain: "",
     entity_id: "",
 
+    toggleCheckedChanged: function(oldVal, newVal) {
+      // to filter out init
+      if(oldVal === -1) {
+        return;
+      }
+
+      if(newVal && this.state == "off") {
+        this.turn_on();
+      } else if(!newVal && this.state == "on") {
+        this.turn_off();
+      }
+    },
+
     stateChanged: function(oldVal, newVal) {
       this.state_unknown = newVal == null;
-
-      if(this.$.toggleButton) {
-        this.$.toggleButton.checked = this.state == 'on';
-      }
+      this.toggleChecked = newVal == "on"
     },
 
     entityChanged: function(oldVal, newVal) {
@@ -158,29 +167,27 @@
       this.last_changed_from_now = moment(this.last_changed, "HH:mm:ss DD-MM-YYYY").fromNow()
     },
 
-    toggle: function(ev) {
-      if(this.state == "off") {
-        this.turn_on();
-      } else {
-        this.turn_off();
-      }
-
-      // unset state while we wait for an update
-      var delayUnsetSate = function() {
-        this.state = null;
-      }
-      setTimeout(delayUnsetSate.bind(this), 500);
-    },
-
     turn_on: function() {
       if(this.cb_turn_on) {
         this.cb_turn_on(this.entity);
+
+        // unset state while we wait for an update
+        var delayUnsetSate = function() {
+          this.state = null;
+        }
+        setTimeout(delayUnsetSate.bind(this), 500);      
       }
     },
 
     turn_off: function() {
       if(this.cb_turn_off) {
         this.cb_turn_off(this.entity);
+
+        // unset state while we wait for an update
+        var delayUnsetSate = function() {
+          this.state = null;
+        }
+        setTimeout(delayUnsetSate.bind(this), 500);      
       }
     },
 
diff --git a/homeassistant/components/http/www_static/polymer/states-cards.html b/homeassistant/components/http/www_static/polymer/states-cards.html
index 1c1bed4f1f4..21fe91ad66b 100755
--- a/homeassistant/components/http/www_static/polymer/states-cards.html
+++ b/homeassistant/components/http/www_static/polymer/states-cards.html
@@ -41,7 +41,6 @@
     raw_states: [],
     states: [],
     filter: null,
-    filter_state: null,
     filter_substates: null,
 
     filterChanged: function(oldVal, newVal) {