diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/EditorBox.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/EditorBox.java
index e857f4ab24..3c2b8fef9a 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/EditorBox.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/EditorBox.java
@@ -87,11 +87,7 @@ public class EditorBox extends Div {
 		LayoutUtils.addSclass("editor-button", btn);
 		btnColumn.appendChild(btn);
 
-		String style = AEnv.isFirefox2() ? "display: inline"
-				: "display: inline-block";
-		style = style
-				+ ";border: none; padding: 0px; margin: 0px; background-color: transparent;";
-		this.setStyle(style);
+		LayoutUtils.addSclass("editor-box", this);
 	}
 
 	/**
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 db3e8a8676..c0220ca175 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
@@ -111,9 +111,7 @@ public class NumberBox extends Div
         btn.setStyle("text-align: center;");
         appendChild(popup);
      
-        String style = AEnv.isFirefox2() ? "display: inline" : "display: inline-block"; 
-        style = style + ";white-space:nowrap";
-        this.setStyle(style);	     
+        LayoutUtils.addSclass(".number-box", 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 3442fbefeb..f306c0c2e8 100644
--- a/org.adempiere.ui.zk/theme/default/css/theme.css.dsp
+++ b/org.adempiere.ui.zk/theme/default/css/theme.css.dsp
@@ -459,3 +459,13 @@ div.z-vfiletree-body td.menu-tree-cell {
 .z-timebox-focus .z-timebox-inp {
 	background: #FFFFCC;
 }
+
+%-- Editor --%>
+.editor-box {
+	display: inline-block;
+	border: none; padding: 0px; margin: 0px; background-color: transparent;
+}
+
+.number-box {
+	display: inline-block; white-space:nowrap;
+}