diff --git a/lms/static/sass/shared-v2/_header.scss b/lms/static/sass/shared-v2/_header.scss
index 921613674a..76a0d3398d 100644
--- a/lms/static/sass/shared-v2/_header.scss
+++ b/lms/static/sass/shared-v2/_header.scss
@@ -47,14 +47,17 @@
         }
 
         .list-inline {
-            margin-top: 12px;
+            &.nav-global {
+                margin-top: 12px;
+            }
+
+            &.nav-courseware {
+                margin-top: 5px;
+            }
 
             .item {
-                display: inline-block;
-                font-size: font-size(small);
                 font-weight: font-weight(semi-bold);
                 text-transform: uppercase;
-                letter-spacing: 0 !important;
 
                 &.active {
                     a {
@@ -62,22 +65,7 @@
                         color: $link-color;
                     }
                 }
-
-                a {
-                    color: $courseware-navigation-color;
-                    padding: 3px 10px;
-
-                    &:hover,
-                    &:focus {
-                        background: inherit;
-                        color: $courseware-hover-color;
-                    }
-                }
             }
         }
-
-        .nav-courseware.list-inline {
-            margin-top: 5px;
-        }
     }
 }
diff --git a/lms/templates/main.html b/lms/templates/main.html
index b7e13300cc..9977348fcc 100644
--- a/lms/templates/main.html
+++ b/lms/templates/main.html
@@ -74,6 +74,7 @@ from pipeline_mako import render_require_js_path_overrides
     ## TODO: Update to only bring in RequireJS
     ## https://openedx.atlassian.net/browse/FEDX-140
     <%static:js group='base_vendor'/>
+    <%static:js group='base_application'/>
   % endif
 
   <script>
diff --git a/lms/templates/navigation.html b/lms/templates/navigation.html
index 3257dc31df..0a70c1eff2 100644
--- a/lms/templates/navigation.html
+++ b/lms/templates/navigation.html
@@ -58,92 +58,24 @@ site_status_msg = get_site_status_msg(course_id)
     </h1>
 
     % if course:
-    <h2 class="course-header"><span class="provider">${course.display_org_with_default}:</span>
-      <span class="course-number">${course.display_number_with_default}</span>
-      <%
+      <h2 class="course-header"><span class="provider">${course.display_org_with_default}:</span>
+        <span class="course-number">${course.display_number_with_default}</span>
+        <%
         display_name = course.display_name_with_default
         if settings.FEATURES.get('CUSTOM_COURSES_EDX', False):
           ccx = get_current_ccx(course.id)
           if ccx:
             display_name = ccx.display_name
-      %>
-      <span class="course-name">${display_name}</span></h2>
-    % endif
+        %>
+        <span class="course-name">${display_name}</span></h2>
+      % endif
 
