diff --git a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-app-header.less b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-app-header.less
index f7c1c58ad5..a033e8abef 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-app-header.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-app-header.less
@@ -13,23 +13,31 @@
     list-style: none;
     align-items: center;
     margin: 0;
-    margin-right: 10px;
+    margin-right: -10px;
 }
 
 .umb-app-header__action a {
-    color: @white;
-    opacity: 0.6;
-    font-size: 22px;
     padding-left: 10px;
     padding-right: 10px;
     text-decoration: none;
     display: flex;
     align-items: center;
+    height: @appHeaderHeight;
 }
 
 .umb-app-header__action a:hover,
 .umb-app-header__action a:focus {
-    opacity: 1;
     outline: none;
 }
 
+.umb-app-header__action-icon {
+    opacity: 0.6;
+    color: @white;
+    font-size: 22px;
+}
+
+.umb-app-header__action a:hover .umb-app-header__action-icon,
+.umb-app-header__action a:focus .umb-app-header__action-icon {
+    opacity: 1;
+}
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-app-header.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-app-header.html
index 0c3b37ec49..07d25e7465 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-app-header.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-app-header.html
@@ -11,24 +11,26 @@
             <ul class="umb-app-header__actions">
                 <li data-element="global-search" class="umb-app-header__action">
                     <a href="#" hotkey="ctrl+space" ng-click="searchClick()" prevent-default style="font-size: 20px;">
-                        <i class="icon-search"></i>
+                        <i class="umb-app-header__action-icon icon-search"></i>
                     </a>
                 </li>
-                <li data-element="section-help" class="umb-app-header__action">
+                <li data-element="global-help" class="umb-app-header__action">
                     <a href="#" hotkey="ctrl+shift+h" ng-click="helpClick()" prevent-default>
-                        <i class="icon-help-alt"></i>
+                        <i class="umb-app-header__action-icon icon-help-alt"></i>
+                    </a>
+                </li>
+                <li data-element="global-user" class="umb-app-header__action">
+                    <a ng-href="" href="" ng-click="avatarClick()" hotkey="ctrl+shift+u" title="{{user.name}}" prevent-default>
+                        <umb-avatar
+                            size="xxs"
+                            color="secondary"
+                            name="{{user.name}}"
+                            img-src="{{avatar[0].value}}"
+                            img-srcset="{{avatar[1].value}} 2x, {{avatar[2].value}} 3x">
+                        </umb-avatar>
                     </a>
                 </li>
             </ul>
-            <a data-element="section-user" ng-href="" href="" ng-click="avatarClick()" hotkey="ctrl+shift+u" title="{{user.name}}" prevent-default>
-                <umb-avatar
-                    size="xxs"
-                    color="secondary"
-                    name="{{user.name}}"
-                    img-src="{{avatar[0].value}}"
-                    img-srcset="{{avatar[1].value}} 2x, {{avatar[2].value}} 3x">
-                </umb-avatar>
-            </a>
         </div>
 
     </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-sections.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-sections.html
index a7a88a1d22..4defc3fdb0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-sections.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-sections.html
@@ -1,6 +1,6 @@
 <div>
     <div id="applications" ng-class="{faded:stickyNavigation}">
-        <ul class="sections">
+        <ul class="sections" data-element="sections">
 
             <li data-element="section-{{section.alias}}" ng-repeat="section in sections | limitTo: maxSections" ng-class="{current: section.alias == currentSection}">
                 <a href="#/{{section.alias}}"
diff --git a/src/Umbraco.Web.UI/config/BackOfficeTours/getting-started.json b/src/Umbraco.Web.UI/config/BackOfficeTours/getting-started.json
index 4bf119d966..0dd79e7446 100644
--- a/src/Umbraco.Web.UI/config/BackOfficeTours/getting-started.json
+++ b/src/Umbraco.Web.UI/config/BackOfficeTours/getting-started.json
@@ -21,7 +21,7 @@
                 "type": "intro"
             },
             {
-                "element": "#applications",
+                "element": "[data-element='sections']",
                 "elementPreventClick": true,
                 "title": "Main Menu",
                 "content": "This is the main menu in Umbraco backoffice. Here you can navigate between the different sections, see your user profile and open the help drawer.",
@@ -52,7 +52,7 @@
                 "content": "The search allows you to quickly find whatever you're looking for across sections within Umbraco."
             },
             {
-                "element": "[data-element='section-user']",
+                "element": "[data-element='global-user']",
                 "title": "User profile",
                 "content": "Now click on your <b>user avatar</b> to open the user profile dialog.",
                 "event": "click",
@@ -71,7 +71,7 @@
                 "event": "click"
             },
             {
-                "element": "[data-element='section-help']",
+                "element": "[data-element='global-help']",
                 "title": "Help",
                 "content": "If you ever find yourself in trouble click here to open the Help drawer.",
                 "event": "click",