diff --git a/app/assets/javascripts/admin/templates/email-index.hbs b/app/assets/javascripts/admin/templates/email-index.hbs
index 200e8aad27..d510b2f4fc 100644
--- a/app/assets/javascripts/admin/templates/email-index.hbs
+++ b/app/assets/javascripts/admin/templates/email-index.hbs
@@ -17,7 +17,7 @@
 <form>
   <div class='admin-controls'>
     {{#if sendingEmail}}
-      <div class='span15 controls'>{{i18n 'admin.email.sending_test'}}</div>
+      <div class='controls'>{{i18n 'admin.email.sending_test'}}</div>
     {{else}}
       <div class='controls'>
         {{text-field value=testEmailAddress placeholderKey="admin.email.test_email_address"}}
diff --git a/app/assets/javascripts/admin/templates/email-preview-digest.hbs b/app/assets/javascripts/admin/templates/email-preview-digest.hbs
index 7a695659c5..58733c1eb3 100644
--- a/app/assets/javascripts/admin/templates/email-preview-digest.hbs
+++ b/app/assets/javascripts/admin/templates/email-preview-digest.hbs
@@ -1,7 +1,7 @@
 <p>{{i18n 'admin.email.preview_digest_desc'}}</p>
 
 <div class='admin-controls email-preview'>
-  <div class='span7 controls'>
+  <div class='controls'>
     <label for='last-seen'>{{i18n 'admin.email.last_seen_user'}}</label>
     {{date-picker-past value=lastSeen id="last-seen"}}
     <label>{{i18n 'admin.email.user'}}:</label>
diff --git a/app/assets/javascripts/discourse/widgets/post.js.es6 b/app/assets/javascripts/discourse/widgets/post.js.es6
index 5107da42f0..bd84bfb428 100644
--- a/app/assets/javascripts/discourse/widgets/post.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post.js.es6
@@ -548,7 +548,7 @@ createWidget("post-article", {
       rows.push(
         h(
           "div.row",
-          h("section.embedded-posts.top.topic-body.offset2", [
+          h("section.embedded-posts.top.topic-body", [
             this.attach("button", {
               title: "post.collapse",
               icon: "chevron-down",
diff --git a/test/javascripts/lib/click-track-edit-history-test.js.es6 b/test/javascripts/lib/click-track-edit-history-test.js.es6
index ae8f6d18c2..f38f4c9fe1 100644
--- a/test/javascripts/lib/click-track-edit-history-test.js.es6
+++ b/test/javascripts/lib/click-track-edit-history-test.js.es6
@@ -22,7 +22,7 @@ QUnit.module("lib:click-track-edit-history", {
        </div>
        <div id="revisions" data-post-id="42" class="">
          <div class="row">
-           <div class="span8">
+           <div>
              <a href="http://www.google.com">google.com</a>
              <a class="lightbox back" href="http://www.google.com">google.com</a>
              <div class="onebox-result">
@@ -34,7 +34,7 @@ QUnit.module("lib:click-track-edit-history", {
              <a class="attachment" href="http://discuss.domain.com/uploads/default/1234/1532357280.txt">log.txt</a>
              <a class="hashtag" href="http://discuss.domain.com">#hashtag</a>
            </div>
-           <div class="span8 offset1">
+           <div>
              <a href="http://www.google.com">google.com</a>
              <a class="lightbox back" href="http://www.google.com">google.com</a>
              <div class="onebox-result">