diff --git a/src/cloud/occi/lib/ui/public/js/plugins/compute.js b/src/cloud/occi/lib/ui/public/js/plugins/compute.js
index aeb9a3ad4a..09ee6c434e 100644
--- a/src/cloud/occi/lib/ui/public/js/plugins/compute.js
+++ b/src/cloud/occi/lib/ui/public/js/plugins/compute.js
@@ -93,9 +93,9 @@ var create_vm_tmpl ='<form id="create_vm_form" action="">\
            <input type="text" name="vm_n_times" id="vm_n_times" value="1">\
         </fieldset>\
           <div class="form_buttons">\
-            <button class="vm_close_dialog_link"/>\
-            <button class="button" id="create_vm" value="VM.create" />\
-            <button class="button" type="reset" id="reset_vm" value="reset" />\
+            <button class="vm_close_dialog_link">'+tr("Close")+'</button>\
+            <button class="button" id="create_vm" value="VM.create">'+tr("Create")+'</button>\
+            <!--<button class="button" type="reset" id="reset_vm" value="reset">Reset</button>-->\
           </div>\
         </div>\
 </form>';
@@ -666,19 +666,21 @@ function popUpCreateVMDialog(){
         icons: {
             primary: "ui-icon-check"
         },
-        text: false
+        text: true
     });
