diff --git a/src/Umbraco.Web.UI.Client/src/views/datatypes/move.html b/src/Umbraco.Web.UI.Client/src/views/datatypes/move.html
index f05b8a6c79..0546cbff44 100644
--- a/src/Umbraco.Web.UI.Client/src/views/datatypes/move.html
+++ b/src/Umbraco.Web.UI.Client/src/views/datatypes/move.html
@@ -12,12 +12,16 @@
             </div>
 
             <div ng-show="error">
-                <h5 class="text-error">{{error.errorMsg}}</h5>
-                <p class="text-error">{{error.data.message}}</p>
+                <div class="alert alert-error">
+                    <div><strong>{{error.errorMsg}}</strong></div>
+                    <div>{{error.data.message}}</div>
+                </div>
             </div>
 
             <div ng-show="success">
-                <h5 class="text-success"><strong>{{currentNode.name}}</strong> <localize key="editdatatype_wasMoved">was moved underneath</localize>&nbsp;<strong>{{target.name}}</strong></h5>
+                <div class="alert alert-success">
+                    <strong>{{currentNode.name}}</strong> <localize key="editdatatype_wasMoved">was moved underneath</localize>&nbsp;<strong>{{target.name}}</strong>
+                </div>
                 <button class="btn btn-primary" ng-click="nav.hideDialog()">Ok</button>
             </div>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/datatypes/rename.html b/src/Umbraco.Web.UI.Client/src/views/datatypes/rename.html
index 6840e58565..ec93009a4c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/datatypes/rename.html
+++ b/src/Umbraco.Web.UI.Client/src/views/datatypes/rename.html
@@ -7,8 +7,10 @@
               val-form-manager>
 
             <div ng-show="error">
-                <h5 class="text-error">{{error.errorMsg}}</h5>
-                <p class="text-error">{{error.data.message}}</p>
+                <div class="alert alert-error">
+                    <div><strong>{{error.errorMsg}}</strong></div>
+                    <div>{{error.data.message}}</div>
+                </div>
             </div>
 
             <umb-control-group label="@renamecontainer_enterNewFolderName" hide-label="false">
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/copy.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/copy.html
index 2976f65917..97de821909 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/copy.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/copy.html
@@ -12,13 +12,16 @@
             </div>
 
             <div ng-show="error">
-                <h5 class="text-error">{{error.errorMsg}}</h5>
-                <p class="text-error">{{error.data.message}}</p>
+                <div class="alert alert-error">
+                    <div><strong>{{error.errorMsg}}</strong></div>
+                    <div>{{error.data.message}}</div>
+                </div>
             </div>
 
             <div ng-show="success">
-                <h5 class="text-success">
-                    <strong>{{currentNode.name}}</strong> <localize key="contentTypeEditor_copiedUnderneath">was copied underneath</localize>&nbsp;<strong>{{target.name}}</strong></h5>
+                <div class="alert alert-success">
+                    <strong>{{currentNode.name}}</strong> <localize key="contentTypeEditor_copiedUnderneath">was copied underneath</localize>&nbsp;<strong>{{target.name}}</strong>
+                </div>
                 <button class="btn btn-primary" ng-click="nav.hideDialog()">Ok</button>
             </div>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html
index 3519195848..b4818a51ab 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html
@@ -50,8 +50,10 @@
               val-form-manager>
 
             <div ng-show="error">
-                <h5 class="text-error">{{error.errorMsg}}</h5>
-                <p class="text-error">{{error.data.message}}</p>
+                <div class="alert alert-error">
+                    <div><strong>{{error.errorMsg}}</strong></div>
+                    <div>{{error.data.message}}</div>
+                </div>
             </div>
 
             <umb-control-group label="Enter a folder name" hide-label="false">
@@ -74,8 +76,10 @@
               val-form-manager>
 
             <div ng-show="error">
-                <h5 class="text-error">{{error.errorMsg}}</h5>
-                <p class="text-error">{{error.data.message}}</p>
+                <div class="alert alert-error">
+                    <div><strong>{{error.errorMsg}}</strong></div>
+                    <div>{{error.data.message}}</div>
+                </div>
             </div>
 
             <umb-control-group label="Name of the Parent Document Type" hide-label="false">
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/move.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/move.html
index 1ed224b5ba..0af4cbfda7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/move.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/move.html
@@ -12,13 +12,16 @@
             </div>
 
             <div ng-show="error">
-                <h5 class="text-error">{{error.errorMsg}}</h5>
-                <p class="text-error">{{error.data.message}}</p>
+                <div class="alert alert-error">
+                    <div><strong>{{error.errorMsg}}</strong></div>
+                    <div>{{error.data.message}}</div>
+                </div>
             </div>
 
             <div ng-show="success">
-                <h5 class="text-success">
-                    <strong>{{currentNode.name}}</strong> <localize key="contentTypeEditor_movedUnderneath">was moved underneath</localize>&nbsp;<strong>{{target.name}}</strong></h5>
+                <div class="alert alert-success">
+                    <strong>{{currentNode.name}}</strong> <localize key="contentTypeEditor_movedUnderneath">was moved underneath</localize>&nbsp;<strong>{{target.name}}</strong>
+                </div>
                 <button class="btn btn-primary" ng-click="nav.hideDialog()">Ok</button>
             </div>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/rename.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/rename.html
index f739cadb71..c52b3be6d6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/rename.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/rename.html
@@ -6,8 +6,10 @@
               val-form-manager>
 
             <div ng-show="error">
