diff --git a/hassio/script/gen-icons.js b/hassio/script/gen-icons.js
index 21c6f3b9e4..f53390153f 100755
--- a/hassio/script/gen-icons.js
+++ b/hassio/script/gen-icons.js
@@ -5,9 +5,11 @@ const {
   generateIconset,
 } = require('../../gulp/tasks/gen-icons.js');
 
-function genHassIcons() {
-  const iconNames = findIcons('./src', 'hassio');
+const MENU_BUTTON_ICON = 'menu';
+
+function genHassioIcons() {
+  const iconNames = findIcons('./src', 'hassio').concat(MENU_BUTTON_ICON);
   fs.writeFileSync('./hassio-icons.html', generateIconset('hassio', iconNames));
 }
 
-genHassIcons();
+genHassioIcons();
diff --git a/hassio/src/addon-view/hassio-addon-view.js b/hassio/src/addon-view/hassio-addon-view.js
index 0340965671..2328fb937b 100644
--- a/hassio/src/addon-view/hassio-addon-view.js
+++ b/hassio/src/addon-view/hassio-addon-view.js
@@ -7,7 +7,6 @@ import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
 import '../../../src/components/ha-menu-button.js';
-// For hassio-iconset: hassio:menu
 import '../../../src/resources/ha-style.js';
 import '../hassio-markdown-dialog.js';
 import './hassio-addon-audio.js';
diff --git a/hassio/src/hassio-pages-with-tabs.js b/hassio/src/hassio-pages-with-tabs.js
index 350917af27..2e6c41babe 100644
--- a/hassio/src/hassio-pages-with-tabs.js
+++ b/hassio/src/hassio-pages-with-tabs.js
@@ -8,7 +8,6 @@ import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
 import '../../src/components/ha-menu-button.js';
-// For hassio-iconset: hassio:menu
 import '../../src/resources/ha-style.js';
 import './addon-store/hassio-addon-store.js';
 import './dashboard/hassio-dashboard.js';
diff --git a/src/components/ha-menu-button.js b/src/components/ha-menu-button.js
index 0edd739f87..ec44307ddd 100644
--- a/src/components/ha-menu-button.js
+++ b/src/components/ha-menu-button.js
@@ -48,6 +48,7 @@ class HaMenuButton extends EventsMixin(PolymerElement) {
   }
 
   _getIcon(hassio) {
+    // hass:menu
     return `${hassio ? 'hassio' : 'hass'}:menu`;
   }
 }
diff --git a/src/panels/experimental-ui/hui-camera-preview-card.js b/src/panels/experimental-ui/hui-camera-preview-card.js
index 7dde9c2e4b..9f1ffa706a 100644
--- a/src/panels/experimental-ui/hui-camera-preview-card.js
+++ b/src/panels/experimental-ui/hui-camera-preview-card.js
@@ -63,7 +63,7 @@ class HuiCameraPreviewCard extends PolymerElement {
 
   _hassChanged(hass) {
     if (this.lastChild && this._entityId) {
-      const element = this.childNodes[0];
+      const element = this.lastChild;
       const stateObj = hass.states[this._entityId];
       element.stateObj = stateObj;
       element.hass = hass;
diff --git a/src/panels/experimental-ui/hui-history-graph-card.js b/src/panels/experimental-ui/hui-history-graph-card.js
index 7731d4d847..f0568a8712 100644
--- a/src/panels/experimental-ui/hui-history-graph-card.js
+++ b/src/panels/experimental-ui/hui-history-graph-card.js
@@ -63,7 +63,7 @@ class HuiHistoryGraphCard extends PolymerElement {
 
   _hassChanged(hass) {
     if (this.lastChild && this._entityId) {
-      const element = this.childNodes[0];
+      const element = this.lastChild;
       const stateObj = hass.states[this._entityId];
       element.stateObj = stateObj;
       element.hass = hass;
diff --git a/src/panels/experimental-ui/hui-media-control-card.js b/src/panels/experimental-ui/hui-media-control-card.js
index 20b94f0eb9..cbe2178d59 100644
--- a/src/panels/experimental-ui/hui-media-control-card.js
+++ b/src/panels/experimental-ui/hui-media-control-card.js
@@ -63,7 +63,7 @@ class HuiMediaControlCard extends PolymerElement {
 
   _hassChanged(hass) {
     if (this.lastChild && this._entityId) {
-      const element = this.childNodes[0];
+      const element = this.lastChild;
       const stateObj = hass.states[this._entityId];
       element.stateObj = stateObj;
       element.hass = hass;
diff --git a/src/panels/experimental-ui/hui-plant-status-card.js b/src/panels/experimental-ui/hui-plant-status-card.js
index 4409ebf700..17b8a9a520 100644
--- a/src/panels/experimental-ui/hui-plant-status-card.js
+++ b/src/panels/experimental-ui/hui-plant-status-card.js
@@ -63,7 +63,7 @@ class HuiPlantStatusCard extends PolymerElement {
 
   _hassChanged(hass) {
     if (this.lastChild && this._entityId) {
-      const element = this.childNodes[0];
+      const element = this.lastChild;
       const stateObj = hass.states[this._entityId];
       element.stateObj = stateObj;
       element.hass = hass;
diff --git a/src/panels/experimental-ui/hui-weather-forecast-card.js b/src/panels/experimental-ui/hui-weather-forecast-card.js
index f600ae934a..d259d5537b 100644
--- a/src/panels/experimental-ui/hui-weather-forecast-card.js
+++ b/src/panels/experimental-ui/hui-weather-forecast-card.js
@@ -63,7 +63,7 @@ class HuiWeatherForecastCard extends PolymerElement {
 
   _hassChanged(hass) {
     if (this.lastChild && this._entityId) {
-      const element = this.childNodes[0];
+      const element = this.lastChild;
       const stateObj = hass.states[this._entityId];
       element.stateObj = stateObj;
       element.hass = hass;