diff --git a/src/sunstone/public/app/sunstone.js b/src/sunstone/public/app/sunstone.js
index 0d7100ee70..089795d4cc 100644
--- a/src/sunstone/public/app/sunstone.js
+++ b/src/sunstone/public/app/sunstone.js
@@ -430,6 +430,10 @@ define(function(require) {
         $("button[data-toggle=" + customId + "lock_buttons]", actionBlock).remove();
       }
 
+      if ($("#" + customId + "vmspause_buttons li", actionBlock).length == 0) {
+        $("button[data-toggle=" + customId + "vmspause_buttons]", actionBlock).remove();
+      }
+
       if ($("#" + customId + "vmsrepeat_buttons li", actionBlock).length == 0) {
         $("button[data-toggle=" + customId + "vmsrepeat_buttons]", actionBlock).remove();
       }
diff --git a/src/sunstone/public/app/tabs/images-tab/buttons.js b/src/sunstone/public/app/tabs/images-tab/buttons.js
index 8f8b40a58c..4f76f09d04 100644
--- a/src/sunstone/public/app/tabs/images-tab/buttons.js
+++ b/src/sunstone/public/app/tabs/images-tab/buttons.js
@@ -87,25 +87,25 @@ define(function(require) {
     },
     "Image.lockA" : {
       type: "action",
-      text: Locale.tr("Admin") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Lock Admin actions")) + "</span>",
+      text: Locale.tr("Admin"),
       layout: "lock_buttons",
       data: 3
     },
     "Image.lockM" : {
       type: "action",
-      text: Locale.tr("Manage") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Lock Manage actions")) + "</span>",
+      text: Locale.tr("Manage"),
       layout: "lock_buttons",
       data: 2
     },
     "Image.lockU" : {
       type: "action",
-      text: Locale.tr("Use") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Lock Use actions")) + "</span>",
+      text: Locale.tr("Use"),
       layout: "lock_buttons",
       data: 1
     },
     "Image.unlock" : {
       type: "action",
-      text: Locale.tr("Unlock") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Unlock all actions")) + "</span>",
+      text: Locale.tr("Unlock"),
       layout: "lock_buttons"
     }
   }
diff --git a/src/sunstone/public/app/tabs/marketplaceapps-tab/buttons.js b/src/sunstone/public/app/tabs/marketplaceapps-tab/buttons.js
index 5d9ba5fcf9..26c2550d2b 100644
--- a/src/sunstone/public/app/tabs/marketplaceapps-tab/buttons.js
+++ b/src/sunstone/public/app/tabs/marketplaceapps-tab/buttons.js
@@ -70,25 +70,25 @@ define(function(require) {
     },
     "MarketPlaceApp.lockA" : {
       type: "action",
-      text: Locale.tr("Admin") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Lock Admin actions")) + "</span>",
+      text: Locale.tr("Admin"),
       layout: "lock_buttons",
       data: 3
     },
     "MarketPlaceApp.lockM" : {
       type: "action",
-      text: Locale.tr("Manage") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Lock Manage actions")) + "</span>",
+      text: Locale.tr("Manage"),
       layout: "lock_buttons",
       data: 2
     },
     "MarketPlaceApp.lockU" : {
       type: "action",
-      text: Locale.tr("Use") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Lock Use actions")) + "</span>",
+      text: Locale.tr("Use"),
       layout: "lock_buttons",
       data: 1
     },
     "MarketPlaceApp.unlock" : {
       type: "action",
-      text: Locale.tr("Unlock") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Unlock all actions")) + "</span>",
+      text: Locale.tr("Unlock"),
       layout: "lock_buttons"
     }
   };
diff --git a/src/sunstone/public/app/tabs/templates-tab/buttons.js b/src/sunstone/public/app/tabs/templates-tab/buttons.js
index bad31000c5..718c67eed9 100644
--- a/src/sunstone/public/app/tabs/templates-tab/buttons.js
+++ b/src/sunstone/public/app/tabs/templates-tab/buttons.js
@@ -86,25 +86,25 @@ define(function(require) {
     },
     "Template.lockA" : {
       type: "action",
-      text: Locale.tr("Admin") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Lock Admin actions")) + "</span>",
+      text: Locale.tr("Admin"),
       layout: "lock_buttons",
       data: 3
     },
     "Template.lockM" : {
       type: "action",
-      text: Locale.tr("Manage") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Lock Manage actions")) + "</span>",
+      text: Locale.tr("Manage"),
       layout: "lock_buttons",
       data: 2
     },
     "Template.lockU" : {
       type: "action",
-      text: Locale.tr("Use") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Lock Use actions")) + "</span>",
+      text: Locale.tr("Use"),
       layout: "lock_buttons",
       data: 1
     },
     "Template.unlock" : {
       type: "action",
-      text: Locale.tr("Unlock") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Unlock all actions")) + "</span>",
+      text: Locale.tr("Unlock"),
       layout: "lock_buttons"
     }
   };
diff --git a/src/sunstone/public/app/tabs/vmgroup-tab/buttons.js b/src/sunstone/public/app/tabs/vmgroup-tab/buttons.js
index 7414111f14..6f34fbedf8 100644
--- a/src/sunstone/public/app/tabs/vmgroup-tab/buttons.js
+++ b/src/sunstone/public/app/tabs/vmgroup-tab/buttons.js
@@ -55,25 +55,25 @@ define(function(require) {
     },
     "VMGroup.lockA" : {
       type: "action",
-      text: Locale.tr("Admin") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Lock Admin actions")) + "</span>",
+      text: Locale.tr("Admin"),
       layout: "lock_buttons",
       data: 3
     },
     "VMGroup.lockM" : {
       type: "action",
-      text: Locale.tr("Manage") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Lock Manage actions")) + "</span>",
+      text: Locale.tr("Manage"),
       layout: "lock_buttons",
       data: 2
     },
     "VMGroup.lockU" : {
       type: "action",
-      text: Locale.tr("Use") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Lock Use actions")) + "</span>",
+      text: Locale.tr("Use"),
       layout: "lock_buttons",
       data: 1
     },
     "VMGroup.unlock" : {
       type: "action",
-      text: Locale.tr("Unlock") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Unlock all actions")) + "</span>",
+      text: Locale.tr("Unlock"),
       layout: "lock_buttons"
     }/*,
     "VMGroup.edit_labels" : {
diff --git a/src/sunstone/public/app/tabs/vms-tab/buttons.js b/src/sunstone/public/app/tabs/vms-tab/buttons.js
index 912bb8c5b2..34a0aa07ca 100644
--- a/src/sunstone/public/app/tabs/vms-tab/buttons.js
+++ b/src/sunstone/public/app/tabs/vms-tab/buttons.js
@@ -200,25 +200,25 @@ define(function(require) {
     },
     "VM.lockA" : {
       type: "action",
-      text: Locale.tr("Admin") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Lock Admin actions")) + "</span>",
+      text: Locale.tr("Admin"),
       layout: "lock_buttons",
       data: 3
     },
     "VM.lockM" : {
       type: "action",
-      text: Locale.tr("Manage") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Lock Manage actions")) + "</span>",
+      text: Locale.tr("Manage"),
       layout: "lock_buttons",
       data: 2
     },
     "VM.lockU" : {
       type: "action",
-      text: Locale.tr("Use") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Lock Use actions")) + "</span>",
+      text: Locale.tr("Use"),
       layout: "lock_buttons",
       data: 1
     },
     "VM.unlock" : {
       type: "action",
-      text: Locale.tr("Unlock") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Unlock all actions")) + "</span>",
+      text: Locale.tr("Unlock"),
       layout: "lock_buttons"
     }
   }
diff --git a/src/sunstone/public/app/tabs/vms-tab/hooks/header.js b/src/sunstone/public/app/tabs/vms-tab/hooks/header.js
index e2a201fb6e..ecf19ee1db 100644
--- a/src/sunstone/public/app/tabs/vms-tab/hooks/header.js
+++ b/src/sunstone/public/app/tabs/vms-tab/hooks/header.js
@@ -49,10 +49,9 @@ define(function(require) {
     $('.resource-info-header-small', '#' + TAB_ID).text(state);
 
     if (element.LOCK){
-      $('.resource-lock-header-small', '#' + TAB_ID).html("<i class='header-title fa fa-lock'> "+Locale.tr(Humanize.lock_to_str(element.LOCK.LOCKED))+"</i>");
-      $('.resource-lock-header-small', '#' + TAB_ID).show();
+      $('.resource-lock-header-small', '#' + contextTabId).html("<span data-tooltip aria-haspopup='true' class='has-tip' data-disable-hover='false' tabindex='1' title="+Locale.tr(Humanize.lock_to_str(element.LOCK.LOCKED))+"><i class='fa fa-lock fa-2x'/></span>");
     } else {
-      $('.resource-lock-header-small', '#' + TAB_ID).hide();
+      $('.resource-lock-header-small', '#' + contextTabId).html("<i style='color: #cacedd;' class='fa fa-unlock-alt fa-2x'/>");
     }
   }
 
diff --git a/src/sunstone/public/app/tabs/vnets-tab/buttons.js b/src/sunstone/public/app/tabs/vnets-tab/buttons.js
index db19b24136..a7dcdfc027 100644
--- a/src/sunstone/public/app/tabs/vnets-tab/buttons.js
+++ b/src/sunstone/public/app/tabs/vnets-tab/buttons.js
@@ -77,25 +77,25 @@ define(function(require) {
     },
     "Network.lockA" : {
       type: "action",
-      text: Locale.tr("Admin") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Lock Admin actions")) + "</span>",
+      text: Locale.tr("Admin"),
       layout: "lock_buttons",
       data: 3
     },
     "Network.lockM" : {
       type: "action",
-      text: Locale.tr("Manage") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Lock Manage actions")) + "</span>",
+      text: Locale.tr("Manage"),
       layout: "lock_buttons",
       data: 2
     },
     "Network.lockU" : {
       type: "action",
-      text: Locale.tr("Use") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Lock Use actions")) + "</span>",
+      text: Locale.tr("Use"),
       layout: "lock_buttons",
       data: 1
     },
     "Network.unlock" : {
       type: "action",
-      text: Locale.tr("Unlock") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Unlock all actions")) + "</span>",
+      text: Locale.tr("Unlock"),
       layout: "lock_buttons"
     }
   };
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/buttons.js b/src/sunstone/public/app/tabs/vrouters-tab/buttons.js
index a73ed8ec77..ca2b3099b4 100644
--- a/src/sunstone/public/app/tabs/vrouters-tab/buttons.js
+++ b/src/sunstone/public/app/tabs/vrouters-tab/buttons.js
@@ -57,25 +57,25 @@ define(function(require) {
     },
     "VirtualRouter.lockA" : {
       type: "action",
-      text: Locale.tr("Admin") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Lock Admin actions")) + "</span>",
+      text: Locale.tr("Admin"),
       layout: "lock_buttons",
       data: 3
     },
     "VirtualRouter.lockM" : {
       type: "action",
-      text: Locale.tr("Manage") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Lock Manage actions")) + "</span>",
+      text: Locale.tr("Manage"),
       layout: "lock_buttons",
       data: 2
     },
     "VirtualRouter.lockU" : {
       type: "action",
-      text: Locale.tr("Use") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Lock Use actions")) + "</span>",
+      text: Locale.tr("Use"),
       layout: "lock_buttons",
       data: 1
     },
     "VirtualRouter.unlock" : {
       type: "action",
-      text: Locale.tr("Unlock") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Unlock all actions")) + "</span>",
+      text: Locale.tr("Unlock"),
       layout: "lock_buttons"
     }
   };