diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/computations/ComputationValueFilePanel.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/computations/ComputationValueFilePanel.java
index 442c795..265a871 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/computations/ComputationValueFilePanel.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/computations/ComputationValueFilePanel.java
@@ -50,7 +50,7 @@ public class ComputationValueFilePanel extends SimpleContainer {
 
 		lc.add(fileNameHtml, new VerticalLayoutData(-1, -1, new Margins(0)));
 		TextButton downloadBtn = new TextButton("Download File");
-		downloadBtn.setIcon(DataMinerManager.resources.fileDownload());
+		downloadBtn.setIcon(DataMinerManager.resources.download());
 		downloadBtn.addSelectHandler(new SelectEvent.SelectHandler() {
 			@Override
 			public void onSelect(SelectEvent event) {
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/computations/ComputationsExecutedPanel.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/computations/ComputationsExecutedPanel.java
index c415803..d00e03b 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/computations/ComputationsExecutedPanel.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/computations/ComputationsExecutedPanel.java
@@ -5,6 +5,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.gcube.portlets.user.dataminermanager.client.DataMinerManager;
 import org.gcube.portlets.user.dataminermanager.client.common.EventBusProvider;
 import org.gcube.portlets.user.dataminermanager.client.events.CancelExecutionFromComputationsRequestEvent;
 import org.gcube.portlets.user.dataminermanager.client.events.ComputationDataRequestEvent;
@@ -316,7 +317,7 @@ public class ComputationsExecutedPanel extends FramedPanel {
 
 			// ToolBar
 			btnShow = new TextButton("Show");
-			// btnOpen.setIcon(StatAlgoImporterResources.INSTANCE.download16());
+			btnShow.setIcon(DataMinerManager.resources.show());
 			btnShow.setScale(ButtonScale.SMALL);
 			btnShow.setIconAlign(IconAlign.LEFT);
 			btnShow.setToolTip("Show");
@@ -330,7 +331,7 @@ public class ComputationsExecutedPanel extends FramedPanel {
 			});
 
 			btnDownload = new TextButton("Download");
-			// btnOpen.setIcon(StatAlgoImporterResources.INSTANCE.download16());
+			btnDownload.setIcon(DataMinerManager.resources.download());
 			btnDownload.setScale(ButtonScale.SMALL);
 			btnDownload.setIconAlign(IconAlign.LEFT);
 			btnDownload.setToolTip("Download");
@@ -344,7 +345,7 @@ public class ComputationsExecutedPanel extends FramedPanel {
 			});
 
 			btnDelete = new TextButton("Delete");
-			// btnDelete.setIcon(StatAlgoImporterResources.INSTANCE.delete16());
+			btnDelete.setIcon(DataMinerManager.resources.deleteCircle());
 			btnDelete.setScale(ButtonScale.SMALL);
 			btnDelete.setIconAlign(IconAlign.LEFT);
 			btnDelete.setToolTip("Delete");
@@ -358,7 +359,7 @@ public class ComputationsExecutedPanel extends FramedPanel {
 			});
 
 			btnRefresh = new TextButton("Refresh");
-			// btnRefresh.setIcon(StatAlgoImporterResources.INSTANCE.reload16());
+			btnRefresh.setIcon(DataMinerManager.resources.refresh());
 			btnRefresh.setScale(ButtonScale.SMALL);
 			btnRefresh.setIconAlign(IconAlign.LEFT);
 			btnRefresh.setToolTip("Refresh");
@@ -372,7 +373,7 @@ public class ComputationsExecutedPanel extends FramedPanel {
 			});
 
 			btnResubmit = new TextButton("Resubmit");
-			// btnResubmit.setIcon(StatAlgoImporterResources.INSTANCE.reload16());
+			btnResubmit.setIcon(DataMinerManager.resources.resubmit());
 			btnResubmit.setScale(ButtonScale.SMALL);
 			btnResubmit.setIconAlign(IconAlign.LEFT);
 			btnResubmit.setToolTip("Resubmit");
@@ -386,7 +387,7 @@ public class ComputationsExecutedPanel extends FramedPanel {
 			});
 
 			btnCancel = new TextButton("Cancel");
