diff --git a/wagtail/wagtailadmin/forms.py b/wagtail/wagtailadmin/forms.py
index 1cb6a159f..18ec6288e 100644
--- a/wagtail/wagtailadmin/forms.py
+++ b/wagtail/wagtailadmin/forms.py
@@ -3,7 +3,7 @@ from django.contrib.auth import get_user_model
 from django.contrib.auth.forms import AuthenticationForm, PasswordResetForm
 
 class SearchForm(forms.Form):
-    q = forms.CharField(label="Search term")
+    q = forms.CharField(label="Search term", widget=forms.TextInput(attrs={'placeholder': 'Search'}))
 
 
 class ExternalLinkChooserForm(forms.Form):
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/components/forms.less b/wagtail/wagtailadmin/static/wagtailadmin/css/components/forms.less
index 5b50b2621..01990b1f6 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/css/components/forms.less
+++ b/wagtail/wagtailadmin/static/wagtailadmin/css/components/forms.less
@@ -597,6 +597,26 @@ ul.inline li:first-child, li.inline:first-child{
             white-space: nowrap
         }
     }
+
+    header &{
+        margin:0;
+        padding:0;
+        .fields{
+            li{
+                padding:0;
+            }
+            .field{
+                padding:0;
+            }
+            .field input{
+                padding:0.4em 1.4em 0.4em 2em;
+            }
+            .field:before{
+                font-size:1.4em;
+                top:0.45em;
+            }
+        }
+    }
 }
 
 /* Transitions */
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/core.less b/wagtail/wagtailadmin/static/wagtailadmin/css/core.less
index 7fada0171..32e0b4f33 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/css/core.less
+++ b/wagtail/wagtailadmin/static/wagtailadmin/css/core.less
@@ -388,6 +388,13 @@ header{
 
     .left{
         float:left;
+        margin-right:1em;
+        width:50%;
+        &:first-child{
+            padding-bottom:0.5em;
+            float:none;
+        }
+
     }
     .right{
         float:right;
@@ -577,7 +584,7 @@ footer, .logo{
         .column(2);
     }
     .col3{
-        .column(3);
+        .column(3) !important;
     }
     .col4{
         .column(4);
@@ -732,6 +739,17 @@ footer, .logo{
     header{
         padding-top:1.5em;
         padding-bottom:1.5em;
+
+        .left{
+            float:left;
+            margin-right:0;
+
+            &:first-child{
+                padding-bottom:0;
+                float:left;
+            }
+
+        }
     }
     footer{
         width:80%;
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
index bbb7ea564..71e234a36 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
+++ b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
@@ -83,7 +83,6 @@ function InlinePanel(opts) {
     var self = {};
 
     self.setHasContent = function(){
-        console.log($('> li:visible', self.formsUl));
         if($('li:visible', self.formsUl).length){
             self.formsUl.parent().removeClass('empty');
         }else{
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/chooser/browse.html b/wagtail/wagtailadmin/templates/wagtailadmin/chooser/browse.html
index b480cc11d..05d77c763 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/chooser/browse.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/chooser/browse.html
@@ -1,6 +1,8 @@
+<<<<<<< HEAD:django-wagtail/wagtail/wagtailadmin/templates/wagtailadmin/chooser/browse.html
 <header class="nice-padding">
     <h1>Choose a page</h1>
 </header>
+{% include "wagtailadmin/shared/header.html" with title="Choose a page" %}
 {% include 'wagtailadmin/chooser/_search_form.html' %}
 
 <div class="nice-padding">
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/chooser/email_link.html b/wagtail/wagtailadmin/templates/wagtailadmin/chooser/email_link.html
index e61ce0b92..069d3a604 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/chooser/email_link.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/chooser/email_link.html
@@ -1,6 +1,4 @@
-<header class="nice-padding"> 
-    <h1>Add an email link</h1>
-</header>
+{% include "wagtailadmin/shared/header.html" with title="Add an email link" %}
 
 <div class="nice-padding">
     {% include 'wagtailadmin/chooser/_link_types.html' with current='email' %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/chooser/external_link.html b/wagtail/wagtailadmin/templates/wagtailadmin/chooser/external_link.html
index c8b95272a..f74925edf 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/chooser/external_link.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/chooser/external_link.html
@@ -1,6 +1,4 @@
-<header class="nice-padding">
-    <h1>Add an external link</h1>
-</header>
+{% include "wagtailadmin/shared/header.html" with title="Add an external link" %}
 
 <div class="nice-padding">
     {% include 'wagtailadmin/chooser/_link_types.html' with current='external' %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/chooser/search.html b/wagtail/wagtailadmin/templates/wagtailadmin/chooser/search.html
index 0f7774e1e..d2143e7e7 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/chooser/search.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/chooser/search.html
@@ -1,6 +1,4 @@
-<header class="nice-padding">
-    <h1>Choose a page</h1>   
-</header>
+{% include "wagtailadmin/shared/header.html" with title="Choose a page" %}
 
 <div class="nice-padding">
     {% include 'wagtailadmin/chooser/_link_types.html' with current='internal' %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/add_subpage.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/add_subpage.html
index 958b2eb47..c2cd5a7c3 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/add_subpage.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/add_subpage.html
@@ -5,9 +5,7 @@
 {% block titletag %}Create a page in {{ parent_page.title }}{% endblock %}
 
 {% block content %}
-    <header class="nice-padding">
-        <h1>Create a page in <span>{{ parent_page.title }}</span></h1>
-    </header>
+    {% include "verdantadmin/shared/header.html" with title="Create a page in" subtitle=parent_page.title %}
 
     <div class="nice-padding">
         <p>Choose which type of page you'd like to create.</p>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/confirm_delete.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/confirm_delete.html
index 77391bd2e..3f25f88c6 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/confirm_delete.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/confirm_delete.html
@@ -3,9 +3,7 @@
 {% block bodyclass %}menu-explorer{% endblock %}
 
 {% block content %}
-    <header class="nice-padding">
-        <h1>Delete <span>{{ page.title }}</span></h1>
-    </header>
+    {% include "wagtailadmin/shared/header.html" with title="Delete" subtitle=page.title %}
 
     <div class="nice-padding">
         <p>Are you sure you want to delete this page? {% if descendant_count %}This will also delete {{ descendant_count }} subpage{{ descendant_count|pluralize }}.{% endif %}</p>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/confirm_move.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/confirm_move.html
index 6b2e24550..32edd42c3 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/confirm_move.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/confirm_move.html
@@ -2,9 +2,7 @@
 {% block titletag %}Move {{ page.title }}{% endblock %}
 {% block bodyclass %}menu-explorer{% endblock %}
 {% block content %}
-    <header class="nice-padding">
-        <h1>Move <span>{{ page_to_move.title }}</span></h1>
-    </header>
+    {% include "wagtailadmin/shared/header.html" with title="Move" subtitle=page_to_move.title %}
 
     <div class="nice-padding">
         {% if page_to_move.is_leaf %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/confirm_unpublish.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/confirm_unpublish.html
index 13079ef29..ac93f21d0 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/confirm_unpublish.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/confirm_unpublish.html
@@ -2,9 +2,8 @@
 {% block titletag %}Unpublish {{ page.title }}{% endblock %}
 {% block bodyclass %}menu-explorer{% endblock %}
 {% block content %}
-    <header class="nice-padding">
-        <h1>Unpublish <span>{{ page.title }}</span></h1>
-    </header>
+
+    {% include "wagtailadmin/shared/header.html" with title="Unpublish" subtitle=page.title %}
 
     <div class="nice-padding">
         <p>Are you sure you want to unpublish this page?</p>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/content_type_use.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/content_type_use.html
index 60ffe8b5c..78e611bfb 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/content_type_use.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/content_type_use.html
@@ -3,9 +3,7 @@
 {% block bodyclass %}menu-explorer{% endblock %}
 
 {% block content %}
-    <header class="nice-padding">
-        <h1>Pages using <span>{{ content_type.model_class.get_verbose_name }}</span></h1>
-    </header>
+	{% include "wagtailadmin/shared/header.html" with title="Pages using" subtitle=content_type.model_class.get_verbose_name %}
    
     <div class="nice-padding">
         {% include "wagtailadmin/pages/list.html" with sortable=1 allow_navigation=0 sortable=0 %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/create.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/create.html
index e5b639372..e1e332d51 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/create.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/create.html
@@ -5,9 +5,7 @@
 {% block bodyclass %}menu-explorer page-editor create{% endblock %}
 
 {% block content %}
-    <header class="merged tab-merged nice-padding">
-        <h1>New <span>{{ content_type.model_class.get_verbose_name }}</span></h1>
-    </header>
+    {% include "wagtailadmin/shared/header.html" with title="New" merged=1 tabbed=1 subtitle=content_type.model_class.get_verbose_name %}
 
     <form id="page-edit-form" action="{% url 'wagtailadmin_pages_create' content_type.app_label content_type.model parent_page.id %}" method="POST">
         {% csrf_token %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/select_location.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/select_location.html
index eb8abf952..647991799 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/select_location.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/select_location.html
@@ -1,9 +1,8 @@
 {% extends "wagtailadmin/base.html" %}
 {% block titletag %}Where do you want to create a {{ content_type.model_class.get_verbose_name }}{% endblock %}
 {% block content %}
-    <header class="nice-padding">>
-        <h1>Where do you want to create this {{ content_type.model_class.get_verbose_name }}?</h1>
-    </header>
+	{% include "wagtailadmin/shared/header.html" with title="Where do you want to create this" subtitle=content_type.model_class.get_verbose_name %}
+
     <ul>
         {% for page in parent_pages %}
             <li><a href="{% url 'wagtailadmin_pages_create' content_type.app_label content_type.model page.id %}">{{ page.title }}</a></li>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/select_type.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/select_type.html
index 81bcde86b..3935807a7 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/select_type.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/select_type.html
@@ -2,9 +2,8 @@
 {% block titletag %}Create a new page{% endblock %}
 {% block bodyclass %}menu-explorer{% endblock %}
 {% block content %}
-    <header class="nice-padding">
-        <h1>Create a new page</h1>
-    </header>
+
+    {% include "verdantadmin/shared/header.html" with title="Create a new page" %}
 
     <div class="nice-padding">
         <p>Your new page will be saved in the <em>top level</em> of your website. You can move it after saving.</p>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/header.html b/wagtail/wagtailadmin/templates/wagtailadmin/shared/header.html
new file mode 100644
index 000000000..293c98454
--- /dev/null
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/shared/header.html
@@ -0,0 +1,24 @@
+<header class="nice-padding {% if merged %}merged{% endif %} {% if tabbed %}tab-merged{% endif %}">
+    <div class="row row-flush">
+        <div class="left col6">
+            <h1>{{ title }} <span>{{ subtitle }}</span></h1>
+        </div>
+        {% if form %}
+            <div class="left col3">
+                <form class="search-bar" action="{% url search_url %}" method="get">
+                    <ul class="fields">
+                        {% for field in form %}
+                            {% include "wagtailadmin/shared/field_as_li.html" with field=field %}
+                        {% endfor %}
+                        <li class="submit"><input type="submit" value="Search" /></li>
+                    </ul>
+                </form>
+            </div>
+        {% endif %}
+        <div class="right col3">
+        	{% if add_link %}
+        		<a href="{% url add_link %}" class="button bicolor icon icon-plus">{{ add_text }}</a>
+        	{% endif %}
+        </div>
+    </div>
+</header>
\ No newline at end of file
diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/chooser/chooser.html b/wagtail/wagtaildocs/templates/wagtaildocs/chooser/chooser.html
index 6481dbe92..d86357af9 100644
--- a/wagtail/wagtaildocs/templates/wagtaildocs/chooser/chooser.html
+++ b/wagtail/wagtaildocs/templates/wagtaildocs/chooser/chooser.html
@@ -1,6 +1,4 @@
-<header class="merged tab-merged nice-padding">
-    <h1>Choose a document</h1>
-</header>
+{% include "wagtailadmin/shared/header.html" with title="Choose a document" tabbed=1 merged=1 %}
 
 {% if uploadform %}
     <ul class="tab-nav merged">
diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/documents/add.html b/wagtail/wagtaildocs/templates/wagtaildocs/documents/add.html
index 17500e26a..ae4d9557d 100644
--- a/wagtail/wagtaildocs/templates/wagtaildocs/documents/add.html
+++ b/wagtail/wagtaildocs/templates/wagtaildocs/documents/add.html
@@ -11,9 +11,7 @@
 {% endblock %}
 
 {% block content %}
-    <header class="nice-padding">
-        <h1>Add document</h1>
-    </header>
+    {% include "wagtailadmin/shared/header.html" with title="Add document" %}
 
     <div class="nice-padding">
         <form action="{% url 'wagtaildocs_add_document' %}" method="POST" enctype="multipart/form-data">
diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/documents/confirm_delete.html b/wagtail/wagtaildocs/templates/wagtaildocs/documents/confirm_delete.html
index 792188a1d..db24ac424 100644
--- a/wagtail/wagtaildocs/templates/wagtaildocs/documents/confirm_delete.html
+++ b/wagtail/wagtaildocs/templates/wagtaildocs/documents/confirm_delete.html
@@ -2,9 +2,7 @@
 {% block titletag %}Delete {{ document.title }}{% endblock %}
 {% block bodyclass %}menu-documents{% endblock %}
 {% block content %}
-    <header class="nice-padding">
-        <h1>Delete document <span>{{ document.title }}</span></h1>
-    </header>
+    {% include "wagtailadmin/shared/header.html" with title="Delete document" subtitle=document.title %}
 
     <div class="nice-padding">
         <p>Are you sure you want to delete this document?</p>
diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/documents/edit.html b/wagtail/wagtaildocs/templates/wagtaildocs/documents/edit.html
index 0529eda64..8234fa436 100644
--- a/wagtail/wagtaildocs/templates/wagtaildocs/documents/edit.html
+++ b/wagtail/wagtaildocs/templates/wagtaildocs/documents/edit.html
@@ -11,9 +11,7 @@
 {% endblock %}
 
 {% block content %}
-    <header class="nice-padding">
-        <h1>Editing <span>{{ document.title }}</span></h1>
-    </header>
+    {% include "wagtailadmin/shared/header.html" with title="Editing" subtitle=document.title %}
 
     <div class="nice-padding">
         <form action="{% url 'wagtaildocs_edit_document' document.id %}" method="POST" enctype="multipart/form-data">
diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/documents/index.html b/wagtail/wagtaildocs/templates/wagtaildocs/documents/index.html
index 8b52c70f0..41668caee 100644
--- a/wagtail/wagtaildocs/templates/wagtaildocs/documents/index.html
+++ b/wagtail/wagtaildocs/templates/wagtaildocs/documents/index.html
@@ -8,11 +8,11 @@
             var wait = setTimeout(search, 200);
             $(this).data('timer', wait);
         });
-        $('a.suggested-tag').click(function() {
-            $('#id_q').val($(this).text());
-            search();
-            return false;
-        })
+        // $('a.suggested-tag').click(function() {
+        //     $('#id_q').val($(this).text());
+        //     search();
+        //     return false;
+        // })
 
         var search_current_index = 0;
         var search_next_index = 0;
@@ -35,33 +35,7 @@
 {% endblock %}
 
 {% block content %}
-    <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 bicolor icon icon-plus">Add a document</a>
-            </div>
-        </div>
-    </header>
-
-    <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 %}
-            {% endfor %}
-            <li class="submit"><input type="submit" value="Search" /></li>
-            {% if popular_tags %}
-                <li class="taglist">
-                    <h3>Popular tags</h3>
-                    {% for tag in popular_tags %}
-                        <a class="suggested-tag tag" href="{% url 'wagtaildocs_search' %}?q={{ tag.name|urlencode }}">{{ tag.name }}</a>
-                    {% endfor %}
-                </li>
-            {% endif %}
-        </ul>
-    </form>
+    {% include "wagtailadmin/shared/header.html" with title="Documents" add_link="wagtaildocs_add_document" add_text="Add a document" search_url="wagtaildocs_index" %}
 
     <div class="nice-padding">
         <div id="document-results" class="documents">
diff --git a/wagtail/wagtailembeds/templates/wagtailembeds/chooser/chooser.html b/wagtail/wagtailembeds/templates/wagtailembeds/chooser/chooser.html
index 6542c1f7a..e7ab18243 100644
--- a/wagtail/wagtailembeds/templates/wagtailembeds/chooser/chooser.html
+++ b/wagtail/wagtailembeds/templates/wagtailembeds/chooser/chooser.html
@@ -1,8 +1,6 @@
 {% load image_tags ellipsistrim%}
 
-<header class="merged nice-padding">
-    <h1>Insert embed</h1>
-</header>
+{% include "wagtailadmin/shared/header.html" with title="Insert embed" merged=1 %}
 
 <div class="tab-content">
     <section id="form" class="active nice-padding">
diff --git a/wagtail/wagtailimages/templates/wagtailimages/chooser/chooser.html b/wagtail/wagtailimages/templates/wagtailimages/chooser/chooser.html
index 670063c9f..1bba76d80 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/chooser/chooser.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/chooser/chooser.html
@@ -1,8 +1,6 @@
 {% load image_tags ellipsistrim%}
 
-<header class="merged tab-merged nice-padding">
-    <h1>Choose an image</h1>
-</header>
+{% include "wagtailadmin/shared/header.html" with title="Choose an image" merged=1 tabbed=1 %}
 
 {% if uploadform %}
     <ul class="tab-nav merged">
diff --git a/wagtail/wagtailimages/templates/wagtailimages/chooser/select_format.html b/wagtail/wagtailimages/templates/wagtailimages/chooser/select_format.html
index 4ff3e1995..b91f9ea04 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/chooser/select_format.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/chooser/select_format.html
@@ -1,8 +1,6 @@
 {% load image_tags %}
 
-<header class="nice-padding">
-    <h1>Choose a format</h1>
-</header>
+{% include "wagtailadmin/shared/header.html" with title="Choose a format" %}
 
 <div class="row row-flush nice-padding">
     <div class="col6">
diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/add.html b/wagtail/wagtailimages/templates/wagtailimages/images/add.html
index aabb5a3b1..bcf3a3d37 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/images/add.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/images/add.html
@@ -11,9 +11,7 @@
 {% endblock %}
 
 {% block content %}
-    <header class="nice-padding">
-        <h1>Add image</h1>
-    </header>
+    {% include "wagtailadmin/shared/header.html" with title="Add image" %}
 
     <div class="nice-padding">
         <form action="{% url 'wagtailimages_add_image' %}" method="POST" enctype="multipart/form-data">
diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/confirm_delete.html b/wagtail/wagtailimages/templates/wagtailimages/images/confirm_delete.html
index 02e5d1e09..1e926e2b7 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/images/confirm_delete.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/images/confirm_delete.html
@@ -4,19 +4,19 @@
 {% block bodyclass %}menu-images{% endblock %}
 
 {% block content %}
-    <header class="nice-padding">
-        <h1>Delete image</h1>
-    </header>
+
+    {% include "wagtailadmin/shared/header.html" with title="Delete image" %}
+
     <div class="row row-flush nice-padding">
         <div class="col6">
             {% image image max-800x600 %}
         </div>
         <div class="col6">
-            <p>Are you sure you want to delete this image?</p>
-            <form action="{% url 'wagtailimages_delete_image' image.id %}" method="POST">
-                {% csrf_token %}
-                <input type="submit" value="Yes, delete" class="serious" />
-            </form>
-        </div>
-    </div>
+		    <p>Are you sure you want to delete this image?</p>
+		    <form action="{% url 'wagtailimages_delete_image' image.id %}" method="POST">
+		        {% csrf_token %}
+		        <input type="submit" value="Yes, delete" class="serious" />
+		    </form>
+		</div>
+	</div>
 {% endblock %}
diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/edit.html b/wagtail/wagtailimages/templates/wagtailimages/images/edit.html
index 47054f46c..711272bc6 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/images/edit.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/images/edit.html
@@ -11,9 +11,9 @@
 {% endblock %}
 
 {% block content %}
-    <header class="nice-padding">
-        <h1>Editing <span>{{ image.title }}</span></h1>
-    </header>
+    
+    {% include "wagtailadmin/shared/header.html" with title="Editing" subtitle=image.title %}
+    
     <div class="row row-flush nice-padding">
        
         <div class="col7">
diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/index.html b/wagtail/wagtailimages/templates/wagtailimages/images/index.html
index e1455272d..c972620c7 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/images/index.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/images/index.html
@@ -38,37 +38,12 @@
 {% endblock %}
 
 {% block content %}
-    <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 bicolor icon icon-plus">Add an image</a>
-            </div>
-        </div>
-    </header>
-
-    <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 %}
-            {% endfor %}
-            <li class="submit"><input type="submit" value="Search" /></li>
-            {% if popular_tags %}
-                <li class="taglist">
-                    <h3>Popular tags</h3>
-                    {% for tag in popular_tags %}
-                        <a class="suggested-tag tag" href="{% url 'wagtailimages_search_image' %}?q={{ tag.name|urlencode }}">{{ tag.name }}</a>
-                    {% endfor %}
-                </li>
-            {% endif %}
-        </ul>
-    </form>
+    {% include "wagtailadmin/shared/header.html" with title="Images" add_link="wagtailimages_add_image" add_text="Add an image" search_url="wagtailimages_index" %}
 
     <div class="nice-padding">
         <div id="image-results">
             {% include "wagtailimages/images/results.html" %}
         </div>
     </div>
+    
 {% endblock %}
diff --git a/wagtail/wagtailredirects/templates/wagtailredirects/add.html b/wagtail/wagtailredirects/templates/wagtailredirects/add.html
index 68bac995c..c1433ffd3 100644
--- a/wagtail/wagtailredirects/templates/wagtailredirects/add.html
+++ b/wagtail/wagtailredirects/templates/wagtailredirects/add.html
@@ -1,9 +1,8 @@
 {% extends "wagtailadmin/base.html" %}
 {% block titletag %}Add redirect{% endblock %}
 {% block content %}
-    <header class="nice-padding">
-        <h1>Add redirect</h1>
-    </header>
+
+    {% include "wagtailadmin/shared/header.html" with title="Add redirect" %}
 
     <form action="{% url 'wagtailredirects_add_redirect' %}" method="POST">
         {% csrf_token %}
@@ -13,6 +12,7 @@
             <input type="submit" value="Save" />
         </div>
     </form>
+    
 {% endblock %}
 
 {% block extra_css %}
diff --git a/wagtail/wagtailredirects/templates/wagtailredirects/confirm_delete.html b/wagtail/wagtailredirects/templates/wagtailredirects/confirm_delete.html
index a6f8a4bec..800c4ae5b 100644
--- a/wagtail/wagtailredirects/templates/wagtailredirects/confirm_delete.html
+++ b/wagtail/wagtailredirects/templates/wagtailredirects/confirm_delete.html
@@ -2,9 +2,9 @@
 
 {% block titletag %}Delete redirect {{ redirect.title }}{% endblock %}
 {% block content %}
-    <header class="nice-padding">
-        <h1>Delete <span>{{ redirect.title }}</span></h1>
-    </header>
+
+    {% include "wagtailadmin/shared/header.html" with title="Delete" subtitle=redirect.title %}
+
     <div class="row row-flush nice-padding">       
         <p>Are you sure you want to delete this redirect?</p>
         <form action="{% url 'wagtailredirects_delete_redirect' redirect.id %}" method="POST">
@@ -12,4 +12,5 @@
             <input type="submit" value="Yes, delete" class="serious" />
         </form>
     </div>
+    
 {% endblock %}
diff --git a/wagtail/wagtailredirects/templates/wagtailredirects/edit.html b/wagtail/wagtailredirects/templates/wagtailredirects/edit.html
index 72be0e5fd..b58b399ad 100644
--- a/wagtail/wagtailredirects/templates/wagtailredirects/edit.html
+++ b/wagtail/wagtailredirects/templates/wagtailredirects/edit.html
@@ -1,9 +1,8 @@
 {% extends "wagtailadmin/base.html" %}
 {% block titletag %}Editing {{ redirect.title }}{% endblock %}
 {% block content %}
-    <header class="nice-padding">
-        <h1>Editing <span>{{ redirect.title }}</span></h1>
-    </header>
+
+    {% include "wagtailadmin/shared/header.html" with title="Editing" subtitle=redirect.title %}
 
     <form action="{% url 'wagtailredirects_edit_redirect' redirect.id %}" method="POST">
         {% csrf_token %}
@@ -14,6 +13,7 @@
             <a href="{% url 'wagtailredirects_delete_redirect' redirect.id %}" class="button button-secondary no">Delete redirect</a>
         </div>
     </form>
+    
 {% endblock %}
 
 {% block extra_css %}
diff --git a/wagtail/wagtailredirects/templates/wagtailredirects/index.html b/wagtail/wagtailredirects/templates/wagtailredirects/index.html
index 5dd79d286..075e8a704 100644
--- a/wagtail/wagtailredirects/templates/wagtailredirects/index.html
+++ b/wagtail/wagtailredirects/templates/wagtailredirects/index.html
@@ -3,16 +3,7 @@
 {% block bodyclass %}page-explorer{% endblock %}
 
 {% block content %}
-    <header class="nice-padding">
-        <div class="row row-flush">
-            <div class="left col9">
-                <h1>Redirects</h1>
-            </div>
-            <div class="right col3">
-                <a href="{% url 'wagtailredirects_add_redirect' %}" class="button bicolor icon icon-plus">Add redirect</a>
-            </div>
-        </div>
-    </header>
+    {% include "wagtailadmin/shared/header.html" with title="Redirects" add_link="wagtailredirects_add_redirect" add_text="Add redirect" %}
 
     <table class="listing full-width">
         <col />
@@ -47,4 +38,5 @@
             {% endif %}
         </tbody>
     </table>
+    
 {% endblock %}
diff --git a/wagtail/wagtailsnippets/templates/wagtailsnippets/chooser/choose.html b/wagtail/wagtailsnippets/templates/wagtailsnippets/chooser/choose.html
index a75c8a7e4..51603cd54 100644
--- a/wagtail/wagtailsnippets/templates/wagtailsnippets/chooser/choose.html
+++ b/wagtail/wagtailsnippets/templates/wagtailsnippets/chooser/choose.html
@@ -1,6 +1,4 @@
-<header class="nice-padding">
-    <h1>Choose <span>{{ snippet_type_name }}</span></h1>
-</header>
+{% include "wagtailadmin/shared/header.html" with title="Choose" subtitle=snippet_type_name %}
 
 <div class="nice-padding">
     {% include "wagtailsnippets/snippets/list.html" with choosing=1 %}
diff --git a/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/confirm_delete.html b/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/confirm_delete.html
index d6bef4bf7..fe67288ce 100644
--- a/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/confirm_delete.html
+++ b/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/confirm_delete.html
@@ -2,9 +2,8 @@
 {% block titletag %}Delete {{ snippet_type_name}} - {{ instance }}{% endblock %}
 {% block bodyclass %}menu-snippets{% endblock %}
 {% block content %}
-    <header class="nice-padding">
-        <h1>Delete <span>{{ snippet_type_name }} - {{ instance }}</span></h1>
-    </header>
+
+    {% include "verdantadmin/shared/header.html" with title="Delete" subtitle=instance %}
 
     <div class="nice-padding">
         <p>Are you sure you want to delete this {{ snippet_type_name }}?</p>
@@ -13,4 +12,5 @@
             <input type="submit" value="Yes, delete" class="serious" />
         </form>
     </div>
+    
 {% endblock %}
diff --git a/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/create.html b/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/create.html
index cfd2f8375..a882ad70e 100644
--- a/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/create.html
+++ b/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/create.html
@@ -2,10 +2,8 @@
 {% block titletag %}New  {{ snippet_type_name}}{% endblock %}
 {% block bodyclass %}menu-snippets{% endblock %}
 {% block content %}
-    <header class="nice-padding">
-        <h1>New <span>{{ snippet_type_name }}</span></h1>
-    </header>
 
+    {% include "wagtailadmin/shared/header.html" with title="New" subtitle=snippet_type_name %}
 
     <form action="{% url 'wagtailsnippets_create' content_type.app_label content_type.model %}" method="POST">
         {% csrf_token %}
diff --git a/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/edit.html b/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/edit.html
index 1dea397b0..9bd0ae5f2 100644
--- a/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/edit.html
+++ b/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/edit.html
@@ -2,9 +2,8 @@
 {% block titletag %}Editing {{ snippet_type_name}} - {{ instance }}{% endblock %}
 {% block bodyclass %}menu-snippets{% endblock %}
 {% block content %}
-    <header class="nice-padding">
-        <h1>Editing <span>{{ snippet_type_name }} - {{ instance }}</span></h1>
-    </header>
+
+    {% include "wagtailadmin/shared/header.html" with title="Editing" subtitle=instance %}
 
     <form action="{% url 'wagtailsnippets_edit' content_type.app_label content_type.model instance.id %}" method="POST">
         {% csrf_token %}
@@ -25,7 +24,6 @@
         </footer>
     </form>
 
-
 {% endblock %}
 
 {% block extra_css %}
diff --git a/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/index.html b/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/index.html
index 6d3dac4cc..5eae53972 100644
--- a/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/index.html
+++ b/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/index.html
@@ -3,9 +3,9 @@
 {% block titletag %}Snippets{% endblock %}
 {% block bodyclass %}menu-snippets{% endblock %}
 {% block content %}
-    <header class="nice-padding">
-        <h1>Snippets</h1>
-    </header>
+
+    {% include "verdantadmin/shared/header.html" with title="Snippets" %}
+
     <div class="nice-padding">
         <ul class="listing">
             {% for name, description, content_type in snippet_types %}
diff --git a/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/type_index.html b/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/type_index.html
index 7ffbab49e..7248211cb 100644
--- a/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/type_index.html
+++ b/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/type_index.html
@@ -2,6 +2,7 @@
 {% block titletag %}Snippets {{ snippet_type_name_plural|capfirst }}{% endblock %}
 {% block bodyclass %}menu-snippets{% endblock %}
 {% block content %}
+
     <header class="nice-padding">
         <div class="row row-flush">
             <div class="left col9">
diff --git a/wagtail/wagtailusers/templates/wagtailusers/create.html b/wagtail/wagtailusers/templates/wagtailusers/create.html
index 3fa9fdc33..3e1d4636d 100644
--- a/wagtail/wagtailusers/templates/wagtailusers/create.html
+++ b/wagtail/wagtailusers/templates/wagtailusers/create.html
@@ -3,9 +3,8 @@
 {% block titletag %}Add user{% endblock %}
 {% block bodyclass %}menu-users{% endblock %}
 {% block content %}
-    <header class="merged tab-merged nice-padding">
-        <h1>Add user</h1>
-    </header>
+
+    {% include "wagtailadmin/shared/header.html" with title="Add user" merged=1 tabbed=1 %}
 
     <ul class="tab-nav merged">
         <li class="active"><a href="#account">Account</a></li>
diff --git a/wagtail/wagtailusers/templates/wagtailusers/edit.html b/wagtail/wagtailusers/templates/wagtailusers/edit.html
index f12364eee..f96aa74bb 100644
--- a/wagtail/wagtailusers/templates/wagtailusers/edit.html
+++ b/wagtail/wagtailusers/templates/wagtailusers/edit.html
@@ -3,9 +3,8 @@
 {% block titletag %}Editing {{ user.username}}{% endblock %}
 {% block bodyclass %}menu-users{% endblock %}
 {% block content %}
-    <header class="merged tab-merged nice-padding">
-        <h1>Editing <span>{{ user.username }}</span></h1>
-    </header>
+
+    {% include "wagtailadmin/shared/header.html" with title="Editing" subtitle=user.username merged=1 tabbed=1 %}
 
     <ul class="tab-nav merged">
         <li class="active"><a href="#account">Account</a></li>
diff --git a/wagtail/wagtailusers/templates/wagtailusers/index.html b/wagtail/wagtailusers/templates/wagtailusers/index.html
index 95bdf8ecb..7bbbcd0b1 100644
--- a/wagtail/wagtailusers/templates/wagtailusers/index.html
+++ b/wagtail/wagtailusers/templates/wagtailusers/index.html
@@ -2,16 +2,9 @@
 {% block titletag %}Users{% endblock %}
 {% block bodyclass %}menu-users{% endblock %}
 {% block content %}
-    <header class="merged nice-padding">
-        <div class="row row-flush">
-            <div class="left col9">
-                <h1>Users</h1>
-            </div>
-            <div class="right col3">
-                <a href="{% url 'wagtailusers_create' %}" class="button bicolor icon icon-plus">Add a user</a>
-            </div>
-        </div>
-    </header>
+
+    {% include "wagtailadmin/shared/header.html" with title="Users" merged=1 add_link="wagtailusers_create" add_text="Add a user" %}
+
     <table class="listing full-width">
         <thead>
             <tr>