diff --git a/app/assets/javascripts/admin/templates/modal/admin_suspend_user.js.handlebars b/app/assets/javascripts/admin/templates/modal/admin_suspend_user.js.handlebars
index 34a414cd072..f2b83891bf3 100644
--- a/app/assets/javascripts/admin/templates/modal/admin_suspend_user.js.handlebars
+++ b/app/assets/javascripts/admin/templates/modal/admin_suspend_user.js.handlebars
@@ -1,7 +1,7 @@
 <div class="modal-body">
   <form>
     {{i18n admin.user.suspend_duration}}
-    {{textField value=duration maxlength="5" autofocus="autofocus" class="span2"}}
+    {{textField value=duration maxlength="5" autofocus="autofocus"}}
     {{i18n admin.user.suspend_duration_units}}<br/>
     <br/>
     {{{i18n admin.user.suspend_reason_label}}}<br/>
diff --git a/app/assets/javascripts/discourse/templates/embedded_post.js.handlebars b/app/assets/javascripts/discourse/templates/embedded_post.js.handlebars
index 46d9e95c330..4b0d970f700 100644
--- a/app/assets/javascripts/discourse/templates/embedded_post.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/embedded_post.js.handlebars
@@ -1,5 +1,5 @@
 <div class='row'>
-  <div class='topic-avatar span2'>
+  <div class='topic-avatar'>
     <div class='contents'>
       <div>
         <a href='/users/{{unbound username}}'>{{avatar this imageSize="large"}}</a>
diff --git a/app/assets/javascripts/discourse/templates/post.js.handlebars b/app/assets/javascripts/discourse/templates/post.js.handlebars
index 1f2c9c071f4..58b632e7875 100644
--- a/app/assets/javascripts/discourse/templates/post.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/post.js.handlebars
@@ -17,7 +17,7 @@
         {{/if}}
       </a>
     {{/if}}
-    <div class='topic-avatar span2'>
+    <div class='topic-avatar'>
       {{#unless userDeleted}}
         <div {{bind-attr class=":contents byTopicCreator:topic-creator :trigger-expansion"}}>
           <a class="main-avatar" href='{{unbound usernameUrl}}' {{action showPosterExpansion this}}>{{avatar this imageSize="large"}}</a>
diff --git a/app/assets/stylesheets/desktop/discourse.scss b/app/assets/stylesheets/desktop/discourse.scss
index 3af1c65b51f..9f5db9f77a3 100644
--- a/app/assets/stylesheets/desktop/discourse.scss
+++ b/app/assets/stylesheets/desktop/discourse.scss
@@ -594,14 +594,6 @@ body {
   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 5e609e0d75c..ad7a042195e 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -778,12 +778,14 @@ blockquote { /* solo quotes */
 .topic-avatar {
  border-top: 1px solid scale-color-diff();
  padding-top: 16px;
+ width: 55px;
+ float: left;
 
-  .wiki {
-    margin-top: 14px;
-    color: scale-color($primary, $lightness: 60%);
-    margin-left: 5px;
-  }
+ .wiki {
+   margin-top: 14px;
+   color: scale-color($primary, $lightness: 60%);
+   margin-left: 5px;
+ }
 }
 
 .posts-wrapper {
@@ -799,8 +801,6 @@ blockquote { /* solo quotes */
   padding-right: 10px;
   }
 
-.span2 { width: 5%; }
-
 .span11 {
   width: 84%;
   padding-left: 4%;
diff --git a/app/assets/stylesheets/vendor/bootstrap.scss b/app/assets/stylesheets/vendor/bootstrap.scss
index 8f2bb3ea876..a22b45719d6 100644
--- a/app/assets/stylesheets/vendor/bootstrap.scss
+++ b/app/assets/stylesheets/vendor/bootstrap.scss
@@ -64,12 +64,6 @@ img {
 .span4 {
   width: 196px;
 }
-.span3 {
-  width: 144px;
-}
-.span2 {
-  width: 92px;
-}
 .offset2 {
   margin-left: 116px;
 }