diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/components/forms.less b/wagtail/wagtailadmin/static/wagtailadmin/css/components/forms.less
index a3572371c..2c08bb257 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/css/components/forms.less
+++ b/wagtail/wagtailadmin/static/wagtailadmin/css/components/forms.less
@@ -52,14 +52,14 @@ input, textarea, select, .richtext, .tagit{
     width:100%;
     border:1px dashed @color-input-border;
     padding:1.2em;
-    background-color:white;
+    background-color:@color-fieldset-hover;
     -webkit-appearance: none;
     color:@color-text-input;
     font-size:1.1em;
     outline:none;
 
     &:hover{
-        background-color:@color-fieldset-hover;
+        background-color:white;
     }
     &:focus{
         border-color: darken(@color-input-focus, 40%);
@@ -136,39 +136,42 @@ input[type=checkbox]:checked:before{
     color:@color-teal;
 }
 
+/* Core button style */
 input[type=submit], input[type=reset], input[type=button], .button, button{
-    .border-radius(2px);
+    .border-radius(3px);
     width:auto;
-    padding:0.6em 1.2em;
+    padding:0.7em 1em;
     border:none;
     background-color: @color-button;
     color:white;
     text-decoration:none;
     text-transform:uppercase;
-    font-size:1em;
+    font-size:0.9em;
     white-space: nowrap;
     position:relative;
     -webkit-font-smoothing: auto;
     vertical-align: middle;
     line-height:1em;
     display:inline-block;
-
-    &.icon:before{
-        font-size:1.5em;
-    }
-    &.icon.text-replace:before{
-        font-size:auto;
-    }
+    overflow:hidden;
+    position:relative;
 
     &.button-small{
-        font-size:0.85em;
-        padding:1em 1.8em;
+        font-size:0.95em;
     }
 
     &.button-secondary{
         border:1px solid @color-button;
         color:@color-button;
-        background-color:transparent;
+        background-color:white;
+    }
+
+    &.icon:before{
+        font-size:1.5em;
+    }
+
+    &.icon.text-replace:before{
+        font-size:auto;
     }
     
     &:hover{
@@ -206,10 +209,30 @@ input[type=submit], input[type=reset], input[type=button], .button, button{
         }
     }  
 
-    /* special consideration for buttons with icons in them, to make them smaller */
-    &.icon{
-        padding:1em 2.4em;
-        padding:0.6em 1.2em;
+    &.bicolor{
+        padding-left:3.5em;
+
+        &:before{
+            font-size:1.2em;
+            position:absolute;
+            left:0;
+            top:0;
+            width:2em;
+            line-height:2em;
+            height:100%;
+            text-align:center;    
+            background-color:rgba(0,0,0,0.3);
+            display:block;
+        }
+    }
+
+    &.button-small.bicolor{
+        padding-left:3em;
+
+        &:before{
+            width:2em;
+            font-size:1.2em;
+        }
     }
 
     + input[type=submit],
@@ -617,10 +640,19 @@ input[type=submit], input[type=reset], input[type=button], .button, button{
 @media screen and (min-width: @breakpoint-mobile){
     input[type=submit], input[type=reset], input[type=button], .button, button{
         font-size:0.95em;
-        padding:1.3em 2.2em;
+        padding:0.8em 1.4em;
 
-        &.icon{
-            padding:1em 2.4em;
+        &.button-small{
+            
+        }
+
+        &.bicolor{
+            padding-left:3.5em;
+
+            &:before{
+                width:2.2em;
+                line-height:2.2em;
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/components/listing.less b/wagtail/wagtailadmin/static/wagtailadmin/css/components/listing.less
index 370cc2d8b..77d9daaf0 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/css/components/listing.less
+++ b/wagtail/wagtailadmin/static/wagtailadmin/css/components/listing.less
@@ -77,7 +77,7 @@ ul.listing{
 
     &.full-width td:first-child,
     &.full-width th:first-child{
-        .push-padding(@grid-content-indent);
+        padding-left:20px;
     }
 
     &.full-width{
@@ -137,7 +137,7 @@ ul.listing{
     }
 
     &.full-width .divider td{
-        .push-padding(@grid-content-indent);
+        padding-left:20px;
     }
 
     .index {
@@ -216,13 +216,7 @@ ul.listing{
         }
 
         .button-small{
-            font-size:1em;
-            padding:0.6em 1.2em;
             margin-right:1em;
-
-            &:before{
-                font-size:1.7em;
-            }
         }
     }
 
@@ -324,7 +318,7 @@ ul.listing{
     }
 
     table .no-results-message{
-        .push-padding(@grid-content-indent);
+        padding-left:20px;
     }
 
     .inactive h2{
@@ -426,6 +420,19 @@ ul.listing{
             border-color:@color-input-border;
             a{opacity:1;}
         }
+
+        table .no-results-message{
+            padding-left:50px;
+        }
+
+        &.full-width td:first-child,
+        &.full-width th:first-child{
+            padding-left:50px;
+        }
+
+        &.full-width .divider td{
+            padding-left:50px;
+        }
     }
    
 }
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/components/tabs.less b/wagtail/wagtailadmin/static/wagtailadmin/css/components/tabs.less
index 83dda6dbf..049078382 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/css/components/tabs.less
+++ b/wagtail/wagtailadmin/static/wagtailadmin/css/components/tabs.less
@@ -8,6 +8,13 @@
         border:1px solid @color-grey-4;
         border-width:1px 1px 0px 1px;
         text-align:center;
+        background-color:@color-grey-5;
+        border-top:0.3em solid @color-grey-3;
+
+        &.active{
+            background-color:white;
+            border-top:0.3em solid @color-grey-1;  
+        }
     }
     a{
         outline:none;
@@ -16,11 +23,9 @@
         font-weight:700;
         font-size:1.2em;
         text-decoration:none;
-        background-color:@color-grey-5;
         display:block;
-        padding:0 1em;
+        padding:0 50px;
         color:@color-grey-2;
-        border-top:0.3em solid @color-grey-3;
         border-bottom:1px solid transparent;
 
         &:hover{
@@ -29,10 +34,8 @@
         }
 
         &.active{
-            background-color:white;
-            .box-shadow(none);
+           
             color:@color-grey-1;
-            border-top:0.3em solid @color-grey-1;
             border-bottom:2px solid white;
             margin-bottom:-1px;
             z-index:1;
@@ -57,8 +60,6 @@
     }
 }
 
-
-
 @media screen and (min-width: @breakpoint-mobile){
     .tab-nav li{
         .column(2);
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/core.less b/wagtail/wagtailadmin/static/wagtailadmin/css/core.less
index 2043f951f..77ec26233 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/css/core.less
+++ b/wagtail/wagtailadmin/static/wagtailadmin/css/core.less
@@ -372,7 +372,6 @@ body.explorer-open .nav-main{
 }
 
 header{
-    .nice-padding();
     padding-top:2em;
     padding-bottom:1em;
     background-color: @color-grey-5;
@@ -557,6 +556,15 @@ footer, .logo{
     }                
 }
 
+.row{
+    .clearfix();
+}
+
+.nice-padding{
+    padding-left:20px;
+    padding-right:20px;
+}
+
 @media screen and (min-width: @breakpoint-mobile){
     .col1{
         .column(1);
@@ -595,6 +603,18 @@ footer, .logo{
         .column(12);
     }
 
+    .row{
+        .row();
+    }
+    .row-flush{
+        .row-flush();
+    }
+
+    .nice-padding{
+        padding-left:50px;
+        padding-right:50px;
+    }
+
     body{
         margin-left:@menu-width;
     }
@@ -703,7 +723,6 @@ footer, .logo{
     header{
         padding-top:2em;
         padding-bottom:2em;
-        .nice-padding();
     }
     footer{
         width:80%;
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/grid.less b/wagtail/wagtailadmin/static/wagtailadmin/css/grid.less
index 70bc427d8..d955391c8 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/css/grid.less
+++ b/wagtail/wagtailadmin/static/wagtailadmin/css/grid.less
@@ -49,8 +49,6 @@
     .border-box();
 
     width: 100%*(@x / @grid-columns);
-    /*padding-right: @padding;
-    padding-left: @padding;*/
 }
 
 /* Push adds left padding */
@@ -69,20 +67,14 @@
     padding-right: 100%*(@offset / @grid-columns);
 }
 
-.row{
-    .row();
-}
-.row-flush{
-    .row-flush();
-}
-
-/* must come after row/row-flush */
-.nice-padding{
-    .push-padding(@grid-content-indent);
-    .pull-padding(@grid-content-indent);
-}
-.nice-margin{
-    .push(@grid-content-indent);
-    .pull(@grid-content-indent);
-}
+/* only used in places where padding not applied to same elements as row or row-flush 
+ * most of the time this class should be applied directly to the html elements */
+.nice-padding(){
+    padding-left:20px;
+    padding-right:20px;
 
+    @media screen and (min-width: @breakpoint-mobile){
+        padding-left:50px;
+        padding-right:50px;
+    }
+}
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/layouts/page-editor.less b/wagtail/wagtailadmin/static/wagtailadmin/css/layouts/page-editor.less
index ec135aed8..c4f80973b 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/css/layouts/page-editor.less
+++ b/wagtail/wagtailadmin/static/wagtailadmin/css/layouts/page-editor.less
@@ -10,8 +10,10 @@
 .object{
     background:url(/static/wagtailadmin/images/bg-editor-diag.svg);
     position:relative;
-    border:1px solid @color-grey-4;
-    border-width:1px 0 0 0;
+    /*border:1px solid @color-grey-4;
+    border-width:1px 0 0 0;*/
+    overflow:hidden;
+    .nice-padding();
 
     &:first-child{
         border:0;
@@ -26,7 +28,6 @@
         padding-top:4em;
         padding-left:0;
         padding-right:0;
-        max-width:1024px;
     }
 
     .object-help{
@@ -71,7 +72,7 @@
             top:0px;
             height:3.2em;
             left:0px;
-            width:3em;
+            width:3.3em;
             background-color:@color-grey-3;
             padding:0;
             margin:0;
@@ -79,9 +80,10 @@
         }
     }
 
-    &.has-content, &.single-field, #promote &{
-        .push-padding(@grid-content-indent);
-        padding-right:@grid-gutter-width/2;    }
+    &.empty > h2, &.empty.single-field label{
+        margin:0;
+        border-bottom:1px solid white;
+    }
 
     &.single-field{
         h2, .object-help{
@@ -121,7 +123,7 @@
         }
 
         input, textarea, .richtext{
-            .nice-padding;
+            .nice-padding();
             .pull-padding(2);
             font-family:Bitter, Georgia, serif;
             .border-radius(0px);
@@ -134,8 +136,7 @@
 
         
         .error-message{
-            .push(@grid-content-indent);
-            .pull(@grid-content-indent);
+            .nice-padding();
             padding-bottom:2em;
         }
 
@@ -156,17 +157,19 @@
 
     .multiple{
         .transition(max-height 5s ease);
-        height:0px;
+        padding-top:4em;
+        height:auto;
 
         > li{
             background-color:white;
             padding:1em;
-            margin-bottom:2em;
+            margin-bottom:1em;
             border:1px solid @color-grey-5;
         }
 
         fieldset{
             padding-top:0;
+            padding-bottom:0;
         }
 
         &.moving{
@@ -177,10 +180,59 @@
             width:100%;
         }
     }
-    &.has-content .multiple{
-        padding-top:4em;
-        height:auto;
-    }  
+
+    /* removes top padding from multiples used within another panel */
+    .fields .multiple{
+        padding-top:0;
+    }
+
+    .add{
+        cursor:pointer;
+    }
+
+    &.empty{
+        border-bottom:1px solid white;
+
+        > h2, &.single-field label{
+            margin:0;
+            border-bottom:1px solid white;
+        }
+
+        /* wrapper around add button for mutliple objects. Default version is wordless plus button for contracted groups of fields */
+        .add{
+            .transition(background-color 0.2s ease);
+            position:relative;
+            z-index:2;
+            top:0px;
+            left:0px;
+            width:3.3em;
+            background-color:@color-teal;
+            padding:0;
+            margin:0 0 0 -50px;
+            cursor:pointer;
+
+            a{
+                font-size: 0em;
+                line-height: 0;
+                overflow: visible;
+                display:block;
+            
+                &:before{
+                    position:relative;
+                    color:white;
+                    padding:0;
+                    line-height:2.6em; /* specific height required as parent 'a' has no height */
+                    font-size:1rem;
+                    width:100%;
+                }
+            }
+        }
+
+        .multiple{
+            padding:0;
+            height:0px;
+        }
+    }
 }   
 
 /* styles applied to an element as it is being reordered */
@@ -189,46 +241,6 @@
     padding-bottom:0.5em;
 }
 
-/* wrapper around add button for mutliple objects */
-.add{
-    position:relative;
-    z-index:2;
-    top:0px;
-    left:0px;
-    width:3em;
-    background-color:@color-teal-darker;
-    padding:0;
-    margin:0;
-    cursor:pointer;
-
-    a{
-        font-size: 0em;
-        line-height: 0;
-        overflow: hidden;
-    }
-
-    a:before{
-        color:white;
-        padding:0.65em 0;
-        font-size:1.1rem;
-    }
-}
-
-.has-content .add{
-    z-index:1;
-    padding:inherit;
-    cursor:pointer;
-    margin-top:0;
-    margin-bottom:0;
-    padding-top:2.5em;
-    padding-bottom:2em;
-
-    a{
-        font-size: inherit;
-        line-height: inherit;
-        overflow: hidden;
-    }
-}
 
 /* Object controls */
 .controls{
@@ -264,8 +276,8 @@
 
 @media screen and (min-width: @breakpoint-mobile){
     .page-editor .tab-nav li{
-        .column(2);
+        .column(3);
         padding:0;
-        min-width:110px;
+        max-width:210px;
     }
 }
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/panels/rich-text.less b/wagtail/wagtailadmin/static/wagtailadmin/css/panels/rich-text.less
index 13528b46a..bd7c87126 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/css/panels/rich-text.less
+++ b/wagtail/wagtailadmin/static/wagtailadmin/css/panels/rich-text.less
@@ -3,6 +3,7 @@
 .hallotoolbar{
     position:absolute;
     left:5.83%;
+    z-index:5;
 }
 .hallotoolbar.affixed{
     position:fixed;
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
index d979d449b..bd3f9e102 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
+++ b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
@@ -83,7 +83,12 @@ function InlinePanel(opts) {
     var self = {};
 
     self.setHasContent = function(){
-        self.formsUl.parent().addClass('has-content')
+        console.log($('> li:visible', self.formsUl));
+        if($('li:visible', self.formsUl).length){
+            self.formsUl.parent().removeClass('empty');
+        }else{
+            self.formsUl.parent().addClass('empty');
+        }
     };
 
     self.initChildControls = function (prefix) {
@@ -98,7 +103,8 @@ function InlinePanel(opts) {
             $('#' + deleteInputId).val('1');
             $('#' + childId).fadeOut(function() {
                 self.updateMoveButtonDisabledStates();
-            });
+                self.setHasContent();
+            });            
         });
         if (opts.canOrder) {
             $('#' + prefix + '-move-up').click(function() {
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/chooser/_search_form.html b/wagtail/wagtailadmin/templates/wagtailadmin/chooser/_search_form.html
index fba1c2d7e..94bc29319 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/chooser/_search_form.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/chooser/_search_form.html
@@ -1,4 +1,4 @@
-<form class="search-bar full-width" action="{% url 'wagtailadmin_choose_page' %}?{{ querystring }}" method="get">
+<form class="search-bar full-width nice-padding" action="{% url 'wagtailadmin_choose_page' %}?{{ querystring }}" method="get">
     <ul class="fields">
         {% for field in search_form %}
             {% include "wagtailadmin/shared/field_as_li.html" with field=field %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/chooser/browse.html b/wagtail/wagtailadmin/templates/wagtailadmin/chooser/browse.html
index 4ee5ba6ad..b480cc11d 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/chooser/browse.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/chooser/browse.html
@@ -1,4 +1,4 @@
-<header>
+<header class="nice-padding">
     <h1>Choose a page</h1>
 </header>
 {% include 'wagtailadmin/chooser/_search_form.html' %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/chooser/email_link.html b/wagtail/wagtailadmin/templates/wagtailadmin/chooser/email_link.html
index d102f156e..e61ce0b92 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/chooser/email_link.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/chooser/email_link.html
@@ -1,4 +1,4 @@
-<header>
+<header class="nice-padding"> 
     <h1>Add an email link</h1>
 </header>
 
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/chooser/external_link.html b/wagtail/wagtailadmin/templates/wagtailadmin/chooser/external_link.html
index 154229618..c8b95272a 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/chooser/external_link.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/chooser/external_link.html
@@ -1,4 +1,4 @@
-<header>
+<header class="nice-padding">
     <h1>Add an external link</h1>
 </header>
 
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/chooser/search.html b/wagtail/wagtailadmin/templates/wagtailadmin/chooser/search.html
index 9ee2bbacb..0f7774e1e 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/chooser/search.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/chooser/search.html
@@ -1,4 +1,4 @@
-<header>
+<header class="nice-padding">
     <h1>Choose a page</h1>   
 </header>
 
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/inline_panel.html b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/inline_panel.html
index 19d1724f5..374018bf5 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/inline_panel.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/inline_panel.html
@@ -10,5 +10,5 @@
 </script>
 
 <p class="add">
-    <a class="icon text-replace icon-plus" id="id_{{ self.formset.prefix }}-ADD" value="Add">Add {{ self.heading|lower }}</a>
+    <a class="button bicolor icon icon-plus" id="id_{{ self.formset.prefix }}-ADD" value="Add">Add {{ self.heading|lower }}</a>
 </p>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/inline_panel.js b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/inline_panel.js
index 9f7833658..7651602f4 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/inline_panel.js
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/inline_panel.js
@@ -13,5 +13,6 @@
         {{ child.render_js }}
         panel.initChildControls(fixPrefix("{{ child.form.prefix }}"));
     {% endfor %}
+    panel.setHasContent();
     panel.updateMoveButtonDisabledStates();
 })();
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/tabbed_interface.html b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/tabbed_interface.html
index 4cb00b0c1..5bbccb03b 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/tabbed_interface.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/tabbed_interface.html
@@ -1,6 +1,6 @@
 <ul class="tab-nav merged">
     {% for child in self.children %}
-        <li><a href="#{{ child.heading|slugify }}" class="{% if forloop.first %}active{% endif %}">{{ child.heading }}</a></li>
+        <li class="{% if forloop.first %}active{% endif %}"><a href="#{{ child.heading|slugify }}" class="{% if forloop.first %}active{% endif %}">{{ child.heading }}</a></li>
     {% endfor %}
 </ul>
 
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/home.html b/wagtail/wagtailadmin/templates/wagtailadmin/home.html
index 060abca41..d6c4de364 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/home.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/home.html
@@ -10,7 +10,7 @@
 {% endblock %}
 
 {% block content %}
-    <header class="merged">
+    <header class="merged nice-padding">
         <div class="row row-flush">
             {% if user.email %}
                 <div class="col1">
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/home/pages_for_moderation.html b/wagtail/wagtailadmin/templates/wagtailadmin/home/pages_for_moderation.html
index a818ff2ac..0d83f4077 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/home/pages_for_moderation.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/home/pages_for_moderation.html
@@ -1,5 +1,5 @@
 {% if page_revisions_for_moderation %}
-    <div class="panel nice-padding row-flush">{# TODO try moving these classes onto the section tag #}
+    <div class="panel nice-padding">{# TODO try moving these classes onto the section tag #}
         <section>
             <h2>Pages awaiting moderation</h2>
             <table class="listing">
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/add_subpage.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/add_subpage.html
index 3d87f26c8..958b2eb47 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/add_subpage.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/add_subpage.html
@@ -5,7 +5,7 @@
 {% block titletag %}Create a page in {{ parent_page.title }}{% endblock %}
 
 {% block content %}
-    <header>
+    <header class="nice-padding">
         <h1>Create a page in <span>{{ parent_page.title }}</span></h1>
     </header>
 
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/confirm_delete.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/confirm_delete.html
index 6d48a67fc..77391bd2e 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/confirm_delete.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/confirm_delete.html
@@ -3,7 +3,7 @@
 {% block bodyclass %}menu-explorer{% endblock %}
 
 {% block content %}
-    <header>
+    <header class="nice-padding">
         <h1>Delete <span>{{ page.title }}</span></h1>
     </header>
 
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/confirm_move.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/confirm_move.html
index f263aceb2..6b2e24550 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/confirm_move.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/confirm_move.html
@@ -2,7 +2,7 @@
 {% block titletag %}Move {{ page.title }}{% endblock %}
 {% block bodyclass %}menu-explorer{% endblock %}
 {% block content %}
-    <header>
+    <header class="nice-padding">
         <h1>Move <span>{{ page_to_move.title }}</span></h1>
     </header>
 
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/confirm_unpublish.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/confirm_unpublish.html
index 5be3ba1e7..13079ef29 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/confirm_unpublish.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/confirm_unpublish.html
@@ -2,7 +2,7 @@
 {% block titletag %}Unpublish {{ page.title }}{% endblock %}
 {% block bodyclass %}menu-explorer{% endblock %}
 {% block content %}
-    <header>
+    <header class="nice-padding">
         <h1>Unpublish <span>{{ page.title }}</span></h1>
     </header>
 
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/content_type_use.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/content_type_use.html
index 9a9ed502e..60ffe8b5c 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/content_type_use.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/content_type_use.html
@@ -3,7 +3,7 @@
 {% block bodyclass %}menu-explorer{% endblock %}
 
 {% block content %}
-    <header>
+    <header class="nice-padding">
         <h1>Pages using <span>{{ content_type.model_class.get_verbose_name }}</span></h1>
     </header>
    
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/create.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/create.html
index 230db1181..e5b639372 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/create.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/create.html
@@ -5,7 +5,7 @@
 {% block bodyclass %}menu-explorer page-editor create{% endblock %}
 
 {% block content %}
-    <header class="merged tab-merged">
+    <header class="merged tab-merged nice-padding">
         <h1>New <span>{{ content_type.model_class.get_verbose_name }}</span></h1>
     </header>
 
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html
index 662ac7ee7..9fd264865 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html
@@ -5,7 +5,7 @@
 {% block bodyclass %}menu-explorer  page-editor{% endblock %}
 
 {% block content %}
-    <header class="merged tab-merged">
+    <header class="merged tab-merged nice-padding">
         <div class="row row-flush">
             <div class="left col9">
                 <h1>Editing <span>{{ page.title }}</span></h1>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html
index 7816095e0..43bf70a45 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html
@@ -4,7 +4,7 @@
 {% block bodyclass %}menu-explorer page-explorer {% if ordering == 'ord' %}reordering{% endif %}{% endblock %}
 
 {% block content %}
-    <header class="merged no-border">
+    <header class="merged no-border nice-padding">
         <h1>Explorer</h1>
 
         <ul class="breadcrumb">
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
index ecb41e1f4..9145e1bc2 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
@@ -1,7 +1,7 @@
 {% load page_permissions %}
 <table class="listing{% if full_width %} full-width{% endif %}{% if moving or choosing %} chooser{% endif %}">
     {% if orderable %}
-        <col width="5.3%" />
+        <col width="50px" />
     {% endif %}
     <col />
     {% if show_parent %}
@@ -49,13 +49,13 @@
                         {% endif %}
                         <ul class="actions">
                             {% if parent_page_perms.can_add_subpage and 'add_subpage' not in hide_actions|default:'' %}
-                                <li><a href="{% url 'verdantadmin_pages_add_subpage' parent_page.id %}" class="button button-small icon white icon-plus-inverse">Add child page</a></li>
+                                <li><a href="{% url 'wagtailadmin_pages_add_subpage' parent_page.id %}" class="button button-small bicolor icon white icon-plus">Add child page</a></li>
                             {% endif %}
                             {% if parent_page_perms.can_edit and 'edit' not in hide_actions|default:'' %}
-                                <li><a href="{% url 'verdantadmin_pages_edit' parent_page.id %}">Edit</a></li>
+                                <li><a href="{% url 'wagtailadmin_pages_edit' parent_page.id %}">Edit</a></li>
                             {% endif %}
                             {% if parent_page.has_unpublished_changes and 'view_draft' not in hide_actions|default:'' %}
-                                <li><a href="{% url 'verdantadmin_pages_view_draft' parent_page.id %}" target="_blank">View draft</a></li>
+                                <li><a href="{% url 'wagtailadmin_pages_view_draft' parent_page.id %}" target="_blank">View draft</a></li>
                             {% endif %}
                             {% if parent_page.live and not parent_page.is_root and 'view_live' not in hide_actions|default:'' %}
                                 <li><a href="{{ parent_page.url }}" target="_blank">View live</a></li>
@@ -169,7 +169,7 @@
                                     <li><a href="{% url 'wagtailadmin_pages_view_draft' page.id %}" target="_blank">View draft</a></li>
                                 {% endif %}
                                 {% if page_perms.can_edit and 'edit' not in hide_actions|default:'' %}
-                                    <li><a href="{% url 'verdantadmin_pages_edit' page.id %}" title="Edit this page">Edit</a></li>
+                                    <li><a href="{% url 'wagtailadmin_pages_edit' page.id %}" title="Edit this page">Edit</a></li>
                                 {% endif %}
                                 {% if page.live and 'view_live' not in hide_actions|default:'' %}
                                     <li><a href="{{ page.url }}" target="_blank">View live</a></li>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/move_choose_destination.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/move_choose_destination.html
index 25ed5f62e..d34c97c92 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/move_choose_destination.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/move_choose_destination.html
@@ -2,7 +2,7 @@
 {% block titletag %}Select a new parent page for {{ page_to_move.title }}{% endblock %}
 {% block bodyclass %}menu-explorer{% endblock %}
 {% block content %}
-    <header>
+    <header class="nice-padding">
         <h1>Select a new parent page for <span>{{ page_to_move.title }}</span></h1>
 
         <ul class="breadcrumb">
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/search.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/search.html
index 30c31a759..229a720a5 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/search.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/search.html
@@ -36,11 +36,11 @@
 {% endblock %}
 
 {% block content %}
-    <header>
+    <header class="nice-padding">
         <h1>Search</h1>
     </header>
 
-    <form class="search-bar full-width" action="{% url 'wagtailadmin_pages_search' %}" method="get">
+    <form class="search-bar full-width nice-padding" action="{% url 'wagtailadmin_pages_search' %}" method="get">
         <ul class="fields">
             {% for field in form %}
                 {% include "wagtailadmin/shared/field_as_li.html" with field=field %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/select_location.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/select_location.html
index c73fde291..eb8abf952 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/select_location.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/select_location.html
@@ -1,7 +1,7 @@
 {% extends "wagtailadmin/base.html" %}
 {% block titletag %}Where do you want to create a {{ content_type.model_class.get_verbose_name }}{% endblock %}
 {% block content %}
-    <header>
+    <header class="nice-padding">>
         <h1>Where do you want to create this {{ content_type.model_class.get_verbose_name }}?</h1>
     </header>
     <ul>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/select_type.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/select_type.html
index 1a080d7c4..81bcde86b 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/select_type.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/select_type.html
@@ -2,7 +2,7 @@
 {% block titletag %}Create a new page{% endblock %}
 {% block bodyclass %}menu-explorer{% endblock %}
 {% block content %}
-    <header>
+    <header class="nice-padding">
         <h1>Create a new page</h1>
     </header>
 
diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/chooser/chooser.html b/wagtail/wagtaildocs/templates/wagtaildocs/chooser/chooser.html
index e6806c0d7..6da290c34 100644
--- a/wagtail/wagtaildocs/templates/wagtaildocs/chooser/chooser.html
+++ b/wagtail/wagtaildocs/templates/wagtaildocs/chooser/chooser.html
@@ -1,4 +1,4 @@
-<header class="merged tab-merged">
+<header class="merged tab-merged nice-padding">
     <h1>Choose a document</h1>
 </header>
 
diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/documents/add.html b/wagtail/wagtaildocs/templates/wagtaildocs/documents/add.html
index 7f601a76f..17500e26a 100644
--- a/wagtail/wagtaildocs/templates/wagtaildocs/documents/add.html
+++ b/wagtail/wagtaildocs/templates/wagtaildocs/documents/add.html
@@ -11,7 +11,7 @@
 {% endblock %}
 
 {% block content %}
-    <header>
+    <header class="nice-padding">
         <h1>Add document</h1>
     </header>
 
diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/documents/confirm_delete.html b/wagtail/wagtaildocs/templates/wagtaildocs/documents/confirm_delete.html
index 6a3a1f9ab..792188a1d 100644
--- a/wagtail/wagtaildocs/templates/wagtaildocs/documents/confirm_delete.html
+++ b/wagtail/wagtaildocs/templates/wagtaildocs/documents/confirm_delete.html
@@ -2,7 +2,7 @@
 {% block titletag %}Delete {{ document.title }}{% endblock %}
 {% block bodyclass %}menu-documents{% endblock %}
 {% block content %}
-    <header>
+    <header class="nice-padding">
         <h1>Delete document <span>{{ document.title }}</span></h1>
     </header>
 
diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/documents/edit.html b/wagtail/wagtaildocs/templates/wagtaildocs/documents/edit.html
index 4edda9f1d..0529eda64 100644
--- a/wagtail/wagtaildocs/templates/wagtaildocs/documents/edit.html
+++ b/wagtail/wagtaildocs/templates/wagtaildocs/documents/edit.html
@@ -11,7 +11,7 @@
 {% endblock %}
 
 {% block content %}
-    <header>
+    <header class="nice-padding">
         <h1>Editing <span>{{ document.title }}</span></h1>
     </header>
 
diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/documents/index.html b/wagtail/wagtaildocs/templates/wagtaildocs/documents/index.html
index e49d19412..8b52c70f0 100644
--- a/wagtail/wagtaildocs/templates/wagtaildocs/documents/index.html
+++ b/wagtail/wagtaildocs/templates/wagtaildocs/documents/index.html
@@ -35,18 +35,18 @@
 {% endblock %}
 
 {% block content %}
-    <header>
+    <header class="nice-padding">
         <div class="row row-flush">
             <div class="left col9">
                 <h1>Documents</h1>
             </div>
             <div class="right col3">
-                <a href="{% url 'wagtaildocs_add_document' %}" class="button icon icon-plus-inverse">Add a document</a>
+                <a href="{% url 'wagtaildocs_add_document' %}" class="button bicolor icon icon-plus">Add a document</a>
             </div>
         </div>
     </header>
 
-    <form class="search-bar full-width" action="{% url 'wagtaildocs_index' %}" method="get">
+    <form class="search-bar full-width nice-padding" action="{% url 'wagtaildocs_index' %}" method="get">
         <ul class="fields">
             {% for field in form %}
                 {% include "wagtailadmin/shared/field_as_li.html" with field=field %}
diff --git a/wagtail/wagtailembeds/templates/wagtailembeds/chooser/chooser.html b/wagtail/wagtailembeds/templates/wagtailembeds/chooser/chooser.html
index d993291f3..6542c1f7a 100644
--- a/wagtail/wagtailembeds/templates/wagtailembeds/chooser/chooser.html
+++ b/wagtail/wagtailembeds/templates/wagtailembeds/chooser/chooser.html
@@ -1,6 +1,6 @@
 {% load image_tags ellipsistrim%}
 
-<header class="merged">
+<header class="merged nice-padding">
     <h1>Insert embed</h1>
 </header>
 
diff --git a/wagtail/wagtailimages/templates/wagtailimages/chooser/chooser.html b/wagtail/wagtailimages/templates/wagtailimages/chooser/chooser.html
index 3736c818d..1f83b1842 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/chooser/chooser.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/chooser/chooser.html
@@ -1,6 +1,6 @@
 {% load image_tags ellipsistrim%}
 
-<header class="merged tab-merged">
+<header class="merged tab-merged nice-padding">
     <h1>Choose an image</h1>
 </header>
 
diff --git a/wagtail/wagtailimages/templates/wagtailimages/chooser/select_format.html b/wagtail/wagtailimages/templates/wagtailimages/chooser/select_format.html
index 452bdf0a3..4ff3e1995 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/chooser/select_format.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/chooser/select_format.html
@@ -1,6 +1,6 @@
 {% load image_tags %}
 
-<header>
+<header class="nice-padding">
     <h1>Choose a format</h1>
 </header>
 
diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/add.html b/wagtail/wagtailimages/templates/wagtailimages/images/add.html
index d22c2ab5b..aabb5a3b1 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/images/add.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/images/add.html
@@ -11,7 +11,7 @@
 {% endblock %}
 
 {% block content %}
-    <header>
+    <header class="nice-padding">
         <h1>Add image</h1>
     </header>
 
diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/confirm_delete.html b/wagtail/wagtailimages/templates/wagtailimages/images/confirm_delete.html
index eaba88964..02e5d1e09 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/images/confirm_delete.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/images/confirm_delete.html
@@ -4,7 +4,7 @@
 {% block bodyclass %}menu-images{% endblock %}
 
 {% block content %}
-    <header>
+    <header class="nice-padding">
         <h1>Delete image</h1>
     </header>
     <div class="row row-flush nice-padding">
diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/edit.html b/wagtail/wagtailimages/templates/wagtailimages/images/edit.html
index 1c3342377..47054f46c 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/images/edit.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/images/edit.html
@@ -11,7 +11,7 @@
 {% endblock %}
 
 {% block content %}
-    <header>
+    <header class="nice-padding">
         <h1>Editing <span>{{ image.title }}</span></h1>
     </header>
     <div class="row row-flush nice-padding">
diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/index.html b/wagtail/wagtailimages/templates/wagtailimages/images/index.html
index 7a2ee856b..e1455272d 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/images/index.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/images/index.html
@@ -38,18 +38,18 @@
 {% endblock %}
 
 {% block content %}
-    <header>
+    <header class="nice-padding">
         <div class="row row-flush">
             <div class="left col9">
                 <h1>Images</h1>
             </div>
             <div class="right col3">
-                <a href="{% url 'wagtailimages_add_image' %}" class="button icon icon-plus-inverse">Add an image</a>
+                <a href="{% url 'wagtailimages_add_image' %}" class="button bicolor icon icon-plus">Add an image</a>
             </div>
         </div>
     </header>
 
-    <form class="search-bar full-width" action="{% url 'wagtailimages_index' %}" method="get">
+    <form class="search-bar full-width nice-padding" action="{% url 'wagtailimages_index' %}" method="get">
         <ul class="fields">
             {% for field in form %}
                 {% include "wagtailadmin/shared/field_as_li.html" with field=field %}
diff --git a/wagtail/wagtailredirects/templates/wagtailredirects/add.html b/wagtail/wagtailredirects/templates/wagtailredirects/add.html
index 4fea72ccd..68bac995c 100644
--- a/wagtail/wagtailredirects/templates/wagtailredirects/add.html
+++ b/wagtail/wagtailredirects/templates/wagtailredirects/add.html
@@ -1,7 +1,7 @@
 {% extends "wagtailadmin/base.html" %}
 {% block titletag %}Add redirect{% endblock %}
 {% block content %}
-    <header>
+    <header class="nice-padding">
         <h1>Add redirect</h1>
     </header>
 
diff --git a/wagtail/wagtailredirects/templates/wagtailredirects/confirm_delete.html b/wagtail/wagtailredirects/templates/wagtailredirects/confirm_delete.html
index 61b5dece2..a6f8a4bec 100644
--- a/wagtail/wagtailredirects/templates/wagtailredirects/confirm_delete.html
+++ b/wagtail/wagtailredirects/templates/wagtailredirects/confirm_delete.html
@@ -2,7 +2,7 @@
 
 {% block titletag %}Delete redirect {{ redirect.title }}{% endblock %}
 {% block content %}
-    <header>
+    <header class="nice-padding">
         <h1>Delete <span>{{ redirect.title }}</span></h1>
     </header>
     <div class="row row-flush nice-padding">       
diff --git a/wagtail/wagtailredirects/templates/wagtailredirects/edit.html b/wagtail/wagtailredirects/templates/wagtailredirects/edit.html
index 44751185e..72be0e5fd 100644
--- a/wagtail/wagtailredirects/templates/wagtailredirects/edit.html
+++ b/wagtail/wagtailredirects/templates/wagtailredirects/edit.html
@@ -1,7 +1,7 @@
 {% extends "wagtailadmin/base.html" %}
 {% block titletag %}Editing {{ redirect.title }}{% endblock %}
 {% block content %}
-    <header>
+    <header class="nice-padding">
         <h1>Editing <span>{{ redirect.title }}</span></h1>
     </header>
 
diff --git a/wagtail/wagtailredirects/templates/wagtailredirects/index.html b/wagtail/wagtailredirects/templates/wagtailredirects/index.html
index 2b3da2529..a104b3c5a 100644
--- a/wagtail/wagtailredirects/templates/wagtailredirects/index.html
+++ b/wagtail/wagtailredirects/templates/wagtailredirects/index.html
@@ -3,7 +3,7 @@
 {% block bodyclass %}page-explorer{% endblock %}
 
 {% block content %}
-    <header>
+    <header class="nice-padding">
         <div class="row row-flush">
             <div class="left col9">
                 <h1>Redirects</h1>
diff --git a/wagtail/wagtailsnippets/templates/wagtailsnippets/chooser/choose.html b/wagtail/wagtailsnippets/templates/wagtailsnippets/chooser/choose.html
index fa687a1be..a75c8a7e4 100644
--- a/wagtail/wagtailsnippets/templates/wagtailsnippets/chooser/choose.html
+++ b/wagtail/wagtailsnippets/templates/wagtailsnippets/chooser/choose.html
@@ -1,4 +1,4 @@
-<header>
+<header class="nice-padding">
     <h1>Choose <span>{{ snippet_type_name }}</span></h1>
 </header>
 
diff --git a/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/confirm_delete.html b/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/confirm_delete.html
index 55948e903..d6bef4bf7 100644
--- a/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/confirm_delete.html
+++ b/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/confirm_delete.html
@@ -2,7 +2,7 @@
 {% block titletag %}Delete {{ snippet_type_name}} - {{ instance }}{% endblock %}
 {% block bodyclass %}menu-snippets{% endblock %}
 {% block content %}
-    <header>
+    <header class="nice-padding">
         <h1>Delete <span>{{ snippet_type_name }} - {{ instance }}</span></h1>
     </header>
 
diff --git a/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/create.html b/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/create.html
index fd508bd14..cfd2f8375 100644
--- a/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/create.html
+++ b/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/create.html
@@ -2,7 +2,7 @@
 {% block titletag %}New  {{ snippet_type_name}}{% endblock %}
 {% block bodyclass %}menu-snippets{% endblock %}
 {% block content %}
-    <header>
+    <header class="nice-padding">
         <h1>New <span>{{ snippet_type_name }}</span></h1>
     </header>
 
diff --git a/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/edit.html b/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/edit.html
index c0ea305bf..1dea397b0 100644
--- a/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/edit.html
+++ b/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/edit.html
@@ -2,7 +2,7 @@
 {% block titletag %}Editing {{ snippet_type_name}} - {{ instance }}{% endblock %}
 {% block bodyclass %}menu-snippets{% endblock %}
 {% block content %}
-    <header>
+    <header class="nice-padding">
         <h1>Editing <span>{{ snippet_type_name }} - {{ instance }}</span></h1>
     </header>
 
diff --git a/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/index.html b/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/index.html
index b80fac132..6d3dac4cc 100644
--- a/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/index.html
+++ b/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/index.html
@@ -3,7 +3,7 @@
 {% block titletag %}Snippets{% endblock %}
 {% block bodyclass %}menu-snippets{% endblock %}
 {% block content %}
-    <header>
+    <header class="nice-padding">
         <h1>Snippets</h1>
     </header>
     <div class="nice-padding">
diff --git a/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/type_index.html b/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/type_index.html
index 81a7e4049..7ffbab49e 100644
--- a/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/type_index.html
+++ b/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/type_index.html
@@ -2,13 +2,13 @@
 {% block titletag %}Snippets {{ snippet_type_name_plural|capfirst }}{% endblock %}
 {% block bodyclass %}menu-snippets{% endblock %}
 {% block content %}
-    <header>
+    <header class="nice-padding">
         <div class="row row-flush">
             <div class="left col9">
                 <h1>Snippets <span>{{ snippet_type_name_plural|capfirst }}</span></h1>
             </div>
             <div class="right col3">
-                <a href="{% url 'wagtailsnippets_create' content_type.app_label content_type.model %}" class="button icon icon-plus-inverse">Add {{ snippet_type_name }}</a>
+                <a href="{% url 'wagtailsnippets_create' content_type.app_label content_type.model %}" class="button bicolor icon icon-plus">Add {{ snippet_type_name }}</a>
                 {# TODO: figure out a way of saying "Add a/an [foo]" #}
             </div>
         </div>
diff --git a/wagtail/wagtailusers/templates/wagtailusers/create.html b/wagtail/wagtailusers/templates/wagtailusers/create.html
index a770e9c1b..46fded1bb 100644
--- a/wagtail/wagtailusers/templates/wagtailusers/create.html
+++ b/wagtail/wagtailusers/templates/wagtailusers/create.html
@@ -3,7 +3,7 @@
 {% block titletag %}Add user{% endblock %}
 {% block bodyclass %}menu-users{% endblock %}
 {% block content %}
-    <header class="merged tab-merged">
+    <header class="merged tab-merged nice-padding">
         <h1>Add user</h1>
     </header>
 
diff --git a/wagtail/wagtailusers/templates/wagtailusers/edit.html b/wagtail/wagtailusers/templates/wagtailusers/edit.html
index 38a76346c..65ce182a9 100644
--- a/wagtail/wagtailusers/templates/wagtailusers/edit.html
+++ b/wagtail/wagtailusers/templates/wagtailusers/edit.html
@@ -3,7 +3,7 @@
 {% block titletag %}Editing {{ user.username}}{% endblock %}
 {% block bodyclass %}menu-users{% endblock %}
 {% block content %}
-    <header class="merged tab-merged">
+    <header class="merged tab-merged nice-padding">
         <h1>Editing <span>{{ user.username }}</span></h1>
     </header>
 
diff --git a/wagtail/wagtailusers/templates/wagtailusers/index.html b/wagtail/wagtailusers/templates/wagtailusers/index.html
index 53e7274ca..7f0cce2bc 100644
--- a/wagtail/wagtailusers/templates/wagtailusers/index.html
+++ b/wagtail/wagtailusers/templates/wagtailusers/index.html
@@ -2,7 +2,7 @@
 {% block titletag %}Users{% endblock %}
 {% block bodyclass %}menu-users{% endblock %}
 {% block content %}
-    <header class="merged">
+    <header class="merged nice-padding">
         <div class="row row-flush">
             <div class="left col9">
                 <h1>Users</h1>