+/*
     $('#reset_vm',dialog).button({
         icons: {
             primary: "ui-icon-scissors"
         },
-        text: false
+        text: true
     });
+*/
     $('.vm_close_dialog_link',dialog).button({
         icons: {
             primary: "ui-icon-closethick"
         },
-        text: false
+        text: true
     });
 
     var net_select = makeSelectOptions(dataTable_vNetworks,
@@ -706,13 +708,13 @@ function popUpCreateVMDialog(){
     });
 
     $('#network_box option,#disk_box option',dialog).click(function(){
-        var clicked = $(this).attr("clicked");
+        var clicked = $(this).attr('clicked');
         if (clicked){//unbold, unmark
-            $(this).text($(this).text().replace(/\*/g,''));
+            $(this).text($(this).text().replace(/✓/g,''));
             $(this).removeAttr('clicked');
         }
         else {//bold,mark
-            $(this).text("*"+$(this).text()+"*");
+            $(this).text("✓"+$(this).text());
             $(this).attr('clicked','clicked');
         }
         return false;
diff --git a/src/cloud/occi/lib/ui/public/js/plugins/network.js b/src/cloud/occi/lib/ui/public/js/plugins/network.js
index 6668ec386d..d66d45d1f8 100644
--- a/src/cloud/occi/lib/ui/public/js/plugins/network.js
+++ b/src/cloud/occi/lib/ui/public/js/plugins/network.js
@@ -53,9 +53,9 @@ var create_vn_tmpl =
             <div class="clear"></div>\
           </fieldset>\
           <div class="form_buttons">\
-            <button class="vnet_close_dialog_link"/>\
-            <button class="button" id="create_vn" value="vn/create" />\
-            <button class="button" type="reset" id="reset_vn" value="reset" />\
+            <button class="vnet_close_dialog_link">'+tr("Close")+'</button>\
+            <button class="button" id="create_vn" value="Network.create">'+tr("Create")+'</button>\
+            <!--<button class="button" type="reset" id="reset_vn" value="reset" />-->\
           </div>\
         </form>\
       </div>\
@@ -342,19 +342,21 @@ function popUpCreateVnetDialog() {
         icons: {
             primary: "ui-icon-check"
         },
-        text: false
+        text: true
     });
+/*
     $('#reset_vn',dialog).button({
         icons: {
             primary: "ui-icon-scissors"
         },
         text: false
     });
+*/
     $('.vnet_close_dialog_link',dialog).button({
         icons: {
             primary: "ui-icon-closethick"
         },
-        text: false
+        text: true
     });
 
     $('#create_vn_form_easy',dialog).submit(function(){
diff --git a/src/cloud/occi/lib/ui/public/js/plugins/storage.js b/src/cloud/occi/lib/ui/public/js/plugins/storage.js
index 891414a42f..7a4b3be704 100644
--- a/src/cloud/occi/lib/ui/public/js/plugins/storage.js
+++ b/src/cloud/occi/lib/ui/public/js/plugins/storage.js
@@ -92,9 +92,9 @@ var create_image_tmpl =
                <div class="img_param">\
 -->\
                <div class="form_buttons">\
-                 <button class="image_close_dialog_link"/>\
-                 <button class="button" id="create_image" value="Image.create" />\
-                 <button class="button" type="reset" id="reset_image" value="reset" />\
+                 <button class="image_close_dialog_link">'+tr("Close")+'</button>\
+                 <button class="button" id="create_image" value="Image.create">'+tr("Create")+'</button>\
+                 <!--<button class="button" type="reset" id="reset_image" value="reset"-->\
                </div>\
            </form>\
         </div>\
@@ -413,19 +413,21 @@ function popUpCreateImageDialog(){
         icons: {
             primary: "ui-icon-check"
         },
-        text: false
+        text: true
     });
+/*
     $('#reset_image',dialog).button({
         icons: {
             primary: "ui-icon-scissors"
         },
         text: false
     });
+*/
     $('.image_close_dialog_link',dialog).button({
         icons: {
             primary: "ui-icon-closethick"
         },
-        text: false
+        text: true
     });
 
     setupTips(dialog);
diff --git a/src/cloud/occi/lib/ui/public/locale/en_US/en_US.js b/src/cloud/occi/lib/ui/public/locale/en_US/en_US.js
index 1ff5bf84e4..d36fd78cb4 100644
--- a/src/cloud/occi/lib/ui/public/locale/en_US/en_US.js
+++ b/src/cloud/occi/lib/ui/public/locale/en_US/en_US.js
@@ -13,6 +13,7 @@ locale={
     "Canvas not supported.":"",
     "CD-ROM":"",
     "Changing language":"",
+    "Close":"",
     "Community":"",
     "Compute":"",
     "Compute resource":"",
@@ -21,6 +22,7 @@ locale={
     "Configuration":"",
     "Confirmation of action":"",
     "CPU":"",
+    "Create":"",
     "Create network":"",
     "Create new compute resource":"",
     "Create new network resource":"",
diff --git a/src/cloud/occi/lib/ui/public/locale/es_ES/es_ES.js b/src/cloud/occi/lib/ui/public/locale/es_ES/es_ES.js
index 8a10534706..49d91652f2 100644
--- a/src/cloud/occi/lib/ui/public/locale/es_ES/es_ES.js
+++ b/src/cloud/occi/lib/ui/public/locale/es_ES/es_ES.js
@@ -13,6 +13,7 @@ locale={
     "Canvas not supported.":"Canvas no soportado",
     "CD-ROM":"CD-ROM",
     "Changing language":"Cambiando el lenguaje",
+    "Close":"Cerrar",
     "Community":"Comunidad",
     "Compute":"Máquinas Virtuales",
     "Compute resource":"máquina virtual",
@@ -21,6 +22,7 @@ locale={
     "Configuration":"Configuración",
     "Confirmation of action":"Confirmar operación",
     "CPU":"CPU",
+    "Create":"Crear",
     "Create network":"Crear red",
     "Create new compute resource":"Crear nueva máquina virtual",
     "Create new network resource":"Crear nueva red",
@@ -89,7 +91,7 @@ locale={
     "Please select":"Por favor escoja",
     "Previous action":"Acción anterior",
     "Public":"Público",
-    "Public scope of the image":"",
+    "Public scope of the image":"Imagen pública",
     "Publish":"Publicar",
     "Refresh list":"Refrescar lista",
     "Resume":"Reanudar",
diff --git a/src/cloud/occi/lib/ui/public/locale/generate_translation_template.rb b/src/cloud/occi/lib/ui/public/locale/generate_translation_template.rb
index e6adde7429..b3719bd4fa 100755
--- a/src/cloud/occi/lib/ui/public/locale/generate_translation_template.rb
+++ b/src/cloud/occi/lib/ui/public/locale/generate_translation_template.rb
@@ -17,7 +17,7 @@
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
 
-tr_strings = `grep -h -o -R -e 'tr("[[:print:]]*")' ../js/* ../customize/* | cut -d'"' -f 2 | sort -u`
+tr_strings = `grep -h -o -R -e 'tr("[[:print:]]*")' ../js/* ../customize/* ../../../../../../sunstone/public/js/sunstone.js ../../../../../../sunstone/public/js/sunstone-util.js | cut -d'"' -f 2 | sort -u`
 
 puts "//Translated by"
 puts 'lang="en_US"'
diff --git a/src/sunstone/public/js/opennebula.js b/src/sunstone/public/js/opennebula.js
index 0cba8a056e..3956b35752 100644
--- a/src/sunstone/public/js/opennebula.js
+++ b/src/sunstone/public/js/opennebula.js
@@ -585,6 +585,9 @@ var OpenNebula = {
         "resubmit": function(params){
             OpenNebula.Action.simple_action(params,OpenNebula.VM.resource,"resubmit");
         },
+        "reboot" : function(params){
+            OpenNebula.Action.simple_action(params,OpenNebula.VM.resource,"reboot");
+        },
 
         "log": function(params){
             OpenNebula.Action.show(params,OpenNebula.VM.resource,"log");
diff --git a/src/sunstone/public/js/plugins/vms-tab.js b/src/sunstone/public/js/plugins/vms-tab.js
index a8f8caad3d..de1000a875 100644
--- a/src/sunstone/public/js/plugins/vms-tab.js
+++ b/src/sunstone/public/js/plugins/vms-tab.js
@@ -241,6 +241,15 @@ var vm_actions = {
         notify: true
     },
 
+    "VM.reboot" : {
+        type: "multiple",
+        call: OpenNebula.VM.reboot,
+        callback: vmShow,
+        elements: vmElements,
+        error: onError,
+        notify: true
+    },
+
     "VM.saveasmultiple" : {
         type: "custom",
         call: function(){
@@ -464,6 +473,11 @@ var vm_buttons = {
                 text: tr("Resubmit"),
                 tip: tr("This will resubmits VMs to PENDING state")
             },
+            "VM.reboot" : {
+                type : "confirm",
+                text: tr("Reboot"),
+                tip: tr("This will send a reboot action to running VMs")
+            },
             "VM.saveasmultiple" : {
                 type: "action",
                 text: tr("Save as")