diff --git a/src/sunstone/etc/sunstone-views/admin.yaml b/src/sunstone/etc/sunstone-views/admin.yaml
index 06f258bc0c..6c70b44273 100644
--- a/src/sunstone/etc/sunstone-views/admin.yaml
+++ b/src/sunstone/etc/sunstone-views/admin.yaml
@@ -461,7 +461,7 @@ tabs:
             Image.refresh: true
             Image.create_dialog: true
             Image.import_dialog: false
-            Image.export_dialog: true
+            Image.upload_marketplace_dialog: true
             Image.rename: true
             Image.chown: true
             Image.chgrp: true
@@ -548,8 +548,8 @@ tabs:
         actions:
             MarketPlaceApp.refresh: true
             MarketPlaceApp.create_dialog: true
-            MarketPlaceApp.export_dialog: true
-            MarketPlaceApp.download: true
+            MarketPlaceApp.download_opennebula_dialog: true
+            MarketPlaceApp.download_local: true
             MarketPlaceApp.rename: true
             MarketPlaceApp.chown: true
             MarketPlaceApp.chgrp: true
diff --git a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
index e5bdb1a1d0..d492a786c7 100644
--- a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
+++ b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
@@ -547,8 +547,8 @@ tabs:
         actions:
             MarketPlaceApp.refresh: true
             MarketPlaceApp.create_dialog: true
-            MarketPlaceApp.export_dialog: true
-            MarketPlaceApp.download: true
+            MarketPlaceApp.download_opennebula_dialog: true
+            MarketPlaceApp.download_local: true
             MarketPlaceApp.rename: true
             MarketPlaceApp.chown: true
             MarketPlaceApp.chgrp: true
diff --git a/src/sunstone/etc/sunstone-views/groupadmin.yaml b/src/sunstone/etc/sunstone-views/groupadmin.yaml
index 2b54e3ad26..5a1a63f552 100644
--- a/src/sunstone/etc/sunstone-views/groupadmin.yaml
+++ b/src/sunstone/etc/sunstone-views/groupadmin.yaml
@@ -460,7 +460,7 @@ tabs:
             Image.refresh: true
             Image.create_dialog: true
             Image.import_dialog: false
-            Image.export_dialog: true
+            Image.upload_marketplace_dialog: true
             Image.rename: true
             Image.chown: true
             Image.chgrp: true
@@ -547,8 +547,8 @@ tabs:
         actions:
             MarketPlaceApp.refresh: true
             MarketPlaceApp.create_dialog: true
-            MarketPlaceApp.export_dialog: true
-            MarketPlaceApp.download: true
+            MarketPlaceApp.download_opennebula_dialog: true
+            MarketPlaceApp.download_local: true
             MarketPlaceApp.rename: true
             MarketPlaceApp.chown: true
             MarketPlaceApp.chgrp: true
diff --git a/src/sunstone/etc/sunstone-views/groupadmin_vcenter.yaml b/src/sunstone/etc/sunstone-views/groupadmin_vcenter.yaml
index 98989b15aa..c990261526 100644
--- a/src/sunstone/etc/sunstone-views/groupadmin_vcenter.yaml
+++ b/src/sunstone/etc/sunstone-views/groupadmin_vcenter.yaml
@@ -460,7 +460,7 @@ tabs:
         actions:
             Image.refresh: true
             Image.create_dialog: true
-            Image.export_dialog: true
+            Image.upload_marketplace_dialog: true
             Image.rename: true
             Image.chown: true
             Image.chgrp: true
@@ -547,8 +547,8 @@ tabs:
         actions:
             MarketPlaceApp.refresh: true
             MarketPlaceApp.create_dialog: true
-            MarketPlaceApp.export_dialog: true
-            MarketPlaceApp.download: true
+            MarketPlaceApp.download_opennebula_dialog: true
+            MarketPlaceApp.download_local: true
             MarketPlaceApp.rename: true
             MarketPlaceApp.chown: true
             MarketPlaceApp.chgrp: true
diff --git a/src/sunstone/etc/sunstone-views/user.yaml b/src/sunstone/etc/sunstone-views/user.yaml
index 69c6cc25d0..7733969f1c 100644
--- a/src/sunstone/etc/sunstone-views/user.yaml
+++ b/src/sunstone/etc/sunstone-views/user.yaml
@@ -464,7 +464,7 @@ tabs:
             Image.refresh: true
             Image.create_dialog: true
             Image.import_dialog: false
-            Image.export_dialog: true
+            Image.upload_marketplace_dialog: true
             Image.rename: true
             Image.chown: false
             Image.chgrp: false
@@ -551,8 +551,8 @@ tabs:
         actions:
             MarketPlaceApp.refresh: true
             MarketPlaceApp.create_dialog: true