-			// btnCancel.setIcon(StatAlgoImporterResources.INSTANCE.reload16());
+			btnCancel.setIcon(DataMinerManager.resources.cancelCircle());
 			btnCancel.setScale(ButtonScale.SMALL);
 			btnCancel.setIconAlign(IconAlign.LEFT);
 			btnCancel.setToolTip("Cancel");
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/dataspace/InputDataSetsPanel.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/dataspace/InputDataSetsPanel.java
index b38ce14..c24415a 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/dataspace/InputDataSetsPanel.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/dataspace/InputDataSetsPanel.java
@@ -5,6 +5,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.gcube.portlets.user.dataminermanager.client.DataMinerManager;
 import org.gcube.portlets.user.dataminermanager.client.common.EventBusProvider;
 import org.gcube.portlets.user.dataminermanager.client.events.DataMinerWorkAreaEvent;
 import org.gcube.portlets.user.dataminermanager.client.events.DeleteItemRequestEvent;
@@ -302,7 +303,7 @@ public class InputDataSetsPanel extends FramedPanel {
 
 			// ToolBar
 			btnDownload = new TextButton("Download");
-			// btnOpen.setIcon(StatAlgoImporterResources.INSTANCE.download16());
+			btnDownload.setIcon(DataMinerManager.resources.download());
 			btnDownload.setScale(ButtonScale.SMALL);
 			btnDownload.setIconAlign(IconAlign.LEFT);
 			btnDownload.setToolTip("Download");
@@ -316,7 +317,7 @@ public class InputDataSetsPanel extends FramedPanel {
 			});
 
 			btnDelete = new TextButton("Delete");
-			// btnDelete.setIcon(StatAlgoImporterResources.INSTANCE.delete16());
+			btnDelete.setIcon(DataMinerManager.resources.deleteCircle());
 			btnDelete.setScale(ButtonScale.SMALL);
 			btnDelete.setIconAlign(IconAlign.LEFT);
 			btnDelete.setToolTip("Delete");
@@ -330,7 +331,7 @@ public class InputDataSetsPanel extends FramedPanel {
 			});
 
 			btnRefresh = new TextButton("Refresh");
-			// btnRefresh.setIcon(StatAlgoImporterResources.INSTANCE.reload16());
+			btnRefresh.setIcon(DataMinerManager.resources.refresh());
 			btnRefresh.setScale(ButtonScale.SMALL);
 			btnRefresh.setIconAlign(IconAlign.LEFT);
 			btnRefresh.setToolTip("Refresh");
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/dataspace/OutputDataSetsPanel.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/dataspace/OutputDataSetsPanel.java
index 1f75feb..f9de1fa 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/dataspace/OutputDataSetsPanel.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/dataspace/OutputDataSetsPanel.java
@@ -5,6 +5,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.gcube.portlets.user.dataminermanager.client.DataMinerManager;
 import org.gcube.portlets.user.dataminermanager.client.common.EventBusProvider;
 import org.gcube.portlets.user.dataminermanager.client.events.DataMinerWorkAreaEvent;
 import org.gcube.portlets.user.dataminermanager.client.events.DeleteItemRequestEvent;
@@ -301,7 +302,7 @@ public class OutputDataSetsPanel extends FramedPanel {
 
 			// ToolBar
 			btnDownload = new TextButton("Download");
-			// btnOpen.setIcon(StatAlgoImporterResources.INSTANCE.download16());
+			btnDownload.setIcon(DataMinerManager.resources.download());
 			btnDownload.setScale(ButtonScale.SMALL);
 			btnDownload.setIconAlign(IconAlign.LEFT);
 			btnDownload.setToolTip("Download");
@@ -315,7 +316,7 @@ public class OutputDataSetsPanel extends FramedPanel {
 			});
 
 			btnDelete = new TextButton("Delete");
-			// btnDelete.setIcon(StatAlgoImporterResources.INSTANCE.delete16());
+			btnDelete.setIcon(DataMinerManager.resources.deleteCircle());
 			btnDelete.setScale(ButtonScale.SMALL);
 			btnDelete.setIconAlign(IconAlign.LEFT);
 			btnDelete.setToolTip("Delete");
@@ -329,7 +330,7 @@ public class OutputDataSetsPanel extends FramedPanel {
 			});
 
 			btnRefresh = new TextButton("Refresh");
-			// btnRefresh.setIcon(StatAlgoImporterResources.INSTANCE.reload16());
+			btnRefresh.setIcon(DataMinerManager.resources.refresh());
 			btnRefresh.setScale(ButtonScale.SMALL);
 			btnRefresh.setIconAlign(IconAlign.LEFT);
 			btnRefresh.setToolTip("Refresh");
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/FileFld.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/FileFld.java
index 97eb1ed..0026e7e 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/FileFld.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/FileFld.java
@@ -179,7 +179,7 @@ public class FileFld extends AbstractFld {
 		});
 
 		downloadButton = new TextButton("");
