diff --git a/customize.dist/src/less2/include/toolbar.less b/customize.dist/src/less2/include/toolbar.less
index f11600c5e..5efb69068 100644
--- a/customize.dist/src/less2/include/toolbar.less
+++ b/customize.dist/src/less2/include/toolbar.less
@@ -1157,6 +1157,11 @@
                         margin-left: 11px;
                     }
                 }
+                &.fa-unlock-alt {
+                    .cp-toolbar-drawer-element {
+                        margin-left: 15px;
+                    }
+                }
                 &.fa-question {
                     .cp-toolbar-drawer-element {
                         margin-left: 16px;
diff --git a/www/common/common-interface.js b/www/common/common-interface.js
index 46e896d32..02ad7b4bc 100644
--- a/www/common/common-interface.js
+++ b/www/common/common-interface.js
@@ -1194,21 +1194,28 @@ define([
         var $spinner = $('<span>', {'class': 'fa fa-spinner fa-pulse'}).hide();
 
         var state = false;
+        var to;
 
         var spin = function () {
+            clearTimeout(to);
             state = true;
             $ok.hide();
             $spinner.show();
         };
         var hide = function () {
+            clearTimeout(to);
             state = false;
             $ok.hide();
             $spinner.hide();
         };
         var done = function () {
+            clearTimeout(to);
             state = false;
             $ok.show();
             $spinner.hide();
+            to = setTimeout(function () {
+                $ok.hide();
+            }, 500);
         };
 
         if ($container && $container.append) {
diff --git a/www/common/inner/access.js b/www/common/inner/access.js
index 826336ca7..a8887d18b 100644
--- a/www/common/inner/access.js
+++ b/www/common/inner/access.js
@@ -160,6 +160,10 @@ define([
                 });
             };
 
+            if (pending && !Object.keys(_owners).length) {
+                return $();
+            }
+
             var msg = pending ? Messages.owner_removePendingText
                         : Messages.owner_removeText;
             var removeCol = UIElements.getUserGrid(msg, {