diff --git a/templates/Includes/AssetAdmin_Content.ss b/templates/Includes/AssetAdmin_Content.ss
index f85e365d..d3ed9c41 100644
--- a/templates/Includes/AssetAdmin_Content.ss
+++ b/templates/Includes/AssetAdmin_Content.ss
@@ -1,30 +1,28 @@
 <div class="cms-content center cms-tabset $BaseCSSClasses" data-layout-type="border" data-pjax-fragment="Content">
 
 	<div class="cms-content-header north">
-		<div>
-			<% with EditForm %>
+		<% with EditForm %>
+			<div class="cms-content-header-info">
 				<% include BackLink_Button %>
 
 				<h2 id="page-title-heading">
 				<% with Controller %>
-					<% include CMSSectionIcon %>
 					<% include CMSBreadcrumbs %>
 				<% end_with %>
 				</h2>
-				<% if Fields.hasTabset %>
-					<% with Fields.fieldByName('Root') %>
-					<div class="cms-content-header-tabs">
-						<ul>
-						<% loop Tabs %>
-							<li<% if extraClass %> class="$extraClass"<% end_if %>><a href="#$id">$Title</a></li>
-						<% end_loop %>
-						</ul>
-					</div>
-					<% end_with %>
-				<% end_if %>
-			<% end_with %>
-		
-		</div>
+			</div>
+			<% if Fields.hasTabset %>
+				<% with Fields.fieldByName('Root') %>
+				<div class="cms-content-header-tabs">
+					<ul>
+					<% loop Tabs %>
+						<li<% if extraClass %> class="$extraClass"<% end_if %>><a href="#$id">$Title</a></li>
+					<% end_loop %>
+					</ul>
+				</div>
+				<% end_with %>
+			<% end_if %>
+		<% end_with %>
 	</div>
 
 	<div class="cms-content-fields center ui-widget-content" data-layout-type="border">
diff --git a/templates/Includes/AssetAdmin_UploadContent.ss b/templates/Includes/AssetAdmin_UploadContent.ss
index af6be21a..a8fe67d5 100644
--- a/templates/Includes/AssetAdmin_UploadContent.ss
+++ b/templates/Includes/AssetAdmin_UploadContent.ss
@@ -1,18 +1,18 @@
 <div class="cms-content center cms-tabset $BaseCSSClasses" data-layout-type="border" data-pjax-fragment="Content">
 
 	<div class="cms-content-header north">
-		<div>
+		<div class="cms-content-header-info">
 			<h2><% _t('AssetAdmin.ADDFILES', 'Add Files') %></h2>
-			<div class="cms-content-header-tabs">
-				<ul>
-					<li>
-						<a href="#cms-content-fromyourcomputer"><% _t('AssetAdmin.FROMYOURCOMPUTER', 'From your computer') %></a>
-					</li>
-					<li>
-						<a href="#cms-content-fromtheinternet"><% _t('AssetAdmin.FROMTHEINTERNET', 'From the internet') %></a>
-					</li>
-				</ul>
-			</div>
+		</div>
+		<div class="cms-content-header-tabs">
+			<ul>
+				<li>
+					<a href="#cms-content-fromyourcomputer"><% _t('AssetAdmin.FROMYOURCOMPUTER', 'From your computer') %></a>
+				</li>
+				<li>
+					<a href="#cms-content-fromtheinternet"><% _t('AssetAdmin.FROMTHEINTERNET', 'From the internet') %></a>
+				</li>
+			</ul>
 		</div>
 	</div>
 
diff --git a/templates/Includes/CMSMain_Content.ss b/templates/Includes/CMSMain_Content.ss
index 626cd285..c31c0d3a 100644
--- a/templates/Includes/CMSMain_Content.ss
+++ b/templates/Includes/CMSMain_Content.ss
@@ -1,31 +1,30 @@
 <div id="pages-controller-cms-content" class="cms-content center cms-tabset $BaseCSSClasses" data-layout-type="border" data-pjax-fragment="Content">
 
 	<div class="cms-content-header north">
-		<div>
+		<div class="cms-content-header-info">
 			<h2>
