diff --git a/resources/css/style.css b/resources/css/style.css
index 2fdaeae1965877a54bb3c6261da39fc00d50171b..64106bff0dbbf3edeb299030d7afa2a68fda9c22 100644
--- a/resources/css/style.css
+++ b/resources/css/style.css
@@ -46,15 +46,6 @@ button:hover, .button:hover{
     color:hsl(223,69%,42%);
 }
 
-.alert-box{
-    margin-left:auto;
-    margin-right:auto;
-}
-.alert-box.radius{
-    border-radius:5px;
-}
-
-
 /* CUSTOM WIZARD*/
 .wizard > .steps .current a, .wizard > .steps .current a:hover, .wizard > .steps .current a:active {
     background: none repeat scroll 0% 0% #214BB5;
diff --git a/templates/web/en/create_accounts.tt2.html b/templates/web/en/create_accounts.tt2.html
index b7bb9e2d8c2867919e4467dfface46d9e4a4e2f0..472eac0fd615b57e78307ec398722418bb7acb76 100644
--- a/templates/web/en/create_accounts.tt2.html
+++ b/templates/web/en/create_accounts.tt2.html
@@ -1,16 +1,11 @@
-<div class="row">
-
-
-    <div class="alert-box success radius">
+<div class="callout success">
     <strong>Success:</strong> Your identity as administrator of the Service Provider with entityID <strong>[% entityid %]</strong> could successfully be validated!
-    </div>
-
-    <h3>The following test accounts with different profiles were created for you:</h3>
-
-            <p>You can now use these test accounts to login at your federated service.<br/>
-    <strong>To do so, select the "[% idp_displayname %]" when choosing an organisation to login at.</strong></p>
 </div>
 
+<h3>The following test accounts with different profiles were created for you:</h3>
+<p>You can now use these test accounts to login at your federated service.<br/>
+<strong>To do so, select the "[% idp_displayname %]" when choosing an organisation to login at.</strong></p>
+
 <div class="accounts_profile">
     [% FOREACH account IN accounts %]
     <div class="tbl">
@@ -51,13 +46,13 @@
             </table>
         </div>
 
-        <div class="alert-box info radius">If you need a customized test account with additional user attributes, you should contact <a href="mailto:[% app.support_email %]">[% app.support_email %]</a>.</div>
+        <div class="callout info">If you need a customized test account with additional user attributes, you should contact <a href="mailto:[% app.support_email %]">[% app.support_email %]</a>.</div>
         <div>(1) eduPersonAffiliation and eduPersonScoppedAffilisation attributes are assigned quite differently from federation to federation. <a href="http://tnc2010.terena.org/files/ePSA%20comparison%20v0%2006.ppt">This usage comparison of eduPersonAffiliation accross different countries</a> discusses these differences. Therefore its values should be handled with great care.</div>
     </div>
     [% END %]
 </div>
 
-<div class="alert-box warning radius">
+<div class="callout warning">
     <p>Note that these test accounts will automatically expire in [% accounts_validity_period %] days and that they can only be used to test federated login to your eduGAIN-enabled Service Provider with entityID <strong>[% entityid %]</strong>.</p>
 </div>
 
diff --git a/templates/web/fr/create_accounts.tt2.html b/templates/web/fr/create_accounts.tt2.html
index b7bb9e2d8c2867919e4467dfface46d9e4a4e2f0..472eac0fd615b57e78307ec398722418bb7acb76 100644
--- a/templates/web/fr/create_accounts.tt2.html
+++ b/templates/web/fr/create_accounts.tt2.html
@@ -1,16 +1,11 @@
-<div class="row">
-
-
-    <div class="alert-box success radius">
+<div class="callout success">
     <strong>Success:</strong> Your identity as administrator of the Service Provider with entityID <strong>[% entityid %]</strong> could successfully be validated!
-    </div>
-
-    <h3>The following test accounts with different profiles were created for you:</h3>
-
-            <p>You can now use these test accounts to login at your federated service.<br/>
-    <strong>To do so, select the "[% idp_displayname %]" when choosing an organisation to login at.</strong></p>
 </div>
 
+<h3>The following test accounts with different profiles were created for you:</h3>
+<p>You can now use these test accounts to login at your federated service.<br/>
+<strong>To do so, select the "[% idp_displayname %]" when choosing an organisation to login at.</strong></p>
+
 <div class="accounts_profile">
     [% FOREACH account IN accounts %]
     <div class="tbl">
@@ -51,13 +46,13 @@
             </table>
         </div>
 
-        <div class="alert-box info radius">If you need a customized test account with additional user attributes, you should contact <a href="mailto:[% app.support_email %]">[% app.support_email %]</a>.</div>
+        <div class="callout info">If you need a customized test account with additional user attributes, you should contact <a href="mailto:[% app.support_email %]">[% app.support_email %]</a>.</div>
         <div>(1) eduPersonAffiliation and eduPersonScoppedAffilisation attributes are assigned quite differently from federation to federation. <a href="http://tnc2010.terena.org/files/ePSA%20comparison%20v0%2006.ppt">This usage comparison of eduPersonAffiliation accross different countries</a> discusses these differences. Therefore its values should be handled with great care.</div>
     </div>
     [% END %]
 </div>
 
-<div class="alert-box warning radius">
+<div class="callout warning">
     <p>Note that these test accounts will automatically expire in [% accounts_validity_period %] days and that they can only be used to test federated login to your eduGAIN-enabled Service Provider with entityID <strong>[% entityid %]</strong>.</p>
 </div>