diff --git a/src/dialogs/more-info/more-info-controls.js b/src/dialogs/more-info/more-info-controls.js
index 0410fa6107..849a4a1452 100644
--- a/src/dialogs/more-info/more-info-controls.js
+++ b/src/dialogs/more-info/more-info-controls.js
@@ -68,8 +68,9 @@ class MoreInfoControls extends EventsMixin(PolymerElement) {
 
       <app-toolbar>
         <paper-icon-button
+          aria-label="Dismiss dialog"
           icon="hass:close"
-          dialog-dismiss=""
+          dialog-dismiss
         ></paper-icon-button>
         <div class="main-title" main-title="" on-click="enlarge">
           [[_computeStateName(stateObj)]]
diff --git a/src/layouts/hass-subpage.ts b/src/layouts/hass-subpage.ts
index be0ec53370..2e0befb405 100644
--- a/src/layouts/hass-subpage.ts
+++ b/src/layouts/hass-subpage.ts
@@ -22,6 +22,7 @@ class HassSubpage extends LitElement {
     return html`
       <div class="toolbar">
         <ha-paper-icon-button-arrow-prev
+          aria-label="Back"
           .hassio=${this.hassio}
           @click=${this._backTapped}
         ></ha-paper-icon-button-arrow-prev>
diff --git a/src/panels/lovelace/hui-root.ts b/src/panels/lovelace/hui-root.ts
index 9c959ade8f..b61eef4071 100644
--- a/src/panels/lovelace/hui-root.ts
+++ b/src/panels/lovelace/hui-root.ts
@@ -154,28 +154,46 @@ class HUIRoot extends LitElement {
                     >
                       ${this._yamlMode
                         ? html`
-                            <paper-item @click="${this._handleRefresh}"
-                              >${this.hass!.localize(
+                            <paper-item
+                              aria-label=${this.hass!.localize(
                                 "ui.panel.lovelace.menu.refresh"
-                              )}</paper-item
+                              )}
+                              @click="${this._handleRefresh}"
                             >
+                              ${this.hass!.localize(
+                                "ui.panel.lovelace.menu.refresh"
+                              )}
+                            </paper-item>
                           `
                         : ""}
                       ${__DEMO__ /* No unused entities available in the demo */
                         ? ""
                         : html`
-                            <paper-item @click="${this._handleUnusedEntities}">
+                            <paper-item
+                              aria-label=${this.hass!.localize(
+                                "ui.panel.lovelace.menu.unused_entities"
+                              )}
+                              @click="${this._handleUnusedEntities}"
+                            >
                               ${this.hass!.localize(
                                 "ui.panel.lovelace.menu.unused_entities"
                               )}
                             </paper-item>
                           `}
-                      <paper-item @click="${this._editModeEnable}"
+                      <paper-item
+                        aria-label=${this.hass!.localize(
+                          "ui.panel.lovelace.menu.configure_ui"
+                        )}
+                        @click="${this._editModeEnable}"
                         >${this.hass!.localize(
                           "ui.panel.lovelace.menu.configure_ui"
                         )}</paper-item
                       >
-                      <paper-item @click="${this._handleHelp}"
+                      <paper-item
+                        aria-label=${this.hass!.localize(
+                          "ui.panel.lovelace.menu.help"
+                        )}
+                        @click="${this._handleHelp}"
                         >${this.hass!.localize(
                           "ui.panel.lovelace.menu.help"
                         )}</paper-item