diff --git a/UI/Templates/MailerUI/UIxMailMainFrame.wox b/UI/Templates/MailerUI/UIxMailMainFrame.wox
index 945b55edf..7028b7b53 100644
--- a/UI/Templates/MailerUI/UIxMailMainFrame.wox
+++ b/UI/Templates/MailerUI/UIxMailMainFrame.wox
@@ -245,11 +245,11 @@
                          ng-click="newFolder(account)">
                 <md-icon>add_circle_outline</md-icon>
               </md-button>
-              <md-button class="iconButton"
+              <md-button class="sg-icon-button"
                          ng-show="account.id == 0"
                          label:aria-label="Delegation..."
                          ng-click="delegate(account)">
-                <i class="md-icon-people"><!-- delegate --></i>
+                <md-icon>people</md-icon>
               </md-button>
             </div>
           </md-subheader>
diff --git a/UI/Templates/MailerUI/UIxMailUserDelegationEditor.wox b/UI/Templates/MailerUI/UIxMailUserDelegationEditor.wox
index d9e12af20..4c39e69fb 100644
--- a/UI/Templates/MailerUI/UIxMailUserDelegationEditor.wox
+++ b/UI/Templates/MailerUI/UIxMailUserDelegationEditor.wox
@@ -24,7 +24,7 @@
             <md-button ng-click="delegate.removeUser(user)"
                        type="button"
                        ng-hide="user.uid != delegate.selectedUser.uid || user.$isSpecial()">
-              <i class="md-icon-delete"><!-- delete --></i>
+              <md-icon>delete</md-icon>
             </md-button>
           </div>
         </md-button>
diff --git a/UI/WebServerResources/js/Mailer/MailboxesController.js b/UI/WebServerResources/js/Mailer/MailboxesController.js
index 0e2f7483d..98d371f72 100644
--- a/UI/WebServerResources/js/Mailer/MailboxesController.js
+++ b/UI/WebServerResources/js/Mailer/MailboxesController.js
@@ -33,16 +33,15 @@
         escapeToClose: true,
         locals: {
           User: User,
-          account: account,
-          $q: $q
+          account: account
         }
       });
 
       /**
        * @ngInject
        */
-      MailboxDelegationController.$inject = ['$scope', '$mdDialog', 'User', 'account', '$q'];
-      function MailboxDelegationController($scope, $mdDialog, User, account, $q) {
+      MailboxDelegationController.$inject = ['$scope', '$mdDialog', 'User', 'account'];
+      function MailboxDelegationController($scope, $mdDialog, User, account) {
         var vm = this;
 
         vm.users = account.delegates;