diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/acct/WAcctViewer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/acct/WAcctViewer.java
index af598d02e2..6b439d45de 100755
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/acct/WAcctViewer.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/acct/WAcctViewer.java
@@ -477,25 +477,16 @@ public class WAcctViewer extends Window implements EventListener<Event>
 		forcePost.setVisible(false);
 
 		// Elaine 2009/07/29
-		if (ThemeManager.isUseFontIconForImage())
-			bZoom.setIconSclass("z-icon-Zoom");
-		else
 		bZoom.setImage(ThemeManager.getThemeResource("images/Zoom16.png"));
 		bZoom.setTooltiptext(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "Zoom")));
 		bZoom.setVisible(tabbedPane.getSelectedIndex() == 1);
 		bZoom.addEventListener(Events.ON_CLICK, this);
 		//
 		
-		if (ThemeManager.isUseFontIconForImage())
-			bQuery.setIconSclass("z-icon-Refresh");
-		else
 		bQuery.setImage(ThemeManager.getThemeResource("images/Refresh16.png"));
 		bQuery.setTooltiptext(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "Refresh")));
 		bQuery.addEventListener(Events.ON_CLICK, this);
 
-		if (ThemeManager.isUseFontIconForImage())
-			bExport.setIconSclass("z-icon-Export");
-		else
 		bExport.setImage(ThemeManager.getThemeResource("images/Export16.png"));
 		bExport.setTooltiptext(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "Export")));
 		bExport.addEventListener(Events.ON_CLICK, this);
@@ -634,9 +625,6 @@ public class WAcctViewer extends Window implements EventListener<Event>
 		m_data.fillTable(selTable);
 		selTable.addEventListener(Events.ON_SELECT, this);
 
-		if (ThemeManager.isUseFontIconForImage())
-			selRecord.setIconSclass("z-icon-Find");
-		else
 		selRecord.setImage(ThemeManager.getThemeResource("images/Find16.png"));
 		selRecord.addEventListener(Events.ON_CLICK, this);
 		selRecord.setLabel("");
@@ -650,9 +638,6 @@ public class WAcctViewer extends Window implements EventListener<Event>
 		selAcct.setName("Account_ID");
 		selAcct.addEventListener(Events.ON_CLICK, this);
 		selAcct.setLabel("");
-		if (ThemeManager.isUseFontIconForImage())
-			selAcct.setIconSclass("z-icon-Find");
-		else
 		selAcct.setImage(ThemeManager.getThemeResource("images/Find16.png"));
 
 		statusLine.setValue(" " + Msg.getMsg(Env.getCtx(), "ViewerOptions"));
@@ -870,9 +855,6 @@ public class WAcctViewer extends Window implements EventListener<Event>
 				labels[selectionIndex].setVisible(true);
 				buttons[selectionIndex].setName(columnName); // actionCommand
 				buttons[selectionIndex].addEventListener(Events.ON_CLICK, this);
-				if (ThemeManager.isUseFontIconForImage())
-					buttons[selectionIndex].setIconSclass("z-icon-Find");
-				else
 				buttons[selectionIndex].setImage(ThemeManager.getThemeResource("images/Find16.png"));
 				buttons[selectionIndex].setLabel("");
 				buttons[selectionIndex].setVisible(true);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/FeedbackRequestWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/FeedbackRequestWindow.java
index 3d2ac0cda6..1d914666cf 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/FeedbackRequestWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/FeedbackRequestWindow.java
@@ -222,11 +222,6 @@ public class FeedbackRequestWindow extends Window implements EventListener<Event
 		southPane.appendChild(confirmPanel);
 		
 		Button btn = new Button();
-
-		//devCoffee #6142
-		if (ThemeManager.isUseFontIconForImage())
-			btn.setIconSclass("z-icon-Attachment");
-		else
 		btn.setImage(ThemeManager.getThemeResource("images/Attachment24.png"));
 		btn.setUpload(AdempiereWebUI.getUploadSetting());
 		btn.addEventListener(Events.ON_UPLOAD, this);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java
index cf14dacc74..281f85a737 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java
@@ -341,14 +341,10 @@ public class ProcessDialog extends AbstractProcessDialog implements EventListene
 		appendRecordLogInfo(pi.getLogs(), infoResultContent);
 		
 		bOK.setLabel(Msg.getMsg(Env.getCtx(), "Parameter"));
-		//devCoffee #6142
-		if (!ThemeManager.isUseFontIconForImage())
 		bOK.setImage(ThemeManager.getThemeResource("images/Reset16.png"));
 		bOK.setDisabled(false);
 
 		bCancel.setLabel(Msg.getMsg(Env.getCtx(), "Close"));
