diff --git a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee
index ceefb3c2d..f3114057e 100644
--- a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee
+++ b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee
@@ -698,8 +698,8 @@ class Edit extends App.Controller
     '.attachmentUpload-progressBar':'progressBar'
     '.js-percentage':               'progressText'
     '.text-bubble':                 'textBubble'
-    '.edit-control-item':           'editControlItem'
-    #'.edit-controls':               'editControls'
+    '.editControls-item':           'editControlItem'
+    #'.editControls':               'editControls'
     #'.recipient-picker':            'recipientPicker'
     #'.recipient-list':              'recipientList'
     #'.recipient-list .list-arrow':  'recipientListArrow'
diff --git a/app/assets/javascripts/app/views/ticket_zoom/edit.jst.eco b/app/assets/javascripts/app/views/ticket_zoom/edit.jst.eco
index eab485ee0..d92111bad 100644
--- a/app/assets/javascripts/app/views/ticket_zoom/edit.jst.eco
+++ b/app/assets/javascripts/app/views/ticket_zoom/edit.jst.eco
@@ -3,9 +3,9 @@
   <input type="hidden" name="internal" value="<%= @article.internal %>">
   <input type="hidden" name="form_id" value="<%= @article.form_id %>">
   <div class="bubble-grid horizontal">
-    <div class="vertical center edit-controls">
+    <div class="editControls">
       <%- App.User.fullLocal( @S('id') ).avatar(false, 'right', 'zIndex-5') %>
-      <div class="dark pop-select zIndex-7 edit-control-item">
+      <div class="dark pop-select zIndex-7 editControls-item">
         <div class="pop-selected u-clickable centered">
           <div class="gray <%- @article.type %> channel icon"></div>
         </div>
@@ -19,7 +19,7 @@
           </div>
         </div>
       </div>
-      <div class="visibility-toggle zIndex-7 u-clickable edit-control-item">
+      <div class="visibility-toggle zIndex-7 u-clickable editControls-item">
         <div class="internal-visibility centered" title="<%- @T("unset internal") %>">
           <div class="internal visibility icon"></div>
         </div>
diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss
index 36bd3b535..c3df4e6d4 100644
--- a/app/assets/stylesheets/zammad.css.scss
+++ b/app/assets/stylesheets/zammad.css.scss
@@ -2767,10 +2767,6 @@ footer {
     background: white;
   }
 
-  .ticket-edit .avatar {
-    margin-bottom: 3px;
-  }
-
   .dropArea {
     background: white;
     border: 5px solid;
@@ -2784,27 +2780,32 @@ footer {
     display: block;
   }
 
-.edit-controls {
+.editControls {
   position: relative;
 }
 
-  .edit-control-item {
+  .editControls-item {
     width: 38px;
     height: 36px;
     position: absolute;
     top: 38px;
     display: none;
+    margin-left: 1px;
   }
 
-  .edit-control-item:nth-child(3) {
-    top: 74px;
+  .editControls-item:nth-child(2) {
+    margin-top: 5px;
   }
 
-  .edit-control-item:nth-child(4) {
-    top: 110px;
+  .editControls-item:nth-child(3) {
+    top: 79px;
   }
 
-  .edit-control-item:not(:last-child) {
+  .editControls-item:nth-child(4) {
+    top: 115px;
+  }
+
+  .editControls-item:not(:last-child) {
     border-bottom: 1px solid #e6e6e6;
   }