diff --git a/modules/core/templates/loginuserpass.twig b/modules/core/templates/loginuserpass.twig
index f90ce56a02c33482e7d51702026434cf64095f4c..297a72f6d89887e06ffe73860bcddbaca37acd57 100644
--- a/modules/core/templates/loginuserpass.twig
+++ b/modules/core/templates/loginuserpass.twig
@@ -12,7 +12,7 @@
     {% if errorcode %}
     <div class="pure-g">
         <div class="pure-u-1">
-            <div class="errorbox b-radius">
+            <div class="message-box error">
 
                 {% set errtitles = errorcodes['title'] %}
                 {% set errtitle = errtitles[errorcode] %}
diff --git a/modules/sanitycheck/templates/check.twig b/modules/sanitycheck/templates/check.twig
index d3e6bd75d2f4c1db7a057e0c76734bac1e65a926..fe51f41809cade804ccfcb83bdd5eb9b3dccfa8a 100644
--- a/modules/sanitycheck/templates/check.twig
+++ b/modules/sanitycheck/templates/check.twig
@@ -6,7 +6,7 @@
 
 {% if errors %}
 
-<div class="errorbox">
+<div class="message-box error">
     <div class="pure-g">
         <div class="pure-u-1-12">
             <span class="fa fa-times-circle fa-2x"></span>
@@ -25,7 +25,7 @@
 {% endif %}
 
 {% if info %}
-<div class="successbox">
+<div class="message-box success">
     <div class="pure-g">
         <div class="pure-u-1-12">
             <span class="fa fa-check fa-2x"> </span>
diff --git a/www/assets/css/src/default-rtl.css b/www/assets/css/src/default-rtl.css
index 473de00c6087cd4d6f905b3edf7884f6c4c6569d..801ef350256b8a79f1b6de284e19625bf15813f3 100644
--- a/www/assets/css/src/default-rtl.css
+++ b/www/assets/css/src/default-rtl.css
@@ -86,20 +86,17 @@ fieldset.fancyfieldset legend {
 	left:0;
 	right: auto;
 }
-.errorbox {
+.message-box {
 	border-left-style: initial;
 	border-left-width: 0;
 	border-left-color: none;
 	border-right-style: solid;
 	border-right-width: 0.3125rem;
+}
+.message-box.error{
 	border-right-color: #cc4b37;
 }
-.successbox{
-	border-left-style: initial;
-	border-left-width: 0;
-	border-left-color: none;
-	border-right-style: solid;
-	border-right-width: 0.3125rem;
+.message-box.success{
 	border-right-color: #46cc48;
 }
 
diff --git a/www/assets/css/src/default.css b/www/assets/css/src/default.css
index 328fa2e94346495199cb314d13813520bd967a92..1387cf4949bff6c4d9fde588c155a40756159178 100644
--- a/www/assets/css/src/default.css
+++ b/www/assets/css/src/default.css
@@ -121,25 +121,22 @@ CONTENT
     padding-top: 2em;
     padding-bottom: 4rem;
 }
-.errorbox {
-    padding: 1.3rem;
-    margin: 0 0 1rem 0;
-    background-color: #f7e4e1;
+
+.message-box {
     border-left-style: solid;
     border-left-width: 0.3125rem;
-    border-left-color: #cc4b37;
-    position: relative;
     box-shadow: 0 5px 8px -6px rgba(0, 0, 0, 0.2);
-}
-.successbox{
-    padding: 1.3rem;
     margin: 0 0 1rem 0;
+    padding: 1.3rem;
+    position: relative;
+}
+.message-box.error {
+    background-color: #f7e4e1;
+    border-left-color: #cc4b37;
+}
+.message-box.success {
     background-color: #daf7e6;
-    border-left-style: solid;
-    border-left-width: 0.3125rem;
     border-left-color: #46cc48;
-    position: relative;
-    box-shadow: 0 5px 8px -6px rgba(0, 0, 0, 0.2);
 }
 
 .auth_methods{