diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
index 2363765509..cc2d27f5a0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
@@ -85,11 +85,11 @@ $(document).ready(function() {
 
 [% IF error_claim %]
     [% IF ( error_claim == "no_email" ) %]
-        <div class="error">This vendor has no email</div>
+        <div class="dialog alert">This vendor has no email</div>
     [% ELSIF ( error_claim == "no_order_selected" ) %]
-        <div class="error">No order selected</div>
+        <div class="dialog alert">No order selected</div>
     [% ELSE %]
-        <div class="error">[% error_claim %]</div>
+        <div class="dialog alert">[% error_claim | html %]</div>
     [% END %]
 [% END %]
 [% IF info_claim %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
index 8087554285..14259623b9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
@@ -219,7 +219,7 @@ $(document).ready(function()
     [% END %]
 </h2>
 
-<div class="error" style="display:none"></div>
+<div class="dialog alert order_error" style="display:none"></div>
 
 [% IF ( basketno ) %]
     <div id="acqui_basket_summary"  class="yui-g">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
index 07aecdb5cf..a21a4c531c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
@@ -139,7 +139,7 @@
     <form action="/cgi-bin/koha/acqui/finishreceive.pl" method="post" onsubmit="return Check(this);">
 <div class="yui-g">
 <div class="yui-u first">
-    <div class="error" style="display:none"></div>
+    <div class="dialog alert order_error" style="display:none"></div>
 
     <fieldset class="rows">
     <legend>Catalog details</legend>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
index 36374137c4..4255f1dc76 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
@@ -286,7 +286,7 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget")
 [% UNLESS op == 'delete_confirm' %][% INCLUDE 'budgets-admin-toolbar.inc' %][% END %]
 
 [% IF (error_not_authorised_to_modify) %]
-    <div class="error">
+    <div class="dialog alert">
         <p>You are not authorized to modify this fund</p>
     </div>
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt
index 5a1ee8003e..5807b64fce 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt
@@ -87,11 +87,11 @@ a.add, a.delete {
     [% END %]
 
     <h1>Search engine configuration</h1>
-    <div class="warning">
+    <div class="dialog message">
         Warning: Any changes to the configuration will only take effect after a full reindex. Until then searching may not work correctly.
     </div>
     [% IF errors %]
-        <div class="error">
+        <div class="dialog alert">
         Changes have not been applied. Please check the following values:
           <ul>
             [% FOREACH e IN errors %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
index beab664fa4..af842410b9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -148,9 +148,9 @@ $(document).ready(function() {
 	<div class="yui-b">
     [% IF error_alert %]
         [% IF ( error_alert == "no_email" ) %]
-            <div class="error">This member has no email</div>
+            <div class="dialog alert">This member has no email</div>
         [% ELSE %]
-            <div class="error">[% error_alert %]</div>
+            <div class="dialog alert">[% error_alert | html %]</div>
         [% END %]
     [% END %]
     [% IF info_alert %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt
index 29b9d752b7..b2d43d2073 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt
@@ -85,11 +85,15 @@
                                         [% plugin.metadata.description %]
 
                                         [% IF ( plugin.metadata.minimum_version && koha_version < plugin.metadata.minimum_version ) %]
-                                            <div class="error">Warning: This report was written for a newer version of Koha. Run at your own risk.</div>
+                                            <div class="dialog alert">
+                                                Warning: This report was written for a newer version of Koha. Run at your own risk.
+                                            </div>
                                         [% END %]
 
                                         [% IF ( plugin.metadata.maximum_version && koha_version > plugin.metadata.maximum_version ) %]
-                                            <div class="error">Warning: This report was written for an older version of Koha. Run at your own risk.</div>
+                                            <div class="dialog alert">
+                                                Warning: This report was written for an older version of Koha. Run at your own risk.
+                                            </div>
                                         [% END %]
                                     </td>
                                     <td>[% plugin.metadata.author %]</td>
diff --git a/koha-tmpl/intranet-tmpl/prog/js/additem.js b/koha-tmpl/intranet-tmpl/prog/js/additem.js
index 6e4bf33444..78b5780a7b 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/additem.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/additem.js
@@ -249,7 +249,7 @@ function check_additem(unique_item_fields) {
     data['field'] = new Array();
     data['value'] = new Array();
     var array_fields = unique_item_fields.split(' ');
-    $(".error").empty(); // Clear error div
+    $(".order_error").empty(); // Clear error div
 
     // Check if a value is duplicated in form
     for ( field in array_fields ) {
@@ -270,7 +270,7 @@ function check_additem(unique_item_fields) {
         var sorted_arr = values.sort();
         for (var i = 0; i < sorted_arr.length - 1; i += 1) {
             if (sorted_arr[i + 1] == sorted_arr[i]) {
-                $(".error").append(
+                $(".order_error").append(
                     fieldname + " '" + sorted_arr[i] + "' "
                     + (window.MSG_ADDITEM_JS_IS_DUPLICATE || "is duplicated")
                     + "<br/>");
@@ -281,7 +281,7 @@ function check_additem(unique_item_fields) {
 
     // If there is a duplication, we raise an error
     if ( success == false ) {
-        $(".error").show();
+        $(".order_error").show();
         return false;
     }
 
@@ -295,7 +295,7 @@ function check_additem(unique_item_fields) {
                 success = false;
                 for (var i=0; i < data[field].length; i++) {
                     var value = data[field][i];
-                    $(".error").append(
+                    $(".order_error").append(
                         field + " '" + value + "' "
                         + (window.MSG_ADDITEM_JS_ALREADY_EXISTS_IN_DB
                             || "already exists in database")
@@ -307,7 +307,7 @@ function check_additem(unique_item_fields) {
     });
 
     if ( success == false ) {
-        $(".error").show();
+        $(".order_error").show();
     }
     return success;
 }