diff --git a/admin/client/dist/images/textures/bg_cms_main_content.png b/admin/client/dist/images/textures/bg_cms_main_content.png
deleted file mode 100644
index ce265dba1..000000000
Binary files a/admin/client/dist/images/textures/bg_cms_main_content.png and /dev/null differ
diff --git a/admin/client/dist/images/textures/cms_content_header.png b/admin/client/dist/images/textures/cms_content_header.png
deleted file mode 100644
index d815a2654..000000000
Binary files a/admin/client/dist/images/textures/cms_content_header.png and /dev/null differ
diff --git a/admin/client/dist/js/bundle.js b/admin/client/dist/js/bundle.js
index f39c83595..780c46554 100644
--- a/admin/client/dist/js/bundle.js
+++ b/admin/client/dist/js/bundle.js
@@ -327,6 +327,7 @@ t&&e.push("btn-"+t),"string"!=typeof this.props.title&&e.push("btn--no-text")
 var n=this.getIcon()
 return n&&e.push("font-icon-"+n),this.props.loading&&e.push("btn--loading"),this.props.disabled&&e.push("disabled"),"string"==typeof this.props.extraClass&&e.push(this.props.extraClass),e.join(" ")}},{
 key:"getButtonStyle",value:function d(){if("undefined"!=typeof this.props.data.buttonStyle)return this.props.data.buttonStyle
+if("undefined"!=typeof this.props.buttonStyle)return this.props.buttonStyle
 var e=this.props.extraClass.split(" ")
 return e.find(function(e){return e.indexOf("btn-")>-1})?null:"action_save"===this.props.name||e.find(function(e){return"ss-ui-action-constructive"===e})?"primary":"secondary"}},{key:"getIcon",value:function f(){
 return this.props.icon||this.props.data.icon||null}},{key:"getLoadingIcon",value:function p(){return this.props.loading?c["default"].createElement("div",{className:"btn__loading-icon"},c["default"].createElement("span",{
@@ -2571,8 +2572,8 @@ className:c.join(" ")},u),h["default"].createElement("div",{className:"toolbar t
 },{key:"renderButtonToolbar",value:function p(){var e=this.getItems()
 if(!e||!e.length)return h["default"].createElement("div",{className:"btn-toolbar"})
 var t={}
-return"open"===this.props.record.State?t=c(t,{title:$["default"]._t("Campaigns.PUBLISHCAMPAIGN"),bootstrapButtonStyle:"primary",loading:this.props.campaign.isPublishing,handleClick:this.handlePublish,icon:"rocket"
-}):"published"===this.props.record.State&&(t=c(t,{title:$["default"]._t("Campaigns.REVERTCAMPAIGN"),bootstrapButtonStyle:"secondary-outline",icon:"back-in-time",disabled:!0})),h["default"].createElement("div",{
+return"open"===this.props.record.State?t=c(t,{title:$["default"]._t("Campaigns.PUBLISHCAMPAIGN"),buttonStyle:"primary",loading:this.props.campaign.isPublishing,handleClick:this.handlePublish,icon:"rocket"
+}):"published"===this.props.record.State&&(t=c(t,{title:$["default"]._t("Campaigns.REVERTCAMPAIGN"),buttonStyle:"secondary-outline",icon:"back-in-time",disabled:!0})),h["default"].createElement("div",{
 className:"btn-toolbar"},h["default"].createElement(F["default"],t))}},{key:"getItems",value:function m(){return this.props.record&&this.props.record._embedded?this.props.record._embedded.items:null}},{
 key:"groupItemsForSet",value:function g(){var e={},t=this.getItems()
 return t?(t.forEach(function(t){var n=t.BaseClass
diff --git a/admin/client/src/components/FormAction/FormAction.js b/admin/client/src/components/FormAction/FormAction.js
index e1f38aa0b..f19c58b2a 100644
--- a/admin/client/src/components/FormAction/FormAction.js
+++ b/admin/client/src/components/FormAction/FormAction.js
@@ -46,6 +46,7 @@ class FormAction extends SilverStripeComponent {
 
     // Add 'type' class
     const style = this.getButtonStyle();
+
     if (style) {
       buttonClasses.push(`btn-${style}`);
     }
@@ -89,6 +90,10 @@ class FormAction extends SilverStripeComponent {
       return this.props.data.buttonStyle;
     }
 
+    if (typeof this.props.buttonStyle !== 'undefined') {
+      return this.props.buttonStyle;
+    }
+
     const extraClasses = this.props.extraClass.split(' ');
 
     // defined their own `btn-${something}` class
diff --git a/admin/client/src/containers/CampaignAdmin/CampaignAdminList.js b/admin/client/src/containers/CampaignAdmin/CampaignAdminList.js
index 58f42c70d..c10f7cc86 100644
--- a/admin/client/src/containers/CampaignAdmin/CampaignAdminList.js
+++ b/admin/client/src/containers/CampaignAdmin/CampaignAdminList.js
@@ -204,7 +204,7 @@ class CampaignAdminList extends SilverStripeComponent {
     if (this.props.record.State === 'open') {
       actionProps = Object.assign(actionProps, {
         title: i18n._t('Campaigns.PUBLISHCAMPAIGN'),
-        bootstrapButtonStyle: 'primary',
+        buttonStyle: 'primary',
         loading: this.props.campaign.isPublishing,
         handleClick: this.handlePublish,
         icon: 'rocket',
@@ -213,7 +213,7 @@ class CampaignAdminList extends SilverStripeComponent {
       // TODO Implement "revert" feature
       actionProps = Object.assign(actionProps, {
         title: i18n._t('Campaigns.REVERTCAMPAIGN'),
-        bootstrapButtonStyle: 'secondary-outline',
+        buttonStyle: 'secondary-outline',
         icon: 'back-in-time',
         disabled: true,
       });
diff --git a/admin/client/src/sprites/menu-icons/16x16/db.png b/admin/client/src/sprites/menu-icons/16x16/db.png
index 4675fe08a..f3eb44e57 100644
Binary files a/admin/client/src/sprites/menu-icons/16x16/db.png and b/admin/client/src/sprites/menu-icons/16x16/db.png differ
diff --git a/templates/SilverStripe/Forms/GridField/GridFieldImportButton_Modal.ss b/templates/SilverStripe/Forms/GridField/GridFieldImportButton_Modal.ss
index fca0236e2..e8de94d62 100644
--- a/templates/SilverStripe/Forms/GridField/GridFieldImportButton_Modal.ss
+++ b/templates/SilverStripe/Forms/GridField/GridFieldImportButton_Modal.ss
@@ -11,9 +11,5 @@
                 $ImportForm
             <% end_if %>
         </div>
-
-        <div class="modal-footer">
-            <button type="button" class="btn btn-secondary-outline font-icon-check-mark" data-dismiss="modal"><%t GridField.DONE 'Done' %></button>
-        </div>
     </div>
 </div>