diff --git a/platform/commonUI/general/res/css/items.css b/platform/commonUI/general/res/css/items.css
index 8ca1234189..104acc4bd1 100644
--- a/platform/commonUI/general/res/css/items.css
+++ b/platform/commonUI/general/res/css/items.css
@@ -352,12 +352,12 @@
   .items-holder .item.grid-item {
     width: 100%;
     height: 50px; } }
-@media screen and (min-device-width: 515px) and (max-device-width: 799px) and (min-device-height: 741px) and (max-device-height: 1024px) and (orientation: portrait), screen and (min-device-height: 515px) and (max-device-height: 799px) and (min-device-width: 741px) and (max-device-width: 1024px) and (max-width: 1024px) and (orientation: landscape) {
+@media screen and (min-device-width: 515px) and (max-device-width: 799px) and (min-device-height: 741px) and (max-device-height: 1024px) and (orientation: portrait), screen and (min-device-height: 515px) and (max-device-height: 799px) and (min-width: 515px) and (max-width: 799px) and (min-device-width: 741px) and (max-device-width: 1024px) and (min-width: 741px) and (max-width: 1024px) and (orientation: landscape) {
   /* line 24, ../sass/mobile/_item.scss */
   .items-holder .item.grid-item {
     width: 100%;
     height: 100px; } }
-@media screen and (min-device-width: 800px) and (min-device-height: 1025px) and (orientation: portrait), screen and (min-device-height: 800px) and (min-device-width: 1025px) and (orientation: landscape) {
+@media screen and (min-device-width: 800px) and (min-device-height: 1025px) and (orientation: portrait), screen and (min-device-height: 800px) and (min-height: 800px) and (min-device-width: 1025px) and (min-width: 1025px) and (orientation: landscape) {
   /* line 24, ../sass/mobile/_item.scss */
   .items-holder .item.grid-item {
     width: 200px;
@@ -366,7 +366,7 @@
   /* line 49, ../sass/mobile/_item.scss */
   .items-holder .item.grid-item .icon {
     display: none; } }
-@media screen and (min-device-width: 515px) and (max-device-width: 799px) and (min-device-height: 741px) and (max-device-height: 1024px) and (orientation: portrait), screen and (min-device-height: 515px) and (max-device-height: 799px) and (min-device-width: 741px) and (max-device-width: 1024px) and (max-width: 1024px) and (orientation: landscape) {
+@media screen and (min-device-width: 515px) and (max-device-width: 799px) and (min-device-height: 741px) and (max-device-height: 1024px) and (orientation: portrait), screen and (min-device-height: 515px) and (max-device-height: 799px) and (min-width: 515px) and (max-width: 799px) and (min-device-width: 741px) and (max-device-width: 1024px) and (min-width: 741px) and (max-width: 1024px) and (orientation: landscape) {
   /* line 49, ../sass/mobile/_item.scss */
   .items-holder .item.grid-item .icon {
     display: none; } }
diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css
index 6a3638f243..6ec675ea30 100644
--- a/platform/commonUI/general/res/css/theme-espresso.css
+++ b/platform/commonUI/general/res/css/theme-espresso.css
@@ -739,7 +739,7 @@ mct-container {
     -webkit-transition-duration: 0.2s;
     transition-duration: 0.2s;
     left: -257px; } }
-@media screen and (min-device-width: 515px) and (max-device-width: 799px) and (min-device-height: 741px) and (max-device-height: 1024px) and (orientation: portrait), screen and (min-device-height: 515px) and (max-device-height: 799px) and (min-device-width: 741px) and (max-device-width: 1024px) and (max-width: 1024px) and (orientation: landscape) {
+@media screen and (min-device-width: 515px) and (max-device-width: 799px) and (min-device-height: 741px) and (max-device-height: 1024px) and (orientation: portrait), screen and (min-device-height: 515px) and (max-device-height: 799px) and (min-width: 515px) and (max-width: 799px) and (min-device-width: 741px) and (max-device-width: 1024px) and (min-width: 741px) and (max-width: 1024px) and (orientation: landscape) {
   /* line 26, ../sass/mobile/_layout.scss */
   .holder-hide {
     -moz-transition-duration: 0.2s;
@@ -756,7 +756,7 @@ mct-container {
     -webkit-transition-duration: 0.2s;
     transition-duration: 0.2s;
     left: 0px; } }
-@media screen and (min-device-width: 515px) and (max-device-width: 799px) and (min-device-height: 741px) and (max-device-height: 1024px) and (orientation: portrait), screen and (min-device-height: 515px) and (max-device-height: 799px) and (min-device-width: 741px) and (max-device-width: 1024px) and (max-width: 1024px) and (orientation: landscape) {
+@media screen and (min-device-width: 515px) and (max-device-width: 799px) and (min-device-height: 741px) and (max-device-height: 1024px) and (orientation: portrait), screen and (min-device-height: 515px) and (max-device-height: 799px) and (min-width: 515px) and (max-width: 799px) and (min-device-width: 741px) and (max-device-width: 1024px) and (min-width: 741px) and (max-width: 1024px) and (orientation: landscape) {
   /* line 37, ../sass/mobile/_layout.scss */
   .holder-show {
     -moz-transition-duration: 0.2s;
@@ -776,7 +776,7 @@ mct-container {
       -webkit-transition-duration: 0.2s;
       transition-duration: 0.2s;
       left: 257px; } }
-  @media screen and (min-device-width: 515px) and (max-device-width: 799px) and (min-device-height: 741px) and (max-device-height: 1024px) and (orientation: portrait), screen and (min-device-height: 515px) and (max-device-height: 799px) and (min-device-width: 741px) and (max-device-width: 1024px) and (max-width: 1024px) and (orientation: landscape) {
+  @media screen and (min-device-width: 515px) and (max-device-width: 799px) and (min-device-height: 741px) and (max-device-height: 1024px) and (orientation: portrait), screen and (min-device-height: 515px) and (max-device-height: 799px) and (min-width: 515px) and (max-width: 799px) and (min-device-width: 741px) and (max-device-width: 1024px) and (min-width: 741px) and (max-width: 1024px) and (orientation: landscape) {
     /* line 48, ../sass/mobile/_layout.scss */
     .button-show {
       -moz-transition-duration: 0.2s;
@@ -796,7 +796,7 @@ mct-container {
     /* line 60, ../sass/mobile/_layout.scss */
     .button-hide {
       left: 257px; } }
-  @media screen and (min-device-width: 515px) and (max-device-width: 799px) and (min-device-height: 741px) and (max-device-height: 1024px) and (orientation: portrait), screen and (min-device-height: 515px) and (max-device-height: 799px) and (min-device-width: 741px) and (max-device-width: 1024px) and (max-width: 1024px) and (orientation: landscape) {
+  @media screen and (min-device-width: 515px) and (max-device-width: 799px) and (min-device-height: 741px) and (max-device-height: 1024px) and (orientation: portrait), screen and (min-device-height: 515px) and (max-device-height: 799px) and (min-width: 515px) and (max-width: 799px) and (min-device-width: 741px) and (max-device-width: 1024px) and (min-width: 741px) and (max-width: 1024px) and (orientation: landscape) {
     /* line 60, ../sass/mobile/_layout.scss */
     .button-hide {
       left: 512px; } }
@@ -808,7 +808,7 @@ mct-container {
     /* line 71, ../sass/mobile/_layout.scss */
     .object-header-mobile {
       left: 25.7px; } }
-  @media screen and (min-device-width: 515px) and (max-device-width: 799px) and (min-device-height: 741px) and (max-device-height: 1024px) and (orientation: portrait), screen and (min-device-height: 515px) and (max-device-height: 799px) and (min-device-width: 741px) and (max-device-width: 1024px) and (max-width: 1024px) and (orientation: landscape) {
+  @media screen and (min-device-width: 515px) and (max-device-width: 799px) and (min-device-height: 741px) and (max-device-height: 1024px) and (orientation: portrait), screen and (min-device-height: 515px) and (max-device-height: 799px) and (min-width: 515px) and (max-width: 799px) and (min-device-width: 741px) and (max-device-width: 1024px) and (min-width: 741px) and (max-width: 1024px) and (orientation: landscape) {
     /* line 71, ../sass/mobile/_layout.scss */
     .object-header-mobile {
       left: 51.2px; } }
@@ -816,7 +816,7 @@ mct-container {
 /* line 81, ../sass/mobile/_layout.scss */
 .mobile-menu-icon {
   top: 5px; }
-  @media screen and (min-device-width: 800px) and (min-device-height: 1025px) and (orientation: portrait), screen and (min-device-height: 800px) and (min-device-width: 1025px) and (orientation: landscape) {
+  @media screen and (min-device-width: 800px) and (min-device-height: 1025px) and (orientation: portrait), screen and (min-device-height: 800px) and (min-height: 800px) and (min-device-width: 1025px) and (min-width: 1025px) and (orientation: landscape) {
     /* line 81, ../sass/mobile/_layout.scss */
     .mobile-menu-icon {
       display: none; } }
@@ -825,11 +825,11 @@ mct-container {
   /* line 88, ../sass/mobile/_layout.scss */
   .browse-manage {
     width: 257px; } }
-@media screen and (min-device-width: 515px) and (max-device-width: 799px) and (min-device-height: 741px) and (max-device-height: 1024px) and (orientation: portrait), screen and (min-device-height: 515px) and (max-device-height: 799px) and (min-device-width: 741px) and (max-device-width: 1024px) and (max-width: 1024px) and (orientation: landscape) {
+@media screen and (min-device-width: 515px) and (max-device-width: 799px) and (min-device-height: 741px) and (max-device-height: 1024px) and (orientation: portrait), screen and (min-device-height: 515px) and (max-device-height: 799px) and (min-width: 515px) and (max-width: 799px) and (min-device-width: 741px) and (max-device-width: 1024px) and (min-width: 741px) and (max-width: 1024px) and (orientation: landscape) {
   /* line 88, ../sass/mobile/_layout.scss */
   .browse-manage {
     width: 512px; } }
-@media screen and (min-device-width: 800px) and (min-device-height: 1025px) and (orientation: portrait), screen and (min-device-height: 800px) and (min-device-width: 1025px) and (orientation: landscape) {
+@media screen and (min-device-width: 800px) and (min-device-height: 1025px) and (orientation: portrait), screen and (min-device-height: 800px) and (min-height: 800px) and (min-device-width: 1025px) and (min-width: 1025px) and (orientation: landscape) {
   /* line 88, ../sass/mobile/_layout.scss */
   .browse-manage {
     min-width: 150px;
diff --git a/platform/commonUI/general/res/sass/mobile/_constants.scss b/platform/commonUI/general/res/sass/mobile/_constants.scss
index f312ac8d91..cf0482bfdf 100644
--- a/platform/commonUI/general/res/sass/mobile/_constants.scss
+++ b/platform/commonUI/general/res/sass/mobile/_constants.scss
@@ -32,12 +32,12 @@ $phoHeiLanCheck: "(max-device-width: #{$phoMaxH})";
 $tabMinW: 515px;
 $tabMaxW: 799px;
 $tabWidPorCheck: "(min-device-width: #{$tabMinW}) and (max-device-width: #{$tabMaxW})";
-$tabWidLanCheck: "(min-device-height: #{$tabMinW}) and (max-device-height: #{$tabMaxW})";
+$tabWidLanCheck: "(min-device-height: #{$tabMinW}) and (max-device-height: #{$tabMaxW}) and (min-width: #{$tabMinW}) and (max-width: #{$tabMaxW})";
 
 $tabMinH: 741px;
 $tabMaxH: 1024px;
 $tabHeiPorCheck: "(min-device-height: #{$tabMinH}) and (max-device-height: #{$tabMaxH})";
-$tabHeiLanCheck: "(min-device-width: #{$tabMinH}) and (max-device-width: #{$tabMaxH}) and (max-width: #{$tabMaxH})";
+$tabHeiLanCheck: "(min-device-width: #{$tabMinH}) and (max-device-width: #{$tabMaxH}) and (min-width: #{$tabMinH}) and (max-width: #{$tabMaxH})";
 
 $phoneWidth: "screen and #{$phoWidPorCheck} and #{$phoHeiPorCheck} and (orientation: portrait)";
 $phoneHeight: "screen and #{$phoWidLanCheck} and #{$phoHeiLanCheck} and (orientation: landscape)";
@@ -51,11 +51,11 @@ $tabletHeight: "screen and #{$tabWidLanCheck} and #{$tabHeiLanCheck} and (orient
 
 $compMinW: 800px;
 $compWidPorCheck: "(min-device-width: #{$compMinW})";
-$compWidLanCheck: "(min-device-height: #{$compMinW})";
+$compWidLanCheck: "(min-device-height: #{$compMinW}) and (min-height: #{$compMinW})";
 
 $compMinH: 1025px;
 $compHeiPorCheck: "(min-device-height: #{$compMinH})";
-$compHeiLanCheck: "(min-device-width: #{$compMinH})";
+$compHeiLanCheck: "(min-device-width: #{$compMinH}) and (min-width: #{$compMinH})";
 
 $compWidth: "screen and #{$compWidPorCheck} and #{$compHeiPorCheck} and (orientation: portrait)";
 $compHeight: "screen and #{$compWidLanCheck} and #{$compHeiLanCheck} and (orientation: landscape)";