diff --git a/app/assets/javascripts/discourse/templates/header.hbs b/app/assets/javascripts/discourse/templates/header.hbs
index d8cf81f9cf9..496371537d9 100644
--- a/app/assets/javascripts/discourse/templates/header.hbs
+++ b/app/assets/javascripts/discourse/templates/header.hbs
@@ -98,12 +98,14 @@
           {{#if showStarButton}}
             <a {{bind-attr class=":star topic.starred:starred"}} {{action "toggleStar"}} href='#' {{bind-attr title="topic.starTooltip"}}></a>
           {{/if}}
-          <div class="title-wrapper">
           <h1>
             {{#if showPrivateMessageGlyph}}
               <span class="private-message-glyph">{{fa-icon envelope}}</span>
             {{/if}}
-
+            {{#if topic.category.parentCategory}}
+              {{bound-category-link topic.category.parentCategory}}
+            {{/if}}
+            {{bound-category-link topic.category}}
             {{#if topic.details.loaded}}
               {{topic-status topic=topic}}
               <a class='topic-link' href='{{unbound topic.url}}' {{action "jumpToTopPost"}}>{{{topic.fancy_title}}}</a>
@@ -115,14 +117,11 @@
               {{/if}}
             {{/if}}
           </h1>
-          {{#if topic.category.parentCategory}}
-            {{bound-category-link topic.category.parentCategory}}
-          {{/if}}
-          {{bound-category-link topic.category}}
-        </div>
         </div>
       </div>
     {{/if}}
 
   </div>
 </div>
+
+
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index 8d14530ede3..f030afd1eba 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -551,7 +551,7 @@ iframe {
   a.star {
     margin-right: 7px;
     font-size: 20px;
-    margin-top: 10px;
+    margin-top: 6px;
     color: dark-light-diff($secondary, $primary, 80%, -20%) !important;
 
   }
@@ -562,18 +562,11 @@ iframe {
   }
 
   .badge-category {
-    border-left: 5px solid;
-    border-color: #aaa;
-    font-weight: normal;
-    text-transform: lowercase;
-    padding: 0 0 0 5px;
-    margin: 0 5px 0 1px;
     vertical-align: top;
-
-  }
-
-  .title-wrapper {
+    margin-top: 2px;
     float: left;
+    margin-right: 5px;
+    display: none;
   }
 
 }