diff --git a/build-scripts/gulp/entry-html.js b/build-scripts/gulp/entry-html.js
index eb26093925..c322aac4ec 100644
--- a/build-scripts/gulp/entry-html.js
+++ b/build-scripts/gulp/entry-html.js
@@ -86,7 +86,7 @@ gulp.task("gen-index-app-dev", (done) => {
     es5CoreJS: "/frontend_es5/core.js",
     es5CustomPanelJS: "/frontend_es5/custom-panel.js",
     es5HassIconsJS: "/frontend_es5/hass-icons.js",
-  });
+  }).replace(/#THEMEC/g, "{{ theme_color }}");
 
   fs.outputFileSync(path.resolve(config.root, "index.html"), content);
   done();
diff --git a/src/common/search/search-input.ts b/src/common/search/search-input.ts
index deb36885b7..65b29881e9 100644
--- a/src/common/search/search-input.ts
+++ b/src/common/search/search-input.ts
@@ -26,7 +26,7 @@ class SearchInput extends LitElement {
           @value-changed=${this._filterInputChanged}
         >
           <iron-icon
-            icon="mdi:magnify"
+            icon="hass:magnify"
             slot="prefix"
             class="prefix"
           ></iron-icon>
@@ -36,7 +36,7 @@ class SearchInput extends LitElement {
                 slot="suffix"
                 class="suffix"
                 @click=${this._clearSearch}
-                icon="mdi:close"
+                icon="hass:close"
                 alt="Clear"
                 title="Clear"
               ></paper-icon-button>
diff --git a/src/dialogs/config-flow/step-flow-create-entry.ts b/src/dialogs/config-flow/step-flow-create-entry.ts
index ac38ba95ed..5ecc457a40 100644
--- a/src/dialogs/config-flow/step-flow-create-entry.ts
+++ b/src/dialogs/config-flow/step-flow-create-entry.ts
@@ -69,9 +69,10 @@ class StepFlowCreateEntry extends LitElement {
                   (device) =>
                     html`
                       <div class="device">
-                        <b>${device.name}</b><br />
-                        ${device.model} (${device.manufacturer})
-
+                        <div>
+                          <b>${device.name}</b><br />
+                          ${device.model} (${device.manufacturer})
+                        </div>
                         <paper-dropdown-menu-light
                           label="Area"
                           .device=${device.id}
@@ -157,6 +158,8 @@ class StepFlowCreateEntry extends LitElement {
           display: flex;
           flex-wrap: wrap;
           margin: -4px;
+          max-height: 600px;
+          overflow-y: auto;
         }
         .device {
           border: 1px solid var(--divider-color);
@@ -178,7 +181,7 @@ class StepFlowCreateEntry extends LitElement {
         }
         @media all and (max-width: 450px), all and (max-height: 500px) {
           .device {
-            width: auto;
+            width: 100%;
           }
         }
       `,
diff --git a/src/dialogs/config-flow/step-flow-pick-handler.ts b/src/dialogs/config-flow/step-flow-pick-handler.ts
index 0fbe0ba597..3305c258d7 100644
--- a/src/dialogs/config-flow/step-flow-pick-handler.ts
+++ b/src/dialogs/config-flow/step-flow-pick-handler.ts
@@ -18,6 +18,7 @@ import * as Fuse from "fuse.js";
 
 import "../../components/ha-icon-next";
 import "../../common/search/search-input";
+import { styleMap } from "lit-html/directives/style-map";
 
 interface HandlerObj {
   name: string;
@@ -29,6 +30,7 @@ class StepFlowPickHandler extends LitElement {
   @property() public hass!: HomeAssistant;
   @property() public handlers!: string[];
   @property() private filter?: string;
+  private _width?: number;
 
   private _getHandlers = memoizeOne((h: string[], filter?: string) => {
     const handlers: HandlerObj[] = h.map((handler) => {
@@ -58,11 +60,11 @@ class StepFlowPickHandler extends LitElement {
 
     return html`
       <h2>${this.hass.localize("ui.panel.config.integrations.new")}</h2>
-      <div>
-        <search-input
-          .filter=${this.filter}
-          @value-changed=${this._filterChanged}
-        ></search-input>
+      <search-input
+        .filter=${this.filter}
+        @value-changed=${this._filterChanged}
+      ></search-input>
+      <div style=${styleMap({ width: `${this._width}px` })}>
         ${handlers.map(
           (handler: HandlerObj) =>
             html`
@@ -80,6 +82,11 @@ class StepFlowPickHandler extends LitElement {
 
   private async _filterChanged(e) {
     this.filter = e.detail.value;
+
+    // Store the width so that when we search, box doesn't jump
+    if (this._width === undefined) {
+      this._width = this.shadowRoot!.querySelector("div")!.clientWidth;
+    }
   }
 
   private async _handlerPicked(ev) {
diff --git a/src/dialogs/notifications/notification-drawer.js b/src/dialogs/notifications/notification-drawer.js
index 0b1255a762..2b574b13d9 100644
--- a/src/dialogs/notifications/notification-drawer.js
+++ b/src/dialogs/notifications/notification-drawer.js
@@ -34,6 +34,8 @@ export class HuiNotificationDrawer extends EventsMixin(
       .notifications {
         overflow-y: auto;
         padding-top: 16px;
+        height: calc(100% - 65px);
+        box-sizing: border-box;
       }
 
       .notification {
diff --git a/src/panels/profile/ha-panel-profile.js b/src/panels/profile/ha-panel-profile.js
index 1cefa17524..47577bc73c 100644
--- a/src/panels/profile/ha-panel-profile.js
+++ b/src/panels/profile/ha-panel-profile.js
@@ -104,10 +104,12 @@ class HaPanelProfile extends EventsMixin(LocalizeMixin(PolymerElement)) {
             mfa-modules="[[hass.user.mfa_modules]]"
           ></ha-mfa-modules-card>
 
-          <ha-advanced-mode-card
-            hass="[[hass]]"
-            core-user-data="[[_coreUserData]]"
-          ></ha-advanced-mode-card>
+          <template is="dom-if" if="[[_isAdmin(hass.user)]]">
+            <ha-advanced-mode-card
+              hass="[[hass]]"
+              core-user-data="[[_coreUserData]]"
+            ></ha-advanced-mode-card>
+          </template>
 
           <ha-refresh-tokens-card
             hass="[[hass]]"
@@ -168,6 +170,10 @@ class HaPanelProfile extends EventsMixin(LocalizeMixin(PolymerElement)) {
       (cred) => cred.auth_provider_type === "homeassistant"
     );
   }
+
+  _isAdmin(user) {
+    return user.is_admin;
+  }
 }
 
 customElements.define("ha-panel-profile", HaPanelProfile);