diff --git a/org.adempiere.ui.zk/WEB-INF/src/metainfo/zk/lang-addon.xml b/org.adempiere.ui.zk/WEB-INF/src/metainfo/zk/lang-addon.xml
index 883b4522e0..2744cf2ea2 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/metainfo/zk/lang-addon.xml
+++ b/org.adempiere.ui.zk/WEB-INF/src/metainfo/zk/lang-addon.xml
@@ -56,5 +56,5 @@ Copyright (C) 2007 Ashley G Ramdass (ADempiere WebUI).
 	
 	<!-- this js module doesn't actually exists and it is here for default theme version -->
 	<!-- since loading of  js module is on demand, it doesn't cause any error as long as you don't try to load it -->
-	<javascript-module name="idempiere.theme.default" version="202012151533" />
+	<javascript-module name="idempiere.theme.default" version="202012310310" />
 </language>
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java
index df97757564..394d06e832 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java
@@ -383,6 +383,9 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
 
         Panel pnlButtonRight = new Panel();
         pnlButtonRight.appendChild(btnOk);
+        Separator sep = new Separator("vertical");
+        sep.setWidth("2px");
+        pnlButtonRight.appendChild(sep);
         pnlButtonRight.appendChild(btnCancel);
         pnlButtonRight.setStyle("text-align:right");
         ZKUpdateUtil.setWidth(pnlButtonRight, "100%");
@@ -390,7 +393,7 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
 
         Panel pnlButtonLeft = new Panel();
         pnlButtonLeft.appendChild(btnNew);
-        Separator sep = new Separator("vertical");
+        sep = new Separator("vertical");
         sep.setWidth("2px");
         pnlButtonLeft.appendChild(sep);
         pnlButtonLeft.appendChild(btnClear);
@@ -399,13 +402,10 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
         Hbox hboxButton = new Hbox();
         hboxButton.appendChild(pnlButtonLeft);
         hboxButton.appendChild(pnlButtonRight);
-        ZKUpdateUtil.setWidth(hboxButton, "100%");
 
         contentSimple = new Grid();
         contentSimple.setId("contentSimple");
-        contentSimple.setStyle("width: 100%; position: relative");
         contentSimple.makeNoStrip();
-        ZKUpdateUtil.setHflex(contentSimple, "1");
         
         Columns columns = new Columns();
         Column column = new Column();
@@ -437,7 +437,6 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
         layout.appendChild(center);
         center.appendChild(contentSimple);
         ZKUpdateUtil.setVflex(contentSimple, "1");
-		ZKUpdateUtil.setHflex(contentSimple, "1");
 
         South south = new South();
         layout.appendChild(south);
@@ -481,19 +480,20 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
 
         Panel pnlButtonRight = new Panel();
         pnlButtonRight.appendChild(btnOk);
+        Separator sep = new Separator("vertical");
+        sep.setWidth("2px");
+        pnlButtonRight.appendChild(sep);
         pnlButtonRight.appendChild(btnCancel);
         pnlButtonRight.setStyle("text-align: right");
 
         advancedPanelToolBar = new ToolBar();
         advancedPanelToolBar.appendChild(btnNew);
         advancedPanelToolBar.appendChild(btnDelete);
-        ZKUpdateUtil.setWidth(advancedPanelToolBar, "100%");
 
         fQueryName.addEventListener(Events.ON_SELECT, this);
 
         Hbox confirmPanel = new Hbox();
         confirmPanel.appendChild(pnlButtonRight);
-        ZKUpdateUtil.setWidth(confirmPanel, "100%");
         confirmPanel.setPack("end");
 
         advancedPanel = new Listbox();
@@ -564,7 +564,6 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
         layout.appendChild(center);
         center.appendChild(advancedPanel);
         ZKUpdateUtil.setVflex(advancedPanel, "1");
-        ZKUpdateUtil.setHflex(advancedPanel, "1");
 
         South south = new South();
         layout.appendChild(south);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/find-window.css.dsp b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/find-window.css.dsp
index 3d32ec72a9..ce79f129f4 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/find-window.css.dsp
+++ b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/find-window.css.dsp
@@ -13,3 +13,16 @@
 .find-window-advanced .img-btn, .find-window-advanced .img-btn.btn-ok.z-button, .find-window-advanced .img-btn.btn-cancel.z-button {
 	margin: 0 2px;
 }
+
+.find-window .z-window-content {
+	padding-bottom: 0px;	
+}
+.find-window .z-grid.z-flex-item,
+.find-window .z-listbox.z-flex-item,
+.find-window .z-toolbar,
+.find-window .z-south-body>.z-hbox {
+	width: calc(100% - 1px);
+}
+.find-window .z-toolbar {
+	border-bottom: 0px;
+}
\ No newline at end of file