diff --git a/app/assets/javascripts/app/controllers/_application_controller_generic.js.coffee b/app/assets/javascripts/app/controllers/_application_controller_generic.js.coffee
index 43b8b68e8..f95a058aa 100644
--- a/app/assets/javascripts/app/controllers/_application_controller_generic.js.coffee
+++ b/app/assets/javascripts/app/controllers/_application_controller_generic.js.coffee
@@ -488,7 +488,7 @@ class App.Sidebar extends App.Controller
   events:
     'click .tabsSidebar-tab':   'toggleTab'
     'click .tabsSidebar-close': 'toggleSidebar'
-    'click .sidebar-header h2': 'toggleDropdown'
+    'click .sidebar-header .js-headline': 'toggleDropdown'
 
   constructor: ->
     super
diff --git a/app/assets/javascripts/app/views/generic/sidebar_tabs.jst.eco b/app/assets/javascripts/app/views/generic/sidebar_tabs.jst.eco
index 9cd95def1..b567d4b46 100644
--- a/app/assets/javascripts/app/views/generic/sidebar_tabs.jst.eco
+++ b/app/assets/javascripts/app/views/generic/sidebar_tabs.jst.eco
@@ -1,8 +1,8 @@
 <% for item in @items: %>
 <div class="sidebar bottom-form-shadow flex hide" data-tab="<%= item.name %>">
   <div class="sidebar-header">
-    <h2 class="u-textTruncate"><%- @T( item.head ) %></h2>
-    <div class="js-actions flex"></div>
+    <h2 class="sidebar-header-headline js-headline"><%- @T( item.head ) %></h2>
+    <div class="sidebar-header-actions js-actions"></div>
     <div class="tabsSidebar-close">
       <svg class="icon icon-long-arrow-right"><use xlink:href="#icon-long-arrow-right" /></svg>
     </div>
diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss
index 81fd61d50..6d7465153 100644
--- a/app/assets/stylesheets/zammad.css.scss
+++ b/app/assets/stylesheets/zammad.css.scss
@@ -2046,10 +2046,6 @@ footer {
   overflow: auto;
 }
 
-  .sidebar h2 {
-    margin-top: 5px;
-  }
-
   .sidebar h3 {
     margin: 0;
     color: rgba(0,8,14,.73);
@@ -3421,19 +3417,11 @@ footer {
   .tabsSidebar .sidebar-header {
     display: flex;
     align-items: center;
-    margin: 20px 20px 0;
-    padding: 0 0 5px;
     position: relative;
-    
-    h2 {
-      margin: 0 0 -1px;
-      line-height: 1;
-      padding-right: 8px;
-      @extend .u-clickable;
-    }
+    margin: 0 20px;
     
     + hr {
-      margin-top: 15px;
+      margin-top: 0;
     }
     
     .dropdown {
@@ -3441,9 +3429,27 @@ footer {
     }
   }
 
+  .sidebar-header-headline {
+    padding: 25px 0 15px 25px;
+    margin: 0 0 0 -20px;
+    line-height: 1;
+    padding-right: 8px;
+    @extend .u-clickable, .u-textTruncate;
+  }
+
+  .sidebar-header-actions {
+    flex: 1;
+    margin-top: 10px;
+    margin-right: 20px;
+    
+    .dropdown-toggle {
+      height: 30px;
+    }
+  }
+
   .tabsSidebar-close {
-    padding: 20px;
-    margin: -15px;
+    padding: 28px 35px 20px 0;
+    margin: 0 -20px 0 0;
     @extend .u-clickable;
     display: flex;
     align-items: center;