diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss
index 0237048f7..98bc1e9f5 100644
--- a/app/assets/stylesheets/zammad.scss
+++ b/app/assets/stylesheets/zammad.scss
@@ -1809,7 +1809,6 @@ kbd {
   margin-left: auto;
   padding-left: 9px;
   display: flex;
-  margin-right: 20px;
 
   .btn + .btn {
     margin-left: 9px;
@@ -2113,11 +2112,16 @@ ol.tabs li {
     border-radius: 3px 0 0 3px;
   }
 
-  .tab:last-child {
+  .tab:last-child:not(:only-child) {
     border-radius: 0 3px 3px 0;
     border-right: none;
   }
 
+  .tab:only-child {
+    border-radius: 3px;
+    border-right: none;
+  }
+
   .tab-badge {
     margin-left: 3px;
     font-size: 0.95em;
@@ -2141,6 +2145,18 @@ ol.tabs li {
     .tab {
       height: auto;
       padding: 10px 23px 9px;
+      
+      &:first-child {
+        border-radius: 8px 0 0 8px;
+      }
+
+      &:last-child {
+        border-radius: 0 8px 8px 0;
+      }
+
+      &:only-child {
+        border-radius: 8px;
+      }
     }
 
     .tab-dropdown {
@@ -2149,14 +2165,6 @@ ol.tabs li {
     }
   }
 
-  .tabs--big .tab:first-child {
-    border-radius: 8px 0 0 8px;
-  }
-
-  .tabs--big .tab:last-child {
-    border-radius: 0 8px 8px 0;
-  }
-
   .dashboard .tabs--big {
     width: 50%;
   }