diff --git a/panels/hassio/addon-store/hassio-addon-store.html b/panels/hassio/addon-store/hassio-addon-store.html
index 22b18292f3..8a1e2a4d45 100644
--- a/panels/hassio/addon-store/hassio-addon-store.html
+++ b/panels/hassio/addon-store/hassio-addon-store.html
@@ -125,7 +125,7 @@ Polymer({
   },
 
   refreshData: function () {
-    this.hass.callApi('post', 'hassio/supervisor/reload')
+    this.hass.callApi('post', 'hassio/addons/reload')
       .then(function () {
         this._loadData();
       }.bind(this));
diff --git a/panels/hassio/addon-view/hassio-addon-info.html b/panels/hassio/addon-view/hassio-addon-info.html
index ee23ed1a66..4231619232 100644
--- a/panels/hassio/addon-view/hassio-addon-info.html
+++ b/panels/hassio/addon-view/hassio-addon-info.html
@@ -10,6 +10,7 @@
 
 
 <link rel="import" href="../../../src/components/ha-icon-check.html">
+<link rel="import" href="../../../src/components/buttons/ha-call-api-button.html">
 
 <dom-module id="hassio-addon-info">
   <template>
@@ -32,10 +33,24 @@
         --iron-icon-width: 16px;
         color: var(--primary-color);
       }
+
+      .card-actions a {
+        text-decoration: none;
+      }
+      .logo {
+        max-height: 70px;
+        max-width: 100%;
+      }
     </style>
     <paper-card heading='Info'>
       <div class="card-content">
         <table class='info' cellspacing="0">
+          <template is='dom-if' if='[[addonState.logo]]'>
+            <tr>
+              <td>Logo</td>
+              <td><img src='[[_pathLogo(addonInfo.slug)]]' class='logo'></td>
+            </tr>
+          </template>
           <tr>
             <td>Description</td>
             <td>[[addonInfo.description]]</td>
@@ -128,6 +143,13 @@
           >Start</ha-call-api-button>
         </template>
         <template is='dom-if' if='[[_isRunning]]'>
+          <template is='dom-if' if='[[addonState.webui]]'>
+            <a
+              href='[[_pathWebui(addonState.webui)]]'
+              tabindex="-1"
+              target="_blank"
+            ><paper-button>Open web UI</paper-button></a>
+          </template>
           <ha-call-api-button
             class='warning'
             hass='[[hass]]'
@@ -196,6 +218,14 @@ Polymer({
     return 'hassio/addons/' + addon + '/options';
   },
 
+  _pathWebui: function (webui) {
+    return webui && webui.replace('[HOST]', document.location.hostname);
+  },
+
+  _pathLogo: function (addon) {
+    return 'hassio/addons/' + addon + '/logo';
+  },
+
   _dataToggleAutoUpdate: function (addon, addonState) {
     return addonState && { auto_update: !addonState.auto_update };
   },
diff --git a/panels/hassio/addon-view/hassio-addon-options.html b/panels/hassio/addon-view/hassio-addon-options.html
index d8e12ddbb1..4239b07b8a 100644
--- a/panels/hassio/addon-view/hassio-addon-options.html
+++ b/panels/hassio/addon-view/hassio-addon-options.html
@@ -1,6 +1,8 @@
 <link rel="import" href="../../../bower_components/polymer/polymer.html">
 <link rel="import" href="../../../bower_components/paper-card/paper-card.html">
 <link rel="import" href="../../../bower_components/iron-autogrow-textarea/iron-autogrow-textarea.html">
+<link rel="import" href="../../../bower_components/iron-flex-layout/iron-flex-layout.html">
+<link rel="import" href="../../../bower_components/paper-button/paper-button.html">
 
 <link rel="import" href="../../../src/components/buttons/ha-call-api-button.html">
 
@@ -13,6 +15,10 @@
       paper-card {
         display: block;
       }
+      .card-actions {
+        @apply(--layout);
+        @apply(--layout-justified);
+      }
       .errors {
         color: var(--google-red-500);
         margin-bottom: 16px;
@@ -33,6 +39,12 @@
           on-tap='saveTapped'
           disabled='[[!optionsParsed]]'
         >Save</paper-button>
+        <ha-call-api-button
+          class='warning'
+          hass='[[hass]]'
+          path="[[pathOptions(addon)]]"
+          data='[[_resetOptionsData]]'
+        >Reset to defaults</ha-call-api-button>
       </div>
     </paper-card>
   </template>
@@ -71,6 +83,11 @@ Polymer({
       value: null,
       observer: 'addonStateChanged',
     },
+
+    _resetOptionsData: {
+      type: Object,
+      value: { options: {} },
+    },
   },
 
   addonStateChanged: function (addonState) {
diff --git a/panels/hassio/dashboard/hassio-dashboard.html b/panels/hassio/dashboard/hassio-dashboard.html
index 0dd83005f2..37eb9b1b9a 100644
--- a/panels/hassio/dashboard/hassio-dashboard.html
+++ b/panels/hassio/dashboard/hassio-dashboard.html
@@ -58,6 +58,9 @@
               slot="dropdown-trigger"
             ></paper-icon-button>
             <paper-listbox slot="dropdown-content">
+              <paper-item
+                on-tap='_restartHomeAssistant'
+              >Restart Home Assistant</paper-item>
               <paper-item
                 on-tap='_openSnapshot'
               >Snapshots</paper-item>
@@ -129,5 +132,13 @@ Polymer({
     this.fire('location-changed');
     ev.target.blur();
   },
+
+  _restartHomeAssistant: function (ev) {
+    ev.target.blur();
+    // eslint-disable-next-line no-alert
+    if (confirm('Are you sure you want to restart Home Assistant?')) {
+      this.hass.callApi('POST', 'hassio/homeassistant/restart');
+    }
+  }
 });
 </script>
diff --git a/panels/hassio/ha-panel-hassio.html b/panels/hassio/ha-panel-hassio.html
index 0d8d3b213e..cf1e084563 100644
--- a/panels/hassio/ha-panel-hassio.html
+++ b/panels/hassio/ha-panel-hassio.html
@@ -26,15 +26,7 @@ Polymer({
     hass: Object,
     narrow: Boolean,
     showMenu: Boolean,
-    route: {
-      type: Object,
-      // Fake route object
-      value: {
-        prefix: '/hassio',
-        path: '',
-        __queryParams: {}
-      }
-    },
+    route: Object,
 
     loaded: {
       type: Boolean,
diff --git a/panels/hassio/hassio-main.html b/panels/hassio/hassio-main.html
index 8cb2d6d5bb..e97dd07ca8 100644
--- a/panels/hassio/hassio-main.html
+++ b/panels/hassio/hassio-main.html
@@ -94,6 +94,7 @@
         <hass-error-screen
           page-name='not-found'
           error='Page not found.'
+          title='Hass.io'
         ></hass-error-screen>
       </iron-pages>
     </template>
@@ -110,6 +111,12 @@ Polymer({
     showMenu: Boolean,
     route: {
       type: Object,
+      // Fake route object
+      value: {
+        prefix: '/hassio',
+        path: '/dashboard',
+        __queryParams: {}
+      },
       observer: '_routeChanged',
     },
     _routeData: Object,
diff --git a/panels/hassio/snapshot/hassio-snapshot.html b/panels/hassio/snapshot/hassio-snapshot.html
index 2bc26703e8..912a3b1881 100644
--- a/panels/hassio/snapshot/hassio-snapshot.html
+++ b/panels/hassio/snapshot/hassio-snapshot.html
@@ -43,6 +43,10 @@
             on-tap='_backTapped'
           ></paper-icon-button>
           <div main-title>Snapshots</div>
+          <paper-icon-button
+            icon="mdi:refresh"
+            on-tap="_refreshTapped"
+          ></paper-icon-button>
         </app-toolbar>
       </app-header>
 
@@ -161,5 +165,12 @@ Polymer({
   _backTapped: function () {
     history.back();
   },
+
+  _refreshTapped: function () {
+    this.hass.callApi('post', 'hassio/snapshots/reload')
+      .then(function () {
+        this._updateData();
+      }.bind(this));
+  },
 });
 </script>
diff --git a/src/layouts/hass-error-screen.html b/src/layouts/hass-error-screen.html
index e98ece000d..480fb2f237 100644
--- a/src/layouts/hass-error-screen.html
+++ b/src/layouts/hass-error-screen.html
@@ -24,7 +24,7 @@
     <div class='placeholder'>
       <app-toolbar>
         <ha-menu-button narrow='[[narrow]]' show-menu='[[showMenu]]'></ha-menu-button>
-        <div main-title>Home Assistant</div>
+        <div main-title>[[title]]</div>
       </app-toolbar>
       <div class='layout vertical center-center'>
         <h3>[[error]]</h3>
@@ -49,6 +49,11 @@ Polymer({
       value: false,
     },
 
+    title: {
+      type: String,
+      value: 'Home Assistant',
+    },
+
     error: {
       type: String,
       value: 'Oops! It looks like something went wrong.'
diff --git a/src/resources/ha-style.html b/src/resources/ha-style.html
index ab842b242d..06b745f740 100644
--- a/src/resources/ha-style.html
+++ b/src/resources/ha-style.html
@@ -86,16 +86,16 @@
         @apply(--paper-font-title);
       }
 
-      .card-actions > paper-button:not([disabled]),
-      .card-actions > ha-call-api-button:not([disabled]),
-      .card-actions > ha-call-service-button:not([disabled]) {
+      .card-actions paper-button:not([disabled]),
+      .card-actions ha-call-api-button:not([disabled]),
+      .card-actions ha-call-service-button:not([disabled]) {
         color: var(--primary-color);
         font-weight: 500;
       }
 
-      .card-actions > paper-button.warning:not([disabled]),
-      .card-actions > ha-call-api-button.warning:not([disabled]),
-      .card-actions > ha-call-service-button.warning:not([disabled]) {
+      .card-actions paper-button.warning:not([disabled]),
+      .card-actions ha-call-api-button.warning:not([disabled]),
+      .card-actions ha-call-service-button.warning:not([disabled]) {
         color: var(--google-red-500);
       }
     </style>