diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WWFActivity.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WWFActivity.java
index 714d6be097..adf76d5ff9 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WWFActivity.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WWFActivity.java
@@ -133,14 +133,13 @@ public class WWFActivity extends ADForm implements EventListener<Event>
 
         fAnswerList.setMold("select");
 
-        if (ThemeManager.isUseFontIconForImage())
+        if (ThemeManager.isUseFontIconForImage()) {
         	bZoom.setIconSclass("z-icon-Zoom");
-        else
-        	bZoom.setImage(ThemeManager.getThemeResource("images/Zoom16.png"));
-        if (ThemeManager.isUseFontIconForImage())
         	bOK.setIconSclass("z-icon-Ok");
-        else
+        } else {
+        	bZoom.setImage(ThemeManager.getThemeResource("images/Zoom16.png"));
         	bOK.setImage(ThemeManager.getThemeResource("images/Ok16.png"));
+        }
 
         MLookup lookup = MLookupFactory.get(Env.getCtx(), m_WindowNo,
                 0, 10443, DisplayType.Search);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPActivities.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPActivities.java
index 52a4d34033..019b149497 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPActivities.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPActivities.java
@@ -47,6 +47,7 @@ import org.zkoss.zul.Vbox;
  * Contributors: 
  * Deepak Pansheriya - showing only notes message
  */
