diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/replace/ReplaceDialog.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/replace/ReplaceAllDialog.java
similarity index 80%
rename from src/main/java/org/gcube/portlets/user/td/columnwidget/client/replace/ReplaceDialog.java
rename to src/main/java/org/gcube/portlets/user/td/columnwidget/client/replace/ReplaceAllDialog.java
index 7c54ae2..cefb840 100644
--- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/replace/ReplaceDialog.java
+++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/replace/ReplaceAllDialog.java
@@ -15,16 +15,16 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler;
  * <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> 
  *
  */
-public class ReplaceDialog extends Window {
+public class ReplaceAllDialog extends Window {
 	protected String WIDTH = "500px";
 	protected String HEIGHT = "150px";
-	protected ReplacePanel ReplacePanel;
+	protected ReplaceAllPanel ReplacePanel;
 	protected CellData cellData;
 	protected TRId trId;
 	protected EventBus eventBus;
 
 	
-	public ReplaceDialog(CellData cellData, TRId trId, EventBus eventBus) {
+	public ReplaceAllDialog(CellData cellData, TRId trId, EventBus eventBus) {
 		initWindow();
 		this.cellData = cellData;
 		this.trId = trId;
@@ -38,9 +38,9 @@ public class ReplaceDialog extends Window {
 		setHeight(HEIGHT);
 		setBodyBorder(false);
 		setResizable(false);
-		setHeadingText("Replace Value");
+		setHeadingText("Replace All");
 		setClosable(true);
-		getHeader().setIcon(ResourceBundle.INSTANCE.replace());
+		getHeader().setIcon(ResourceBundle.INSTANCE.replaceAll());
 
 	}
 
@@ -61,7 +61,7 @@ public class ReplaceDialog extends Window {
 	}
 
 	protected void create() {
-		ReplacePanel replacePanel = new ReplacePanel(this, trId, cellData,
+		ReplaceAllPanel replacePanel = new ReplaceAllPanel(this, trId, cellData,
 				eventBus);
 		add(replacePanel);
 	}
diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/replace/ReplacePanel.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/replace/ReplaceAllPanel.java
similarity index 98%
rename from src/main/java/org/gcube/portlets/user/td/columnwidget/client/replace/ReplacePanel.java
rename to src/main/java/org/gcube/portlets/user/td/columnwidget/client/replace/ReplaceAllPanel.java
index 305fe96..457894a 100644
--- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/replace/ReplacePanel.java
+++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/replace/ReplaceAllPanel.java
@@ -58,7 +58,7 @@ import com.sencha.gxt.widget.core.client.form.TextField;
  *         href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
  * 
  */
-public class ReplacePanel extends FramedPanel implements
+public class ReplaceAllPanel extends FramedPanel implements
 		DimensionRowSelectionListener, MonitorDialogListener {
 	private static final String REPLACEMENT = "Replacement";
 	private static final String CURRENT_VALUE = "Current Value";
@@ -70,7 +70,7 @@ public class ReplacePanel extends FramedPanel implements
 	private EventBus eventBus;
 	private TRId trId;
 	private CellData cellData;
-	private ReplaceDialog parent;
+	private ReplaceAllDialog parent;
 	private ColumnData column;
 
 	private DimensionRow dimensionRow;
@@ -87,7 +87,7 @@ public class ReplacePanel extends FramedPanel implements
 	private TextButton btnClose;
 	private boolean isDimension;
 
-	public ReplacePanel(ReplaceDialog parent, TRId trId, CellData cellData,
+	public ReplaceAllPanel(ReplaceAllDialog parent, TRId trId, CellData cellData,
 			EventBus eventBus) {
 		this.parent = parent;
 		this.cellData = cellData;
@@ -178,7 +178,7 @@ public class ReplacePanel extends FramedPanel implements
 		}
 
 		btnApply = new TextButton("Replace");
-		btnApply.setIcon(ResourceBundle.INSTANCE.replace());
+		btnApply.setIcon(ResourceBundle.INSTANCE.replaceAll());
 		btnApply.setIconAlign(IconAlign.RIGHT);
 		btnApply.setTitle("Replace Value");
 		btnApply.addSelectHandler(new SelectHandler() {
diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/resources/ResourceBundle.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/resources/ResourceBundle.java
index 4e8c94c..533c03f 100644
--- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/resources/ResourceBundle.java
+++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/resources/ResourceBundle.java
@@ -77,6 +77,13 @@ public interface ResourceBundle extends ClientBundle {
 	@Source("column-replace_32.png")
 	ImageResource replace32();
 	
+	@Source("column-replace-all.png")
+	ImageResource replaceAll();
+	
+	@Source("column-replace-all_32.png")
+	ImageResource replaceAll32();
+	
+	
 	@Source("column-replace-batch.png")
 	ImageResource replaceBatch();
 	
diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/resources/column-replace-all.png b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/resources/column-replace-all.png
new file mode 100644
index 0000000..f17ffa6
Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/resources/column-replace-all.png differ
diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/resources/column-replace-all_32.png b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/resources/column-replace-all_32.png
new file mode 100644
index 0000000..04e8c76
Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/resources/column-replace-all_32.png differ
diff --git a/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/resources/column-replace-all.png b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/resources/column-replace-all.png
new file mode 100644
index 0000000..f17ffa6
Binary files /dev/null and b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/resources/column-replace-all.png differ
diff --git a/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/resources/column-replace-all_32.png b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/resources/column-replace-all_32.png
new file mode 100644
index 0000000..04e8c76
Binary files /dev/null and b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/resources/column-replace-all_32.png differ