-		//devCoffee #6142
-		if (!ThemeManager.isUseFontIconForImage())
 		bCancel.setImage(ThemeManager.getThemeResource("images/Cancel16.png"));
 		bCancel.setDisabled(false);
 
@@ -462,13 +458,9 @@ public class ProcessDialog extends AbstractProcessDialog implements EventListene
 		isParameterPage = true;
 
 		bOK.setLabel(Msg.getMsg(Env.getCtx(), "Start"));
-		//devCoffee #6142
-		if (!ThemeManager.isUseFontIconForImage())
 		bOK.setImage(ThemeManager.getThemeResource("images/Ok16.png"));
 		
 		bCancel.setLabel(Util.cleanAmp(Msg.translate(Env.getCtx(), ConfirmPanel.A_CANCEL)));
-		//devCoffee #6142
-		if (!ThemeManager.isUseFontIconForImage())
 		bCancel.setImage(ThemeManager.getThemeResource("images/Cancel16.png"));
 
 		//recreate process info
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WReportCustomization.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WReportCustomization.java
index bc5cc4e9c7..05eb5e57ae 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WReportCustomization.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WReportCustomization.java
@@ -264,7 +264,6 @@ public class WReportCustomization  implements IFormController,EventListener<Even
 		tpgc4.refresh();
 		tpgc4.setWReportCustomization(this);
 		tabpanels.appendChild(tpgc4);
-		tabpanels.setStyle("overflow: auto;");
 
 		tpsf5.setMPrintFormat(fm);
 		tpsf5.setPrintFormatItems(pfi);		
@@ -286,10 +285,6 @@ public class WReportCustomization  implements IFormController,EventListener<Even
 		btnSave = new Button();
 		btnSave.setName("btnSave");
 		btnSave.setTooltiptext(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "Save")));
-		//devCoffee #6142
-		if (ThemeManager.isUseFontIconForImage())
-			btnSave.setIconSclass("z-icon-Save");
-		else
 		btnSave.setImage(ThemeManager.getThemeResource("images/Save24.png"));
 		if(fm.getAD_Client_ID()== 0 || !isChange)
 		{	
@@ -302,10 +297,6 @@ public class WReportCustomization  implements IFormController,EventListener<Even
 
 		if (m_isCanExport)
 		{
-			//devCoffee #6142
-			if (ThemeManager.isUseFontIconForImage())
-				bExport.setIconSclass("z-icon-Export");
-			else
 			bExport.setImage(ThemeManager.getThemeResource("images/Export24.png"));
 			bExport.setName("btnExport");
 			bExport.setTooltiptext(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "Export")));
@@ -323,7 +314,6 @@ public class WReportCustomization  implements IFormController,EventListener<Even
 		
 		f.appendChild(foot);
 		grid.appendChild(f);
-		grid.setStyle("border:none");
 		form.appendChild(grid);
 		form.setBorder("normal");
 	}
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WSQLProcess.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WSQLProcess.java
index 1f863d9e60..71fc123b67 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WSQLProcess.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WSQLProcess.java
@@ -155,9 +155,7 @@ public class WSQLProcess extends ADForm implements EventListener<Event>
     public static final Button createProcessButton()
     {
         Button btnProcess = new Button();
-        if(ThemeManager.isUseFontIconForImage())
-        	btnProcess.setIconSclass("z-icon-Process");
-        else
+
         btnProcess.setImage(ThemeManager.getThemeResource("images/Process24.png"));
         btnProcess.setName(Msg.getMsg(Env.getCtx(), "Process"));
 
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WEditor.java
index 9322bb66be..a725ebbc15 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WEditor.java
@@ -773,14 +773,9 @@ public abstract class WEditor implements EventListener<Event>, PropertyChangeLis
      * @param popupMenu
      */
 	protected void addTextEditorMenu(WEditorPopupMenu popupMenu) {
-		Menuitem editor = new Menuitem();
+		Menuitem editor = new Menuitem(Msg.getMsg(Env.getCtx(), "Editor"), ThemeManager.getThemeResource("images/Editor16.png"));
 		editor.setAttribute("EVENT", WEditorPopupMenu.EDITOR_EVENT);
-		editor.setLabel(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "Editor")).intern());
-        if (ThemeManager.isUseFontIconForImage())
-        	editor.setIconSclass("z-icon-Edit");
-        else
-        	editor.setImage(ThemeManager.getThemeResource("images/Editor16.png"));
-        editor.addEventListener(Events.ON_CLICK, this);
+		editor.addEventListener(Events.ON_CLICK, popupMenu);
 		popupMenu.appendChild(editor);
 	}
 	
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTableDirEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTableDirEditor.java
index fce22856cf..ca27170704 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTableDirEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTableDirEditor.java
@@ -240,9 +240,6 @@ ContextMenuListener, IZoomableEditor
         			searchMode = new Menuitem();
         			searchMode.setAttribute(WEditorPopupMenu.EVENT_ATTRIBUTE, SHORT_LIST_EVENT);
         			searchMode.setLabel(Msg.getMsg(Env.getCtx(), "ShortListSwitchSearchMode"));
