diff --git a/app/assets/javascripts/app/views/dashboard.jst.eco b/app/assets/javascripts/app/views/dashboard.jst.eco
index ca8eb477b..d31604bed 100644
--- a/app/assets/javascripts/app/views/dashboard.jst.eco
+++ b/app/assets/javascripts/app/views/dashboard.jst.eco
@@ -1,5 +1,5 @@
 <div class="dashboard main flex center">
-  <div class="tabs wide-tabs">
+  <div class="tabs tabs--big">
     <div class="tab active" data-area="stat-widgets"><%- @T('My Stats') %></div>
     <div class="tab" data-area="first-steps-widgets"><%- @T('First Steps') %></div>
   </div>
diff --git a/app/assets/javascripts/app/views/generic/table.jst.eco b/app/assets/javascripts/app/views/generic/table.jst.eco
index 4427f6822..bcbdb3362 100644
--- a/app/assets/javascripts/app/views/generic/table.jst.eco
+++ b/app/assets/javascripts/app/views/generic/table.jst.eco
@@ -1,4 +1,4 @@
-<table class="table table-hover<%- @class if @class %>">
+<table class="table table-hover<%- " #{@class}" if @class %>">
   <thead>
     <tr>
     <% if @checkbox: %>
diff --git a/app/assets/javascripts/app/views/layout_ref/content.jst.eco b/app/assets/javascripts/app/views/layout_ref/content.jst.eco
index f2aa5fd75..814567d94 100644
--- a/app/assets/javascripts/app/views/layout_ref/content.jst.eco
+++ b/app/assets/javascripts/app/views/layout_ref/content.jst.eco
@@ -6,7 +6,7 @@
 
 
   <h2>Tabs</h2>
-  <div class="tabs wide-tabs">
+  <div class="tabs tabs--big">
     <div class="tab my-stats active">My Stats</div>
     <div class="tab my-groups">My Group</div>
     <div class="tab all-stats">All</div>
diff --git a/app/assets/javascripts/app/views/layout_ref/local_modal.jst.eco b/app/assets/javascripts/app/views/layout_ref/local_modal.jst.eco
index 1f1a350d2..d1e953d24 100644
--- a/app/assets/javascripts/app/views/layout_ref/local_modal.jst.eco
+++ b/app/assets/javascripts/app/views/layout_ref/local_modal.jst.eco
@@ -355,7 +355,7 @@
     </div>
     <div class="profile-section">
       <!-- if user has organization -->
-      <div class="tabs wide-tabs">
+      <div class="tabs tabs--big">
         <div class="tab js-userTickets active">Tickets von Doreen Kubiak</div>
         <div class="tab js-organizationTickets">Tickets von Steuerbüro C. Kaik</div>
       </div>
diff --git a/app/assets/javascripts/app/views/layout_ref/user_profile.jst.eco b/app/assets/javascripts/app/views/layout_ref/user_profile.jst.eco
index 9a9111861..d2736f8f5 100644
--- a/app/assets/javascripts/app/views/layout_ref/user_profile.jst.eco
+++ b/app/assets/javascripts/app/views/layout_ref/user_profile.jst.eco
@@ -57,7 +57,7 @@
     </div>
     <div class="profile-section">
       <!-- if user has organization -->
-      <div class="tabs wide-tabs">
+      <div class="tabs tabs--big">
         <div class="tab js-userTickets active">Tickets von Doreen Kubiak</div>
         <div class="tab js-organizationTickets">Tickets von Steuerbüro C. Kaik</div>
       </div>
diff --git a/app/assets/javascripts/app/views/widget/ticket_stats.jst.eco b/app/assets/javascripts/app/views/widget/ticket_stats.jst.eco
index 21431341f..824583645 100644
--- a/app/assets/javascripts/app/views/widget/ticket_stats.jst.eco
+++ b/app/assets/javascripts/app/views/widget/ticket_stats.jst.eco
@@ -1,5 +1,5 @@
 <% if @user && @user.organization: %>
-  <div class="tabs wide-tabs horizontal">
+  <div class="tabs tabs--big">
     <div class="tab js-userTab active"><%- @T('Tickets of User') %> <%- "(" + @user_total + ")" %></div>
     <div class="tab js-orgTab"><%- @T('Tickets of Organization') %> <%- "(" + @org_total + ")" %></div>
   </div>
diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss
index fddc3925e..c8c284a30 100644
--- a/app/assets/stylesheets/zammad.scss
+++ b/app/assets/stylesheets/zammad.scss
@@ -2064,16 +2064,24 @@ ol.tabs li {
     font-size: 0.95em;
   }
 
-  .wide-tabs {
-    margin: 25px 0 20px;
+  .tabs.tabs--inline {
+    display: inline-flex;
+    margin-left: 0;
+    margin-right: 0;
+    
+    .tab {
+      flex: none;
+    }
+  }
+
+  .tabs--big {
+    margin: 25px auto 20px;
     font-size: 14px;
     border-radius: 8px;
-    display: inline-flex;
     
     .tab {
       height: auto;
       padding: 10px 24px;
-      flex-grow: 0;
     }
 
     .tab-dropdown {
@@ -2082,25 +2090,18 @@ ol.tabs li {
     }
   }
 
-  .dashboard .wide-tabs {
-    width: 50%;
-    margin-left: auto;
-    margin-right: auto;
-    display: flex;
-    
-    .tab {
-      flex: 1;
-    }
-  }
-
-  .wide-tabs .tab:first-child {
+  .tabs--big .tab:first-child {
     border-radius: 8px 0 0 8px;
   }
 
-  .wide-tabs .tab:last-child {
+  .tabs--big .tab:last-child {
     border-radius: 0 8px 8px 0;
   }
 
+  .dashboard .tabs--big {
+    width: 50%;
+  }
+
 .separator {
   margin: 20px 0;
   position: relative;
@@ -4934,6 +4935,7 @@ footer {
 }
 
 .type-tabs .tab {
+  height: 40px;
   line-height: 42px;
   padding: 0 12px 0 12px;
   list-style: none;