diff --git a/UI/Templates/MailerUI/UIxMailMainFrame.wox b/UI/Templates/MailerUI/UIxMailMainFrame.wox
index 0e68f50c0..870cc7e97 100644
--- a/UI/Templates/MailerUI/UIxMailMainFrame.wox
+++ b/UI/Templates/MailerUI/UIxMailMainFrame.wox
@@ -234,6 +234,12 @@
         <section ng-repeat="account in app.accounts track by account.id">
           <md-subheader class="md-hue-2">
             <div layout="row" layout-align="start center">
+              <md-button class="md-icon-button"
+                         ng-show="account.id == 0"
+                         label:aria-label="Delegation..."
+                         ng-click="app.delegate(account)">
+                <md-icon>people</md-icon>
+              </md-button>
               <div class="sg-no-wrap">{{account.name}}</div>
               <div class="md-flex"><!-- spacer --></div>
               <md-button class="sg-icon-button"
@@ -241,12 +247,6 @@
                          ng-click="app.newFolder(account)">
                 <md-icon>add_circle_outline</md-icon>
               </md-button>
-              <md-button class="sg-icon-button"
-                         ng-show="account.id == 0"
-                         label:aria-label="Delegation..."
-                         ng-click="app.delegate(account)">
-                <md-icon>people</md-icon>
-              </md-button>
             </div>
           </md-subheader>
           <md-list>
diff --git a/UI/WebServerResources/scss/components/button/button.scss b/UI/WebServerResources/scss/components/button/button.scss
index 107f8f4a5..c6d9d9386 100644
--- a/UI/WebServerResources/scss/components/button/button.scss
+++ b/UI/WebServerResources/scss/components/button/button.scss
@@ -78,9 +78,10 @@ md-list md-list-item button.md-button.sg-icon-button {
 
 .md-subheader-content {
   .md-icon-button:first-child {
+    // Delegation button of mail accounts
     padding-left: 0;
-    margin-left: $icon-button-margin/2;
-    margin-right: $icon-button-margin*1.5;
+    margin-left: 0;
+    margin-right: 0;
   }
 }
 md-tab-content {