-                <h5 class="text-error">{{error.errorMsg}}</h5>
-                <p class="text-error">{{error.data.message}}</p>
+                <div class="alert alert-error">
+                    <div><strong>{{error.errorMsg}}</strong></div>
+                    <div>{{error.data.message}}</div>
+                </div>
             </div>
 
             <umb-control-group label="@renamecontainer_enterNewFolderName" hide-label="false">
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/copy.html b/src/Umbraco.Web.UI.Client/src/views/mediatypes/copy.html
index fcc26b9928..77f50358c3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/copy.html
+++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/copy.html
@@ -12,13 +12,16 @@
             </div>
 
             <div ng-show="error">
-                <h5 class="text-error">{{error.errorMsg}}</h5>
-                <p class="text-error">{{error.data.message}}</p>
+                <div class="alert alert-error">
+                    <div><strong>{{error.errorMsg}}</strong></div>
+                    <div>{{error.data.message}}</div>
+                </div>
             </div>
 
             <div ng-show="success">
-                <h5 class="text-success">
-                    <strong>{{currentNode.name}}</strong> <localize key="contentTypeEditor_copiedUnderneath">was copied underneath</localize>&nbsp;<strong>{{target.name}}</strong></h5>
+                <div class="alert alert-success">
+                    <strong>{{currentNode.name}}</strong> <localize key="contentTypeEditor_copiedUnderneath">was copied underneath</localize>&nbsp;<strong>{{target.name}}</strong>
+                </div>
                 <button class="btn btn-primary" ng-click="nav.hideDialog()">Ok</button>
             </div>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/move.html b/src/Umbraco.Web.UI.Client/src/views/mediatypes/move.html
index 18f7aee337..c240925a7d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/move.html
+++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/move.html
@@ -12,12 +12,16 @@
             </div>
 
             <div ng-show="error">
-                <h5 class="text-error">{{error.errorMsg}}</h5>
-                <p class="text-error">{{error.data.message}}</p>
+                <div class="alert alert-error">
+                    <div><strong>{{error.errorMsg}}</strong></div>
+                    <div>{{error.data.message}}</div>
+                </div>
             </div>
 
             <div ng-show="success">
-                <h5 class="text-success"><strong>{{currentNode.name}}</strong> <localize key="contentTypeEditor_movedUnderneath">was moved underneath</localize>&nbsp;<strong>{{target.name}}</strong></h5>
+                <div class="alert alert-success">
+                    <strong>{{currentNode.name}}</strong> <localize key="contentTypeEditor_movedUnderneath">was moved underneath</localize>&nbsp;<strong>{{target.name}}</strong>
+                </div>
                 <button class="btn btn-primary" ng-click="nav.hideDialog()">Ok</button>
             </div>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/rename.html b/src/Umbraco.Web.UI.Client/src/views/mediatypes/rename.html
index 5f027cf607..0bc4aa5123 100644
--- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/rename.html
+++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/rename.html
@@ -6,8 +6,10 @@
               val-form-manager>
 
             <div ng-show="error">
-                <h5 class="text-error">{{error.errorMsg}}</h5>
-                <p class="text-error">{{error.data.message}}</p>
+                <div class="alert alert-error">
+                    <div><strong>{{error.errorMsg}}</strong></div>
+                    <div>{{error.data.message}}</div>
+                </div>
             </div>
 
             <umb-control-group label="@renamecontainer_enterNewFolderName" hide-label="false">
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html
index febaaab646..e2c7ab0af6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html
@@ -61,8 +61,10 @@
                     val-form-manager>
 
                 <div ng-show="vm.createFolderError">
-                    <h5 class="text-error">{{vm.createFolderError.errorMsg}}</h5>
-                    <p class="text-error">{{vm.createFolderError.data.message}}</p>
+                    <div class="alert alert-error">
+                        <div><strong>{{vm.createFolderError.errorMsg}}</strong></div>
+                        <div>{{vm.createFolderError.data.message}}</div>
+                    </div>
                 </div>
 
                 <umb-control-group label="Enter a folder name" hide-label="false">
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html b/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html
index 7dc4268ce1..4d15ab6c01 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html
@@ -51,8 +51,10 @@
                     val-form-manager>
                 
                 <div ng-show="vm.createFolderError">
-                    <h5 class="text-error">{{vm.createFolderError.errorMsg}}</h5>
-                    <p class="text-error">{{vm.createFolderError.data.message}}</p>
+                    <div class="alert alert-error">
+                        <div><strong>{{vm.createFolderError.errorMsg}}</strong></div>
+                        <div>{{vm.createFolderError.data.message}}</div>
+                    </div>
                 </div>
 
                 <umb-control-group label="Enter a folder name" hide-label="false">
diff --git a/src/Umbraco.Web.UI.Client/src/views/scripts/create.html b/src/Umbraco.Web.UI.Client/src/views/scripts/create.html
index f7d8b0382d..6cda42f21a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/scripts/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/scripts/create.html
@@ -26,8 +26,10 @@
               val-form-manager>
             
             <div ng-show="vm.createFolderError">
-                <h5 class="text-error">{{vm.createFolderError.errorMsg}}</h5>
-                <p class="text-error">{{vm.createFolderError.data.message}}</p>
+                <div class="alert alert-error">
+                    <div><strong>{{vm.createFolderError.errorMsg}}</strong></div>
+                    <div>{{vm.createFolderError.data.message}}</div>
+                </div>
             </div>
 
             <umb-control-group label="Enter a folder name" hide-label="false">