diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index 634ed2829f6..5184099efd4 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -9,12 +9,14 @@
   {{#if postStream.firstPostPresent}}
     <div id='topic-title'>
       <div class='container'>
-        <div class='inner'>
 
           {{#if showStarButton}}
             <a {{bind-attr class=":star starred:starred"}} {{action "toggleStar"}} href='#' {{bind-attr title="starTooltip"}}></a>
           {{/if}}
 
+          <div class="title-wrapper">
+
+
           {{#if editingTopic}}
             {{#if isPrivateMessage}}
               <span class="private-message-glyph">{{fa-icon envelope}}</span>
@@ -48,19 +50,18 @@
               {{/if}}
             </h1>
 
-            <div class="title-category-wrapper">
             {{#unless isPrivateMessage}}
               {{#if category.parentCategory}}
                 {{bound-category-link category.parentCategory}}
               {{/if}}
               {{bound-category-link category}}
             {{/unless}}
-          </div>
+
+        </div>
 
           {{/if}}
           {{plugin-outlet "topic-title"}}
         </div>
-      </div>
     </div>
   {{/if}}
 
diff --git a/app/assets/stylesheets/common/base/topic.scss b/app/assets/stylesheets/common/base/topic.scss
new file mode 100644
index 00000000000..5a07e3db7f6
--- /dev/null
+++ b/app/assets/stylesheets/common/base/topic.scss
@@ -0,0 +1,18 @@
+#topic-title {
+
+  .title-wrapper {float: left; width: 90%;}
+
+  a.badge-category {
+    margin-top: 5px;
+    }
+
+  h1 {
+    a.edit-topic {
+      font-size: 17px;
+      display: inline-block;
+      vertical-align: top;
+      position: relative;
+      }
+  }
+
+}
diff --git a/app/assets/stylesheets/desktop/topic.scss b/app/assets/stylesheets/desktop/topic.scss
index b222de85435..f839c4a4806 100644
--- a/app/assets/stylesheets/desktop/topic.scss
+++ b/app/assets/stylesheets/desktop/topic.scss
@@ -23,7 +23,6 @@
     font-size: 20px;
     margin-top: 6px;
     margin-right: 6px;
-    margin-bottom: 30px; // this allows the categories to align underneath title
   }
   #edit-title { width: 500px; }
   .category-combobox {
@@ -42,17 +41,11 @@
     line-height: 1.2em;
     overflow: hidden;
     a {color: $primary;}
-    a.badge-category {
-      float: left;
-      vertical-align: top;
-      margin-top: 2px;
-      margin-right: 5px;
-      }
-    a.edit-topic { font-size: 17px; position: absolute; margin-left: 8px; }
-  }
-  .title-category-wrapper {
-    margin-top: 5px;
+
+
   }
+
+
   .topic-statuses {
     margin-top: -2px;
   }
@@ -62,6 +55,8 @@
     margin-bottom: 2px;
   }
   .private-message-glyph { display: none; }
+
+
 }
 
 .private-message-glyph {
diff --git a/app/assets/stylesheets/mobile/discourse.scss b/app/assets/stylesheets/mobile/discourse.scss
index 7093f7e982f..f5d048ed64b 100644
--- a/app/assets/stylesheets/mobile/discourse.scss
+++ b/app/assets/stylesheets/mobile/discourse.scss
@@ -27,6 +27,7 @@ body {
       font-size: 20px;
       color: scale-color($primary, $lightness: 75%);
       margin-right: 8px;
+      margin-top: 4px;
       &:before {
         font-family: "FontAwesome";
         content: "\f005";
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index 4e0bb1f28bc..d9fb2aeb3ef 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -132,7 +132,6 @@ a.star {
   display: inline-block;
   float: left;
   font-size: 1.3em;
-  margin-top: 4px;
 }
 
 #main a.star.starred {
diff --git a/app/assets/stylesheets/mobile/topic.scss b/app/assets/stylesheets/mobile/topic.scss
index 85ed06c83a2..b29f5af5ba9 100644
--- a/app/assets/stylesheets/mobile/topic.scss
+++ b/app/assets/stylesheets/mobile/topic.scss
@@ -16,11 +16,9 @@
 #topic-title {
   margin-bottom: 20px;
   margin: 0 60px 10px 20px;
-  .star {
-    margin-bottom: 30px; // this allows the categories to align underneath title
-  }
   h1 {
     font-size: 1.5em;
+    line-height: 1.25em;
     margin:0;
     a {
       color: $primary;