diff --git a/app/assets/javascripts/discourse/templates/header.js.handlebars b/app/assets/javascripts/discourse/templates/header.js.handlebars
index d4ec6beced5..586b175b2be 100644
--- a/app/assets/javascripts/discourse/templates/header.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/header.js.handlebars
@@ -110,21 +110,23 @@
       </section>
 
       <section class='d-dropdown' id='site-map-dropdown'>
-      <ul class="site-location">
+      <ul class="location-links">
         {{#if currentUser.staff}}
-          <li class='admin-location'><a href="/admin"><i class='icon icon-wrench'></i>{{i18n admin_title}}</a></li>
-          <li class='flags-location'><a href="/admin/flags/active"><i class='icon icon-flag'></i>{{i18n flags_title}}</a>
+          <li><a href="/admin"><i class='icon icon-wrench'></i>{{i18n admin_title}}</a></li>
+          <li><a href="/admin/flags/active"><i class='icon icon-flag'></i>{{i18n flags_title}}</a>
           {{#if currentUser.site_flagged_posts_count}}
             <a href='/admin/flags/active' title='{{i18n notifications.total_flagged}}' class='badge-notification flagged-posts'>{{currentUser.site_flagged_posts_count}}</a>
           {{/if}}
           </li>
         {{/if}}
-        <li class='latest-location'>
+        <li>
           {{#titledLinkTo "list.latest" titleKey="filters.latest.help"}}{{i18n filters.latest.title}}{{/titledLinkTo}}
         </li>
-        <li class='faq-location'>{{faqLink}}</li>
+        <li>{{faqLink}}</li>
+      </ul>
 
-        {{#if categories}}
+      {{#if categories}}
+        <ul class="category-links">
           <li class='heading' title="{{i18n filters.categories.help}}">
             {{#linkTo "list.categories"}}{{i18n filters.categories.title}}{{/linkTo}}
           </li>
@@ -135,9 +137,9 @@
               <b>{{unbound topic_count}}</b></a>
             </li>
           {{/each}}
-        {{/if}}
+        </ul>
+      {{/if}}
 
-      </ul>
     </section>
 
     </div>