-				<% include CMSSectionIcon %>
 				<% include CMSBreadcrumbs %>
 			</h2>
-		
-			<div class="cms-content-header-tabs">
-				<ul>
-					<li class="content-treeview<% if class == 'CMSPageEditController' %> ui-tabs-selected<% end_if %>">
-						<a href="#dummy" class="cms-panel-link" title="Form_EditForm" data-href="$LinkPageEdit">
-							<% _t('CMSMain.TabContent', 'Content') %>
-						</a>
-					</li>
-					<li class="content-listview<% if class == 'CMSPageSettingsController' %> ui-tabs-selected<% end_if %>">
-						<a href="#dummy" class="cms-panel-link" title="Form_EditForm" data-href="$LinkPageSettings">
-							<% _t('CMSMain.TabSettings', 'Settings') %>
-						</a>
-					</li>
-					<li class="content-listview<% if class == 'CMSPageHistoryController' %> ui-tabs-selected<% end_if %>">
-						<a href="#dummy" class="cms-panel-link" title="Form_EditForm" data-href="$LinkPageHistory">
-							<% _t('CMSMain.TabHistory', 'History') %>
-						</a>
-					</li>
-				</ul>
-			</div>
+		</div>
+	
+		<div class="cms-content-header-tabs">
+			<ul>
+				<li class="content-treeview<% if class == 'CMSPageEditController' %> ui-tabs-selected<% end_if %>">
+					<a href="#dummy" class="cms-panel-link" title="Form_EditForm" data-href="$LinkPageEdit">
+						<% _t('CMSMain.TabContent', 'Content') %>
+					</a>
+				</li>
+				<li class="content-listview<% if class == 'CMSPageSettingsController' %> ui-tabs-selected<% end_if %>">
+					<a href="#dummy" class="cms-panel-link" title="Form_EditForm" data-href="$LinkPageSettings">
+						<% _t('CMSMain.TabSettings', 'Settings') %>
+					</a>
+				</li>
+				<li class="content-listview<% if class == 'CMSPageHistoryController' %> ui-tabs-selected<% end_if %>">
+					<a href="#dummy" class="cms-panel-link" title="Form_EditForm" data-href="$LinkPageHistory">
+						<% _t('CMSMain.TabHistory', 'History') %>
+					</a>
+				</li>
+			</ul>
 		</div>
 	</div>
 
diff --git a/templates/Includes/CMSPageAddController_Content.ss b/templates/Includes/CMSPageAddController_Content.ss
index 09e9560a..1683921c 100644
--- a/templates/Includes/CMSPageAddController_Content.ss
+++ b/templates/Includes/CMSPageAddController_Content.ss
@@ -2,7 +2,7 @@
 	<form $FormAttributes data-layout-type="border">
 
 		<div class="cms-content-header north">
-			<div>
+			<div class="cms-content-header-info">
 				<h2><% _t('CMSAddPageController.Title','Add page') %></h2>
 			</div>
 		</div>
diff --git a/templates/Includes/CMSPagesController_Content.ss b/templates/Includes/CMSPagesController_Content.ss
index a7a76b74..24035b3b 100644
--- a/templates/Includes/CMSPagesController_Content.ss
+++ b/templates/Includes/CMSPagesController_Content.ss
@@ -1,27 +1,26 @@
 <div id="pages-controller-cms-content" class="cms-content center cms-tabset $BaseCSSClasses" data-layout-type="border" data-pjax-fragment="Content">
 
 	<div class="cms-content-header north">
-		<div>
+		<div class="cms-content-header-info">
 			<h2>
-				<% include CMSSectionIcon %>
 				<% include CMSBreadcrumbs %>
 			</h2>