-            MarketPlaceApp.export_dialog: true
-            MarketPlaceApp.download: true
+            MarketPlaceApp.download_opennebula_dialog: true
+            MarketPlaceApp.download_local: true
             MarketPlaceApp.rename: true
             MarketPlaceApp.chown: true
             MarketPlaceApp.chgrp: true
diff --git a/src/sunstone/public/app/tabs/images-tab/actions.js b/src/sunstone/public/app/tabs/images-tab/actions.js
index 4f93a20aff..af9fdb0f20 100644
--- a/src/sunstone/public/app/tabs/images-tab/actions.js
+++ b/src/sunstone/public/app/tabs/images-tab/actions.js
@@ -62,7 +62,7 @@ define(function(require) {
     "Image.snapshot_flatten": _commonActions.singleAction("snapshot_flatten"),
     "Image.snapshot_revert": _commonActions.singleAction("snapshot_revert"),
     "Image.snapshot_delete": _commonActions.singleAction("snapshot_delete"),
-    "Image.export_dialog" : {
+    "Image.upload_marketplace_dialog" : {
       type: "custom",
       call: function(params) {
         var selectedNodes = Sunstone.getDataTable(TAB_ID).elements();
diff --git a/src/sunstone/public/app/tabs/images-tab/buttons.js b/src/sunstone/public/app/tabs/images-tab/buttons.js
index 91906acae4..ecffb22222 100644
--- a/src/sunstone/public/app/tabs/images-tab/buttons.js
+++ b/src/sunstone/public/app/tabs/images-tab/buttons.js
@@ -27,9 +27,9 @@ define(function(require) {
       type: "create_dialog",
       layout: "create"
     },
-    "Image.export_dialog" : {
+    "Image.upload_marketplace_dialog" : {
       type: "action",
-      text: '<i class="fa fa-share-alt"/>'
+      text: '<i class="fa fa-share"/> '+ Locale.tr("MarketPlace")
     },
     "Image.import_dialog" : {
       type: "create_dialog",
diff --git a/src/sunstone/public/app/tabs/marketplaceapps-tab/actions.js b/src/sunstone/public/app/tabs/marketplaceapps-tab/actions.js
index 89d3d070e9..7ba7abb936 100644
--- a/src/sunstone/public/app/tabs/marketplaceapps-tab/actions.js
+++ b/src/sunstone/public/app/tabs/marketplaceapps-tab/actions.js
@@ -35,7 +35,7 @@ define(function(require) {
   var _actions = {
     "MarketPlaceApp.create" : _commonActions.create(CREATE_DIALOG_ID),
     "MarketPlaceApp.create_dialog" : _commonActions.showCreate(CREATE_DIALOG_ID),
-    "MarketPlaceApp.export_dialog" : {
+    "MarketPlaceApp.download_opennebula_dialog" : {
       type: "custom",
       call: function() {
         var selected_nodes = Sunstone.getDataTable(TAB_ID).elements();
@@ -91,7 +91,7 @@ define(function(require) {
       },
       notify: true
     },
-    "MarketPlaceApp.download": {
+    "MarketPlaceApp.download_local": {
       type: "multiple",
       call: function(params) {
         var selected_nodes = Sunstone.getDataTable(TAB_ID).elements();
diff --git a/src/sunstone/public/app/tabs/marketplaceapps-tab/buttons.js b/src/sunstone/public/app/tabs/marketplaceapps-tab/buttons.js
index 5339e7b0a4..7ae272cba1 100644
--- a/src/sunstone/public/app/tabs/marketplaceapps-tab/buttons.js
+++ b/src/sunstone/public/app/tabs/marketplaceapps-tab/buttons.js
@@ -27,13 +27,13 @@ define(function(require) {
       type: "create_dialog",
       layout: "create"
     },
-    "MarketPlaceApp.export_dialog" : {
+    "MarketPlaceApp.download_opennebula_dialog" : {
       type: "action",
-      text: Locale.tr("Export to OpenNebula")
+      text: '<i class="fa fa-share"/> '+ Locale.tr("OpenNebula")
     },
-    "MarketPlaceApp.download" : {
+    "MarketPlaceApp.download_local" : {
       type: "action",
-      text: '<i class="fa fa-download"/>'
+      text: '<i class="fa fa-lg fa-cloud-download"/>'
     },
     "MarketPlaceApp.chown" : {
       type: "confirm_with_select",
diff --git a/src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/export.js b/src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/export.js
index 245de8a53f..9529c940f7 100644
--- a/src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/export.js
+++ b/src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/export.js
@@ -52,8 +52,8 @@ define(function(require) {
     this.tabId = TAB_ID;
     this.actions = {
       'export': {
-        'title': Locale.tr("Export App To OpenNebula"),
-        'buttonText': Locale.tr("Export"),
+        'title': Locale.tr("Download App To OpenNebula"),
+        'buttonText': Locale.tr("Download"),
         'resetButton': false
       }
     };