diff --git a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee
index 04085c62e..b02887e8e 100644
--- a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee
+++ b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee
@@ -162,23 +162,22 @@ class App.TicketZoom extends App.Controller
     @main.unbind('scroll', @positionPageHeaderUpdate)
 
   positionPageHeaderUpdate: =>
-    pageHeader       = @scrollPageHeader.height()
+    headerHeight     = @scrollPageHeader.outerHeight()
     mainScrollHeigth = @main.prop('scrollHeight')
     mainHeigth       = @main.height()
 
     # if page header is possible to use, show page header
     top = 0
-    if mainScrollHeigth > mainHeigth + pageHeader
-      offset = @ticketZoom.offset()
-      if offset.top >= 0
-        top = offset.top
+    if mainScrollHeigth > mainHeigth + headerHeight
+      scroll = @main.scrollTop()
+      if scroll <= headerHeight
+        top = (scroll - headerHeight)
 
     # if page header is not possible to use - mainScrollHeigth to low - hide page header
     else
-      top = pageHeader
-
-    #console.log('TOP', top, @ticket.id, new Date)
-    @scrollPageHeader.css('transform', "translateY(-#{top}px)")
+      top = -headerHeight
+    
+    @scrollPageHeader.css('transform', "translateY(#{top}px)")
 
   render: (force) =>
 
diff --git a/app/assets/javascripts/app/views/ticket_zoom.jst.eco b/app/assets/javascripts/app/views/ticket_zoom.jst.eco
index 9a6f127a1..d56da1fa8 100644
--- a/app/assets/javascripts/app/views/ticket_zoom.jst.eco
+++ b/app/assets/javascripts/app/views/ticket_zoom.jst.eco
@@ -45,7 +45,7 @@
     </div>
   </div>
 
-  <div class="tabsSidebar vertical"></div>
+  <div class="tabsSidebar tabsSidebar--attributeBarSpacer vertical"></div>
 
   <div class="attributeBar">
     <form class="form-inline is-closed hide" role="form">
diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss
index 404cd4be5..21f71f970 100644
--- a/app/assets/stylesheets/zammad.css.scss
+++ b/app/assets/stylesheets/zammad.css.scss
@@ -308,6 +308,11 @@ span[data-tooltip]:hover:before {
   margin-left: auto;
 }
 
+.subtle-link.align-right ~ .btn,
+.btn.align-right ~ .btn {
+  margin-left: 15px;
+}
+
 .vertical > .btn + .btn {
   margin-left: 0;
   margin-top: 10px;
@@ -665,6 +670,24 @@ textarea,
     right: 12px;
     top: 50%;
     margin-top: -3px;
+    @extend .u-unclickable;
+  }
+
+  /* 
+
+    Firefox only hack
+    -----------------
+
+    Firefox doesn't allow us to hide the dropdown arrow
+    but we want to replace it with our own icon.
+    So we have to hide our own icon in Firefox.
+
+  */
+
+  @-moz-document url-prefix() {
+    .form-control + .select-arrow {
+      display: none;
+    }
   }
 
   select::-ms-expand {
@@ -3451,7 +3474,6 @@ footer {
   width: 280px;
   border-left: 1px solid #e6e6e6;
   padding: 0;
-  @extend .vertical;
 }
 
   .tabsSidebar .sidebar > hr {
@@ -3487,7 +3509,6 @@ footer {
   }
 
   .tabsSidebar .sidebar-content {
-    @extend .flex;
     padding: 0 20px 20px;
   }
 
@@ -3503,8 +3524,12 @@ footer {
     position: absolute;
     right: 0;
     top: 0;
-    bottom: 60px;
+    bottom: 0;
     transition: 500ms;
+
+    &.tabsSidebar--attributeBarSpacer {
+      bottom: 60px;
+    }
   }
 
   .tabsSidebar.is-closed {
@@ -3683,14 +3708,15 @@ footer {
 }
 
 .type-tabs .tab {
-  line-height: 40px;
-  padding: 0 8px 0 8px;
+  line-height: 42px;
+  padding: 0 12px 0 12px;
+  list-style: none;
 }
 
 .type-tabs .icon {
   vertical-align: top;
   margin-right: 9px;
-  margin-top: 10px;
+  margin-top: 11px;
   -webkit-transform: scale(1.2);
           transform: scale(1.2);
 }
@@ -4949,12 +4975,6 @@ body.fit {
 
 .align-right {
   margin-left: auto;
-  
-  // give following elements a margin left
-  // used in setup wizard
-  & ~ * {
-    margin-left: 15px;
-  }
 }
 
 .align-center {