diff --git a/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js b/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
index b3e6ddc95..8eec27e80 100644
--- a/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
+++ b/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
@@ -23,11 +23,16 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
             self.populate(newValue);
         }) : o.items;
 
+        var height = BI.isNumeric(o.height) ? (o.height - (o.simple ? 1 : 2)) : o.height;
+        var width = BI.isNumeric(o.width) ? (o.width - 2) : o.width;
+
         return {
             type: "bi.combo",
             cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-focus-shadow",
             container: o.container,
             adjustLength: 2,
+            height: height,
+            width: width,
             toggle: false,
             ref: function () {
                 self.combo = this;
@@ -40,7 +45,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
                     self.trigger = this;
                 },
                 items: o.items,
-                height: o.height - (o.simple ? 1 : 2),
+                height: height,
                 text: o.text,
                 defaultText: o.defaultText,
                 value: o.value,
diff --git a/src/core/wrapper/layout.js b/src/core/wrapper/layout.js
index 786e522d1..7a41ee0ae 100644
--- a/src/core/wrapper/layout.js
+++ b/src/core/wrapper/layout.js
@@ -294,37 +294,37 @@ BI.Layout = BI.inherit(BI.Widget, {
 
     _optimiseItemLgap: function (item) {
         if (BI.Providers.getProvider("bi.provider.system").getLayoutOptimize()) {
-            return ((!item.type && item.el) ? item.lgap : item._lgap) || 0;
+            return ((!item.type && item.el) ? ((item._lgap || 0) + (item.lgap || 0)) : item._lgap) || 0;
         }
         return (item._lgap || 0) + (item.lgap || 0);
     },
     _optimiseItemRgap: function (item) {
         if (BI.Providers.getProvider("bi.provider.system").getLayoutOptimize()) {
-            return ((!item.type && item.el) ? item.rgap : item._rgap) || 0;
+            return ((!item.type && item.el) ? ((item._rgap || 0) + (item.rgap || 0)) : item._rgap) || 0;
         }
         return (item._rgap || 0) + (item.rgap || 0);
     },
     _optimiseItemTgap: function (item) {
         if (BI.Providers.getProvider("bi.provider.system").getLayoutOptimize()) {
-            return ((!item.type && item.el) ? item.tgap : item._tgap) || 0;
+            return ((!item.type && item.el) ? ((item._tgap || 0) + (item.tgap || 0)) : item._tgap) || 0;
         }
         return (item._tgap || 0) + (item.tgap || 0);
     },
     _optimiseItemBgap: function (item) {
         if (BI.Providers.getProvider("bi.provider.system").getLayoutOptimize()) {
-            return ((!item.type && item.el) ? item.bgap : item._bgap) || 0;
+            return ((!item.type && item.el) ? ((item._bgap || 0) + (item.bgap || 0)) : item._bgap) || 0;
         }
         return (item._bgap || 0) + (item.bgap || 0);
     },
     _optimiseItemHgap: function (item) {
         if (BI.Providers.getProvider("bi.provider.system").getLayoutOptimize()) {
-            return ((!item.type && item.el) ? item.hgap : item._hgap) || 0;
+            return ((!item.type && item.el) ? ((item._hgap || 0) + (item.hgap || 0)) : item._hgap) || 0;
         }
         return (item._hgap || 0) + (item.hgap || 0);
     },
     _optimiseItemVgap: function (item) {
         if (BI.Providers.getProvider("bi.provider.system").getLayoutOptimize()) {
-            return ((!item.type && item.el) ? item.vgap : item._vgap) || 0;
+            return ((!item.type && item.el) ? ((item._vgap || 0) + (item.vgap || 0)) : item._vgap) || 0;
         }
         return (item._vgap || 0) + (item.vgap || 0);
     },
diff --git a/src/less/base/trigger/trigger.searchtextvalue.less b/src/less/base/trigger/trigger.searchtextvalue.less
index 33508ae3b..457589b20 100644
--- a/src/less/base/trigger/trigger.searchtextvalue.less
+++ b/src/less/base/trigger/trigger.searchtextvalue.less
@@ -5,7 +5,11 @@
     color: @color-bi-text-error-text-trigger;
   }
 
-  &:where(:not(&:hover)) .clear-button {
+  .clear-button {
     display: none;
   }
+
+  &:hover .clear-button {
+    display: block;
+  }
 }
diff --git a/src/less/base/trigger/trigger.text.less b/src/less/base/trigger/trigger.text.less
index 9e2040512..758d7c48d 100644
--- a/src/less/base/trigger/trigger.text.less
+++ b/src/less/base/trigger/trigger.text.less
@@ -4,8 +4,12 @@
   &.error .select-text-label {
     color: @color-bi-text-error-text-trigger;
   }
-  
-  &:where(:not(&:hover)) .clear-button {
+
+  .clear-button {
     display: none;
   }
+
+  &:hover .clear-button {
+    display: block;
+  }
 }
diff --git a/src/less/core/wrapper/flex.horizontal.less b/src/less/core/wrapper/flex.horizontal.less
index 24d8862f6..606e929d5 100644
--- a/src/less/core/wrapper/flex.horizontal.less
+++ b/src/less/core/wrapper/flex.horizontal.less
@@ -170,8 +170,9 @@
 
   > .f-f {
     &:not(.f-s-n) {
-      min-width: 0;
+      min-width: 1px;
     }
+
     -webkit-flex-grow: 1;
     -moz-flex-grow: 1;
     -ms-flex-grow: 1;
diff --git a/src/less/core/wrapper/flex.vertical.less b/src/less/core/wrapper/flex.vertical.less
index 007396436..8124422b3 100644
--- a/src/less/core/wrapper/flex.vertical.less
+++ b/src/less/core/wrapper/flex.vertical.less
@@ -169,8 +169,9 @@
 
   > .f-f {
     &:not(.f-s-n) {
-      min-height: 0;
+      min-height: 1px;
     }
+
     -webkit-flex-grow: 1;
     -moz-flex-grow: 1;
     -ms-flex-grow: 1;
diff --git a/src/less/core/wrapper/flex.wrapper.horizontal.less b/src/less/core/wrapper/flex.wrapper.horizontal.less
index 09926f54b..70ae040d7 100644
--- a/src/less/core/wrapper/flex.wrapper.horizontal.less
+++ b/src/less/core/wrapper/flex.wrapper.horizontal.less
@@ -266,8 +266,9 @@
 
     > .f-f {
       &:not(.f-s-n) {
-        min-width: 0;
+        min-width: 1px;
       }
+
       -webkit-flex-grow: 1;
       -moz-flex-grow: 1;
       -ms-flex-grow: 1;
diff --git a/src/less/core/wrapper/flex.wrapper.vertical.less b/src/less/core/wrapper/flex.wrapper.vertical.less
index 118759152..755289825 100644
--- a/src/less/core/wrapper/flex.wrapper.vertical.less
+++ b/src/less/core/wrapper/flex.wrapper.vertical.less
@@ -260,8 +260,9 @@
 
     > .f-f {
       &:not(.f-s-n) {
-        min-height: 0;
+        min-height: 1px;
       }
+
       -webkit-flex-grow: 1;
       -moz-flex-grow: 1;
       -ms-flex-grow: 1;