diff --git a/src/components/ha-menu-button.ts b/src/components/ha-menu-button.ts
index 6c2b148c4b..baac1dc297 100644
--- a/src/components/ha-menu-button.ts
+++ b/src/components/ha-menu-button.ts
@@ -98,8 +98,8 @@ class HaMenuButton extends LitElement {
       return;
     }
 
-    this.style.visibility =
-      newNarrow || this._alwaysVisible ? "initial" : "hidden";
+    this.style.display =
+      newNarrow || this._alwaysVisible ? "initial" : "none";
 
     if (!newNarrow) {
       this._hasNotifications = false;
diff --git a/src/components/ha-tabs.ts b/src/components/ha-tabs.ts
new file mode 100644
index 0000000000..33338c4a93
--- /dev/null
+++ b/src/components/ha-tabs.ts
@@ -0,0 +1,97 @@
+import "@polymer/paper-tabs/paper-tabs";
+import type { PaperIconButtonElement } from "@polymer/paper-icon-button/paper-icon-button";
+import type { PaperTabElement } from "@polymer/paper-tabs/paper-tab";
+import type { PaperTabsElement } from "@polymer/paper-tabs/paper-tabs";
+import { customElement } from "lit-element";
+import { Constructor } from "../types";
+
+const PaperTabs = customElements.get("paper-tabs") as Constructor<
+  PaperTabsElement
+>;
+
+let subTemplate: HTMLTemplateElement;
+
+@customElement("ha-tabs")
+export class HaTabs extends PaperTabs {
+  private _firstTabWidth = 0;
+
+  private _lastTabWidth = 0;
+
+  private _lastLeftHiddenState = false;
+
+  static get template(): HTMLTemplateElement {
+    if (!subTemplate) {
+      subTemplate = (PaperTabs as any).template.cloneNode(true);
+
+      const superStyle = subTemplate.content.querySelector("style");
+
+      // Add "noink" attribute for scroll buttons to disable animation.
+      subTemplate.content
+        .querySelectorAll("paper-icon-button")
+        .forEach((arrow: PaperIconButtonElement) => {
+          arrow.setAttribute("noink", "");
+        });
+
+      superStyle!.appendChild(
+        document.createTextNode(`
+          .not-visible {
+            display: none;
+          }
+          :host > paper-icon-button:first-of-type {
+            padding-left: 0;
+          }
+          paper-icon-button {
+            margin: 0 -8px 0 0;
+          }
+        `)
+      );
+    }
+    return subTemplate;
+  }
+
+  // Get first and last tab's width for _affectScroll
+  public _tabChanged(tab: PaperTabElement, old: PaperTabElement): void {
+    super._tabChanged(tab, old);
+    const tabs = this.querySelectorAll("paper-tab:not(.hide-tab)");
+    if (tabs.length > 0) {
+      this._firstTabWidth = tabs[0].clientWidth;
+      this._lastTabWidth = tabs[tabs.length - 1].clientWidth;
+    }
+
+    // Scroll active tab into view if needed.
+    const selected = this.querySelector(".iron-selected");
+    if (selected) {
+      selected.scrollIntoView();
+    }
+  }
+
+  /**
+   * Modify _affectScroll so that when the scroll arrows appear
+   * while scrolling and the tab container shrinks we can counteract
+   * the jump in tab position so that the scroll still appears smooth.
+   */
+  public _affectScroll(dx: number): void {
+    if (this._firstTabWidth === 0 || this._lastTabWidth === 0) {
+      return;
+    }
+
+    this.$.tabsContainer.scrollLeft += dx;
+
+    const scrollLeft = this.$.tabsContainer.scrollLeft;
+
+    this._leftHidden = scrollLeft - this._firstTabWidth < 0;
+    this._rightHidden =
+      scrollLeft + this._lastTabWidth > this._tabContainerScrollSize;
+
+    if (this._lastLeftHiddenState !== this._leftHidden) {
+      this._lastLeftHiddenState = this._leftHidden;
+      this.$.tabsContainer.scrollLeft += this._leftHidden ? -46 : 46;
+    }
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-tabs": HaTabs;
+  }
+}
diff --git a/src/panels/developer-tools/ha-panel-developer-tools.ts b/src/panels/developer-tools/ha-panel-developer-tools.ts
index 1a71602c8b..e8c8317e17 100644
--- a/src/panels/developer-tools/ha-panel-developer-tools.ts
+++ b/src/panels/developer-tools/ha-panel-developer-tools.ts
@@ -3,7 +3,7 @@ import "@polymer/app-layout/app-toolbar/app-toolbar";
 import "../../layouts/ha-app-layout";
 import "../../components/ha-icon-button";
 import "@polymer/paper-tabs/paper-tab";
-import "@polymer/paper-tabs/paper-tabs";
+import "../../components/ha-tabs";
 import {
   css,
   CSSResultArray,
@@ -44,7 +44,7 @@ class PanelDeveloperTools extends LitElement {
             ></ha-menu-button>
             <div main-title>${this.hass.localize("panel.developer_tools")}</div>
           </app-toolbar>
-          <paper-tabs
+          <ha-tabs
             scrollable
             attr-for-selected="page-name"
             .selected=${page}
@@ -70,7 +70,7 @@ class PanelDeveloperTools extends LitElement {
                 "ui.panel.developer-tools.tabs.events.title"
               )}
             </paper-tab>
-          </paper-tabs>
+          </ha-tabs>
         </app-header>
         <developer-tools-router
           .route=${this.route}
@@ -106,8 +106,9 @@ class PanelDeveloperTools extends LitElement {
           display: block;
           height: calc(100vh - 112px);
         }
-        paper-tabs {
-          margin-left: 12px;
+        ha-tabs {
+          margin-left: max(env(safe-area-inset-left), 24px);
+          margin-right: max(env(safe-area-inset-right), 24px);
           --paper-tabs-selection-bar-color: #fff;
           text-transform: uppercase;
         }
diff --git a/src/panels/lovelace/hui-root.ts b/src/panels/lovelace/hui-root.ts
index 5aa182e9ca..f789e3303e 100644
--- a/src/panels/lovelace/hui-root.ts
+++ b/src/panels/lovelace/hui-root.ts
@@ -13,7 +13,6 @@ import "@polymer/app-layout/app-header/app-header";
 import "@polymer/app-layout/app-scroll-effects/effects/waterfall";
 import "@polymer/app-layout/app-toolbar/app-toolbar";
 import "@polymer/paper-tabs/paper-tab";
-import "@polymer/paper-tabs/paper-tabs";
 import {
   css,
   CSSResult,
@@ -40,6 +39,7 @@ import "../../components/ha-icon-button-arrow-next";
 import "../../components/ha-icon-button-arrow-prev";
 import "../../components/ha-menu-button";
 import "../../components/ha-svg-icon";
+import "../../components/ha-tabs";
 import type {
   LovelaceConfig,
   LovelacePanelConfig,
@@ -283,7 +283,7 @@ class HUIRoot extends LitElement {
           ${this.lovelace!.config.views.length > 1 || this._editMode
             ? html`
                 <div sticky>
-                  <paper-tabs
+                  <ha-tabs
                     scrollable
                     .selected="${this._curView}"
                     @iron-activate="${this._handleViewSelected}"
@@ -363,7 +363,7 @@ class HUIRoot extends LitElement {
                           </mwc-icon-button>
                         `
                       : ""}
-                  </paper-tabs>
+                  </ha-tabs>
                 </div>
               `
             : ""}
@@ -698,9 +698,9 @@ class HUIRoot extends LitElement {
         ha-app-layout {
           min-height: 100%;
         }
-        paper-tabs {
-          margin-left: max(env(safe-area-inset-left), 12px);
-          margin-right: env(safe-area-inset-right);
+        ha-tabs {
+          margin-left: max(env(safe-area-inset-left), 24px);
+          margin-right: max(env(safe-area-inset-right), 24px);
           --paper-tabs-selection-bar-color: var(--text-primary-color, #fff);
           text-transform: uppercase;
         }
diff --git a/src/panels/mailbox/ha-panel-mailbox.js b/src/panels/mailbox/ha-panel-mailbox.js
index fb9e17acb0..08c5e1fd51 100644
--- a/src/panels/mailbox/ha-panel-mailbox.js
+++ b/src/panels/mailbox/ha-panel-mailbox.js
@@ -6,7 +6,7 @@ import "@polymer/paper-input/paper-textarea";
 import "@polymer/paper-item/paper-item";
 import "@polymer/paper-item/paper-item-body";
 import "@polymer/paper-tabs/paper-tab";
-import "@polymer/paper-tabs/paper-tabs";
+import "../../components/ha-tabs";
 import { html } from "@polymer/polymer/lib/utils/html-tag";
 /* eslint-plugin-disable lit */
 import { PolymerElement } from "@polymer/polymer/polymer-element";
@@ -46,6 +46,13 @@ class HaPanelMailbox extends EventsMixin(LocalizeMixin(PolymerElement)) {
           cursor: pointer;
         }
 
+        ha-tabs {
+          margin-left: max(env(safe-area-inset-left), 24px);
+          margin-right: max(env(safe-area-inset-right), 24px);
+          --paper-tabs-selection-bar-color: #fff;
+          text-transform: uppercase;
+        }
+
         .empty {
           text-align: center;
           color: var(--secondary-text-color);
@@ -86,7 +93,7 @@ class HaPanelMailbox extends EventsMixin(LocalizeMixin(PolymerElement)) {
             <div main-title>[[localize('panel.mailbox')]]</div>
           </app-toolbar>
           <div sticky hidden$="[[areTabsHidden(platforms)]]">
-            <paper-tabs
+            <ha-tabs
               scrollable
               selected="[[_currentPlatform]]"
               on-iron-activate="handlePlatformSelected"
@@ -96,7 +103,7 @@ class HaPanelMailbox extends EventsMixin(LocalizeMixin(PolymerElement)) {
                   [[getPlatformName(item)]]
                 </paper-tab>
               </template>
-            </paper-tabs>
+            </ha-tabs>
           </div>
         </app-header>
         <div class="content">
diff --git a/src/resources/styles.ts b/src/resources/styles.ts
index ff7235f9d9..5cce29ec5d 100644
--- a/src/resources/styles.ts
+++ b/src/resources/styles.ts
@@ -110,10 +110,12 @@ export const haStyle = css`
     color: var(--app-header-text-color, white);
   }
 
-  app-toolbar ha-menu-button + [main-title],
-  app-toolbar ha-icon-button-arrow-prev + [main-title],
-  app-toolbar ha-icon-button + [main-title] {
-    margin-left: 24px;
+  app-toolbar [main-title] {
+    margin-left: 20px;
+  }
+
+  ha-menu-button {
+    margin-left: 4px;
   }
 
   h1 {