diff --git a/data/web/admin.php b/data/web/admin.php
index 4a4ed2cc3..c15058a8a 100644
--- a/data/web/admin.php
+++ b/data/web/admin.php
@@ -11,7 +11,7 @@ if (!isset($_SESSION['gal']) && $license_cache = $redis->Get('LICENSE_STATUS_CAC
 ?>
 <div class="container">
 
-  <ul class="nav nav-tabs nav-justified" role="tablist">
+  <ul class="nav nav-tabs" role="tablist">
     <li role="presentation" class="active"><a href="#tab-access" aria-controls="tab-access" role="tab" data-toggle="tab"><?=$lang['admin']['access'];?></a></li>
     <li role="presentation"><a href="#tab-config" aria-controls="tab-config" role="tab" data-toggle="tab"><?=$lang['admin']['configuration'];?></a></li>
     <li role="presentation"><a href="#tab-routing" aria-controls="tab-routing" role="tab" data-toggle="tab"><?=$lang['admin']['routing'];?></a></li>
diff --git a/data/web/css/site/admin.css b/data/web/css/site/admin.css
index a5296ee6e..5eae52283 100644
--- a/data/web/css/site/admin.css
+++ b/data/web/css/site/admin.css
@@ -77,7 +77,3 @@ table tbody tr {
 table tbody tr td input[type="checkbox"] {
   cursor: pointer;
 }
-.nav-tabs>li>a:hover, .nav-tabs>li>a:focus, .nav-tabs>li.active>a, .nav-tabs>li.active>a:hover, .nav-tabs>li.active>a:focus, .nav-tabs .open>a, .nav-tabs .open>a:hover, .nav-tabs .open>a:focus {
-  padding-bottom: 10px;
-  margin-top: 6px;
-}
\ No newline at end of file
diff --git a/data/web/css/site/mailbox.css b/data/web/css/site/mailbox.css
index a5071d8dd..173095a9f 100644
--- a/data/web/css/site/mailbox.css
+++ b/data/web/css/site/mailbox.css
@@ -59,7 +59,3 @@ table tbody tr {
 table tbody tr td input[type="checkbox"] {
   cursor: pointer;
 }
-.nav-tabs>li>a:hover, .nav-tabs>li>a:focus, .nav-tabs>li.active>a, .nav-tabs>li.active>a:hover, .nav-tabs>li.active>a:focus, .nav-tabs .open>a, .nav-tabs .open>a:hover, .nav-tabs .open>a:focus {
-  padding-bottom: 10px;
-  margin-top: 6px;
-}
\ No newline at end of file
diff --git a/data/web/js/build/014-mailcow.js b/data/web/js/build/014-mailcow.js
index 0c49efaf1..266027146 100644
--- a/data/web/js/build/014-mailcow.js
+++ b/data/web/js/build/014-mailcow.js
@@ -56,13 +56,6 @@ $(document).ready(function() {
     'use strict';
     if ($('a[data-toggle="tab"]').length) {
       $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
-        $("ul.nav-tabs li a").parent().find("a").each(function(){
-          var t = $(this).text();
-          t = t.replace(/^⤏ /, '');
-          $(this).text(t);
-        });
-        $(this).prepend("⤏ ");
-
         if ($(this).data('dont-remember') == 1) {
           return true;
         }
diff --git a/data/web/mailbox.php b/data/web/mailbox.php
index 30c02d5e1..1311a2305 100644
--- a/data/web/mailbox.php
+++ b/data/web/mailbox.php
@@ -7,7 +7,7 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
 ?>
 <div class="container">
 
-  <ul class="nav nav-tabs nav-justified" role="tablist">
+  <ul class="nav nav-tabs" role="tablist">
     <li role="presentation" class="active"><a href="#tab-domains" aria-controls="tab-domains" role="tab" data-toggle="tab"><?=$lang['mailbox']['domains'];?></a></li>
     <li role="presentation"><a href="#tab-mailboxes" aria-controls="tab-mailboxes" role="tab" data-toggle="tab"><?=$lang['mailbox']['mailboxes'];?></a></li>
     <li role="presentation"><a href="#tab-resources" aria-controls="tab-resources" role="tab" data-toggle="tab"><?=$lang['mailbox']['resources'];?></a></li>