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 35c3fc2874..e6ddf4ee8c 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,7 +170,6 @@ public class WSearchEditor extends WEditor implements ContextMenuListener, Value
 	{
 
 		columnName = this.getColumnName();
-		imageUrl = ThemeManager.getThemeResource("images/PickOpen16.png");
 		if (columnName.equals("C_BPartner_ID"))
 		{
 			popupMenu = new WEditorPopupMenu(true, true, isShowPreference(), true, true, false, lookup);
@@ -184,6 +183,7 @@ public class WSearchEditor extends WEditor implements ContextMenuListener, Value
 		else
 		{
 			popupMenu = new WEditorPopupMenu(true, true, isShowPreference(), false, false, false, lookup);
+			imageUrl = ThemeManager.getThemeResource("images/PickOpen16.png");
 		}
 		getComponent().getButton().setImage(imageUrl);
 
diff --git a/org.adempiere.ui.zk/theme/default/images/Location16.png b/org.adempiere.ui.zk/theme/default/images/Location16.png
new file mode 100644
index 0000000000..b7a50d3fb2
Binary files /dev/null and b/org.adempiere.ui.zk/theme/default/images/Location16.png differ
diff --git a/org.adempiere.ui.zk/theme/default/images/Locator16.png b/org.adempiere.ui.zk/theme/default/images/Locator16.png
new file mode 100644
index 0000000000..f3dc2b9b82
Binary files /dev/null and b/org.adempiere.ui.zk/theme/default/images/Locator16.png differ
diff --git a/org.adempiere.ui.zk/theme/default/images/PickOpen16.png b/org.adempiere.ui.zk/theme/default/images/PickOpen16.png
new file mode 100644
index 0000000000..5364d53d60
Binary files /dev/null and b/org.adempiere.ui.zk/theme/default/images/PickOpen16.png differ