diff --git a/data/web/templates/admin/tab-config-admins.twig b/data/web/templates/admin/tab-config-admins.twig
index eefaa6301..4dbb567f8 100644
--- a/data/web/templates/admin/tab-config-admins.twig
+++ b/data/web/templates/admin/tab-config-admins.twig
@@ -1,4 +1,4 @@
-<div role="tabpanel" class="tab-pane active" id="tab-config-admins">
+<div role="tabpanel" class="tab-pane fade show active" id="tab-config-admins" role="tabpanel" aria-labelledby="tab-config-admins">
     <div class="panel panel-danger">
       <div class="panel-heading xs-show">{{ lang.admin.admin_details }}</div>
       <div class="panel-body">
diff --git a/data/web/templates/admin/tab-config-customize.twig b/data/web/templates/admin/tab-config-customize.twig
index 5427ebd39..49bba596c 100644
--- a/data/web/templates/admin/tab-config-customize.twig
+++ b/data/web/templates/admin/tab-config-customize.twig
@@ -1,4 +1,4 @@
-<div role="tabpanel" class="tab-pane" id="tab-config-customize">
+<div role="tabpanel" class="tab-pane fade" id="tab-config-customize" role="tabpanel" aria-labelledby="tab-config-customize">
   <div class="panel panel-default">
     <div class="panel-heading">{{ lang.admin.customize }}</div>
     <div class="panel-body">
diff --git a/data/web/templates/admin/tab-config-dkim.twig b/data/web/templates/admin/tab-config-dkim.twig
index 859fe809f..c242d605d 100644
--- a/data/web/templates/admin/tab-config-dkim.twig
+++ b/data/web/templates/admin/tab-config-dkim.twig
@@ -1,4 +1,4 @@
-<div role="tabpanel" class="tab-pane" id="tab-config-dkim">
+<div role="tabpanel" class="tab-pane fade" id="tab-config-dkim" role="tabpanel" aria-labelledby="tab-config-dkim">
   <div class="panel panel-default">
     <div class="panel-heading">{{ lang.admin.dkim_keys }}</div>
     <div class="panel-body">
diff --git a/data/web/templates/admin/tab-config-f2b.twig b/data/web/templates/admin/tab-config-f2b.twig
index 5c4c2a24c..1bcc2303f 100644
--- a/data/web/templates/admin/tab-config-f2b.twig
+++ b/data/web/templates/admin/tab-config-f2b.twig
@@ -1,4 +1,4 @@
-<div role="tabpanel" class="tab-pane" id="tab-config-f2b">
+<div role="tabpanel" class="tab-pane fade" id="tab-config-f2b" role="tabpanel" aria-labelledby="tab-config-f2b">
   <div class="panel panel-default">
     <div class="panel-heading">{{ lang.admin.f2b_parameters }}</div>
     <div class="panel-body">
diff --git a/data/web/templates/admin/tab-config-fwdhosts.twig b/data/web/templates/admin/tab-config-fwdhosts.twig
index c691e27bc..f8a18d68d 100644
--- a/data/web/templates/admin/tab-config-fwdhosts.twig
+++ b/data/web/templates/admin/tab-config-fwdhosts.twig
@@ -1,4 +1,4 @@
-<div role="tabpanel" class="tab-pane" id="tab-config-fwdhosts">
+<div role="tabpanel" class="tab-pane fade" id="tab-config-fwdhosts" role="tabpanel" aria-labelledby="tab-config-fwdhosts">
   <div class="panel panel-default">
     <div class="panel-heading">{{ lang.admin.forwarding_hosts }}</div>
     <div class="panel-body">
diff --git a/data/web/templates/admin/tab-config-oauth2.twig b/data/web/templates/admin/tab-config-oauth2.twig
index 146b88dae..a29dfcdc9 100644
--- a/data/web/templates/admin/tab-config-oauth2.twig
+++ b/data/web/templates/admin/tab-config-oauth2.twig
@@ -1,4 +1,4 @@
-<div role="tabpanel" class="tab-pane" id="tab-config-oauth2">
+<div role="tabpanel" class="tab-pane fade" id="tab-config-oauth2" role="tabpanel" aria-labelledby="tab-config-oauth2">
   <div class="panel panel-default">
     <div class="panel-heading">{{ lang.admin.oauth2_apps }}</div>
     <div class="panel-body">
