diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypePanel.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypePanel.java
index 9f2478b..827bff1 100644
--- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypePanel.java
+++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypePanel.java
@@ -15,6 +15,7 @@ import org.gcube.portlets.user.td.columnwidget.client.properties.ColumnTypeCodeP
 import org.gcube.portlets.user.td.columnwidget.client.properties.LocaleTypeProperties;
 import org.gcube.portlets.user.td.columnwidget.client.properties.TabResourceProperties;
 import org.gcube.portlets.user.td.columnwidget.client.properties.TimeDimensionTypeProperties;
+import org.gcube.portlets.user.td.columnwidget.client.resources.ResourceBundle;
 import org.gcube.portlets.user.td.columnwidget.client.store.ColumnDataTypeElement;
 import org.gcube.portlets.user.td.columnwidget.client.store.ColumnDataTypeStore;
 import org.gcube.portlets.user.td.columnwidget.client.store.ColumnTypeCodeElement;
@@ -47,6 +48,7 @@ import com.google.gwt.event.logical.shared.SelectionEvent;
 import com.google.gwt.event.logical.shared.SelectionHandler;
 import com.google.gwt.user.client.rpc.AsyncCallback;
 import com.google.web.bindery.event.shared.EventBus;
+import com.sencha.gxt.cell.core.client.ButtonCell.IconAlign;
 import com.sencha.gxt.cell.core.client.form.ComboBoxCell.TriggerAction;
 import com.sencha.gxt.core.client.util.Margins;
 import com.sencha.gxt.data.client.loader.RpcProxy;
@@ -373,6 +375,11 @@ public class ChangeColumnTypePanel extends FramedPanel implements
 
 		// Change
 		change = new TextButton("Change");
+		change.setIcon(ResourceBundle.INSTANCE.columnType());
+		change.setIconAlign(IconAlign.RIGHT);
+		change.setTitle("Change Column Type");
+
+		
 		SelectHandler changeHandler = new SelectHandler() {
 
 			public void onSelect(SelectEvent event) {
diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/LabelColumnPanel.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/LabelColumnPanel.java
index b0a66ae..34e2740 100644
--- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/LabelColumnPanel.java
+++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/LabelColumnPanel.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
 
 import org.gcube.portlets.user.td.columnwidget.client.progress.LabelColumnProgressDialog;
 import org.gcube.portlets.user.td.columnwidget.client.properties.ColumnDataPropertiesCombo;
+import org.gcube.portlets.user.td.columnwidget.client.resources.ResourceBundle;
 import org.gcube.portlets.user.td.columnwidget.client.utils.UtilsGXT3;
 import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync;
 import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTSessionExpiredException;
@@ -21,6 +22,7 @@ import com.google.gwt.event.logical.shared.SelectionEvent;
 import com.google.gwt.event.logical.shared.SelectionHandler;
 import com.google.gwt.user.client.rpc.AsyncCallback;
 import com.google.web.bindery.event.shared.EventBus;
+import com.sencha.gxt.cell.core.client.ButtonCell.IconAlign;
 import com.sencha.gxt.cell.core.client.form.ComboBoxCell.TriggerAction;
 import com.sencha.gxt.core.client.util.Margins;
 import com.sencha.gxt.data.client.loader.RpcProxy;
@@ -136,6 +138,11 @@ public class LabelColumnPanel extends FramedPanel {
 		label.setAllowBlank(false);
 
 		change = new TextButton("Change");
+		change.setIcon(ResourceBundle.INSTANCE.columnLabel());
+		change.setIconAlign(IconAlign.RIGHT);
+		change.setTitle("Change Column Label");
+
+		
 		change.addSelectHandler(new SelectHandler() {
 
 			public void onSelect(SelectEvent event) {
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 c025931..f6a7ccb 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
@@ -52,6 +52,18 @@ public interface ResourceBundle extends ClientBundle {
 	@Source("column-delete_32.png")
 	ImageResource columnDelete32();
 	
+	@Source("column-label.png")
+	ImageResource columnLabel();
+	
+	@Source("column-label_32.png")
+	ImageResource columnLabel32();
+	
+	@Source("column-type.png")
+	ImageResource columnType();
+	
+	@Source("column-type_32.png")
+	ImageResource columnType32();
+	
 	@Source("column-replace.png")
 	ImageResource replace();
 	
diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/resources/column-label.png b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/resources/column-label.png
new file mode 100644
index 0000000..ba73017
Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/resources/column-label.png differ
diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/resources/column-label_32.png b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/resources/column-label_32.png
new file mode 100644
index 0000000..6a3442f
Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/resources/column-label_32.png differ
diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/resources/column-type.png b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/resources/column-type.png
new file mode 100644
index 0000000..a9177f4
Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/resources/column-type.png differ
diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/resources/column-type_32.png b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/resources/column-type_32.png
new file mode 100644
index 0000000..584f112
Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/resources/column-type_32.png differ
diff --git a/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/resources/column-label.png b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/resources/column-label.png
new file mode 100644
index 0000000..ba73017
Binary files /dev/null and b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/resources/column-label.png differ
diff --git a/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/resources/column-label_32.png b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/resources/column-label_32.png
new file mode 100644
index 0000000..6a3442f
Binary files /dev/null and b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/resources/column-label_32.png differ
diff --git a/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/resources/column-type.png b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/resources/column-type.png
new file mode 100644
index 0000000..a9177f4
Binary files /dev/null and b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/resources/column-type.png differ
diff --git a/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/resources/column-type_32.png b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/resources/column-type_32.png
new file mode 100644
index 0000000..584f112
Binary files /dev/null and b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/resources/column-type_32.png differ