diff --git a/app/assets/stylesheets/desktop/discourse.scss b/app/assets/stylesheets/desktop/discourse.scss
index 3f9010a757a..dc6f6875162 100644
--- a/app/assets/stylesheets/desktop/discourse.scss
+++ b/app/assets/stylesheets/desktop/discourse.scss
@@ -35,6 +35,9 @@ body {
   }
 }
 
+/**/
+
+
 @include small-width {
   body {
     min-width: $small-width;
@@ -117,9 +120,6 @@ body {
       color: #e45735;
     }
     a.star {
-      display: inline-block;
-      font-size: 15px;
-      line-height: 1;
       color: #cacaca;
       &:before {
         font-family: "FontAwesome";
@@ -167,6 +167,8 @@ body {
       }
     }
   }
+
+  /**/
   .message {
     @include border-radius-all(8px);
     background-color: $white;
@@ -229,15 +231,14 @@ blockquote {
 }
 
 .topic-statuses {
-  display: inline-block;
-  margin: 0;
+  float: left;
+  margin: 1px 3px 0 0;
   padding: 0;
   .topic-status {
-    padding: 5px 2px 0 0;
+    padding: 0 2px 0 0;
     margin: 0;
-    display: inline-block;
     i {
-      font-size: 15px;
+        font-size: 15px;
       color: darken($white, 60%);
     }
   }
diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss
index 20c91896144..43aaf4cdd53 100644
--- a/app/assets/stylesheets/desktop/topic-list.scss
+++ b/app/assets/stylesheets/desktop/topic-list.scss
@@ -113,8 +113,6 @@
     padding-right: 0;
     .icon-star {
       position: relative;
-      top: -1px;
-      font-size: 15px !important;
     }
     + .main-link {
       padding-left: 0;
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index 1b3f46dab19..6f2d3a774c3 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -220,7 +220,6 @@ nav.post-controls {
 a.star {
   display: inline-block;
   float: left;
-  font-size: 20px !important;
 }
 
 #main a.star.starred {
@@ -325,7 +324,7 @@ a.star {
 
 .participants {
 
-.user:not(:first-of-type) {margin-top: 10px;}
+.user {float: left; margin: 7px 20px 7px 0;}
 
 
 }
@@ -424,8 +423,13 @@ span.post-count {
 }
 
 #topic-title {
+
   z-index: 1000;
-  padding: 25px 10px 15px 10px;
+  padding: 14px 0 8px 0;
+ h1 { line-height: 1em; overflow: hidden; }
+.topic-statuses {margin-top: -2px; .icon-pushpin {margin-top: -1px;}}
+.star {font-size: 20px; margin-top: 5px;}
+
 .chzn-container {vertical-align: middle;}
 }
 
@@ -462,23 +466,25 @@ iframe {
 .topic-statuses {margin-right: 5px;}
 }
 
-#main .inner a.star {margin-top: 6px;}
 
 .extra-info {
   h1 {
-    margin: 7px 0 0 25px;
+    margin: 5px 0 0 0;
+    font-size: 2em;
     line-height: 1em;
-  a:not(.badge-category) {margin-left: -10px;}
-
+    overflow: hidden;
   }
 
   a.star {
     margin-right: 5px;
-    margin-top: 6px;
+    font-size: 20px;
+    margin-top: 5px;
   }
 
+  .topic-statuses {margin-top: -2px;}
+
   .badge-category {
-    vertical-align: middle  ;
+    vertical-align: top;
   }
 
 }
@@ -964,7 +970,6 @@ clear: both;
   }
 }
 
-input#edit-title {margin-left: 10px;}
 
 a.attachment:before {
   display: inline-block;
diff --git a/app/assets/stylesheets/desktop/topic.scss b/app/assets/stylesheets/desktop/topic.scss
index d7706e9c389..2188767c742 100644
--- a/app/assets/stylesheets/desktop/topic.scss
+++ b/app/assets/stylesheets/desktop/topic.scss
@@ -29,18 +29,15 @@ margin-left: 10px;
 
 #topic-title {
   margin-bottom: 20px;
-margin: -20px 0 0 0;
-.topic-statuses {margin-left: 5px;}
+  .star {margin-right: 8px;}
 h1 {
-
-  font-size: 2.2em;
-  line-height: 1em;
+  font-size: 2em;
   margin: 0;
 
 
-a.badge-category {vertical-align: middle;}
+a.badge-category {vertical-align: top;}
 
-a.edit-topic {font-size: 15px;}
+a.edit-topic {font-size: 15px; position: absolute; margin-left: 8px;}
 
 }