diff --git a/client/res/templates/admin/field-manager/list.tpl b/client/res/templates/admin/field-manager/list.tpl
index 68153b4038..b9e019d5c4 100644
--- a/client/res/templates/admin/field-manager/list.tpl
+++ b/client/res/templates/admin/field-manager/list.tpl
@@ -45,7 +45,7 @@
         </td>
         <td>{{translate name scope=../scope category='fields'}}</td>
         <td>{{translate type category='fieldTypes' scope='Admin'}}</td>
-        <td align="right">
+        <td style="text-align: right">
             {{#if isCustom}}
             <a role="button" tabindex="0" data-action="removeField" data-name="{{name}}">{{translate 'Remove'}}</a>
             {{/if}}
diff --git a/client/res/templates/record/merge.tpl b/client/res/templates/record/merge.tpl
index 03797f7e04..3d5fabfdc7 100644
--- a/client/res/templates/record/merge.tpl
+++ b/client/res/templates/record/merge.tpl
@@ -23,7 +23,7 @@
         <tbody>
             {{#if hasCreatedAt}}
             <tr>
-                <td align="right">
+                <td style="text-align: right">
                     {{translate 'createdAt' scope=scope category='fields'}}
                 </td>
                 {{#each dataList}}
@@ -38,7 +38,7 @@
             {{/if}}
             {{#each rows}}
             <tr>
-                <td align="right">
+                <td style="text-align: right">
                     {{translate name scope=../scope category='fields'}}
                 </td>
                 {{#each columns}}
diff --git a/install/core/tpl/errors.tpl b/install/core/tpl/errors.tpl
index 8ff50bb533..b7f788f9cf 100644
--- a/install/core/tpl/errors.tpl
+++ b/install/core/tpl/errors.tpl
@@ -3,7 +3,7 @@
     <form id="nav">
         <div class="row">
             <div class=" col-md-13">
-                <div class="panel-body" align="center">
+                <div class="panel-body" style="text-align: center">
                 </div>
             </div>
         </div>
diff --git a/install/core/tpl/header.tpl b/install/core/tpl/header.tpl
index aa008d471b..3efc902eda 100644
--- a/install/core/tpl/header.tpl
+++ b/install/core/tpl/header.tpl
@@ -8,7 +8,7 @@
                 {$langs['labels']["{$action} page title"]}
             </h4>
         </div>
-        <div class="col-md-2 version" align="right">
+        <div class="col-md-2 version" style="text-align: right">
             {$langs['labels']['Version']} {$version}
         </div>
     </div>
diff --git a/install/core/tpl/main.tpl b/install/core/tpl/main.tpl
index 422e069be5..18e3de37f7 100644
--- a/install/core/tpl/main.tpl
+++ b/install/core/tpl/main.tpl
@@ -4,7 +4,7 @@
 
         <div class="row">
             <div class="col-md-12">
-                <div align="center">
+                <div style="text-align: center">
                     <div class="content-img">
                         <img class="devices" src="img/devices.png" alt="EspoCRM">
                     </div>
@@ -44,7 +44,7 @@
                 </div>
             </div>
 
-            <div class="cell cell-website col-md-4" align="right" style="padding-top: 24px;">
+            <div class="cell cell-website col-md-4" style="padding-top: 24px; text-align: right;">
                 <a
                     target="_blank"
                     href="https://www.espocrm.com/documentation/administration/installation/"
diff --git a/install/core/tpl/setupConfirmation.tpl b/install/core/tpl/setupConfirmation.tpl
index 45d2016dd8..1ada73bfcf 100644
--- a/install/core/tpl/setupConfirmation.tpl
+++ b/install/core/tpl/setupConfirmation.tpl
@@ -83,8 +83,12 @@
                 </tbody>
             </table>
 
-            <div class="cell cell-website pull-right margin-top" align="right">
-                <a target="_blank" href="https://www.espocrm.com/documentation/administration/server-configuration/" style="font-weight:600;">{$langs['labels']['Configuration Instructions']}</a>
+            <div class="cell cell-website pull-right margin-top" style="text-align: right">
+                <a
+                    target="_blank"
+                    href="https://www.espocrm.com/documentation/administration/server-configuration/"
+                    style="font-weight: 600;"
+                >{$langs['labels']['Configuration Instructions']}</a>
             </div>
         </div>
     </form>