diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindowToolbar.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindowToolbar.java
index be9ee25222..d6b4aeab27 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindowToolbar.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindowToolbar.java
@@ -374,7 +374,7 @@ public class ADWindowToolbar extends FToolbar implements EventListener<Event>
 			item.setImageContent(button.getImageContent());
 		else if (ThemeManager.isUseFontIconForImage()) { 
 			item.setIconSclass(button.getIconSclass());
-    		LayoutUtils.addSclass("font-icon-toolbar-button", item);
+    		LayoutUtils.addSclass("font-icon-menuitem", item);
 		}
 		item.setId(MNITMPREFIX+button.getName());
 		item.setValue(button.getName());
@@ -683,7 +683,7 @@ public class ADWindowToolbar extends FToolbar implements EventListener<Event>
       		LayoutUtils.addSclass("font-icon-toolbar-button", this.btnLock);
       		if (menuItems.get(btnLock) != null) {
     			menuItems.get(btnLock).setIconSclass(iconSclass);
-    			LayoutUtils.addSclass("font-icon-toolbar-button", menuItems.get(btnLock));
+    			LayoutUtils.addSclass("font-icon-menuitem", menuItems.get(btnLock));
     		}
       	}
       	else
@@ -1100,10 +1100,10 @@ public class ADWindowToolbar extends FToolbar implements EventListener<Event>
     	getButton(buttonName).setPressed(pressed);
     	if (menuItems.get(getButton(buttonName)) != null) {
     		if (pressed)
-    			menuItems.get(getButton(buttonName)).setSclass("z-toolbarbutton-checked");
+    			menuItems.get(getButton(buttonName)).setSclass("z-toolbarbutton-checked font-icon-menuitem");
     		else {
     			menuItems.get(getButton(buttonName)).setClass("");
-    			menuItems.get(getButton(buttonName)).setClass("z-menu-item");
+    			menuItems.get(getButton(buttonName)).setClass("font-icon-menuitem z-menu-item");
     		}
     	}
     }
diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/toolbar.css.dsp b/org.adempiere.ui.zk/theme/default/css/fragment/toolbar.css.dsp
index bf7c01f100..2861b7c933 100644
--- a/org.adempiere.ui.zk/theme/default/css/fragment/toolbar.css.dsp
+++ b/org.adempiere.ui.zk/theme/default/css/fragment/toolbar.css.dsp
@@ -92,3 +92,6 @@
 .font-icon-toolbar-button .z-toolbarbutton-content {
 	color: inherit;
 }
+.font-icon-menuitem i {
+	vertical-align: middle;
+}
\ No newline at end of file