-    % if user.is_authenticated():
-    <ol class="left ${main_nav_menu_classlist} authenticated">
-      <%block name="navigation_global_links_authenticated">
-        % if settings.FEATURES.get('COURSES_ARE_BROWSABLE') and not show_program_listing:
-          <li class="item nav-global-01">
-            <a href="${marketing_link('COURSES')}">${_('Explore courses')}</a>
-          </li>
-        % endif
-        % if show_program_listing:
-          <li class="tab-nav-item">
-            <a class="${'active ' if reverse('dashboard') == request.path else ''}tab-nav-link" href="${reverse('dashboard')}">
-              ${_("Courses")}
-            </a>
-          </li>
-          <li class="tab-nav-item">
-            <a class="${'active ' if reverse('program_listing_view') == request.path else ''}tab-nav-link" href="${reverse('program_listing_view')}">
-              ${_("Programs")}
-            </a>
-          </li>
-        % endif
-        %if settings.FEATURES.get('ENABLE_SYSADMIN_DASHBOARD','') and user.is_staff:
-          <li class="item">
-            ## Translators: This is short for "System administration".
-            <a href="${reverse('sysadmin')}">${_("Sysadmin")}</a>
-          </li>
-        %endif
-      </%block>
-    </ol>
-    % if uses_pattern_library:
-    <div class="wrapper-user-menu dropdown-menu-container logged-in js-header-user-menu">
-      <a href="${reverse('dashboard')}" class="menu-title">
-        <span class="sr-only">${_("Dashboard for:")}</span>
-        <%
-          username = user.username
-          profile_image_url = get_profile_image_urls_for_user(user)['medium']
-        %>
-        <img class="menu-image" src="${profile_image_url}" alt="">
-        ${username}
-      </a>
-      <button type="button" class="menu-button button-more has-dropdown js-dropdown-button default-icon" aria-haspopup="true" aria-expanded="false" aria-controls="${_("Usermenu")}">
-        <span class="icon-fallback icon-fallback-img">
-          <span class="icon icon-angle-down" aria-hidden="true"></span>
-          <span class="text">${_("Usermenu dropdown")}</span>
-        </span>
-      </button>
-      <ul class="dropdown-menu list-divided is-hidden" id="${_("Usermenu")}" tabindex="-1">
-        <%block name="navigation_dropdown_menu_links" >
-        <%
-        if uses_pattern_library:
-          dropdown_menu_item_classlist = "dropdown-item item has-block-link"
-        else:
-          dropdown_menu_item_classlist = ""
-        %>
-            <li class="${dropdown_menu_item_classlist}"><a href="${reverse('dashboard')}" class="action">${_("Dashboard")}</a></li>
-            <li class="${dropdown_menu_item_classlist}"><a href="${reverse('learner_profile', kwargs={'username': user.username})}" class="action">${_("Profile")}</a></li>
-            <li class="${dropdown_menu_item_classlist}"><a href="${reverse('account_settings')}" class="action">${_("Account")}</a></li>
-          </%block>
-            <li class="${dropdown_menu_item_classlist}"><a href="${reverse('logout')}" role="menuitem" class="action">${_("Sign Out")}</a></li>
-      </ul>
-    </div>
-    % else:
-    <ol class="user">
-      <li class="primary">
-        <a href="${reverse('dashboard')}" class="user-link">
-          <span class="sr">${_("Dashboard for:")}</span>
-          <%
-          if uses_pattern_library:
-            discovery_btn_classlist = "btn"
-          else:
-            discovery_btn_classlist = "cta cta-discovery"
-          %>
-          % if settings.FEATURES.get('COURSES_ARE_BROWSABLE'):
+      % if user.is_authenticated():
+        <ol class="left nav-global authenticated">
+        <%block name="navigation_global_links_authenticated">
+          % if settings.FEATURES.get('COURSES_ARE_BROWSABLE') and not show_program_listing:
             <li class="item nav-global-01">
-              <a href="${marketing_link('COURSES')}">${_('Find Courses')}</a>
+              <a href="${marketing_link('COURSES')}">${_('Explore courses')}</a>
             </li>
           % endif
           % if show_program_listing:
@@ -158,12 +90,12 @@ site_status_msg = get_site_status_msg(course_id)
               </a>
             </li>
           % endif
-          % if settings.FEATURES.get('ENABLE_SYSADMIN_DASHBOARD','') and user.is_staff:
+          %if settings.FEATURES.get('ENABLE_SYSADMIN_DASHBOARD','') and user.is_staff:
             <li class="item">
               ## Translators: This is short for "System administration".
               <a href="${reverse('sysadmin')}">${_("Sysadmin")}</a>
             </li>
-          % endif
+          %endif
         </%block>
       </ol>
 
@@ -218,12 +150,12 @@ site_status_msg = get_site_status_msg(course_id)
 
       <ol class="right nav-courseware list-inline">
         <%block name="navigation_sign_in">