-        			if(ThemeManager.isUseFontIconForImage())
-        				searchMode.setIconSclass("z-icon-Lock");
-        			else
         			searchMode.setImage(ThemeManager.getThemeResource("images/Lock16.png"));
         			searchMode.addEventListener(Events.ON_CLICK, popupMenu);
         			popupMenu.appendChild(searchMode);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WEMailDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WEMailDialog.java
index 077418266b..ed22a5062a 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WEMailDialog.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WEMailDialog.java
@@ -309,16 +309,6 @@ public class WEMailDialog extends Window implements EventListener<Event>, ValueC
 		row.appendChild(new Label(""));
 		row.appendChild(isAcknowledgmentReceipt);
 				
-		row = new Row();
-		rows.appendChild(row);
-		row.appendChild(new Label(""));
-		row.appendChild(isAcknowledgmentReceipt);
-
-		row = new Row();
-		rows.appendChild(row);
-		row.appendChild(new Label(""));
-		row.appendChild(isAcknowledgmentReceipt);
-
 		row = new Row();
 		rows.appendChild(row);
 		div = new Div();
@@ -373,9 +363,6 @@ public class WEMailDialog extends Window implements EventListener<Event>, ValueC
 			LayoutUtils.addSclass("large-toolbarbutton", btn);
 
 		bAddDefaultMailText = new Button();
-		if(ThemeManager.isUseFontIconForImage())
-			bAddDefaultMailText.setIconSclass("z-icon-GetMail");
-		else
 		bAddDefaultMailText.setImage(ThemeManager.getThemeResource("images/DefaultMailText.png"));
 		bAddDefaultMailText.addEventListener(Events.ON_CLICK, this);
 		bAddDefaultMailText.setTooltiptext(Msg.getMsg(Env.getCtx(), "AddDefaultMailTextContent"));
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WMediaDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WMediaDialog.java
index a6e709860c..3175c7412b 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WMediaDialog.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WMediaDialog.java
@@ -157,24 +157,15 @@ public class WMediaDialog extends Window implements EventListener<Event>
 		
 
 		bSave.setEnabled(false);
-		if (ThemeManager.isUseFontIconForImage())
-			bSave.setIconSclass("z-icon-Export");
-		else
-			bSave.setImage(ThemeManager.getThemeResource("images/Download24.png"));
+		bSave.setImage(ThemeManager.getThemeResource("images/Export24.png"));
 		bSave.setTooltiptext(Msg.getMsg(Env.getCtx(), "AttachmentSave"));
 		bSave.addEventListener(Events.ON_CLICK, this);
 
-		if (ThemeManager.isUseFontIconForImage())
-			bLoad.setIconSclass("z-icon-Import");
-		else
-			bLoad.setImage(ThemeManager.getThemeResource("images/Upload24.png"));
+		bLoad.setImage(ThemeManager.getThemeResource("images/Import24.png"));
 		bLoad.setTooltiptext(Msg.getMsg(Env.getCtx(), "Load"));
 		bLoad.addEventListener(Events.ON_UPLOAD, this);
 		bLoad.setUpload(AdempiereWebUI.getUploadSetting());
 
-		if (ThemeManager.isUseFontIconForImage())
-			bDelete.setIconSclass("z-icon-Delete");
-		else
 		bDelete.setImage(ThemeManager.getThemeResource("images/Delete24.png"));
 		bDelete.setTooltiptext(Msg.getMsg(Env.getCtx(), "Delete"));
 		bDelete.addEventListener(Events.ON_CLICK, this);
@@ -196,15 +187,9 @@ public class WMediaDialog extends Window implements EventListener<Event>
 		southPane.appendChild(confirmPanel);
 		ZKUpdateUtil.setHeight(southPane, "30px");
 		
-		if(ThemeManager.isUseFontIconForImage())
-			bOk.setIconSclass("z-icon-Ok");
-		else
 		bOk.setImage(ThemeManager.getThemeResource("images/Ok24.png"));
 		bOk.addEventListener(Events.ON_CLICK, this);
 				
