diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/NumberBox.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/NumberBox.java
index 0162d0dd82..fd7d1713b2 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/NumberBox.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/NumberBox.java
@@ -86,7 +86,7 @@ public class NumberBox extends Div
     	hlayout.appendChild(decimalBox);
 		
 		btn = new Button();
-        btn.setImage(ThemeManager.getThemeResource("images/Calculator10.png"));
+        btn.setImage(ThemeManager.getThemeResource("images/Calculator16.png"));
 		btn.setTabindex(-1);
 		btn.setHflex("0");
 		btn.setWidgetListener("onClick", "try{var id=this.getPopup(); zk.Widget.$(id.substring(5, id.length - 1)).focus_(100);" +
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WAccountEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WAccountEditor.java
index 40d6a4c255..2b345e8638 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WAccountEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WAccountEditor.java
@@ -55,7 +55,7 @@ public class WAccountEditor extends WEditor implements ContextMenuListener
 	public WAccountEditor(GridField gridField)
 	{
 		super(new Combinationbox(), gridField);
-		getComponent().setButtonImage(ThemeManager.getThemeResource("images/Account10.png"));
+		getComponent().setButtonImage(ThemeManager.getThemeResource("images/Account16.png"));
 
 		m_mAccount = new MAccountLookup (gridField.getVO().ctx, gridField.getWindowNo());
 		
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WAssignmentEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WAssignmentEditor.java
index 1ac60bda88..65bd7dce0a 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WAssignmentEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WAssignmentEditor.java
@@ -55,7 +55,7 @@ public class WAssignmentEditor extends WEditor implements ContextMenuListener {
 	
 	private void initComponents() {
 		getComponent().getTextbox().setReadonly(true);
-		getComponent().setButtonImage(ThemeManager.getThemeResource("images/Assignment10.png"));
+		getComponent().setButtonImage(ThemeManager.getThemeResource("images/Assignment16.png"));
 		
 		popupMenu = new WEditorPopupMenu(true, false, false);
 		popupMenu.addMenuListener(this);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocationEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocationEditor.java
index e79384a71d..3209087950 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocationEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocationEditor.java
@@ -86,7 +86,7 @@ public class WLocationEditor extends WEditor implements EventListener<Event>, Pr
 
     private void init()
     {
-    	getComponent().setButtonImage(ThemeManager.getThemeResource("images/Location10.png"));
+    	getComponent().setButtonImage(ThemeManager.getThemeResource("images/Location16.png"));
     	
     	popupMenu = new WEditorPopupMenu(false, false, isShowPreference());
     	popupMenu.addMenuListener(this);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocatorEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocatorEditor.java
index c257762b04..80b430451b 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocatorEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocatorEditor.java
@@ -94,7 +94,7 @@ public class WLocatorEditor extends WEditor implements EventListener<Event>, Pro
 		
 		setColumnName(columnName);
 		m_mLocator = mLocator;
-		getComponent().setButtonImage(ThemeManager.getThemeResource("images/Locator10.png"));
+		getComponent().setButtonImage(ThemeManager.getThemeResource("images/Locator16.png"));
 
 		m_WindowNo = windowNo;	//Yvonne: move it b4 setDefault_Locator_ID()
 		setDefault_Locator_ID(); // set default locator, teo_sarca [ 1661546 ]
@@ -108,7 +108,7 @@ public class WLocatorEditor extends WEditor implements EventListener<Event>, Pro
 		super(new EditorBox(), gridField);
 		m_mLocator = (MLocatorLookup)gridField.getLookup();
 		
-		getComponent().setButtonImage(ThemeManager.getThemeResource("images/Locator10.png"));
+		getComponent().setButtonImage(ThemeManager.getThemeResource("images/Locator16.png"));
 		
 		setDefault_Locator_ID(); // set default locator, teo_sarca [ 1661546 ]
 		
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WPAttributeEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WPAttributeEditor.java
index a88adc0de1..9ed104433e 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WPAttributeEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WPAttributeEditor.java
@@ -70,7 +70,7 @@ public class WPAttributeEditor extends WEditor implements ContextMenuListener
 	}
 
 	private void initComponents() {
-		getComponent().setButtonImage(ThemeManager.getThemeResource("images/PAttribute10.png"));
+		getComponent().setButtonImage(ThemeManager.getThemeResource("images/PAttribute16.png"));
 		// getComponent().addEventListener(Events.ON_CLICK, this); // IDEMPIERE-426 - dup listener, already set at WEditor
 
 		m_WindowNo = gridField.getWindowNo();
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WPaymentEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WPaymentEditor.java
index f1a667a553..0cdcd84409 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WPaymentEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WPaymentEditor.java
@@ -65,7 +65,7 @@ public class WPaymentEditor extends WEditor implements ListDataListener {
         getComponent().getCombobox().setAutocomplete(true);
         getComponent().getCombobox().setAutodrop(true);
         getComponent().getCombobox().addEventListener(Events.ON_BLUR, this);
-        getComponent().setButtonImage(ThemeManager.getThemeResource("images/Payment10.png"));        
+        getComponent().setButtonImage(ThemeManager.getThemeResource("images/Payment16.png"));        
         getComponent().getButton().addActionListener(this);
 
         if (lookup != null)
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WSearchEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WSearchEditor.java
index 2ecb7ccb37..35c3fc2874 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WSearchEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WSearchEditor.java
@@ -170,16 +170,16 @@ public class WSearchEditor extends WEditor implements ContextMenuListener, Value
 	{
 
 		columnName = this.getColumnName();
-		imageUrl = ThemeManager.getThemeResource("images/PickOpen10.png");
+		imageUrl = ThemeManager.getThemeResource("images/PickOpen16.png");
 		if (columnName.equals("C_BPartner_ID"))
 		{
 			popupMenu = new WEditorPopupMenu(true, true, isShowPreference(), true, true, false, lookup);
-			imageUrl = ThemeManager.getThemeResource("images/BPartner10.png");
+			imageUrl = ThemeManager.getThemeResource("images/BPartner16.png");
 		}
 		else if (columnName.equals("M_Product_ID"))
 		{
 			popupMenu = new WEditorPopupMenu(true, true, isShowPreference(), false, false, false, lookup);
-			imageUrl = ThemeManager.getThemeResource("images/Product10.png");
+			imageUrl = ThemeManager.getThemeResource("images/Product16.png");
 		}
 		else
 		{
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WUrlEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WUrlEditor.java
index 4f8e8999d9..9f46e0ef1a 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WUrlEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WUrlEditor.java
@@ -36,7 +36,7 @@ public class WUrlEditor extends WEditor implements ContextMenuListener
 	public WUrlEditor(GridField gridField)
 	{
 		super(new Urlbox(), gridField);
-		getComponent().setButtonImage(ThemeManager.getThemeResource("images/Online10.png"));
+		getComponent().setButtonImage(ThemeManager.getThemeResource("images/Online16.png"));
 		
 		popupMenu = new WEditorPopupMenu(false, false, isShowPreference());
 		popupMenu.addMenuListener(this);
diff --git a/org.adempiere.ui.zk/theme/default/css/theme.css.dsp b/org.adempiere.ui.zk/theme/default/css/theme.css.dsp
index a2cbf1cf79..547fc077c8 100644
--- a/org.adempiere.ui.zk/theme/default/css/theme.css.dsp
+++ b/org.adempiere.ui.zk/theme/default/css/theme.css.dsp
@@ -1001,15 +1001,16 @@ span.z-tree-tee, span.z-tree-last, span.z-tree-firstspacer {
 }
 
 .editor-button {
-	padding: 3px 8px;
+	padding: 0px 2px;
 	margin: 0px;
+	border-radius: 2px;
 }
 
 .editor-button img {
 	vertical-align: middle;
 	text-align: center;
-	width: 10px;
-	height: 10px;
+	width: 16px;
+	height: 16px;
 }
 
 .editor-button-column {