diff --git a/templates/CMSPageEditController_Tools.ss b/templates/CMSPageEditController_Tools.ss
index 030d1cf2..b3ed137a 100644
--- a/templates/CMSPageEditController_Tools.ss
+++ b/templates/CMSPageEditController_Tools.ss
@@ -1,4 +1,4 @@
-<div class="cms-content-tools west cms-panel cms-panel-layout" data-expandOnClick="true" data-layout="{type: 'border'}" id="cms-content-tools-CMSPageEditController">
+<div class="cms-content-tools west cms-panel cms-panel-layout" data-expandOnClick="true" data-layout-type="border" id="cms-content-tools-CMSPageEditController">
 	<div class="cms-content-header cms-panel-header north">
 		<h2><% _t('CMSPageEditController.Title','Pages') %></h2>
 	</div>
diff --git a/templates/Includes/AssetAdmin_Tools.ss b/templates/Includes/AssetAdmin_Tools.ss
index df026e13..6431b873 100644
--- a/templates/Includes/AssetAdmin_Tools.ss
+++ b/templates/Includes/AssetAdmin_Tools.ss
@@ -1,4 +1,4 @@
-<div class="cms-content-tools west cms-panel cms-panel-layout collapsed" id="cms-content-tools" data-expandOnClick="true" data-layout="{type: 'border'}">
+<div class="cms-content-tools west cms-panel cms-panel-layout collapsed" id="cms-content-tools" data-expandOnClick="true" data-layout-type="border">
 	<div class="cms-panel-content center">
 		<h3 class="cms-panel-header"><% _t('FILTER', 'Filter') %></h3>
 		TODO
diff --git a/templates/Includes/AssetAdmin_UploadContent.ss b/templates/Includes/AssetAdmin_UploadContent.ss
index 825d8abd..39752423 100644
--- a/templates/Includes/AssetAdmin_UploadContent.ss
+++ b/templates/Includes/AssetAdmin_UploadContent.ss
@@ -1,4 +1,4 @@
-<div class="cms-content center ss-tabset $BaseCSSClasses" data-layout="{type: 'border'}">
+<div class="cms-content center ss-tabset $BaseCSSClasses" data-layout-type="border">
 
 	<div class="cms-content-header north">
 		<div>
diff --git a/templates/Includes/CMSPageAddController_Content.ss b/templates/Includes/CMSPageAddController_Content.ss
index f64d24f4..d5d76210 100644
--- a/templates/Includes/CMSPageAddController_Content.ss
+++ b/templates/Includes/CMSPageAddController_Content.ss
@@ -1,5 +1,5 @@
 <% with AddForm %>
-	<form $FormAttributes data-layout="{type: 'border'}">
+	<form $FormAttributes data-layout-type="border">
 
 		<div class="cms-content-header north">
 			<div>
diff --git a/templates/Includes/CMSPageHistoryController_Tools.ss b/templates/Includes/CMSPageHistoryController_Tools.ss
index 544b7f4b..de7766bb 100644
--- a/templates/Includes/CMSPageHistoryController_Tools.ss
+++ b/templates/Includes/CMSPageHistoryController_Tools.ss
@@ -1,4 +1,4 @@
-<div class="cms-content-tools west cms-panel cms-panel-layout" data-expandOnClick="true" data-layout="{type: 'border'}" id="cms-content-tools-CMSPageHistoryController">
+<div class="cms-content-tools west cms-panel cms-panel-layout" data-expandOnClick="true" data-layout-type="border" id="cms-content-tools-CMSPageHistoryController">
 	<div class="cms-content-header north">
 		<div>
 			<h2><% _t('CMSPageHistoryController.History','History') %></h2>
diff --git a/templates/Includes/CMSPagesController_Content.ss b/templates/Includes/CMSPagesController_Content.ss
index c76a67c0..b6e3fb05 100644
--- a/templates/Includes/CMSPagesController_Content.ss
+++ b/templates/Includes/CMSPagesController_Content.ss
@@ -1,4 +1,4 @@
-<div class="cms-content center ss-tabset $BaseCSSClasses" data-layout="{type: 'border'}">
+<div class="cms-content center ss-tabset $BaseCSSClasses" data-layout-type="border">
 
 	<div class="cms-content-header north">
 		<div>
diff --git a/templates/Includes/CMSPagesController_ContentToolbar.ss b/templates/Includes/CMSPagesController_ContentToolbar.ss
index 82916fc7..d5f4892e 100644
--- a/templates/Includes/CMSPagesController_ContentToolbar.ss
+++ b/templates/Includes/CMSPagesController_ContentToolbar.ss
@@ -12,8 +12,8 @@
 	</div>
 </div>
 
-<div class="cms-content-constructive-actions">
-	<a class="ss-ui-button ss-ui-action-constructive cms-page-add-button" href="#cms-page-add-form"><% _t('CMSMain.AddNewButton', 'Add new') %></a>
+<div class="cms-actions-row">
+	<a class="ss-ui-button ss-ui-action-constructive icon-add" href="#cms-page-add-form"><% _t('CMSMain.AddNewButton', 'Add new') %></a>
 </div>
 
 <div class="cms-content-batchactions">
diff --git a/templates/Includes/CMSPagesController_Tools.ss b/templates/Includes/CMSPagesController_Tools.ss
index 05c00e76..477ea3b4 100644
--- a/templates/Includes/CMSPagesController_Tools.ss
+++ b/templates/Includes/CMSPagesController_Tools.ss
@@ -1,4 +1,4 @@
-<div class="cms-content-tools west cms-panel cms-panel-layout collapsed" id="cms-content-tools" data-expandOnClick="true" data-layout="{type: 'border'}" id="cms-content-tools-CMSPagesController">
+<div class="cms-content-tools west cms-panel cms-panel-layout collapsed" id="cms-content-tools" data-expandOnClick="true" data-layout-type="border" id="cms-content-tools-CMSPagesController">
 	<div class="cms-panel-content center">
 		<h3 class="cms-panel-header"><% _t('FILTER', 'Filter') %></h3>
 		$SearchForm
diff --git a/templates/Includes/ReportAdmin_Content.ss b/templates/Includes/ReportAdmin_Content.ss
index 18518e90..7315f2d3 100644
--- a/templates/Includes/ReportAdmin_Content.ss
+++ b/templates/Includes/ReportAdmin_Content.ss
@@ -1,4 +1,4 @@
-<div class="cms-content center $BaseCSSClasses" data-layout="{type: 'border'}">
+<div class="cms-content center $BaseCSSClasses" data-layout-type="border">
 
 	<div class="cms-content-header north">
 		<h2><% _t('REPORTS','Reports') %></h2>