diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocationDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocationDialog.java
index 3ca8d84167..f0ec36c86b 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocationDialog.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocationDialog.java
@@ -93,7 +93,6 @@ public class WLocationDialog extends Window implements EventListener<Event>
 	 * 
 	 */
 	private static final long serialVersionUID = -9116270523919373406L;
-	private static final String LABEL_STYLE = "white-space: nowrap;";
 	/** Logger          */
 	private static final CLogger log = CLogger.getCLogger(WLocationDialog.class);
 	private Label lblAddress1;
@@ -228,29 +227,29 @@ public class WLocationDialog extends Window implements EventListener<Event>
 	private void initComponents()
 	{
 		lblAddress1     = new Label(Msg.getElement(Env.getCtx(), "Address1"));
-		lblAddress1.setStyle(LABEL_STYLE);
+		lblAddress1.setSclass("field-label");
 		lblAddress2     = new Label(Msg.getElement(Env.getCtx(), "Address2"));
-		lblAddress2.setStyle(LABEL_STYLE);
+		lblAddress2.setSclass("field-label");
 		lblAddress3     = new Label(Msg.getElement(Env.getCtx(), "Address3"));
-		lblAddress3.setStyle(LABEL_STYLE);
+		lblAddress3.setSclass("field-label");
 		lblAddress4     = new Label(Msg.getElement(Env.getCtx(), "Address4"));
-		lblAddress4.setStyle(LABEL_STYLE);
+		lblAddress4.setSclass("field-label");
 		lblAddress5     = new Label(Msg.getElement(Env.getCtx(), "Address5"));
-		lblAddress5.setStyle(LABEL_STYLE);
+		lblAddress5.setSclass("field-label");
 		lblComments     = new Label(Msg.getElement(Env.getCtx(), "Comments"));
-		lblComments.setStyle(LABEL_STYLE);
+		lblComments.setSclass("field-label");
 		lblCity         = new Label(Msg.getMsg(Env.getCtx(), "City"));
-		lblCity.setStyle(LABEL_STYLE);
+		lblCity.setSclass("field-label");
 		lblZip          = new Label(Msg.getMsg(Env.getCtx(), "Postal"));
-		lblZip.setStyle(LABEL_STYLE);
+		lblZip.setSclass("field-label");
 		lblRegion       = new Label(Msg.getMsg(Env.getCtx(), "Region"));
-		lblRegion.setStyle(LABEL_STYLE);
+		lblRegion.setSclass("field-label");
 		lblPostal       = new Label(Msg.getMsg(Env.getCtx(), "Postal"));
-		lblPostal.setStyle(LABEL_STYLE);
+		lblPostal.setSclass("field-label");
 		lblPostalAdd    = new Label(Msg.getMsg(Env.getCtx(), "PostalAdd"));
-		lblPostalAdd.setStyle(LABEL_STYLE);
+		lblPostalAdd.setSclass("field-label");
 		lblCountry      = new Label(Msg.getMsg(Env.getCtx(), "Country"));
-		lblCountry.setStyle(LABEL_STYLE);
+		lblCountry.setSclass("field-label");
 
 		txtAddress1 = new Textbox();
 		txtAddress1.setCols(20);
@@ -351,57 +350,57 @@ public class WLocationDialog extends Window implements EventListener<Event>
 		ZKUpdateUtil.setWidth(column, "70%");
 		
 		Row pnlAddress1 = new Row();
-		pnlAddress1.appendChild(lblAddress1.rightAlign());
+		pnlAddress1.appendChild(lblAddress1);
 		pnlAddress1.appendChild(txtAddress1);
 		ZKUpdateUtil.setHflex(txtAddress1, "1");
 
 		Row pnlAddress2 = new Row();
-		pnlAddress2.appendChild(lblAddress2.rightAlign());
+		pnlAddress2.appendChild(lblAddress2);
 		pnlAddress2.appendChild(txtAddress2);
 		ZKUpdateUtil.setHflex(txtAddress2, "1");
 
 		Row pnlAddress3 = new Row();
-		pnlAddress3.appendChild(lblAddress3.rightAlign());
+		pnlAddress3.appendChild(lblAddress3);
 		pnlAddress3.appendChild(txtAddress3);
 		ZKUpdateUtil.setHflex(txtAddress3, "1");
 
 		Row pnlAddress4 = new Row();
-		pnlAddress4.appendChild(lblAddress4.rightAlign());
+		pnlAddress4.appendChild(lblAddress4);
 		pnlAddress4.appendChild(txtAddress4);
 		ZKUpdateUtil.setHflex(txtAddress4, "1");
 
 		Row pnlAddress5 = new Row();
-		pnlAddress5.appendChild(lblAddress5.rightAlign());
+		pnlAddress5.appendChild(lblAddress5);
 		pnlAddress5.appendChild(txtAddress5);
 		ZKUpdateUtil.setHflex(txtAddress5, "1");
 
 		Row pnlComments = new Row();
-		pnlComments.appendChild(lblComments.rightAlign());
+		pnlComments.appendChild(lblComments);
 		pnlComments.appendChild(txtComments);
 		ZKUpdateUtil.setHflex(txtComments, "1");
 
 		Row pnlCity     = new Row();
-		pnlCity.appendChild(lblCity.rightAlign());
+		pnlCity.appendChild(lblCity);
 		pnlCity.appendChild(txtCity);
 		ZKUpdateUtil.setHflex(txtCity, "1");
 
 		Row pnlPostal   = new Row();
-		pnlPostal.appendChild(lblPostal.rightAlign());
+		pnlPostal.appendChild(lblPostal);
 		pnlPostal.appendChild(txtPostal);
 		ZKUpdateUtil.setHflex(pnlPostal, "1");
 
 		Row pnlPostalAdd = new Row();
-		pnlPostalAdd.appendChild(lblPostalAdd.rightAlign());
+		pnlPostalAdd.appendChild(lblPostalAdd);
 		pnlPostalAdd.appendChild(txtPostalAdd);
 		ZKUpdateUtil.setHflex(txtPostalAdd, "1");
 
 		Row pnlRegion    = new Row();
-		pnlRegion.appendChild(lblRegion.rightAlign());
+		pnlRegion.appendChild(lblRegion);
 		pnlRegion.appendChild(lstRegion);
 		ZKUpdateUtil.setHflex(lstRegion, "1");
 
 		Row pnlCountry  = new Row();
-		pnlCountry.appendChild(lblCountry.rightAlign());
+		pnlCountry.appendChild(lblCountry);
 		pnlCountry.appendChild(lstCountry);
 		ZKUpdateUtil.setHflex(lstCountry, "1");
 
diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/window-size.css.dsp b/org.adempiere.ui.zk/theme/default/css/fragment/window-size.css.dsp
index 041f190ae1..7cefdc4d1c 100644
--- a/org.adempiere.ui.zk/theme/default/css/fragment/window-size.css.dsp
+++ b/org.adempiere.ui.zk/theme/default/css/fragment/window-size.css.dsp
@@ -224,6 +224,10 @@
 }
 .quick-entry-dialog > .z-window-content {
 	overflow: auto;
+	padding: 4px;	
+}
+.quick-entry-dialog > .z-window-content > .confirm-panel {
+	padding-top: 4px;
 }
 @media screen and (max-width: 350px) {
 	.quick-entry-dialog {
@@ -300,9 +304,17 @@
 }
 
 .location-dialog {
-	width: 380px;
 	height: 420px;
 }
+.location-dialog > .z-window-content > .z-borderlayout {
+	min-width: 380px;
+}
+.location-dialog .field-label {
+	white-space: nowrap;
+}
+.location-dialog .confirm-panel {
+	padding: 4px 8px;
+}
 @media screen and (max-width: 380px) {
 	.location-dialog {
 		width: 100%;