+@Deprecated // replaced with DPDocumentStatus
 public class DPActivities extends DashboardPanel implements EventListener<Event> {
 	/**
 	 * 
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPRunningJobs.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPRunningJobs.java
index 49eb37bbdb..75e0f275f4 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPRunningJobs.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPRunningJobs.java
@@ -50,11 +50,10 @@ import org.zkoss.zul.Toolbar;
 import org.zkoss.zul.Vbox;
 
 public class DPRunningJobs extends DashboardPanel implements EventListener<Event>, EventHandler {
-	
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 1946438226234068194L;
+	private static final long serialVersionUID = -8515643315156488709L;
 
 	private static final String AD_PINSTANCE_ID_ATTR = "AD_PInstance_ID";
 	
@@ -194,7 +193,10 @@ public class DPRunningJobs extends DashboardPanel implements EventListener<Event
 			btnJob.setAttribute(AD_PINSTANCE_ID_ATTR, String.valueOf(pi.getAD_PInstance_ID()));
 			bxJobs.appendChild(btnJob);
 			btnJob.setLabel(label);
-			btnJob.setImage(ThemeManager.getThemeResource(getIconFile()));
+			if (ThemeManager.isUseFontIconForImage())
+				btnJob.setIconSclass("z-icon-Window");
+			else
+				btnJob.setImage(ThemeManager.getThemeResource("images/mWindow.png"));
 			btnJob.addEventListener(Events.ON_CLICK, this);
 			btnJob.setSclass("menu-href");
 			ZKUpdateUtil.setHflex(btnJob, "1");
@@ -211,11 +213,6 @@ public class DPRunningJobs extends DashboardPanel implements EventListener<Event
 			.list();
 		return pis;
 	}
-		
-	private String getIconFile() 
-	{
-		return "images/mWindow.png";
-	}
 
 	@Override
     public void refresh(ServerPushTemplate template)
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WChosenboxSearchEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WChosenboxSearchEditor.java
index 19a9a6a278..b8138bb09c 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WChosenboxSearchEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WChosenboxSearchEditor.java
@@ -167,21 +167,33 @@ public class WChosenboxSearchEditor extends WEditor implements ContextMenuListen
 	private void init()
 	{
 		columnName = this.getColumnName();
-		imageUrl = ThemeManager.getThemeResource("images/PickOpen16.png");
+		if (ThemeManager.isUseFontIconForImage())
+			imageUrl = "z-icon-More";
+		else
+			imageUrl = ThemeManager.getThemeResource("images/PickOpen16.png");
 		if (lookup instanceof MLookup) 
 		{
 			MLookup mlookup = (MLookup) lookup;
 			if ("C_BPartner_ID".equals(mlookup.getLookupInfo().KeyColumn))
 			{
-				imageUrl = ThemeManager.getThemeResource("images/BPartner16.png");
+				if (ThemeManager.isUseFontIconForImage())
+					imageUrl = "z-icon-BPartner";
+				else
+					imageUrl = ThemeManager.getThemeResource("images/BPartner16.png");
 			}
 			else if ("M_Product_ID".equals(mlookup.getLookupInfo().KeyColumn))
 			{
-				imageUrl = ThemeManager.getThemeResource("images/Product16.png");
+				if (ThemeManager.isUseFontIconForImage())
+					imageUrl = "z-icon-Product";
+				else
+					imageUrl = ThemeManager.getThemeResource("images/Product16.png");
 			}
 		}
 		popupMenu = new WEditorPopupMenu(false, true, isShowPreference(), false, false, false, lookup);
-		getComponent().getButton().setImage(imageUrl);
+		if (ThemeManager.isUseFontIconForImage())
+			getComponent().getButton().setIconSclass(imageUrl);
+		else
+			getComponent().getButton().setImage(imageUrl);
 		
 		setTableAndKeyColumn();
 		subModel = new InfoListSubModel(lookup, gridField, m_tableName, m_keyColumnName);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRC2FieldOrderPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRC2FieldOrderPanel.java
index eb4149dfac..d3e3704446 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRC2FieldOrderPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRC2FieldOrderPanel.java
@@ -142,12 +142,16 @@ public class WRC2FieldOrderPanel extends WRCTabPanel implements EventListener<Ev
 			}
 		};
 
-		bUp.setImage(ThemeManager.getThemeResource("images/Parent24.png"));
+    	if (ThemeManager.isUseFontIconForImage()) {
+    		bUp.setIconSclass("z-icon-Parent");
+    		bDown.setIconSclass("z-icon-Detail");
+    	} else {
+    		bUp.setImage(ThemeManager.getThemeResource("images/Parent24.png"));
+    		bDown.setImage(ThemeManager.getThemeResource("images/Detail24.png"));
+    	}
 		bUp.addEventListener(Events.ON_CLICK, actionListener);
-
-		bDown.setImage(ThemeManager.getThemeResource("images/Detail24.png"));
 		bDown.addEventListener(Events.ON_CLICK, actionListener);
-		
+
 		Vbox vbox = new Vbox();
 		vbox.appendChild(bUp);
 		vbox.appendChild(bDown);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRC3SortCriteriaPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRC3SortCriteriaPanel.java
index 868b6ddcd9..3c1faed8ea 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRC3SortCriteriaPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRC3SortCriteriaPanel.java
@@ -112,10 +112,14 @@ public class WRC3SortCriteriaPanel extends WRCTabPanel implements  EventListener
 		yesList.setSeltype("multiple");
 		noList.setSeltype("multiple");
 
-		bAdd.setImage(ThemeManager.getThemeResource("images/Next24.png"));
+		if (ThemeManager.isUseFontIconForImage()) {
+    		bAdd.setIconSclass("z-icon-Next");
+    		bRemove.setIconSclass("z-icon-Previous");
+    	} else {
+    		bAdd.setImage(ThemeManager.getThemeResource("images/Next24.png"));
+    		bRemove.setImage(ThemeManager.getThemeResource("images/Previous24.png"));
+    	}
 		bAdd.addEventListener(Events.ON_CLICK, actionListener);
-
-		bRemove.setImage(ThemeManager.getThemeResource("images/Previous24.png"));
 		bRemove.addEventListener(Events.ON_CLICK, actionListener);
 
 		EventListener<Event> crossListMouseListener = new DragListener();
@@ -160,11 +164,15 @@ public class WRC3SortCriteriaPanel extends WRCTabPanel implements  EventListener
 				migrateValueWithinYesList(event);
 			}
 		};
-		
-		bUp.setImage(ThemeManager.getThemeResource("images/Parent24.png"));
-		bUp.addEventListener(Events.ON_CLICK, actionListener2);
 
-		bDown.setImage(ThemeManager.getThemeResource("images/Detail24.png"));
+    	if (ThemeManager.isUseFontIconForImage()) {
+    		bUp.setIconSclass("z-icon-Parent");
+    		bDown.setIconSclass("z-icon-Detail");
+    	} else {
+    		bUp.setImage(ThemeManager.getThemeResource("images/Parent24.png"));
+    		bDown.setImage(ThemeManager.getThemeResource("images/Detail24.png"));
+    	}
+		bUp.addEventListener(Events.ON_CLICK, actionListener2);
 		bDown.addEventListener(Events.ON_CLICK, actionListener2);
 		
 		vbox = new Vbox();
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WGadgets.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WGadgets.java
index 455ee06bfa..f1f34cee37 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WGadgets.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WGadgets.java
@@ -155,10 +155,14 @@ public class WGadgets extends Window implements  EventListener<Event>{
 		yesList.setSeltype("multiple");
 		noList.setSeltype("multiple");
 
-		bAdd.setImage(ThemeManager.getThemeResource("images/Next24.png"));
+		if (ThemeManager.isUseFontIconForImage()) {
+    		bAdd.setIconSclass("z-icon-Next");
+    		bRemove.setIconSclass("z-icon-Previous");
+    	} else {
+    		bAdd.setImage(ThemeManager.getThemeResource("images/Next24.png"));
+    		bRemove.setImage(ThemeManager.getThemeResource("images/Previous24.png"));
+    	}
 		bAdd.addEventListener(Events.ON_CLICK, actionListener);
-
-		bRemove.setImage(ThemeManager.getThemeResource("images/Previous24.png"));
 		bRemove.addEventListener(Events.ON_CLICK, actionListener);
 
 		final EventListener<Event> moveListener = new MoveListener();