diff --git a/app/design/frontend/Magento/luma/Magento_AdvancedCheckout/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_AdvancedCheckout/web/css/source/_module.less
index 8538a481903c7..4f2cf789d3a0e 100644
--- a/app/design/frontend/Magento/luma/Magento_AdvancedCheckout/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_AdvancedCheckout/web/css/source/_module.less
@@ -48,12 +48,6 @@
             }
 
             .block-content {
-                &:extend(.abs-add-clearfix-desktop all);
-
-                .box {
-                    &:extend(.abs-blocks-2columns all);
-                }
-
                 .actions-toolbar {
                     clear: both;
                     .lib-actions-toolbar(
@@ -188,4 +182,16 @@
             &:extend(.abs-add-clearfix-desktop all);
         }
     }
+
+    .column {
+        .block-addbysku {
+            .block-content {
+                &:extend(.abs-add-clearfix-desktop all);
+
+                .box {
+                    &:extend(.abs-blocks-2columns all);
+                }
+            }
+        }
+    }
 }
diff --git a/app/design/frontend/Magento/luma/Magento_CatalogSearch/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_CatalogSearch/web/css/source/_module.less
index 31859a46d3efe..2176fcd241916 100644
--- a/app/design/frontend/Magento/luma/Magento_CatalogSearch/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_CatalogSearch/web/css/source/_module.less
@@ -18,7 +18,7 @@
 //  _____________________________________________
 
 & when (@media-common = true) {
-    
+
     .search {
         .fieldset {
             .control {
@@ -31,7 +31,7 @@
             }
         }
     }
-    
+
     .block-search {
         margin-bottom: 0;
 
@@ -136,8 +136,6 @@
     }
 
     .form.search.advanced {
-        &:extend(.abs-forms-general-desktop all);
-
         .fields.range {
             .field {
                 &:first-child {
@@ -275,4 +273,8 @@
     .search-autocomplete {
         margin-top: 0;
     }
+
+    .form.search.advanced {
+        &:extend(.abs-forms-general-desktop all);
+    }
 }
diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_estimated-total.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_estimated-total.less
index 530c700cbc395..e89ad3aaf137f 100644
--- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_estimated-total.less
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_estimated-total.less
@@ -14,7 +14,6 @@
     //  ---------------------------------------------
 
     .opc-estimated-wrapper {
-        &:extend(.abs-no-display-desktop all);
         &:extend(.abs-add-clearfix all);
         .lib-css(background, @checkout-step-content-mobile__background);
         .lib-css(border-bottom, @checkout-step-title__border);
@@ -54,6 +53,6 @@
 
 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
     .opc-estimated-wrapper {
-        display: none;
+        &:extend(.abs-no-display-desktop all);
     }
 }
diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/fields/_file-uploader.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/fields/_file-uploader.less
index 7b06186ef9ad3..fbd9701d44be9 100644
--- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/fields/_file-uploader.less
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/fields/_file-uploader.less
@@ -129,7 +129,6 @@
 
 .file-uploader-preview {
     .action-remove {
-        &:extend(.abs-action-reset all);
         .lib-icon-font (
                 @icon-delete__content,
             @_icon-font: @icons__font-name,
diff --git a/app/design/frontend/Magento/luma/Magento_Downloadable/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Downloadable/web/css/source/_module.less
index 7d911220d9dca..40b8cb8740810 100644
--- a/app/design/frontend/Magento/luma/Magento_Downloadable/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Downloadable/web/css/source/_module.less
@@ -92,7 +92,6 @@
         }
 
         .field.choice {
-            &:extend(.clearer all);
             border-bottom: 1px solid @color-gray92;
             box-sizing: border-box;
             margin-bottom: @indent__s;
@@ -178,10 +177,6 @@
 
 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
     .page-product-downloadable {
-        .product-add-form {
-            &:extend(.clearer all);
-        }
-
         .product-options-wrapper {
             float: left;
             width: 55%;
diff --git a/app/design/frontend/Magento/luma/Magento_GiftMessage/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_GiftMessage/web/css/source/_module.less
index 0f2a0db56a355..0453937471a28 100644
--- a/app/design/frontend/Magento/luma/Magento_GiftMessage/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_GiftMessage/web/css/source/_module.less
@@ -27,7 +27,6 @@
 & when (@media-common = true) {
     .gift-message {
         .field {
-            &:extend(.abs-clearfix all);
             margin-bottom: @indent__base;
 
             .label {
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_module.less
index 599218f970907..bab8a2abb9b93 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_module.less
@@ -311,7 +311,6 @@
             margin-right: 30px;
 
             &.print {
-                &:extend(.abs-action-print all);
                 display: none;
                 margin: 0;
             }
@@ -589,6 +588,7 @@
 
     .order-actions-toolbar {
         .action.print {
+            &:extend(.abs-action-print all);
             display: block;
             float: right;
         }
@@ -709,7 +709,7 @@
     }
 }
 
-.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__l) { 
+.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__l) {
     .order-links {
         .item {
             margin: 0 @tab-control__margin-right 0 0;