diff --git a/data/web/templates/admin/tab-config-password-policy.twig b/data/web/templates/admin/tab-config-password-policy.twig
index ca1c75dbc..e91ea48ec 100644
--- a/data/web/templates/admin/tab-config-password-policy.twig
+++ b/data/web/templates/admin/tab-config-password-policy.twig
@@ -1,4 +1,4 @@
-<div role="tabpanel" class="tab-pane" id="tab-config-password-policy">
+<div role="tabpanel" class="tab-pane fade" id="tab-config-password-policy" role="tabpanel" aria-labelledby="tab-config-password-policy">
   <div class="panel panel-default">
     <div class="panel-heading">{{ lang.admin.password_policy }}</div>
     <div class="panel-body">
diff --git a/data/web/templates/admin/tab-config-quarantine.twig b/data/web/templates/admin/tab-config-quarantine.twig
index 2ed9f05f9..ff8858109 100644
--- a/data/web/templates/admin/tab-config-quarantine.twig
+++ b/data/web/templates/admin/tab-config-quarantine.twig
@@ -1,4 +1,4 @@
-<div role="tabpanel" class="tab-pane" id="tab-config-quarantine">
+<div role="tabpanel" class="tab-pane fade" id="tab-config-quarantine" role="tabpanel" aria-labelledby="tab-config-quarantine">
   <div class="panel panel-default">
     <div class="panel-heading">{{ lang.admin.quarantine }}</div>
     <div class="panel-body">
diff --git a/data/web/templates/admin/tab-config-quota.twig b/data/web/templates/admin/tab-config-quota.twig
index eabf4742b..8008940fd 100644
--- a/data/web/templates/admin/tab-config-quota.twig
+++ b/data/web/templates/admin/tab-config-quota.twig
@@ -1,4 +1,4 @@
-<div role="tabpanel" class="tab-pane" id="tab-config-quota">
+<div role="tabpanel" class="tab-pane fade" id="tab-config-quota" role="tabpanel" aria-labelledby="tab-config-quota">
   <div class="panel panel-default">
     <div class="panel-heading">{{ lang.admin.quota_notifications }}</div>
     <div class="panel-body">
diff --git a/data/web/templates/admin/tab-config-rsettings.twig b/data/web/templates/admin/tab-config-rsettings.twig
index 3b776c4eb..3b4c00632 100644
--- a/data/web/templates/admin/tab-config-rsettings.twig
+++ b/data/web/templates/admin/tab-config-rsettings.twig
@@ -1,4 +1,4 @@
-<div role="tabpanel" class="tab-pane" id="tab-config-rsettings">
+<div role="tabpanel" class="tab-pane fade" id="tab-config-rsettings" role="tabpanel" aria-labelledby="tab-config-rsettings">
   <div class="panel panel-default">
     <div class="panel-heading">{{ lang.admin.rspamd_settings_map }}</div>
     <div class="panel-body">
diff --git a/data/web/templates/admin/tab-config-rspamd.twig b/data/web/templates/admin/tab-config-rspamd.twig
index f22cff78a..5b318cf28 100644
--- a/data/web/templates/admin/tab-config-rspamd.twig
+++ b/data/web/templates/admin/tab-config-rspamd.twig
@@ -1,4 +1,4 @@
-<div role="tabpanel" class="tab-pane" id="tab-config-rspamd">
+<div role="tabpanel" class="tab-pane fade" id="tab-config-rspamd" role="tabpanel" aria-labelledby="tab-config-rspamd">
   <div class="panel panel-default">
     <div class="panel-heading">
       <h3 class="panel-title">Rspamd UI</h3>
diff --git a/data/web/templates/admin/tab-globalfilter-regex.twig b/data/web/templates/admin/tab-globalfilter-regex.twig
index dfd52351a..91b25f435 100644
--- a/data/web/templates/admin/tab-globalfilter-regex.twig
+++ b/data/web/templates/admin/tab-globalfilter-regex.twig
@@ -1,4 +1,4 @@
-<div role="tabpanel" class="tab-pane" id="tab-globalfilter-regex">
+<div role="tabpanel" class="tab-pane fade" id="tab-globalfilter-regex" role="tabpanel" aria-labelledby="tab-globalfilter-regex">
   <div class="panel panel-default">
     <div class="panel-heading">
       {{ lang.admin.rspamd_global_filters }}