-		downloadButton.setIcon(DataMinerManager.resources.fileDownload());
+		downloadButton.setIcon(DataMinerManager.resources.download());
 		downloadButton.addSelectHandler(new SelectEvent.SelectHandler() {
 
 			@Override
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/TabItem.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/TabItem.java
index 1d940dd..7acaeac 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/TabItem.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/TabItem.java
@@ -93,7 +93,7 @@ public class TabItem extends HBoxLayoutContainer {
 		
 		
 		downloadButton = new TextButton("");
-		downloadButton.setIcon(DataMinerManager.resources.fileDownload());
+		downloadButton.setIcon(DataMinerManager.resources.download());
 		downloadButton.addSelectHandler(new SelectEvent.SelectHandler() {
 
 			@Override
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/TabularFld.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/TabularFld.java
index 00c0e57..0e47054 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/TabularFld.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/TabularFld.java
@@ -251,7 +251,7 @@ public class TabularFld extends AbstractFld implements
 			});
 
 			downloadButton = new TextButton("");
-			downloadButton.setIcon(DataMinerManager.resources.fileDownload());
+			downloadButton.setIcon(DataMinerManager.resources.download());
 			downloadButton.addSelectHandler(new SelectEvent.SelectHandler() {
 
 				@Override
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/resources/Resources.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/resources/Resources.java
index adc9f33..378ff8a 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/resources/Resources.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/resources/Resources.java
@@ -59,9 +59,6 @@ public interface Resources extends ClientBundle {
 	@Source("menuItemDataspace.png")
 	ImageResource menuItemInputspace();
 
-	@Source("table.png")
-	ImageResource fileDownload(); // TODO change
-
 	@Source("ajax-loader-big.gif")
 	ImageResource loaderBig();
 
@@ -77,4 +74,22 @@ public interface Resources extends ClientBundle {
 	@Source("monitor.png")
 	ImageResource computationPerspective();
 
+	@Source("download.png")
+	ImageResource download();
+	
+	@Source("cancel_circle.png")
+	ImageResource cancelCircle();
+	
+	@Source("delete_circle.png")
+	ImageResource deleteCircle();
+	
+	@Source("refresh.png")
+	ImageResource refresh();
+	
+	@Source("resubmit.png")
+	ImageResource resubmit();
+
+	@Source("show.png")
+	ImageResource show();
+	
 }
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/resources/cancel_circle.png b/src/main/java/org/gcube/portlets/user/dataminermanager/client/resources/cancel_circle.png
new file mode 100644
index 0000000..8829755
Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/dataminermanager/client/resources/cancel_circle.png differ
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/resources/delete_circle.png b/src/main/java/org/gcube/portlets/user/dataminermanager/client/resources/delete_circle.png
new file mode 100644
index 0000000..5aa62e2
Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/dataminermanager/client/resources/delete_circle.png differ
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/resources/download.png b/src/main/java/org/gcube/portlets/user/dataminermanager/client/resources/download.png
new file mode 100644
index 0000000..f588bf6
Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/dataminermanager/client/resources/download.png differ
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/resources/refresh.png b/src/main/java/org/gcube/portlets/user/dataminermanager/client/resources/refresh.png
new file mode 100644
index 0000000..ee2106d
Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/dataminermanager/client/resources/refresh.png differ
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/resources/resubmit.png b/src/main/java/org/gcube/portlets/user/dataminermanager/client/resources/resubmit.png
new file mode 100644
index 0000000..0202cbe
Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/dataminermanager/client/resources/resubmit.png differ
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/resources/show.png b/src/main/java/org/gcube/portlets/user/dataminermanager/client/resources/show.png
new file mode 100644
index 0000000..b8a25e4
Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/dataminermanager/client/resources/show.png differ
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/widgets/FileViewer.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/widgets/FileViewer.java
index ea75970..e568a9c 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/widgets/FileViewer.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/widgets/FileViewer.java
@@ -50,7 +50,7 @@ public class FileViewer extends SimpleContainer {
 								.toSafeHtml().asString() + "</p></div>");
 		lc.add(fileNameHtml, new VerticalLayoutData(-1, -1, new Margins(0)));
 		TextButton downloadBtn = new TextButton("Download File");
-		downloadBtn.setIcon(DataMinerManager.resources.fileDownload());
+		downloadBtn.setIcon(DataMinerManager.resources.download());
 		downloadBtn.addSelectHandler(new SelectEvent.SelectHandler() {
 			@Override
 			public void onSelect(SelectEvent event) {