diff --git a/resources/css/style.css b/resources/css/style.css
index 1a5201a3d825f21665bee314d93dd83f2cb536c7..aaff7ac3207db9c7d32586d1d9fa94f898f9f5c4 100644
--- a/resources/css/style.css
+++ b/resources/css/style.css
@@ -53,17 +53,6 @@ footer span{
     line-height:2rem;
 }
 
-/* Alignment classes*/
-.align-center{
-    text-align:center;
-}
-.align-right{
-    text-align:right;
-}
-.align-left{
-    text-align:left;
-}
-
 /* Changes for foundation buttons*/
 button, .button{
     background:#214BB5;
diff --git a/templates/web/en/create_accounts.tt2.html b/templates/web/en/create_accounts.tt2.html
index fe08bb5fbb6c7b6e9d3aa7d86293262cbf1e670b..b7bb9e2d8c2867919e4467dfface46d9e4a4e2f0 100644
--- a/templates/web/en/create_accounts.tt2.html
+++ b/templates/web/en/create_accounts.tt2.html
@@ -26,7 +26,7 @@
                 <td colspan="2"><strong>comment:</strong><div><p>[% account.comment() %]</p></div></td>
             </tr>
             <tr>
-                <td colspan=2 class="align-center" ><button data-open="account_details_[% account.id() %]" class="button show_account_details" id="show_account_details_[% account.id() %]">show account details</button></td>
+                <td colspan=2 class="text-center" ><button data-open="account_details_[% account.id() %]" class="button show_account_details" id="show_account_details_[% account.id() %]">show account details</button></td>
             </tr>
         </table>
     </div>
@@ -61,4 +61,4 @@
     <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>
 
-<p class="align-center"><Strong>Thank you for using the [% app.name %]</strong></p>
+<p class="text-center"><Strong>Thank you for using the [% app.name %]</strong></p>
diff --git a/templates/web/en/home.tt2.html b/templates/web/en/home.tt2.html
index ae33711cf08f62ee296b9a10c31dc395864713e8..1c873db3321a20d2fa76048a21ac5ca2d4ab8561 100644
--- a/templates/web/en/home.tt2.html
+++ b/templates/web/en/home.tt2.html
@@ -9,7 +9,7 @@ federated login. The test accounts can only be used to access own services. <a h
 <h3>Start testing your eduGAIN service</h3>
 <p>To start testing your own eduGAIN service, start by selecting the Service
 Provider you are administrator for.</p>
-<p class="align-center"><a href="?action=select_sp" class="button">Go on testing the service</a></p>
+<p class="text-center"><a href="?action=select_sp" class="button">Go on testing the service</a></p>
 
 <h3>[% app.name %] basics</h3>
 <p>
diff --git a/templates/web/fr/create_accounts.tt2.html b/templates/web/fr/create_accounts.tt2.html
index fe08bb5fbb6c7b6e9d3aa7d86293262cbf1e670b..b7bb9e2d8c2867919e4467dfface46d9e4a4e2f0 100644
--- a/templates/web/fr/create_accounts.tt2.html
+++ b/templates/web/fr/create_accounts.tt2.html
@@ -26,7 +26,7 @@
                 <td colspan="2"><strong>comment:</strong><div><p>[% account.comment() %]</p></div></td>
             </tr>
             <tr>
-                <td colspan=2 class="align-center" ><button data-open="account_details_[% account.id() %]" class="button show_account_details" id="show_account_details_[% account.id() %]">show account details</button></td>
+                <td colspan=2 class="text-center" ><button data-open="account_details_[% account.id() %]" class="button show_account_details" id="show_account_details_[% account.id() %]">show account details</button></td>
             </tr>
         </table>
     </div>
@@ -61,4 +61,4 @@
     <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>
 
-<p class="align-center"><Strong>Thank you for using the [% app.name %]</strong></p>
+<p class="text-center"><Strong>Thank you for using the [% app.name %]</strong></p>
diff --git a/templates/web/fr/home.tt2.html b/templates/web/fr/home.tt2.html
index c883324ed27dcc803944ce28e1c0e3a094f87df8..5c17a0fdafb3bd363db2d1c232a912cb199d9ff4 100644
--- a/templates/web/fr/home.tt2.html
+++ b/templates/web/fr/home.tt2.html
@@ -7,7 +7,7 @@ federated login. The test accounts can only be used to access own services. <a h
 </p>
 <h3>Start testing your eduGAIN service</h3>
 <p>To start testing your own eduGAIN service, start by selecting the Service Provider you are administrator for.</p>
-<p class="align-center"><a href="?action=select_sp" class="button">Go on testing the service</a></p>
+<p class="text-center"><a href="?action=select_sp" class="button">Go on testing the service</a></p>
 
 <h3>[% app.name %] basics</h3>
 <p>