diff --git a/data/web/templates/admin/tab-ldap.twig b/data/web/templates/admin/tab-ldap.twig
index e5c4e67fd..853c2683e 100644
--- a/data/web/templates/admin/tab-ldap.twig
+++ b/data/web/templates/admin/tab-ldap.twig
@@ -1,4 +1,4 @@
-<div role="tabpanel" class="tab-pane" id="tab-config-ldap-admins">
+<div role="tabpanel" class="tab-pane fade" id="tab-config-ldap-admins" role="tabpanel" aria-labelledby="tab-config-ldap-admins">
   <div class="panel panel-default">
     <div class="panel-heading">{{ lang.admin.admins_ldap }}</div>
     <div class="panel-body">
diff --git a/data/web/templates/admin/tab-mailq.twig b/data/web/templates/admin/tab-mailq.twig
index ab2f40f17..1337599df 100644
--- a/data/web/templates/admin/tab-mailq.twig
+++ b/data/web/templates/admin/tab-mailq.twig
@@ -1,4 +1,4 @@
-<div role="tabpanel" class="tab-pane" id="tab-mailq">
+<div role="tabpanel" class="tab-pane fade" id="tab-mailq" role="tabpanel" aria-labelledby="tab-mailq">
   <div class="panel panel-default">
     <div class="panel-heading">
       {{ lang.admin.queue_manager }} <span class="badge badge-info table-lines"></span>
diff --git a/data/web/templates/admin/tab-routing.twig b/data/web/templates/admin/tab-routing.twig
index 8aae1bcf5..0b4908dc0 100644
--- a/data/web/templates/admin/tab-routing.twig
+++ b/data/web/templates/admin/tab-routing.twig
@@ -1,4 +1,4 @@
-<div role="tabpanel" class="tab-pane" id="tab-routing">
+<div role="tabpanel" class="tab-pane fade" id="tab-routing" role="tabpanel" aria-labelledby="tab-routing">
   <div class="panel panel-default">
     <div class="panel-heading">{{ lang.admin.relayhosts }}</div>
     <div class="panel-body">
diff --git a/data/web/templates/admin/tab-sys-mails.twig b/data/web/templates/admin/tab-sys-mails.twig
index 44a8b4385..5eb1c2b42 100644
--- a/data/web/templates/admin/tab-sys-mails.twig
+++ b/data/web/templates/admin/tab-sys-mails.twig
@@ -1,4 +1,4 @@
-<div role="tabpanel" class="tab-pane" id="tab-sys-mails">
+<div role="tabpanel" class="tab-pane fade" id="tab-sys-mails" role="tabpanel" aria-labelledby="tab-sys-mails">
   <div class="panel panel-default">
     <div class="panel-heading">{{ lang.admin.sys_mails }}</div>
     <div class="panel-body">
diff --git a/data/web/templates/edit/domain.twig b/data/web/templates/edit/domain.twig
index 2ece7ff39..a10989db3 100644
--- a/data/web/templates/edit/domain.twig
+++ b/data/web/templates/edit/domain.twig
@@ -2,15 +2,15 @@
 
 {% block inner_content %}
 {% if result %}
-<ul class="nav nav-tabs responsive-tabs" role="tablist">
-  <li class="active"><a data-toggle="tab" href="#dedit">{{ lang.edit.domain }}</a></li>
-  <li><a data-toggle="tab" href="#dratelimit">{{ lang.edit.ratelimit }}</a></li>
-  <li><a data-toggle="tab" href="#dspamfilter">{{ lang.edit.spam_filter }}</a></li>
-  <li><a data-toggle="tab" href="#dqwbcc">{{ lang.edit.quota_warning_bcc }}</a></li>
+<ul class="nav nav-tabs" role="tablist">
+  <li role="presentation" class="nav-item"><button class="nav-link active" data-bs-toggle="tab" data-bs-target="#dedit">{{ lang.edit.domain }}</button></li>
+  <li role="presentation" class="nav-item"><button class="nav-link" data-bs-toggle="tab" data-bs-target="#dratelimit">{{ lang.edit.ratelimit }}</button></li>
+  <li role="presentation" class="nav-item"><button class="nav-link" data-bs-toggle="tab" data-bs-target="#dspamfilter">{{ lang.edit.spam_filter }}</button></li>
+  <li role="presentation" class="nav-item"><button class="nav-link" data-bs-toggle="tab" data-bs-target="#dqwbcc">{{ lang.edit.quota_warning_bcc }}</button></li>
 </ul>
 <hr>
 <div class="tab-content">
-  <div id="dedit" class="tab-pane in active">
+  <div id="dedit" class="tab-pane fade show active" role="tabpanel" aria-labelledby="domain-edit">
     <form data-id="editdomain" class="form-horizontal" role="form" method="post">
       <input type="hidden" value="0" name="active">
       <input type="hidden" value="0" name="backupmx">
