diff --git a/src/sunstone/public/app/tabs/vms-tab/buttons.js b/src/sunstone/public/app/tabs/vms-tab/buttons.js
index a2ca69f3a8..0c9e94c5a5 100644
--- a/src/sunstone/public/app/tabs/vms-tab/buttons.js
+++ b/src/sunstone/public/app/tabs/vms-tab/buttons.js
@@ -17,8 +17,13 @@
 define(function(require) {
   var Locale = require('utils/locale');
   var Tips = require('utils/tips');
-
-  var Buttons = {
+  var Config = require('sunstone-config');
+  var confirm = Config.confirmVMActions;
+  var text = "action";
+  if(confirm){
+    text = "confirm";
+  }
+    var Buttons = {
     "VM.refresh" : {
       type: "action",
       layout: "refresh",
@@ -44,7 +49,7 @@ define(function(require) {
       tip: Locale.tr("Select the new group")
     },
     "VM.deploy" : {
-      type: "action",
+      type: text,
       text: Locale.tr("Deploy"),
       layout: "vmsplanification_buttons",
       custom_classes : "state-dependent"
@@ -74,79 +79,79 @@ define(function(require) {
       custom_classes : "state-dependent"
     },
     "VM.suspend" : {
-      type: "action",
+      type: text,
       text: Locale.tr("Suspend") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Keeps allocated Host resources. The resume operation happens quickly")) + "</span>",
       layout: "vmspause_buttons",
       custom_classes : "state-dependent"
     },
     "VM.resume" : {
-      type: "action",
+      type: text,
       text: '<i class="fa fa-play"/>',
       layout: "vmsplay_buttons",
       custom_classes : "state-dependent"
     },
     "VM.stop" : {
-      type: "action",
+      type: text,
       text: Locale.tr("Stop")  + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Frees Host resources. The resume operation may take long")) + "</span>",
       layout: "vmspause_buttons",
       custom_classes : "state-dependent"
     },
     "VM.reboot" : {
-      type: "action",
+      type: text,
       text: Locale.tr("Reboot"),
       layout: "vmsrepeat_buttons",
       custom_classes : "state-dependent"
     },
     "VM.reboot_hard" : {
-      type: "action",
+      type: text,
       text: Locale.tr("Reboot") + ' <span class="label secondary radius">' + Locale.tr("hard") + '</span>',
       layout: "vmsrepeat_buttons",
       custom_classes : "state-dependent"
     },
     "VM.poweroff" : {
-      type: "action",
+      type: text,
       text: Locale.tr("Power Off") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Keeps allocated Host resources. The resume operation happens quickly")) + "</span>",
       layout: "vmsstop_buttons",
       custom_classes : "state-dependent"
     },
     "VM.poweroff_hard" : {
-      type: "action",
+      type: text,
       text: Locale.tr("Power Off") + ' <span class="label secondary radius">' + Locale.tr("hard") + '</span>'  + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Keeps allocated Host resources. The resume operation happens quickly")) + "</span>",
       layout: "vmsstop_buttons",
       custom_classes : "state-dependent"
     },
     "VM.undeploy" : {
-      type: "action",
+      type: text,
       text: Locale.tr("Undeploy")  + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Frees Host resources. The resume operation may take long")) + "</span>",
       layout: "vmsstop_buttons",
       custom_classes : "state-dependent"
     },
     "VM.undeploy_hard" : {
-      type: "action",
+      type: text,
       text: Locale.tr("Undeploy") + ' <span class="label secondary radius">' + Locale.tr("hard") + '</span>'  + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Frees Host resources. The resume operation may take long")) + "</span>",
       layout: "vmsstop_buttons",
       custom_classes : "state-dependent"
     },
     "VM.terminate" : {
-      type: "confirm",
+      type: text,
       text: Locale.tr("Terminate"),
       layout: "vmsdelete_buttons",
       custom_classes : "state-dependent"
     },
     "VM.terminate_hard" : {
-      type: "confirm",
+      type: text,
       text: Locale.tr("Terminate") + ' <span class="label secondary radius">' + Locale.tr("hard") + '</span>',
       layout: "vmsdelete_buttons",
       custom_classes : "state-dependent"
     },
     "VM.resched" : {
-      type: "action",
+      type: text,
       text: Locale.tr("Reschedule"),
       layout: "vmsplanification_buttons",
       custom_classes : "state-dependent"
     },
     "VM.unresched" : {
-      type: "action",
+      type: text,
       text: Locale.tr("Un-Reschedule"),
       layout: "vmsplanification_buttons",
       custom_classes : "state-dependent"
@@ -190,6 +195,5 @@ define(function(require) {
       layout: "labels",
     }
   }
-
   return Buttons;
 })
diff --git a/src/sunstone/public/app/tabs/vms-tab/dialogs/vnc/html.hbs b/src/sunstone/public/app/tabs/vms-tab/dialogs/vnc/html.hbs
index 5a6c402494..814c3ed3d5 100644
--- a/src/sunstone/public/app/tabs/vms-tab/dialogs/vnc/html.hbs
+++ b/src/sunstone/public/app/tabs/vms-tab/dialogs/vnc/html.hbs
@@ -21,11 +21,11 @@
         {{tr "VNC"}}
         <span id="VNC_status">{{tr "Loading"}}</span>
         <span id="VNC_buttons" class="right">
-          <button class="button secondary" value="Send CtrlAltDel" id="sendCtrlAltDelButton">{{tr "Send CtrlAltDel"}}</button>
+          <button class="button alert" value="Send CtrlAltDel" id="sendCtrlAltDelButton">{{tr "Send CtrlAltDel"}}</button>
           <a class="button" id="open_in_a_new_window" href="" target="_blank" title="{{tr "Open in a new window"}}">
             <i class="fa fa-external-link detach-vnc-icon"/>
           </a>
-          <button class="button alert" data-close aria-label="{{tr "Close modal"}}" type="button">
+          <button class="button secondary" data-close aria-label="{{tr "Close modal"}}" type="button" title="Close VNC">
             <i class="fa fa-times-circle"></i>
           </button>
         </span>