-          <li class="nav-courseware-01">
+          <li class="item nav-courseware-01">
             % if not settings.FEATURES['DISABLE_LOGIN_BUTTON']:
               % if course and settings.FEATURES.get('RESTRICT_ENROLL_BY_REG_METHOD') and course.enrollment_domain:
-                <a class="btn-brand btn-login" href="${reverse('course-specific-login', args=[course.id.to_deprecated_string()])}${login_query()}">${_("Sign in")}</a>
+                <a class="btn btn-login" href="${reverse('course-specific-login', args=[course.id.to_deprecated_string()])}${login_query()}">${_("Sign in")}</a>
               % else:
-                <a class="btn-brand btn-login" href="/login${login_query()}">${_("Sign in")}</a>
+                <a class="btn btn-login" href="/login${login_query()}">${_("Sign in")}</a>
               % endif
             % endif
           </li>
diff --git a/themes/edx.org/lms/templates/header.html b/themes/edx.org/lms/templates/header.html
index e324b84415..7624a4b3c2 100644
--- a/themes/edx.org/lms/templates/header.html
+++ b/themes/edx.org/lms/templates/header.html
@@ -73,13 +73,13 @@ site_status_msg = get_site_status_msg(course_id)
             <ul class="left list-inline nav-global authenticated">
               % if not nav_hidden:
                 <%block name="navigation_global_links_authenticated">
-                  <li class="nav-global-01">
+                  <li class="item nav-global-01">
                     <a href="${marketing_link('HOW_IT_WORKS')}">${_("How it Works")}</a>
                   </li>
-                  <li class="nav-global-02">
+                  <li class="item nav-global-02">
                     <a href="${marketing_link('COURSES')}">${_("Find Courses")}</a>
                   </li>
-                  <li class="nav-global-03">
+                  <li class="item nav-global-03">
                     <a href="${marketing_link('SCHOOLS')}">${_("Schools & Partners")}</a>
                   </li>
                 </%block>
@@ -98,8 +98,8 @@ site_status_msg = get_site_status_msg(course_id)
               % endif
             </ul>
           </nav>
+        % endif
       % endif
-    % endif
 
       <%include file="user_dropdown.html"/>
 
@@ -115,23 +115,23 @@ site_status_msg = get_site_status_msg(course_id)
 
     % else:
       <nav aria-label="Account" class="nav-account-management">
-        <div class="right nav-courseware">
-          <div class="nav-courseware-01">
+        <div class="right nav-courseware list-inline">
+          <div class="item nav-courseware-01">
             % if not settings.FEATURES['DISABLE_LOGIN_BUTTON']:
               % if course and settings.FEATURES.get('RESTRICT_ENROLL_BY_REG_METHOD') and course.enrollment_domain:
-                <a class="btn-brand btn-login" href="${reverse('course-specific-login', args=[course.id.to_deprecated_string()])}${login_query()}">${_("Sign in")}</a>
+                <a class="btn btn-login" href="${reverse('course-specific-login', args=[course.id.to_deprecated_string()])}${login_query()}">${_("Sign in")}</a>
               % else:
-                <a class="btn-brand btn-login" href="/login${login_query()}">${_("Sign in")}</a>
+                <a class="btn btn-login" href="/login${login_query()}">${_("Sign in")}</a>
               % endif
             % endif
           </div>
           % if not settings.FEATURES['DISABLE_LOGIN_BUTTON']:
             % if course and settings.FEATURES.get('RESTRICT_ENROLL_BY_REG_METHOD') and course.enrollment_domain:
-              <div class="nav-courseware-02">
+              <div class="item nav-courseware-02">
                 <a class="btn-neutral btn-register" href="${reverse('course-specific-register', args=[course.id.to_deprecated_string()])}">${_("Register")}</a>
               </div>
             % else:
-              <div class="nav-courseware-02">
+              <div class="item nav-courseware-02">
                 <a class="btn-neutral btn-register" href="/register">${_("Register")}</a>
               </div>
             % endif