diff --git a/platform/commonUI/general/res/css/items.css b/platform/commonUI/general/res/css/items.css
index bf0f5094ce..9295201d2b 100644
--- a/platform/commonUI/general/res/css/items.css
+++ b/platform/commonUI/general/res/css/items.css
@@ -357,7 +357,7 @@
   .items-holder .item.grid-item {
     width: 100%;
     height: 100px; } }
-@media screen and (min-width: 801px) and (orientation: portrait), screen and (min-device-width: 801px) and (orientation: portrait), screen and (min-width: 1025px) and (orientation: landscape), screen and (min-device-width: 1025px) and (orientation: landscape) {
+@media screen and (min-device-width: 801px) and (min-device-height: 1025px) and (orientation: portrait), screen and (min-device-width: 801px) and (min-device-height: 1025px) and (orientation: landscape) {
   /* line 24, ../sass/mobile/_item.scss */
   .items-holder .item.grid-item {
     width: 200px;
diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css
index 1778fb4848..702fb0bae7 100644
--- a/platform/commonUI/general/res/css/theme-espresso.css
+++ b/platform/commonUI/general/res/css/theme-espresso.css
@@ -816,7 +816,7 @@ mct-container {
 /* line 81, ../sass/mobile/_layout.scss */
 .mobile-menu-icon {
   top: 5px; }
-  @media screen and (min-width: 801px) and (orientation: portrait), screen and (min-device-width: 801px) and (orientation: portrait), screen and (min-width: 1025px) and (orientation: landscape), screen and (min-device-width: 1025px) and (orientation: landscape) {
+  @media screen and (min-device-width: 801px) and (min-device-height: 1025px) and (orientation: portrait), screen and (min-device-width: 801px) and (min-device-height: 1025px) and (orientation: landscape) {
     /* line 81, ../sass/mobile/_layout.scss */
     .mobile-menu-icon {
       display: none; } }
@@ -829,7 +829,7 @@ mct-container {
   /* line 88, ../sass/mobile/_layout.scss */
   .browse-manage {
     width: 400px; } }
-@media screen and (min-width: 801px) and (orientation: portrait), screen and (min-device-width: 801px) and (orientation: portrait), screen and (min-width: 1025px) and (orientation: landscape), screen and (min-device-width: 1025px) and (orientation: landscape) {
+@media screen and (min-device-width: 801px) and (min-device-height: 1025px) and (orientation: portrait), screen and (min-device-width: 801px) and (min-device-height: 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 2f5ddc08e3..2d968b0c82 100644
--- a/platform/commonUI/general/res/sass/mobile/_constants.scss
+++ b/platform/commonUI/general/res/sass/mobile/_constants.scss
@@ -50,7 +50,11 @@ $tabletHeight: "screen and #{$tabWidLanCheck} and #{$tabHeiLanCheck} and (orient
 $compMinW: 801px;
 $compMinH: 1025px;
 
-$deskTopDevice: "(min-device-width: #{$compMinW}) and (min-device-height: #{$compMinH})";
+$desktopDevicePortrait: "(min-device-width: #{$compMinW}) and (min-device-height: #{$compMinH})";
+$desktopDeviceLandscape: "(min-device-width: #{$compMinH}) and (min-device-height: #{$compMinW})";
+
+$compWidth: "screen and #{$desktopDevicePortrait} and (orientation: portrait)";
+$compHeight: "screen and #{$desktopDevicePortrait} and (orientation: landscape)";
 
 $leftPhone: $phoMaxW/2;
 $leftTab: $tabMaxW/2;
diff --git a/platform/commonUI/general/res/sass/mobile/_mixins.scss b/platform/commonUI/general/res/sass/mobile/_mixins.scss
index f23b8bc1d6..58127a0c14 100644
--- a/platform/commonUI/general/res/sass/mobile/_mixins.scss
+++ b/platform/commonUI/general/res/sass/mobile/_mixins.scss
@@ -43,10 +43,8 @@
 //}
 
 @mixin desktop {
-    @media screen and (min-width: $compMinW) and (orientation: portrait),
-           screen and (min-device-width: $compMinW) and (orientation: portrait),
-           screen and (min-width: $compMinH) and (orientation: landscape),
-           screen and (min-device-width: $compMinH) and (orientation: landscape) {
+    @media #{$compWidth},
+           #{$compHeight} {
         @content
     }
 }