diff --git a/app/assets/javascripts/app/views/navigation/personal.jst.eco b/app/assets/javascripts/app/views/navigation/personal.jst.eco
index 20f6f01db..30ee6f39c 100644
--- a/app/assets/javascripts/app/views/navigation/personal.jst.eco
+++ b/app/assets/javascripts/app/views/navigation/personal.jst.eco
@@ -10,8 +10,8 @@
         <% end %>
       </a>
       <ul class="dropdown-menu" role="menu">
-        <% for item in item.child: %>
-          <% if item.divider: %>
+        <% for item, id in item.child: %>
+          <% if item.divider and id > 0: %>
             <li class="divider"></li>
           <% end %>
           <% if item.navheader: %>
diff --git a/app/assets/stylesheets/bootstrap.css b/app/assets/stylesheets/bootstrap.css
index 57a21abad..d0324fad4 100644
--- a/app/assets/stylesheets/bootstrap.css
+++ b/app/assets/stylesheets/bootstrap.css
@@ -2638,14 +2638,6 @@ tbody.collapse.in {
   right: auto;
   left: 0;
 }
-.dropdown-header {
-  display: block;
-  padding: 3px 20px;
-  font-size: 12px;
-  line-height: 1.42857143;
-  color: #777;
-  white-space: nowrap;
-}
 .dropdown-backdrop {
   position: fixed;
   top: 0;
diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss
index 368e90606..f5e3ec679 100644
--- a/app/assets/stylesheets/zammad.css.scss
+++ b/app/assets/stylesheets/zammad.css.scss
@@ -1979,7 +1979,6 @@ footer {
 
   .user-menu .dropdown-menu > li > a {
     height: 40px;
-    padding: 0 15px;
     color: #2594d4;
     display: flex;
   }
@@ -3988,7 +3987,7 @@ footer {
   margin: 0;
   padding: 0;
   min-width: 100%;
-  color: white;
+  color: hsl(198,19%,72%);
   text-transform: initial;
   letter-spacing: 0;
   background: hsl(234,10%,19%);
@@ -4014,8 +4013,10 @@ footer {
     margin: 0;
   }
 
-  .dropdown li {
-    height: 40px;
+  .dropdown li,
+  .dropup li {
+    height: 39px;
+    line-height: 38px;
     padding: 0 15px;
   }
 
@@ -4034,9 +4035,9 @@ footer {
     }
 
   .dropdown-menu > li > a {
-    height: 40px;
-    line-height: 39px;
     color: white;
+    padding: 0 15px;
+    margin: 0 -15px;
   }
 
   .dropdown-menu > li > a:hover {
@@ -4050,7 +4051,6 @@ footer {
 
   .dropdown.dropdown--actions {
     li {
-      padding: 0;
       display: flex;
       align-items: center;
     }
@@ -4079,6 +4079,11 @@ footer {
     }
   }
 
+  li.dropdown-header {
+    line-height: 36px;
+    height: 32px;
+  }
+
 .recipientList,
 .recipientList-organizationMembers {
   list-style: none;