-		
-			<div class="cms-content-header-tabs">
-				<ul>
-					<li class="content-treeview<% if ViewState == tree %> ui-tabs-selected<% end_if %>">
-						<a href="#cms-content-treeview" class="cms-panel-link" data-href="$LinkTreeView"><% _t('CMSPagesController.TreeView', 'Tree View') %></a>
-					</li>
-					<li class="content-listview<% if ViewState == list %> ui-tabs-selected<% end_if %>">
-						<a href="#cms-content-listview" class="cms-panel-link" data-href="$LinkListView"><% _t('CMSPagesController.ListView', 'List View') %></a>
-					</li>
-					<!--
-					<li class="content-galleryview">
-						<a href="#cms-content-galleryview"><% _t('CMSPagesController.GalleryView', 'Gallery View') %></a>
-					</li>
-					-->
-				</ul>
-			</div>
+		</div>
+	
+		<div class="cms-content-header-tabs">
+			<ul>
+				<li class="content-treeview<% if ViewState == tree %> ui-tabs-selected<% end_if %>">
+					<a href="#cms-content-treeview" class="cms-panel-link" data-href="$LinkTreeView"><% _t('CMSPagesController.TreeView', 'Tree View') %></a>
+				</li>
+				<li class="content-listview<% if ViewState == list %> ui-tabs-selected<% end_if %>">
+					<a href="#cms-content-listview" class="cms-panel-link" data-href="$LinkListView"><% _t('CMSPagesController.ListView', 'List View') %></a>
+				</li>
+				<!--
+				<li class="content-galleryview">
+					<a href="#cms-content-galleryview"><% _t('CMSPagesController.GalleryView', 'Gallery View') %></a>
+				</li>
+				-->
+			</ul>
 		</div>
 	</div>
 
diff --git a/templates/Includes/CMSSettingsController_Content.ss b/templates/Includes/CMSSettingsController_Content.ss
index bf45dce8..6561f0ec 100644
--- a/templates/Includes/CMSSettingsController_Content.ss
+++ b/templates/Includes/CMSSettingsController_Content.ss
@@ -1,27 +1,26 @@
 <div class="cms-content center cms-tabset $BaseCSSClasses" data-layout-type="border" data-pjax-fragment="Content">
 
 	<div class="cms-content-header north">
-		<div>
-			<% with EditForm %>
+		<% with EditForm %>
+			<div class="cms-content-header-info">
 				<h2>
 				<% with Controller %>
-					<% include CMSSectionIcon %>
 					<% include CMSBreadcrumbs %>
 				<% end_with %>
 				</h2>
-				<% if Fields.hasTabset %>
-					<% with Fields.fieldByName('Root') %>
-					<div class="cms-content-header-tabs">
-						<ul>
-						<% loop Tabs %>
-							<li<% if extraClass %> class="$extraClass"<% end_if %>><a href="#$id">$Title</a></li>
-						<% end_loop %>
-						</ul>
-					</div>
-					<% end_with %>
-				<% end_if %>
-			<% end_with %>
-		</div>
+			</div>
+			<% if Fields.hasTabset %>
+				<% with Fields.fieldByName('Root') %>
+				<div class="cms-content-header-tabs">
+					<ul>
+					<% loop Tabs %>
+						<li<% if extraClass %> class="$extraClass"<% end_if %>><a href="#$id">$Title</a></li>
+					<% end_loop %>
+					</ul>
+				</div>
+				<% end_with %>
+			<% end_if %>
+		<% end_with %>
 	</div>
 
 	<div class="cms-content-fields center ui-widget-content" data-layout-type="border">
diff --git a/templates/Includes/ReportAdmin_Content.ss b/templates/Includes/ReportAdmin_Content.ss
index c926d375..6c138f2d 100644
--- a/templates/Includes/ReportAdmin_Content.ss
+++ b/templates/Includes/ReportAdmin_Content.ss
@@ -1,19 +1,16 @@
 <div class="cms-content center cms-tabset $BaseCSSClasses" data-layout-type="border" data-pjax-fragment="Content">
 
 	<div class="cms-content-header north">
-		<div>
-			<% with EditForm %>
+		<% with EditForm %>
+			<div class="cms-content-header-info">
 				<% include BackLink_Button %>
-
 				<h2 id="page-title-heading">
 				<% with Controller %>
-					<% include CMSSectionIcon %>
 					<% include CMSBreadcrumbs %>
 				<% end_with %>
 				</h2>
-			<% end_with %>
-		
-		</div>
+			</div>
+		<% end_with %>
 	</div>
 
 	<div class="cms-content-fields center ui-widget-content" data-layout-type="border">