diff --git a/app/assets/javascripts/discourse/templates/application.hbs b/app/assets/javascripts/discourse/templates/application.hbs
index 6b9b1332196..23822e0f409 100644
--- a/app/assets/javascripts/discourse/templates/application.hbs
+++ b/app/assets/javascripts/discourse/templates/application.hbs
@@ -1,6 +1,6 @@
 {{render "header"}}
 
-<div id='main-outlet'>
+<div id='main-outlet' class='wrap'>
   {{outlet}}
   {{render "user-card"}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/header.hbs b/app/assets/javascripts/discourse/templates/header.hbs
index 4d71d1eb220..3a8bd239ed7 100644
--- a/app/assets/javascripts/discourse/templates/header.hbs
+++ b/app/assets/javascripts/discourse/templates/header.hbs
@@ -1,4 +1,4 @@
-<div class='container'>
+<div class='wrap'>
   <div class='contents clearfix'>
 
     {{home-logo minimized=showExtraInfo}}
diff --git a/app/assets/stylesheets/common/base/discourse.scss b/app/assets/stylesheets/common/base/discourse.scss
index d9bf6279782..43da67c1e50 100644
--- a/app/assets/stylesheets/common/base/discourse.scss
+++ b/app/assets/stylesheets/common/base/discourse.scss
@@ -4,8 +4,13 @@ img.avatar {
 
 .container {
   @extend .clearfix;
+}
+
+.wrap {
+  @extend .clearfix;
   margin-right: auto;
   margin-left: auto;
+  padding: 0 8px;
   .contents {
     position: relative;
   }
diff --git a/app/assets/stylesheets/desktop/discourse.scss b/app/assets/stylesheets/desktop/discourse.scss
index 52997e7b1f0..0d117b4ae26 100644
--- a/app/assets/stylesheets/desktop/discourse.scss
+++ b/app/assets/stylesheets/desktop/discourse.scss
@@ -6,7 +6,7 @@
   body {
     min-width: $medium-width;
   }
-  .container,
+  .wrap,
   .full-width {
     width: $medium-width;
   }
@@ -17,7 +17,7 @@ and (max-width : 570px) {
   body {
     min-width: 0;
   }
-  .container,
+  .wrap,
   .full-width {
     min-width: 0;
   }
diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss
index 45da7a14775..2e90524da09 100644
--- a/app/assets/stylesheets/desktop/topic-list.scss
+++ b/app/assets/stylesheets/desktop/topic-list.scss
@@ -298,15 +298,6 @@ button.dismiss-read {
 @media all
 and (max-width : 850px) {
 
-  // add some left padding to topics otherwise everything is 100% flush
-  // with left edge in portrait tablet, which looks awful
-  #topic-title {
-    padding-left: 10px;
-  }
-  .container.posts {
-    padding-left: 10px;
-  }
-
   .nav-pills {
     > li > a {
       font-size: 1em;
@@ -315,7 +306,6 @@ and (max-width : 850px) {
   }
 
   .list-controls {
-    padding: 0 5px;
 
     .btn {
         font-size: 1em
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index 8f051d1e923..99794d40b30 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -1,8 +1,5 @@
-.container {
-  @extend .clearfix;
+.wrap {
   max-width: $large-width;
-  margin-right: auto;
-  margin-left: auto;
 }
 
 .full-width {