diff --git a/app/assets/stylesheets/desktop/discourse.scss b/app/assets/stylesheets/desktop/discourse.scss
index 344f7804c..e59fb1929 100644
--- a/app/assets/stylesheets/desktop/discourse.scss
+++ b/app/assets/stylesheets/desktop/discourse.scss
@@ -554,46 +554,56 @@ body {
 .row:after {
   clear: both;
 }
-[class*="span"] {
-  float: left;
-}
+
 .span24 {
   width: 1236px;
+  float: left;
 }
 .span15 {
   /* intentionally no width set here, do not add one */
   margin-left: 12px;
+  float: left;
 }
 .span14 {
   width: 716px;
+  float: left;
 }
 .span13 {
   width: 664px;
+  float: left;
 }
 .span11 {
   width: 560px;
+  float: left;
 }
 .span10 {
   width: 508px;
+  float: left;
 }
 .span8 {
   width: 404px;
+  float: left;
 }
 .span6 {
   width: 300px;
+  float: left;
 }
 .span5 {
   width: 248px;
+  float: left;
 }
 .span4 {
   width: 196px;
   margin-right: 12px;
+  float: left;
 }
 .span3 {
   width: 144px;
+  float: left;
 }
 .span2 {
   width: 92px;
+  float: left;
 }
 .offset2 {
   margin-left: 116px;
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index b0010d65f..eb998ea8a 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -566,7 +566,7 @@ iframe {
 
   .badge-category {
     vertical-align: top;
-    margin-top: 4px;
+    margin-top: 2px;
   }
 
 }
@@ -769,7 +769,7 @@ blockquote { /* solo quotes */
   &.highlighted {
     background-color: scale-color($tertiary, $lightness: 85%);
   }
-  img, svg {
+  img:not(.avatar), svg {
     max-width: 100%;
   }
 }
@@ -794,22 +794,41 @@ blockquote { /* solo quotes */
 
 //columns
 
-.span14 { width: 70%; } //main content
-.span2 {width: 6%; }
-.span11 {width: 86%; padding-left: 2%;}
-.span5 {width: 19%; padding-left: 1%; }
+.span14 {
+  width: 68%;
+  padding-left: 1%;
+  padding-right: 1%;
+  }
+
+.span2 { width: 5%; }
+
+.span11 {
+  width: 84%;
+  padding-left: 4%;
+}
+
+.span5 {
+  width: 19%;
+  padding-left: 1%;
+}
 
 
 @media screen and (max-width: 966px) {
   .gutter {display: none;}
-  .span14 { width: 80%; max-width: 720px; } //main content
+  .span14 {
+    width: 78%;
+    padding-left: 1%;
+    padding-right: 1%;
+    max-width: 720px;
+  } //main content
 }
 
-.row:before, .row:after {display: table; content: "";}
+.row:before, .row:after {
+  display: table;
+  content: "";
+}
 .row:after {clear: both;}
 
-
-
 .dropdown {
   position: relative;
 }
@@ -1029,7 +1048,6 @@ a.attachment:before {
 }
 
 .topic-meta-data {
- margin-bottom: 10px;
 
  &:after {
     visibility: hidden;