@@ -122,7 +122,7 @@
     </div>
     {% endif %}
   </div>
-  <div id="dratelimit" class="tab-pane">
+  <div id="dratelimit" class="tab-pane fade" role="tabpanel" aria-labelledby="domain-ratelimit">
     <form data-id="domratelimit" class="form-inline well" method="post">
       <div class="form-group">
         <label class="control-label">{{ lang.edit.ratelimit }}</label>
@@ -138,7 +138,7 @@
       </div>
     </form>
   </div>
-  <div id="dspamfilter" class="tab-pane">
+  <div id="dspamfilter" class="tab-pane fade" role="tabpanel" aria-labelledby="domain-spamfilter">
     <div class="row">
       <div class="col-sm-6">
         <h4>{{ lang.user.spamfilter_wl }}</h4>
@@ -185,7 +185,7 @@
       </div>
     </div>
   </div>
-  <div id="dqwbcc" class="tab-pane">
+  <div id="dqwbcc" class="tab-pane fade" role="tabpanel" aria-labelledby="domain-qwbcc">
     <div class="row">
       <div class="col-sm-12">
         <h4>{{ lang.edit.quota_warning_bcc }}</h4>
diff --git a/data/web/templates/edit/mailbox.twig b/data/web/templates/edit/mailbox.twig
index 4447ccba3..d9aecc4b7 100644
--- a/data/web/templates/edit/mailbox.twig
+++ b/data/web/templates/edit/mailbox.twig
@@ -2,15 +2,15 @@
 
 {% block inner_content %}
 {% if result %}
-<ul class="nav nav-tabs responsive-tabs" role="tablist">
-  <li class="active"><a data-toggle="tab" href="#medit">{{ lang.edit.mailbox }}</a></li>
-  <li><a data-toggle="tab" href="#mpushover">{{ lang.edit.pushover }}</a></li>
-  <li><a data-toggle="tab" href="#macl">{{ lang.edit.acl }}</a></li>
-  <li><a data-toggle="tab" href="#mrl">{{ lang.edit.ratelimit }}</a></li>
+<ul class="nav nav-tabs" role="tablist">
+  <li role="presentation" class="nav-item"><button class="nav-link active" data-bs-toggle="tab" data-bs-target="#medit">{{ lang.edit.mailbox }}</button></li>
+  <li role="presentation" class="nav-item"><button class="nav-link" data-bs-toggle="tab" data-bs-target="#mpushover">{{ lang.edit.pushover }}</button></li>
+  <li role="presentation" class="nav-item"><button class="nav-link" data-bs-toggle="tab" data-bs-target="#macl">{{ lang.edit.acl }}</button></li>
+  <li role="presentation" class="nav-item"><button class="nav-link" data-bs-toggle="tab" data-bs-target="#mrl">{{ lang.edit.ratelimit }}</button></li>
 </ul>
 <hr>
 <div class="tab-content">
-  <div id="medit" class="tab-pane in active">
+  <div id="medit" class="tab-pane fade show active" role="tabpanel" aria-labelledby="mailbox-edit">
     <form class="form-horizontal" data-id="editmailbox" role="form" method="post">
       <input type="hidden" value="default" name="sender_acl">
       <input type="hidden" value="0" name="force_pw_update">
@@ -244,7 +244,7 @@
       </div>
     </form>
   </div>
-  <div id="mpushover" class="tab-pane">
+  <div id="mpushover" class="tab-pane fade" role="tabpanel" aria-labelledby="mailbox-pushover">
     <form data-id="pushover" class="form well" method="post">
       <input type="hidden" value="0" name="evaluate_x_prio">
       <input type="hidden" value="0" name="only_x_prio">
@@ -324,7 +324,7 @@
       </div>
     </form>
   </div>
-  <div id="macl" class="tab-pane">
+  <div id="macl" class="tab-pane fade" role="tabpanel" aria-labelledby="mailbox-acl">
     <form data-id="useracl" class="form-inline well" method="post">
       <div class="row">
         <div class="col-sm-1">
@@ -345,7 +345,7 @@
       </div>
     </form>
   </div>
-  <div id="mrl" class="tab-pane">
+  <div id="mrl" class="tab-pane fade" role="tabpanel" aria-labelledby="mailbox-rl">
     <form data-id="mboxratelimit" class="form-inline well" method="post">
       <div class="row">
         <div class="col-sm-1">