-		if(ThemeManager.isUseFontIconForImage())
-			bCancel.setIconSclass("z-icon-Cancel");
-		else
 		bCancel.setImage(ThemeManager.getThemeResource("images/Cancel24.png"));
 		bCancel.addEventListener(Events.ON_CLICK, this);
 		
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeDialog.java
index 94ef9d767c..8f548fca70 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeDialog.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeDialog.java
@@ -351,9 +351,6 @@ public class WPAttributeDialog extends Window implements EventListener<Event>
 			cbNewEdit.addEventListener(Events.ON_CHECK, this);
 			row.appendChild(cbNewEdit);
 			bSelect.setLabel(Msg.getMsg(Env.getCtx(), "SelectExisting"));
-			if (ThemeManager.isUseFontIconForImage())
-				bSelect.setIconSclass("z-icon-PAttribute");
-			else
 			bSelect.setImage(ThemeManager.getThemeResource("images/PAttribute16.png"));
 			bSelect.addEventListener(Events.ON_CLICK, this);
 			row.appendChild(bSelect);
@@ -433,11 +430,6 @@ public class WPAttributeDialog extends Window implements EventListener<Event>
 			//	Popup 
 //			fieldLot.addMouseListener(new VPAttributeDialog_mouseAdapter(this));    //  popup
 			mZoom = new Menuitem(Msg.getMsg(Env.getCtx(), "Zoom"), ThemeManager.getThemeResource("images/Zoom16.png"));
-			if(ThemeManager.isUseFontIconForImage()) {
-				mZoom.setIconSclass("z-icon-Zoom");
-				mZoom.setImage("");
-			}
-
 			mZoom.addEventListener(Events.ON_CLICK, this);
 			popupMenu.appendChild(mZoom);
 			this.appendChild(popupMenu);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WRecordAccessDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WRecordAccessDialog.java
index 39c544759b..47f6dc9a69 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WRecordAccessDialog.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WRecordAccessDialog.java
@@ -36,7 +36,6 @@ import org.compiere.util.CLogger;
 import org.compiere.util.DB;
 import org.compiere.util.Env;
 import org.compiere.util.Msg;
-import org.zkoss.zk.ui.HtmlBasedComponent;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zk.ui.event.Events;
@@ -153,28 +152,12 @@ public class WRecordAccessDialog extends Window implements EventListener<Event>
 	 */
 	private void jbInit() throws Exception
 	{
-		//devCoffee #6142
-    	if(ThemeManager.isUseFontIconForImage())
-    		bDelete.setIconSclass("z-icon-Delete");
-    	else
 		bDelete.setImage(ThemeManager.getThemeResource("images/Delete16.png"));
 		bDelete.setTooltiptext(Msg.getMsg(Env.getCtx(), "Delete"));
-		//devCoffee #6142
-    	if(ThemeManager.isUseFontIconForImage())
-    		bNew.setIconSclass("z-icon-New");
-    	else
 		bNew.setImage(ThemeManager.getThemeResource("images/New16.png"));
 		bNew.setTooltiptext(Msg.getMsg(Env.getCtx(), "New"));
-		//devCoffee #6142
-    	if(ThemeManager.isUseFontIconForImage())
-    		bUp.setIconSclass("z-icon-Previous");
-    	else
 		bUp.setImage(ThemeManager.getThemeResource("images/Previous16.png"));
 		bUp.setTooltiptext(Msg.getMsg(Env.getCtx(), "Previous"));
-		//devCoffee #6142
-    	if(ThemeManager.isUseFontIconForImage())
-    		bDown.setIconSclass("z-icon-Next");
-    	else
 		bDown.setImage(ThemeManager.getThemeResource("images/Next16.png"));
 		bDown.setTooltiptext(Msg.getMsg(Env.getCtx(), "Next"));
 		
@@ -203,8 +186,6 @@ public class WRecordAccessDialog extends Window implements EventListener<Event>
 		rows.appendChild(row);	
 		row.appendChild(roleLabel);
 		row.appendChild(roleField);
-		//devCoffee #6142
-		ZKUpdateUtil.setHflex((HtmlBasedComponent) row.getLastChild(), "1");
 		row.appendChild(cbActive);
 		row.appendChild(cbExclude);
 		row.appendChild(cbReadOnly);
diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/font-icons.css.dsp b/org.adempiere.ui.zk/theme/default/css/fragment/font-icons.css.dsp
index ee6f3d7165..b16964fceb 100644
--- a/org.adempiere.ui.zk/theme/default/css/fragment/font-icons.css.dsp
+++ b/org.adempiere.ui.zk/theme/default/css/fragment/font-icons.css.dsp
@@ -280,6 +280,4 @@
 .z-icon-CSVImport:before {
 	content: "\f0f6";
 }
-.z-icon-GetMail:before {
-	content: "\f0e0";
-}
+