diff --git a/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_EditForm.ss b/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_EditForm.ss
index 0468be07..5afe0d65 100644
--- a/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_EditForm.ss
+++ b/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_EditForm.ss
@@ -1,6 +1,6 @@
 <form $FormAttributes data-layout-type="border">
 
-	<div class="cms-content-fields panel-scrollable panel-scrollable--single-toolbar">
+	<div class="panel panel--padded panel--scrollable panel--single-toolbar cms-content-fields ">
 		<% if $Message %>
 		<p id="{$FormName}_error" class="message $MessageType">$Message</p>
 		<% else %>
diff --git a/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_PreviewPanel.ss b/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_PreviewPanel.ss
index ba3bbca1..7c112d3d 100644
--- a/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_PreviewPanel.ss
+++ b/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_PreviewPanel.ss
@@ -1,6 +1,6 @@
 <div class="cms-preview east" data-layout-type="border">
 	<div class="preview-note"><span><!-- --></span><%t CMSPageHistoryController_versions_ss.PREVIEW 'Website preview' %></div>
-	<div class="panel-scrollable panel-scrollable--single-toolbar">
+	<div class="panel panel--scrollable panel--single-toolbar">
 		<div class="preview-device-outer">
 			<div class="preview-device-inner">
 				<iframe src="about:blank" class="center" name="cms-preview-iframe"></iframe>
diff --git a/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_Tools.ss b/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_Tools.ss
index 8f8825aa..77a291ba 100644
--- a/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_Tools.ss
+++ b/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_Tools.ss
@@ -1,10 +1,10 @@
 <div class="cms-content-tools west cms-panel cms-panel-layout" data-expandOnClick="true" data-layout-type="border" id="cms-content-tools-CMSMain">
-	<div class="panel-scrollable--single-toolbar cms-panel-content center">
+	<div class="panel panel--scrollable panel--single-toolbar cms-panel-content center">
 		<div class="cms-content-filters">
 			$SearchForm
 		</div>
 
-		<div class="cms-content-view cms-tree-view-sidebar cms-panel-deferred" id="cms-content-treeview" data-url="$LinkTreeView">
+		<div class="panel panel--padded cms-content-view cms-tree-view-sidebar cms-panel-deferred" id="cms-content-treeview" data-url="$LinkTreeView">
 			<%-- Lazy-loaded via ajax --%>
 		</div>
 	</div>
diff --git a/templates/SilverStripe/CMS/Controllers/Includes/CMSPageAddController_Content.ss b/templates/SilverStripe/CMS/Controllers/Includes/CMSPageAddController_Content.ss
index b81ba27b..fde670f0 100644
--- a/templates/SilverStripe/CMS/Controllers/Includes/CMSPageAddController_Content.ss
+++ b/templates/SilverStripe/CMS/Controllers/Includes/CMSPageAddController_Content.ss
@@ -13,7 +13,7 @@
 				</div>
 			</div>
 
-			<div class="panel-scrollable panel-scrollable--double-toolbar container-fluid cms-panel-padded">
+			<div class="panel panel--padded panel--scrollable panel--double-toolbar container-fluid cms-panel-padded">
 				<% if $Message %>
 				<p id="{$FormName}_error" class="message $MessageType">$Message</p>
 				<% else %>
diff --git a/templates/SilverStripe/CMS/Controllers/Includes/CMSPagesController_ContentToolActions.ss b/templates/SilverStripe/CMS/Controllers/Includes/CMSPagesController_ContentToolActions.ss
index d8f51017..01436c6e 100644
--- a/templates/SilverStripe/CMS/Controllers/Includes/CMSPagesController_ContentToolActions.ss
+++ b/templates/SilverStripe/CMS/Controllers/Includes/CMSPagesController_ContentToolActions.ss
@@ -1,4 +1,4 @@
-<div class="cms-content-toolbar">
+<div class="toolbar toolbar--content cms-content-toolbar">
 	<div class="cms-actions-buttons-row">
 		<a class="ss-ui-button cms-content-addpage-button tool-button font-icon-plus" href="$LinkPageAdd" data-url-addpage="{$LinkPageAdd('', 'ParentID=%s')}"><% _t('CMSMain.AddNewButton', 'Add new') %></a>