diff --git a/Gruntfile.js b/Gruntfile.js
index dbdca189e092f..4718c7cb6dbe4 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -23,17 +23,17 @@ module.exports = function (grunt) {
     require('load-grunt-config')(grunt, {
         configPath: path.join(__dirname, configDir),
         init: true,
-        loadGruntTasks: {
-            pattern: [
-                'grunt-*'
-            ]
+        jitGrunt: {
+            staticMappings: {
+                usebanner: 'grunt-banner'
+            }
         }
     });
 
     _.each({
         /**
          * Assembling tasks.
-         * ToDo UI: define default tasks.
+         * ToDo: define default tasks.
          */
         default: function () {
             grunt.log.subhead('I\'m default task and at the moment I\'m empty, sorry :/');
@@ -43,17 +43,19 @@ module.exports = function (grunt) {
          * Production preparation task.
          */
         prod: function (component) {
-            if (component === 'setup') {
-                grunt.task.run([
-                    'less:' + component,
-                    'autoprefixer:' + component,
-                    'cssmin:' + component,
-                    'usebanner:' + component
-                ]);
-            }
+            var tasks = [
+                'less',
+                'autoprefixer',
+                'cssmin',
+                'usebanner'
+            ].map(function(task){
+                return task + ':' + component;
+            });
 
             if (typeof component === 'undefined') {
                 grunt.log.subhead('Tip: Please make sure that u specify prod subtask. By default prod task do nothing');
+            } else {
+                grunt.task.run(tasks);
             }
         },
 
diff --git a/app/code/Magento/AdminNotification/Block/System/Messages.php b/app/code/Magento/AdminNotification/Block/System/Messages.php
index 9bd1aaf5df08d..949ba575abe85 100644
--- a/app/code/Magento/AdminNotification/Block/System/Messages.php
+++ b/app/code/Magento/AdminNotification/Block/System/Messages.php
@@ -123,6 +123,7 @@ public function getSystemMessageDialogJson()
                     'autoOpen' => false,
                     'width' => '75%',
                     'modal' => true,
+                    'minHeight' => '0',
                     'dialogClass' => 'ui-dialog-active ui-popup-message',
                     'ajaxUrl' => $this->_getMessagesUrl()
                 ],
diff --git a/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml b/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml
index c0818bb7a81f9..3652e763a1c9b 100644
--- a/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml
+++ b/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml
@@ -31,6 +31,7 @@ require([
             resizable: false,
             width: '75%',
             modal: true,
+            minHeight: '0',
             dialogClass: 'ui-popup-message',
             position: {
                 my: 'left+12.5% top',
diff --git a/app/code/Magento/Backend/Block/Widget/Grid.php b/app/code/Magento/Backend/Block/Widget/Grid.php
index 1d33dc1814621..b95a5af2763bb 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid.php
@@ -436,12 +436,12 @@ protected function _prepareFilterButtons()
             $this->getLayout()->createBlock(
                 'Magento\Backend\Block\Widget\Button'
             )->setData(
-                ['label' => __('Reset Filter'), 'onclick' => $this->getJsObjectName() . '.resetFilter()', 'class' => 'action-reset']
-            )->setDataAttribute(
                 [
-                    'action' => 'grid-filter-reset'
+                    'label' => __('Reset Filter'),
+                    'onclick' => $this->getJsObjectName() . '.resetFilter()',
+                    'class' => 'action-reset action-tertiary'
                 ]
-            )
+            )->setDataAttribute(['action' => 'grid-filter-reset'])
         );
         $this->setChild(
             'search_button',
@@ -451,13 +451,9 @@ protected function _prepareFilterButtons()
                 [
                     'label' => __('Search'),
                     'onclick' => $this->getJsObjectName() . '.doFilter()',
-                    'class' => 'task',
+                    'class' => 'action-secondary',
                 ]
-            )->setDataAttribute(
-                [
-                    'action' => 'grid-filter-apply'
-                ]
-            )
+            )->setDataAttribute(['action' => 'grid-filter-apply'])
         );
     }
 
@@ -820,8 +816,8 @@ public function getMainButtonsHtml()
     {
         $html = '';
         if ($this->getColumnSet()->isFilterVisible()) {
-            $html .= $this->getResetFilterButtonHtml();
             $html .= $this->getSearchButtonHtml();
+            $html .= $this->getResetFilterButtonHtml();
         }
         return $html;
     }
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php
index 9288cf5df470c..0404a6050c228 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php
@@ -58,7 +58,7 @@ public function getHtml()
             ' value="' .
             $this->getEscapedValue(
                 'from'
-            ) . '" class="input-text no-changes" placeholder="' . __(
+            ) . '" class="admin__control-text input-text no-changes" placeholder="' . __(
                 'From'
             ) . '" ' . $this->getUiId(
                 'filter',
@@ -74,7 +74,7 @@ public function getHtml()
             ' value="' .
             $this->getEscapedValue(
                 'to'
-            ) . '" class="input-text no-changes" placeholder="' . __(
+            ) . '" class="input-text admin__control-text no-changes" placeholder="' . __(
                 'To'
             ) . '" ' . $this->getUiId(
                 'filter',
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Select.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Select.php
index c06fb05c9a4e0..ccf950fd706b1 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Select.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Select.php
@@ -66,7 +66,7 @@ public function getHtml()
         $html = '<select name="' . $this->_getHtmlName() . '" id="' . $this->_getHtmlId() . '"' . $this->getUiId(
             'filter',
             $this->_getHtmlName()
-        ) . 'class="admin__control-select no-changes">';
+        ) . 'class="no-changes admin__control-select">';
         $value = $this->getValue();
         foreach ($this->_getOptions() as $option) {
             if (is_array($option['value'])) {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Text.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Text.php
index f1b6d1a98dba0..f7f540e1d27b8 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Text.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Text.php
@@ -17,7 +17,7 @@ class Text extends \Magento\Backend\Block\Widget\Grid\Column\Filter\AbstractFilt
      */
     public function getHtml()
     {
-        $html = '<div class="field-100"><input type="text" name="' .
+        $html = '<input type="text" name="' .
             $this->_getHtmlName() .
             '" id="' .
             $this->_getHtmlId() .
@@ -27,7 +27,7 @@ public function getHtml()
             $this->getUiId(
                 'filter',
                 $this->_getHtmlName()
-            ) . ' /></div>';
+            ) . ' />';
         return $html;
     }
 }
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/AbstractRenderer.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/AbstractRenderer.php
index 3e58f4104f66e..a906d70f0950f 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/AbstractRenderer.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/AbstractRenderer.php
@@ -52,10 +52,9 @@ public function render(Object $row)
     {
         if ($this->getColumn()->getEditable()) {
             $value = $this->_getValue($row);
-            return $value . ($this->getColumn()->getEditOnly() ? '' : ($value !=
-                '' ? '' : '&nbsp;')) . $this->_getInputValueElement(
-                    $row
-                );
+            return '<div class="admin__grid-control">' .
+            '<span class="admin__grid-control-value">' . $value . '</span>' .
+            $this->_getInputValueElement($row) . '</div>' ;
         }
         return $this->_getValue($row);
     }
@@ -123,26 +122,23 @@ public function renderHeader()
             $dir = strtolower($this->getColumn()->getDir());
             $nDir = $dir == 'asc' ? 'desc' : 'asc';
             if ($this->getColumn()->getDir()) {
-                $className = 'sort-arrow-' . $dir;
+                $className = '_' . $dir . 'end';
             }
-            $out = '<a href="#" name="' .
+            $out = '<th data-sort="' .
                 $this->getColumn()->getId() .
-                '" title="' .
+                '" data-direction="' .
                 $nDir .
-                '" class="' .
-                $className .
-                '">' .
-                '<label class="sort-title" for=' .
-                $this->getColumn()->getHtmlId() .
-                '>' .
+                '" class="data-grid-th _sortable ' .
+                $className . ' ' .
+                $this->getColumn()->getHeaderCssClass() .
+                '"><span>' .
                 $this->getColumn()->getHeader() .
-                '</label></a>';
+                '</span></th>';
         } else {
-            $out = '<label for=' .
-                $this->getColumn()->getHtmlId() .
-                '>' .
+            $out = '<th class="data-grid-th ' .
+                $this->getColumn()->getHeaderCssClass() . '"><span>' .
                 $this->getColumn()->getHeader() .
-                '</label>';
+                '</span></th>';
         }
         return $out;
     }
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php
index 2da717929a0ec..6bbbf0b5284bd 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php
@@ -55,7 +55,7 @@ public function render(\Magento\Framework\Object $row)
             }
         }
 
-        $out = '<select class="action-select" onchange="varienGridAction.execute(this);">' .
+        $out = '<select class="admin__control-select" onchange="varienGridAction.execute(this);">' .
             '<option value=""></option>';
         $i = 0;
         foreach ($actions as $action) {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Checkbox.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Checkbox.php
index bca3b3038445b..867dfc9f56ee2 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Checkbox.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Checkbox.php
@@ -141,11 +141,11 @@ public function renderHeader()
         if ($this->getColumn()->getDisabled()) {
             $disabled = ' disabled="disabled"';
         }
-        $html = '<input type="checkbox" ';
+        $html = '<th class="data-grid-th data-grid-actions-cell"><input type="checkbox" ';
         $html .= 'name="' . $this->getColumn()->getFieldName() . '" ';
         $html .= 'onclick="' . $this->getColumn()->getGrid()->getJsObjectName() . '.checkCheckboxes(this)" ';
-        $html .= 'class="checkbox"' . $checked . $disabled . ' ';
-        $html .= 'title="' . __('Select All') . '"/>';
+        $html .= 'class="admin__control-checkbox"' . $checked . $disabled . ' ';
+        $html .= 'title="' . __('Select All') . '"/><label></label></th>';
         return $html;
     }
 }
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Massaction.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Massaction.php
index a805ba971295b..529b3f4e0ddde 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Massaction.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Massaction.php
@@ -63,8 +63,12 @@ public function render(\Magento\Framework\Object $row)
      */
     protected function _getCheckboxHtml($value, $checked)
     {
-        $html = '<input type="checkbox" name="' . $this->getColumn()->getName() . '" ';
-        $html .= 'value="' . $this->escapeHtml($value) . '" class="massaction-checkbox"' . $checked . '/>';
+        $id = 'id_' . rand(0, 999);
+        $html = '<label class="data-grid-checkbox-cell-inner" for="'. $id .'">';
+        $html .= '<input type="checkbox" name="' . $this->getColumn()->getName() . '" ';
+        $html .= 'id="' . $id . '" data-role="select-row"';
+        $html .= 'value="' . $this->escapeHtml($value) . '" class="admin__control-checkbox"' . $checked . '/>';
+        $html .= '<label for="'. $id .'"></label></label>';
         return $html;
     }
 }
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Extended.php b/app/code/Magento/Backend/Block/Widget/Grid/Extended.php
index 516c3eaae5040..e19827a61b65a 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Extended.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Extended.php
@@ -206,7 +206,7 @@ protected function _prepareLayout()
                 [
                     'label' => __('Reset Filter'),
                     'onclick' => $this->getJsObjectName() . '.resetFilter()',
-                    'class' => 'action-reset'
+                    'class' => 'action-reset action-tertiary'
                 ]
             )->setDataAttribute(
                 [
@@ -220,7 +220,7 @@ protected function _prepareLayout()
                 [
                     'label' => __('Search'),
                     'onclick' => $this->getJsObjectName() . '.doFilter()',
-                    'class' => 'task',
+                    'class' => 'task action-secondary',
                 ]
             )->setDataAttribute(
                 [
@@ -1302,8 +1302,8 @@ public function getMainButtonsHtml()
     {
         $html = '';
         if ($this->getFilterVisibility()) {
-            $html .= $this->getResetFilterButtonHtml();
             $html .= $this->getSearchButtonHtml();
+            $html .= $this->getResetFilterButtonHtml();
         }
         return $html;
     }
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml
index e9a724fdbf857..9ee5d5025d968 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml
@@ -25,7 +25,7 @@ $numColumns = sizeof($block->getColumns());
                 <?php if ($block->getHeadersVisibility()): ?>
                     <tr>
                         <?php foreach ($block->getColumns() as $_column): ?>
-                            <th <?php echo $_column->getHeaderHtmlProperty() ?>><?php echo $_column->getHeaderHtml() ?></th>
+                            <?php echo $_column->getHeaderHtml() ?>
                         <?php endforeach; ?>
                     </tr>
                 <?php endif; ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/cache/edit.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/cache/edit.phtml
index c96c9a0c43738..976fa606ed42d 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/system/cache/edit.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/system/cache/edit.phtml
@@ -37,7 +37,7 @@
             <h4 class="icon-head head-edit-form fieldset-legend"><?php echo __('Catalog') ?></h4>
         </div>
         <fieldset id="catalog">
-            <table cellspacing="0" class="form-list">
+            <table class="form-list">
                 <tbody>
                     <?php foreach ($block->getCatalogData() as $_item): ?>
                     <?php /* disable reindex buttons. functionality moved to index management*/?>
@@ -70,7 +70,7 @@
         </div>
 
         <fieldset id="jscss">
-            <table cellspacing="0" class="form-list">
+            <table class="form-list">
                 <tbody>
                     <tr>
                         <td class="label"><label><?php echo __('JavaScript/CSS Cache') ?></label></td>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/info.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/info.phtml
index c87029504a287..54ea90d58e31b 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/system/info.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/system/info.phtml
@@ -24,7 +24,7 @@
             <dl class="grid accordion">
                 <dt><a href="#">Sales Statistics</a></dt>
                 <dd class="open grid">
-                    <table cellspacing="0" class="data">
+                    <table class="data">
                         <thead>
                             <tr>
                                 <th>Store</th>
@@ -60,7 +60,7 @@
         <dl class="accordion">
             <dt><a href="#">Last 5 Orders</a></dt>
             <dd class="grid open">
-                <table cellspacing="0" class="data">
+                <table class="data">
                     <thead>
                         <tr>
                             <th>Order #</th>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml
index 88470e31c7d16..ed79720277308 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml
@@ -38,11 +38,13 @@ if ($isField) {
 */ ?>
 
 <?php if ($isWrapped): ?>
-    <div class="fieldset-wrapper <?php echo($isCollapsable) ? 'collapsable-wrapper ' : ''; ?>"
+    <div class="fieldset-wrapper <?php echo($isCollapsable) ? 'admin__collapsible-block-wrapper ' : ''; ?>"
         id="<?php echo $containerId ? $containerId : $id . '-wrapper';?>"
         data-role="<?php echo $id ?>-wrapper">
         <div class="fieldset-wrapper-title admin__fieldset-wrapper-title">
-            <strong class="title"<?php echo($isCollapsable) ? ' data-toggle="collapse" data-target="#' . $id . '-content"' : ''; ?>>
+            <strong <?php echo($isCollapsable) ?
+                'class="admin__collapsible-title" data-toggle="collapse" data-target="#' . $id . '-content"' :
+                'class="title"'; ?>>
                 <span><?php echo $element->getLegend() ?></span>
             </strong>
             <?php echo $titleActions; ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
index ce39df8da943b..c750a63e8e1e4 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
@@ -22,152 +22,161 @@
 $numColumns = sizeof($block->getColumns());
 ?>
 <?php if ($block->getCollection()): ?>
+
 <?php if ($block->canDisplayContainer()): ?>
-    <?php if ($block->getGridHeader()): ?>
-        <div class="page-title-wrapper">
-            <h1 class="page-title"><?php echo $block->getGridHeader(); ?></h1>
-        </div>
-    <?php endif ?>
+<div id="<?php echo $block->getId() ?>" data-grid-id="<?php echo $block->getId() ?>">
+<?php else: ?>
+<?php echo $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?>
+<?php endif; ?>
+
+        <div class="admin__data-grid-header admin__data-grid-toolbar">
+            <?php $massActionAvailable = $block->getChildBlock('grid.massaction') && $block->getChildBlock('grid.massaction')->isAvailable() ?>
+            <?php if ($block->getPagerVisibility() || $block->getExportTypes() || $block->getChildBlock('grid.columnSet')->getFilterVisibility()): ?>
+            <div class="admin__data-grid-header-row">
+                <?php if ($massActionAvailable): ?>
+                    <?php echo $block->getMainButtonsHtml() ? '<div class="admin__filter-actions">' . $block->getMainButtonsHtml() . '</div>' : ''; ?>
+                <?php endif; ?>
 
-    <div id="<?php echo $block->getId() ?>" data-grid-id="<?php echo $block->getId() ?>">
-        <?php else: ?>
-            <?php echo $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?>
-        <?php endif; ?>
-        <?php if ($block->getPagerVisibility() || $block->getExportTypes() || $block->getChildBlock('grid.columnSet')->getFilterVisibility()): ?>
-            <div class="grid-actions">
                 <?php if ($block->getChildBlock('grid.export')): ?>
-                    <div class="export">
-                        <?php echo $block->getChildHtml('grid.export'); ?>
-                    </div>
+                    <?php echo $block->getChildHtml('grid.export'); ?>
                 <?php endif; ?>
-                <div class="filter-actions">
-                    <?php echo $block->getMainButtonsHtml() ?>
-                </div>
-                <?php if ($block->getPagerVisibility()): ?>
-                    <div class="pager">
-                        <?php $countRecords = $block->getCollection()->getSize(); ?>
-                        <span class="pages-total-found"><?php echo __('Total %1 records found', $countRecords) ?></span>
-                        <span id="<?php echo $block->getHtmlId() ?>-total-count"
-                              class="total-count no-display"<?php echo $block->getUiId('total-count') ?>>
+            </div>
+            <?php endif; ?>
+            <div class="<?php if($massActionAvailable) { echo '_massaction ';} ?>admin__data-grid-header-row">
+                <?php if ($massActionAvailable): ?>
+                    <?php echo $block->getChildHtml('grid.massaction') ?>
+                <?php else: ?>
+                    <?php echo $block->getMainButtonsHtml() ? '<div class="admin__filter-actions">' . $block->getMainButtonsHtml() . '</div>' : ''; ?>
+                <?php endif; ?>
+                    <?php $countRecords = $block->getCollection()->getSize(); ?>
+                    <div class="admin__control-support-text">
+                        <span id="<?php echo $block->getHtmlId() ?>-total-count" <?php echo $block->getUiId('total-count') ?>>
                             <?php echo $countRecords ?>
                         </span>
-                        <label class="view-pages">
-                            <?php echo __('View') ?>
-                            <select name="<?php echo $block->getVarNameLimit() ?>"
-                                    onchange="<?php echo $block->getJsObjectName() ?>.loadByElement(this)" <?php echo $block->getUiId('per-page') ?>
-                                    class="select admin__control-select">
-                                <option value="20"<?php if ($block->getCollection()->getPageSize() == 20): ?>
-                                    selected="selected"<?php endif; ?>>20
-                                </option>
-                                <option value="30"<?php if ($block->getCollection()->getPageSize() == 30): ?>
-                                    selected="selected"<?php endif; ?>>30
-                                </option>
-                                <option value="50"<?php if ($block->getCollection()->getPageSize() == 50): ?>
-                                    selected="selected"<?php endif; ?>>50
-                                </option>
-                                <option value="100"<?php if ($block->getCollection()->getPageSize() == 100): ?>
-                                    selected="selected"<?php endif; ?>>100
-                                </option>
-                                <option value="200"<?php if ($block->getCollection()->getPageSize() == 200): ?>
-                                    selected="selected"<?php endif; ?>>200
-                                </option>
-                            </select>
-                            <?php echo __('per page') ?>
-                        </label>
+                        <?php echo __('records found') ?>
+                        <span id="<?php echo $block->getHtmlId() ?>_massaction-count"
+                              class="mass-select-info _empty"><strong data-role="counter">0</strong> <span><?php echo __('selected') ?></span></span>
                     </div>
-                <?php endif ?>
-            </div>
-        <?php endif; ?>
-        <?php if ($block->getChildBlock('grid.massaction') && $block->getChildBlock('grid.massaction')->isAvailable()): ?>
-            <?php echo $block->getChildHtml('grid.massaction') ?>
-        <?php endif ?>
-
-        <?php if ($block->getGridCssClass()): ?>
-            <div class="grid-container">
-                <table class="<?php echo $block->getGridCssClass() ?>" id="<?php echo $block->getId() ?>_table">
-                    <!-- Rendering column set -->
-                    <?php echo $block->getChildHtml('grid.columnSet'); ?>
-                </table>
-            </div>
-        <?php else: ?>
-            <div class="grid">
-                <div class="hor-scroll">
-                    <table class="data" id="<?php echo $block->getId() ?>_table">
-                        <!-- Rendering column set -->
-                        <?php echo $block->getChildHtml('grid.columnSet'); ?>
-                    </table>
-                </div>
                 <?php if ($block->getPagerVisibility()): ?>
-                    <div class="pager">
-                        <label class="page"><?php echo __('Page') ?></label>
+                    <div class="admin__data-grid-pager-wrap">
+                        <select name="<?php echo $block->getVarNameLimit() ?>"
+                                id="<?php echo $block->getHtmlId()?>_page-limit"
+                                onchange="<?php echo $block->getJsObjectName() ?>.loadByElement(this)" <?php echo $block->getUiId('per-page') ?>
+                                class="admin__control-select">
+                            <option value="20"<?php if ($block->getCollection()->getPageSize() == 20): ?>
+                                selected="selected"<?php endif; ?>>20
+                            </option>
+                            <option value="30"<?php if ($block->getCollection()->getPageSize() == 30): ?>
+                                selected="selected"<?php endif; ?>>30
+                            </option>
+                            <option value="50"<?php if ($block->getCollection()->getPageSize() == 50): ?>
+                                selected="selected"<?php endif; ?>>50
+                            </option>
+                            <option value="100"<?php if ($block->getCollection()->getPageSize() == 100): ?>
+                                selected="selected"<?php endif; ?>>100
+                            </option>
+                            <option value="200"<?php if ($block->getCollection()->getPageSize() == 200): ?>
+                                selected="selected"<?php endif; ?>>200
+                            </option>
+                        </select>
+                        <label for="<?php echo $block->getHtmlId()?>_page-limit"
+                            class="admin__control-support-text"><?php echo __('per page') ?></label>
+                        <div class="admin__data-grid-pager">
+                            <?php $_curPage = $block->getCollection()->getCurPage() ?>
+                            <?php $_lastPage = $block->getCollection()->getLastPageNumber() ?>
 
-                        <?php $_curPage = $block->getCollection()->getCurPage() ?>
-                        <?php $_lastPage = $block->getCollection()->getLastPageNumber() ?>
+                            <?php if ($_curPage > 1): ?>
+                                <button class="action-previous"
+                                        type="button"
+                                        onclick="<?php echo $block->getJsObjectName() ?>.setPage('<?php echo($_curPage - 1) ?>');return false;">
+                                            <span><?php echo __('Previous page') ?></span>
+                                </button>
+                            <?php else: ?>
+                                <button type="button" class="action-previous disabled"><span><?php echo __('Previous page') ?></span></button>
+                            <?php endif; ?>
 
-                        <?php if ($_curPage > 1): ?>
-                            <a href="#" title="<?php echo __('Previous page') ?>" class="action-previous"
-                               onclick="<?php echo $block->getJsObjectName() ?>.setPage('<?php echo($_curPage - 1) ?>');return false;"><span><?php echo __('Previous page') ?></span></a>
-                        <?php else: ?>
-                            <span class="action-default action-previous disabled"><span><?php echo __('Previous page') ?></span></span>
-                        <?php endif; ?>
-
-                        <input type="text" name="<?php echo $block->getVarNamePage() ?>" value="<?php echo $_curPage ?>"
-                               class="input-text admin__control-text page"
-                               onkeypress="<?php echo $block->getJsObjectName() ?>.inputPage(event, '<?php echo $_lastPage ?>')" <?php echo $block->getUiId('current-page') ?> />
-
-                        <span class="pages-total">
-                            <?php echo __('of %1', $block->getCollection()->getLastPageNumber()) ?></span>
-                        </span>
+                            <input type="text"
+                                   id="<?php echo $block->getHtmlId()?>_page-current"
+                                   name="<?php echo $block->getVarNamePage() ?>"
+                                   value="<?php echo $_curPage ?>"
+                                   class="admin__control-text"
+                                   onkeypress="<?php echo $block->getJsObjectName() ?>.inputPage(event, '<?php echo $_lastPage ?>')" <?php echo $block->getUiId('current-page') ?> />
 
-                        <?php if ($_curPage < $_lastPage): ?>
-                            <a href="#" title="<?php echo __('Next page') ?>" class="action-next"
-                               onclick="<?php echo $block->getJsObjectName() ?>.setPage('<?php echo($_curPage + 1) ?>');return false;"><span><?php echo __('Next page') ?></span></a>
-                        <?php else: ?>
-                            <span class="action-default action-next disabled"><span><?php echo __('Next page') ?></span></span>
-                        <?php endif; ?>
-                        <?php if ($block->getChildBlock('grid.bottom.links')): ?>
-                            <?php echo $block->getChildHtml('grid.bottom.links') ?>
-                        <?php endif; ?>
+                            <label class="admin__control-support-text" for="<?php echo $block->getHtmlId()
+                            ?>_page-current">
+                                <?php echo __('of %1', '<span>' . $block->getCollection()->getLastPageNumber() . '</span>') ?>
+                            </label>
+                            <?php if ($_curPage < $_lastPage): ?>
+                                <button title="<?php echo __('Next page') ?>"
+                                        class="action-next"
+                                        onclick="<?php echo $block->getJsObjectName() ?>.setPage('<?php echo($_curPage + 1) ?>');return false;">
+                                    <span><?php echo __('Next page') ?></span>
+                                </button>
+                            <?php else: ?>
+                                <button type="button" class="action-next disabled"><span><?php echo __('Next page') ?></span></button>
+                            <?php endif; ?>
+                        </div>
                     </div>
                 <?php endif ?>
             </div>
+        </div>
+        <div class="admin__data-grid-wrap">
+        <?php if ($block->getGridCssClass()): ?>
+            <table class="<?php echo $block->getGridCssClass() ?> data-grid" id="<?php echo $block->getId() ?>_table">
+                <!-- Rendering column set -->
+                <?php echo $block->getChildHtml('grid.columnSet'); ?>
+            </table>
+        <?php else: ?>
+
+            <table class="data-grid" id="<?php echo $block->getId() ?>_table">
+                <!-- Rendering column set -->
+                <?php echo $block->getChildHtml('grid.columnSet'); ?>
+            </table>
+
+            <?php if ($block->getChildBlock('grid.bottom.links')): ?>
+                <?php echo $block->getChildHtml('grid.bottom.links') ?>
+            <?php endif; ?>
+
         <?php endif ?>
-        <?php if ($block->canDisplayContainer()): ?>
-    </div>
-    <script>
-        var deps = ['mage/adminhtml/grid'];
+        </div>
+<?php if ($block->canDisplayContainer()): ?>
+</div>
+<script>
+    var deps = ['mage/adminhtml/grid'];
 
     <?php if (strpos($block->getRowClickCallback(), 'order.') !== false): ?>
-    deps.push('Magento_Sales/order/create/form')
+    deps.push('Magento_Sales/order/create/form');
     <?php endif; ?>
 
-        require(deps, function(){
-            <?php //TODO: getJsObjectName and getRowClickCallback has unexpected behavior. Should be removed ?>
+    require(deps, function(){
+        <?php //TODO: getJsObjectName and getRowClickCallback has unexpected behavior. Should be removed ?>
 
-            <?php echo $block->getJsObjectName() ?> = new varienGrid('<?php echo $block->getId() ?>', '<?php echo $block->getGridUrl() ?>', '<?php echo $block->getVarNamePage() ?>', '<?php echo $block->getVarNameSort() ?>', '<?php echo $block->getVarNameDir() ?>', '<?php echo $block->getVarNameFilter() ?>');
-            <?php echo $block->getJsObjectName() ?>.useAjax = <?php echo $block->getUseAjax() ? 'true' : 'false' ?>;
-            <?php if ($block->getRowClickCallback()): ?>
-            <?php echo $block->getJsObjectName() ?>.rowClickCallback = <?php echo $block->getRowClickCallback() ?>;
-            <?php endif; ?>
-            <?php if ($block->getCheckboxCheckCallback()): ?>
-            <?php echo $block->getJsObjectName() ?>.checkboxCheckCallback = <?php echo $block->getCheckboxCheckCallback() ?>;
-            <?php endif; ?>
-            <?php if ($block->getSortableUpdateCallback()): ?>
-            <?php echo $block->getJsObjectName() ?>.sortableUpdateCallback = <?php echo $block->getSortableUpdateCallback()?>;
-            <?php endif; ?>
-            <?php echo $block->getJsObjectName() ?>.bindSortable();
-            <?php if ($block->getRowInitCallback()): ?>
-            <?php echo $block->getJsObjectName() ?>.initRowCallback = <?php echo $block->getRowInitCallback() ?>;
-            <?php echo $block->getJsObjectName() ?>.initGridRows();
-            <?php endif; ?>
-            <?php if ($block->getChildBlock('grid.massaction') && $block->getChildBlock('grid.massaction')->isAvailable()): ?>
-            <?php echo $block->getChildBlock('grid.massaction')->getJavaScript() ?>
-            <?php endif ?>
-            <?php echo $block->getAdditionalJavaScript(); ?>
-        });
+        <?php echo $block->getJsObjectName() ?> = new varienGrid('<?php echo $block->getId() ?>', '<?php echo $block->getGridUrl() ?>', '<?php echo $block->getVarNamePage() ?>', '<?php echo $block->getVarNameSort() ?>', '<?php echo $block->getVarNameDir() ?>', '<?php echo $block->getVarNameFilter() ?>');
+        <?php echo $block->getJsObjectName() ?>.useAjax = <?php echo $block->getUseAjax() ? 'true' : 'false' ?>;
+        <?php if ($block->getRowClickCallback()): ?>
+        <?php echo $block->getJsObjectName() ?>.rowClickCallback = <?php echo $block->getRowClickCallback() ?>;
+        <?php endif; ?>
+        <?php if ($block->getCheckboxCheckCallback()): ?>
+        <?php echo $block->getJsObjectName() ?>.checkboxCheckCallback = <?php echo $block->getCheckboxCheckCallback() ?>;
+        <?php endif; ?>
+        <?php if ($block->getSortableUpdateCallback()): ?>
+        <?php echo $block->getJsObjectName() ?>.sortableUpdateCallback = <?php echo $block->getSortableUpdateCallback()?>;
+        <?php endif; ?>
+        <?php echo $block->getJsObjectName() ?>.bindSortable();
+        <?php if ($block->getRowInitCallback()): ?>
+        <?php echo $block->getJsObjectName() ?>.initRowCallback = <?php echo $block->getRowInitCallback() ?>;
+        <?php echo $block->getJsObjectName() ?>.initGridRows();
+        <?php endif; ?>
+        <?php if ($block->getChildBlock('grid.massaction') && $block->getChildBlock('grid.massaction')->isAvailable()): ?>
+        <?php echo $block->getChildBlock('grid.massaction')->getJavaScript() ?>
+        <?php endif ?>
+        <?php echo $block->getAdditionalJavaScript(); ?>
+    });
 </script>
 <?php endif; ?>
-    <?php if ($block->getChildBlock('grid.js')): ?>
-        <?php echo $block->getChildHtml('grid.js'); ?>
-    <?php endif; ?>
+
+<?php if ($block->getChildBlock('grid.js')): ?>
+    <?php echo $block->getChildHtml('grid.js'); ?>
+<?php endif; ?>
+
 <?php endif ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/column_set.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/column_set.phtml
index 7474b6b0219be..2ba8f456149f4 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/column_set.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/column_set.phtml
@@ -20,31 +20,35 @@ $numColumns = sizeof($block->getColumns());
     /* foreach ($block->getColumns() as $_column): ?>
         <col <?php echo $_column->getHtmlProperty() ?> />
     <?php endforeach; */ ?>
-    <?php if ($block->isHeaderVisible() || $block->isFilterVisible()): ?>
+    <?php if ($block->isHeaderVisible()): ?>
         <thead>
-            <?php if ($block->isHeaderVisible()): ?>
-                <tr class="headings">
+            <?php if ($block->isHeaderVisible() || $block->getFilterVisibility()): ?>
+                <tr>
                 <?php foreach ($block->getColumns() as $_column): ?>
                 <?php /* @var $_column \Magento\Backend\Block\Widget\Grid\Column */ ?>
-                    <th data-column="<?php echo $_column->getId() ?>" <?php echo $_column->getHeaderHtmlProperty() ?>>
-                            <span><?php echo $_column->getHeaderHtml() ?></span>
-                    </th>
+                    <?php if ($_column->getHeaderHtml() == '&nbsp;'):?>
+                        <th class="data-grid-th" data-column="<?php echo $_column->getId() ?>"
+                            <?php echo $_column->getHeaderHtmlProperty() ?>>&nbsp;</th>
+                    <?php else: ?>
+                        <?php echo $_column->getHeaderHtml()?>
+                    <?php endif; ?>
                 <?php endforeach; ?>
                 </tr>
             <?php endif; ?>
             <?php if ($block->isFilterVisible()): ?>
-                <tr class="filter">
-                <?php $i = 0; foreach ($block->getColumns() as $_column): ?>
-                    <th data-column="<?php echo $_column->getId() ?>" <?php echo $_column->getHeaderHtmlProperty() ?>>
-                        <?php echo $_column->getFilterHtml() ?>
-                    </th>
-                <?php endforeach; ?>
+                <tr class="data-grid-filters" data-role="filter-form">
+                    <?php $i = 0; foreach ($block->getColumns() as $_column): ?>
+                        <td data-column="<?php echo $_column->getId() ?>" <?php echo $_column->getHeaderHtmlProperty() ?>>
+                            <?php echo $_column->getFilterHtml() ?>
+                        </td>
+                    <?php endforeach; ?>
                 </tr>
             <?php endif ?>
         </thead>
     <?php endif; ?>
 
     <tbody>
+
         <?php if ($block->getCollection()->getSize() > 0 && !$block->getIsCollapsed()): ?>
         <?php foreach ($block->getCollection() as $_index => $_item): ?>
             <?php if ($block->hasMultipleRows($_item)) :?>
@@ -56,7 +60,7 @@ $numColumns = sizeof($block->getColumns());
                             $_rowspan = $block->getRowspan($_item, $_column);
                           ?><td data-column="<?php echo $_column->getId() ?>"
                                 <?php echo($_rowspan ? 'rowspan="' . $_rowspan . '" ' : '') ?>
-                                class="<?php echo $_column->getCssProperty() ?> <?php echo ++$i == $numColumns ? 'last' : '' ?>"
+                                class="<?php echo $_column->getCssProperty() ?> <?php echo $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': ''?> <?php echo ++$i == $numColumns ? 'last' : '' ?>"
                             >
                                 <?php echo(($_html = $_column->getRowField($_item)) != '' ? $_html : '&nbsp;') ?>
                             </td><?php
@@ -76,7 +80,7 @@ $numColumns = sizeof($block->getColumns());
                     <tr data-role="row">
                         <?php $i = 0; foreach ($block->getMultipleRowColumns($_i) as $_column):
                             ?><td data-column="<?php echo $_column->getId() ?>"
-                            class="<?php echo $_column->getCssProperty() ?> <?php echo ++$i == $numColumns-1 ? 'last' : '' ?>"
+                            class="<?php echo $_column->getCssProperty() ?> <?php echo $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': ''?> <?php echo ++$i == $numColumns-1 ? 'last' : '' ?>"
                         >
                             <?php echo(($_html = $_column->getRowField($_i)) != '' ? $_html : '&nbsp;') ?>
                         </td><?php
@@ -88,7 +92,7 @@ $numColumns = sizeof($block->getColumns());
                     <tr class="subtotals">
                         <?php $i = 0; foreach ($block->getMultipleRowColumns() as $_column): ?>
                             <td data-column="<?php echo $_column->getId() ?>"
-                                class="<?php echo $_column->getCssProperty() ?> <?php echo ++$i == $numColumns ? 'last' : '' ?>"
+                                class="<?php echo $_column->getCssProperty() ?> <?php echo $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': ''?> <?php echo ++$i == $numColumns ? 'last' : '' ?>"
                             >
                                 <?php echo $_column->hasSubtotalsLabel() ? $_column->getSubtotalsLabel()
                                     : $_column->getRowField($block->getSubTotals($_item));
@@ -104,7 +108,7 @@ $numColumns = sizeof($block->getColumns());
                     <?php $i = 0; foreach ($block->getColumns() as $_column): ?>
                         <?php if ($block->shouldRenderCell($_item, $_column)):?>
                             <td data-column="<?php echo $_column->getId() ?>"
-                                class="<?php echo $_column->getCssProperty() ?> <?php echo ++$i == $numColumns ? 'last' : '' ?>"
+                                class="<?php echo $_column->getCssProperty() ?> <?php echo $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': ''?> <?php echo ++$i == $numColumns ? 'last' : '' ?>"
                             >
                                 <?php echo(($_html = $_column->getRowField($_item)) != '' ? $_html : '&nbsp;') ?>
                             </td>
@@ -122,10 +126,9 @@ $numColumns = sizeof($block->getColumns());
             <?php endif; ?>
         <?php endforeach; ?>
         <?php elseif ($block->getEmptyText()): ?>
-            <tr data-role="row">
+            <tr class="data-grid-tr-no-data" data-role="row">
                 <td class="<?php echo $block->getEmptyTextClass() ?>"
-                    colspan="<?php echo $numColumns ?>"
-                ><?php echo $block->getEmptyText() ?></td>
+                    colspan="<?php echo $numColumns ?>"><?php echo $block->getEmptyText() ?></td>
             </tr>
         <?php endif; ?>
     </tbody>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/export.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/export.phtml
index 94e11d5377914..05387761a7b59 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/export.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/export.phtml
@@ -7,13 +7,14 @@
 // @codingStandardsIgnoreFile
 
 ?>
-
-<label for="<?php echo $block->getId() ?>_export" class="label">
-    <?php echo __('Export to:') ?>
-</label>
-<select name="<?php echo $block->getId() ?>_export" id="<?php echo $block->getId() ?>_export" class="select">
-    <?php foreach ($block->getExportTypes() as $_type): ?>
-        <option value="<?php echo $_type->getUrl() ?>"><?php echo $_type->getLabel() ?></option>
-    <?php endforeach; ?>
-</select>
-<?php echo $block->getExportButtonHtml() ?>
+<div class="admin__data-grid-export">
+    <label for="<?php echo $block->getId() ?>_export" class="admin__control-support-text">
+        <?php echo __('Export to:') ?>
+    </label>
+    <select name="<?php echo $block->getId() ?>_export" id="<?php echo $block->getId() ?>_export" class="admin__control-select">
+        <?php foreach ($block->getExportTypes() as $_type): ?>
+            <option value="<?php echo $_type->getUrl() ?>"><?php echo $_type->getLabel() ?></option>
+        <?php endforeach; ?>
+    </select>
+    <?php echo $block->getExportButtonHtml() ?>
+</div>
\ No newline at end of file
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
index c8f1b79cf2cca..b266fd638eaf6 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
@@ -25,24 +25,25 @@ $numColumns = sizeof($block->getColumns());
 ?>
 <?php if ($block->getCollection()): ?>
     <?php if ($block->canDisplayContainer()): ?>
-    <?php if ($block->getGridHeader()): ?>
-        <div class="page-title-wrapper">
-            <h1 class="page-title"><?php echo $block->getGridHeader(); ?></h1>
-        </div>
-    <?php endif ?>
 
-    <div id="<?php echo $block->getId() ?>">
+    <div id="<?php echo $block->getId() ?>" data-grid-id="<?php echo $block->getId() ?>">
     <?php else: ?>
         <?php echo $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?>
     <?php endif; ?>
     <?php if ($block->getPagerVisibility() || $block->getExportTypes() || $block->getFilterVisibility()): ?>
-        <div class="grid-actions">
+        <?php $massActionAvailable = $block->getMassactionBlock() && $block->getMassactionBlock()->isAvailable() ?>
+        <div class="admin__data-grid-header admin__data-grid-toolbar">
+            <div class="admin__data-grid-header-row">
+                <?php if ($massActionAvailable): ?>
+                    <?php echo $block->getMainButtonsHtml() ? '<div class="admin__filter-actions">' . $block->getMainButtonsHtml() . '</div>' : ''; ?>
+                <?php endif; ?>
             <?php if ($block->getExportTypes()): ?>
-                <div class="export">
-                    <label for="<?php echo $block->getId() ?>_export"
-                           class="label"><?php echo __('Export to:') ?></label>
+                <div class="admin__data-grid-export">
+                    <label
+                        class="admin__control-support-text"
+                        for="<?php echo $block->getId() ?>_export"><?php echo __('Export to:') ?></label>
                     <select name="<?php echo $block->getId() ?>_export" id="<?php echo $block->getId() ?>_export"
-                            class="select admin__control-select">
+                            class="admin__control-select">
                         <?php foreach ($block->getExportTypes() as $_type): ?>
                             <option value="<?php echo $_type->getUrl() ?>"><?php echo $_type->getLabel() ?></option>
                         <?php endforeach; ?>
@@ -50,178 +51,194 @@ $numColumns = sizeof($block->getColumns());
                     <?php echo $block->getExportButtonHtml() ?>
                 </div>
             <?php endif; ?>
-            <div class="filter-actions">
-                <?php echo $block->getMainButtonsHtml() ?>
             </div>
+
+            <div class="admin__data-grid-header-row <?php echo $massActionAvailable ? '_massaction' : '';?>">
+                <?php if ($massActionAvailable): ?>
+                    <?php echo $block->getMassactionBlockHtml() ?>
+                <?php else: ?>
+                    <?php echo $block->getMainButtonsHtml() ? '<div class="admin__filter-actions">' . $block->getMainButtonsHtml() . '</div>' : ''; ?>
+                <?php endif; ?>
+                <?php $countRecords = $block->getCollection()->getSize(); ?>
+                <div class="admin__control-support-text">
+                        <span id="<?php echo $block->getHtmlId() ?>-total-count" <?php echo $block->getUiId('total-count') ?>>
+                            <?php echo $countRecords ?>
+                        </span>
+                    <?php echo __('records found') ?>
+                    <span id="<?php echo $block->getHtmlId() ?>_massaction-count"
+                          class="mass-select-info _empty"><strong data-role="counter">0</strong> <span><?php echo __('selected') ?></span></span>
+                </div>
+
             <?php if ($block->getPagerVisibility()): ?>
-                <div class="pager">
-                    <span class="pages-total-found">
-                        <?php echo __('Total %1 records found', $block->getCollection()->getSize()) ?>
-                    </span>
-                    <span id="<?php echo $block->getHtmlId() ?>-total-count"
-                          class="no-display"><?php echo $block->getCollection()->getSize() ?></span>
-                    <label class="view-pages">
-                        <?php echo __('View') ?>
-                        <select name="<?php echo $block->getVarNameLimit() ?>"
-                                onchange="<?php echo $block->getJsObjectName() ?>.loadByElement(this)"
-                                class="select admin__control-select">
-                            <option value="20"<?php if ($block->getCollection()->getPageSize() == 20): ?>
-                                selected="selected"<?php endif; ?>>20
-                            </option>
-                            <option value="30"<?php if ($block->getCollection()->getPageSize() == 30): ?>
-                                selected="selected"<?php endif; ?>>30
-                            </option>
-                            <option value="50"<?php if ($block->getCollection()->getPageSize() == 50): ?>
-                                selected="selected"<?php endif; ?>>50
-                            </option>
-                            <option value="100"<?php if ($block->getCollection()->getPageSize() == 100): ?>
-                                selected="selected"<?php endif; ?>>100
-                            </option>
-                            <option value="200"<?php if ($block->getCollection()->getPageSize() == 200): ?>
-                                selected="selected"<?php endif; ?>>200
-                            </option>
-                        </select>
-                        <?php echo __('per page') ?>
-                    </label>
+                <div class="admin__data-grid-pager-wrap">
+                    <select name="<?php echo $block->getVarNameLimit() ?>"
+                            id="<?php echo $block->getHtmlId()?>_page-limit"
+                            onchange="<?php echo $block->getJsObjectName() ?>.loadByElement(this)"
+                            class="admin__control-select">
+                        <option value="20"<?php if ($block->getCollection()->getPageSize() == 20): ?>
+                            selected="selected"<?php endif; ?>>20
+                        </option>
+                        <option value="30"<?php if ($block->getCollection()->getPageSize() == 30): ?>
+                            selected="selected"<?php endif; ?>>30
+                        </option>
+                        <option value="50"<?php if ($block->getCollection()->getPageSize() == 50): ?>
+                            selected="selected"<?php endif; ?>>50
+                        </option>
+                        <option value="100"<?php if ($block->getCollection()->getPageSize() == 100): ?>
+                            selected="selected"<?php endif; ?>>100
+                        </option>
+                        <option value="200"<?php if ($block->getCollection()->getPageSize() == 200): ?>
+                            selected="selected"<?php endif; ?>>200
+                        </option>
+                    </select>
+                    <label for="<?php echo $block->getHtmlId()?><?php echo $block->getHtmlId()?>_page-limit"
+                        class="admin__control-support-text"><?php echo __('per page') ?></label>
+
+                    <div class="admin__data-grid-pager">
+                        <?php $_curPage = $block->getCollection()->getCurPage() ?>
+                        <?php $_lastPage = $block->getCollection()->getLastPageNumber() ?>
+                        <?php if ($_curPage > 1): ?>
+                            <button class="action-previous"
+                                    type="button"
+                                    onclick="<?php echo $block->getJsObjectName() ?>.setPage('<?php echo($_curPage - 1) ?>');return false;">
+                                <span><?php echo __('Previous page') ?></span>
+                            </button>
+                        <?php else: ?>
+                            <button type="button" class="action-previous disabled"><span><?php echo __('Previous page') ?></span></button>
+                        <?php endif; ?>
+                        <input type="text"
+                               id="<?php echo $block->getHtmlId()?>_page-current"
+                               name="<?php echo $block->getVarNamePage() ?>"
+                               value="<?php echo $_curPage ?>"
+                               class="admin__control-text"
+                               onkeypress="<?php echo $block->getJsObjectName() ?>.inputPage(event, '<?php echo $_lastPage ?>')" <?php echo $block->getUiId('current-page') ?> />
+                        <label class="admin__control-support-text" for="<?php echo $block->getHtmlId()?>_page-current">
+                            <?php echo __('of %1', '<span>' . $block->getCollection()->getLastPageNumber() . '</span>') ?>
+                        </label>
+                        <?php if ($_curPage < $_lastPage): ?>
+                            <button href="#"
+                                    title="<?php echo __('Next page') ?>"
+                                    class="action-next"
+                                    onclick="<?php echo $block->getJsObjectName() ?>.setPage('<?php echo($_curPage + 1) ?>');return false;">
+                                <span><?php echo __('Next page') ?></span>
+                            </button>
+                        <?php else: ?>
+                        <button type="button" class="action-next disabled"><span><?php echo __('Next page') ?></span></button>
+                        <?php endif; ?>
+                    </div>
                 </div>
             <?php endif ?>
+            </div>
         </div>
     <?php endif; ?>
-    <?php if ($block->getMassactionBlock() && $block->getMassactionBlock()->isAvailable()): ?>
-        <?php echo $block->getMassactionBlockHtml() ?>
-    <?php endif ?>
-    <div class="grid">
-        <div class="hor-scroll">
-            <table class="data" id="<?php echo $block->getId() ?>_table">
-                <?php
-                /* This part is commented to remove all <col> tags from the code. */
-                /* foreach ($block->getColumns() as $_column): ?>
-                <col <?php echo $_column->getHtmlProperty() ?> />
-                <?php endforeach; */
-                ?>
-                <?php if ($block->getHeadersVisibility() || $block->getFilterVisibility()): ?>
-                    <thead>
-                    <?php if ($block->getHeadersVisibility()): ?>
-                        <tr class="headings">
-                            <?php foreach ($block->getColumns() as $_column): ?>
-                                <th<?php echo $_column->getHeaderHtmlProperty() ?>>
-                                    <span><?php echo $_column->getHeaderHtml() ?></span>
-                                </th>
-                            <?php endforeach; ?>
-                        </tr>
-                    <?php endif; ?>
-                    <?php if ($block->getFilterVisibility()): ?>
-                        <tr class="filter">
-                            <?php $i = 0;
-                            foreach ($block->getColumns() as $_column): ?>
-                                <th<?php echo $_column->getHeaderHtmlProperty() ?>><?php echo $_column->getFilterHtml() ?></th>
-                            <?php endforeach; ?>
-                        </tr>
-                    <?php endif ?>
-                    </thead>
-                <?php endif; ?>
-                <?php if ($block->getCountTotals()): ?>
-                    <tfoot>
-                    <tr class="totals">
+
+    <div class="admin__data-grid-wrap">
+        <table class="data-grid" id="<?php echo $block->getId() ?>_table">
+            <?php
+            /* This part is commented to remove all <col> tags from the code. */
+            /* foreach ($block->getColumns() as $_column): ?>
+            <col <?php echo $_column->getHtmlProperty() ?> />
+            <?php endforeach; */
+            ?>
+            <?php if ($block->getHeadersVisibility() || $block->getFilterVisibility()): ?>
+                <thead>
+                <?php if ($block->getHeadersVisibility()): ?>
+                    <tr>
                         <?php foreach ($block->getColumns() as $_column): ?>
-                            <th class="<?php echo $_column->getCssProperty() ?>">
-                                <?php echo($_column->hasTotalsLabel()) ? $_column->getTotalsLabel() : $_column->getRowField($_column->getGrid()->getTotals()) ?>
-                            </th>
+                            <?php if ($_column->getHeaderHtml() == '&nbsp;'):?>
+                                <th class="data-grid-th" data-column="<?php echo $_column->getId() ?>"
+                                    <?php echo $_column->getHeaderHtmlProperty() ?>>&nbsp;</th>
+                            <?php else: ?>
+                                <?php echo $_column->getHeaderHtml()?>
+                            <?php endif; ?>
                         <?php endforeach; ?>
                     </tr>
-                    </tfoot>
                 <?php endif; ?>
+                <?php if ($block->getFilterVisibility()): ?>
+                    <tr class="data-grid-filters" data-role="filter-form">
+                        <?php $i = 0;
+                        foreach ($block->getColumns() as $_column): ?>
+                            <td data-column="<?php echo $_column->getId() ?>" <?php echo $_column->getHeaderHtmlProperty() ?>>
+                                <?php echo $_column->getFilterHtml() ?>
+                            </td>
+                        <?php endforeach; ?>
+                    </tr>
+                <?php endif ?>
+                </thead>
+            <?php endif; ?>
+            <?php if ($block->getCountTotals()): ?>
+                <tfoot>
+                <tr class="totals">
+                    <?php foreach ($block->getColumns() as $_column): ?>
+                        <th class="<?php echo $_column->getCssProperty() ?>">
+                            <?php echo($_column->hasTotalsLabel()) ? $_column->getTotalsLabel() : $_column->getRowField($_column->getGrid()->getTotals()) ?>
+                        </th>
+                    <?php endforeach; ?>
+                </tr>
+                </tfoot>
+            <?php endif; ?>
 
-                <tbody>
-                <?php if (($block->getCollection()->getSize() > 0) && (!$block->getIsCollapsed())): ?>
-                    <?php foreach ($block->getCollection() as $_index => $_item): ?>
-                        <tr title="<?php echo $block->getRowUrl($_item) ?>"<?php if ($_class = $block->getRowClass($_item)): ?>
-                            class="<?php echo $_class; ?>"<?php endif; ?> ><?php
-                            $i = 0;
-                            foreach ($block->getColumns() as $_column):
-                                if ($block->shouldRenderCell($_item, $_column)):
-                                    $_rowspan = $block->getRowspan($_item, $_column);
+            <tbody>
+            <?php if (($block->getCollection()->getSize() > 0) && (!$block->getIsCollapsed())): ?>
+                <?php foreach ($block->getCollection() as $_index => $_item): ?>
+                    <tr title="<?php echo $block->getRowUrl($_item) ?>"<?php if ($_class = $block->getRowClass($_item)): ?>
+                        class="<?php echo $_class; ?>"<?php endif; ?> ><?php
+                        $i = 0;
+                        foreach ($block->getColumns() as $_column):
+                            if ($block->shouldRenderCell($_item, $_column)):
+                                $_rowspan = $block->getRowspan($_item, $_column);
+                                ?>
+                            <td <?php echo($_rowspan ? 'rowspan="' . $_rowspan . '" ' : '') ?>
+                                class="<?php echo $_column->getCssProperty() ?>
+                                        <?php echo $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': ''?>">
+                                <?php echo(($_html = $_column->getRowField($_item)) != '' ? $_html : '&nbsp;') ?>
+                                </td><?php
+                                if ($block->shouldRenderEmptyCell($_item, $_column)):
                                     ?>
-                                <td <?php echo($_rowspan ? 'rowspan="' . $_rowspan . '" ' : '') ?>class="<?php echo $_column->getCssProperty() ?> <?php echo ++$i == $numColumns ? 'last' : '' ?>">
-                                    <?php echo(($_html = $_column->getRowField($_item)) != '' ? $_html : '&nbsp;') ?>
-                                    </td><?php
-                                    if ($block->shouldRenderEmptyCell($_item, $_column)):
-                                        ?>
-                                        <td colspan="<?php echo $block->getEmptyCellColspan($_item) ?>"
-                                            class="last"><?php echo $block->getEmptyCellLabel() ?></td><?php
-                                    endif;
+                                    <td colspan="<?php echo $block->getEmptyCellColspan($_item) ?>"
+                                        class="last"><?php echo $block->getEmptyCellLabel() ?></td><?php
                                 endif;
-                            endforeach; ?>
-                        </tr>
-                        <?php if ($_multipleRows = $block->getMultipleRows($_item)): ?>
-                            <?php foreach ($_multipleRows as $_i): ?>
-                                <tr>
-                                    <?php $i = 0;
-                                    foreach ($block->getMultipleRowColumns($_i) as $_column): ?>
-                                        <td class="<?php echo $_column->getCssProperty() ?> <?php echo ++$i == $numColumns - 1 ? 'last' : '' ?>">
-                                            <?php echo(($_html = $_column->getRowField($_i)) != '' ? $_html : '&nbsp;') ?>
-                                        </td>
-                                    <?php endforeach; ?>
-                                </tr>
-                            <?php endforeach; ?>
-                        <?php endif; ?>
-
-                        <?php if ($block->shouldRenderSubTotal($_item)): ?>
-                            <tr class="subtotals">
+                            endif;
+                        endforeach; ?>
+                    </tr>
+                    <?php if ($_multipleRows = $block->getMultipleRows($_item)): ?>
+                        <?php foreach ($_multipleRows as $_i): ?>
+                            <tr>
                                 <?php $i = 0;
-                                foreach ($block->getSubTotalColumns() as $_column): ?>
-                                    <td class="<?php echo $_column->getCssProperty() ?> <?php echo ++$i == $numColumns ? 'last' : '' ?>">
-                                        <?php echo($_column->hasSubtotalsLabel() ? $_column->getSubtotalsLabel() :
-                                            $_column->getRowField($block->getSubTotalItem($_item))
-                                        );
-                                        ?>
+                                foreach ($block->getMultipleRowColumns($_i) as $_column): ?>
+                                    <td class="<?php echo $_column->getCssProperty() ?>
+                                        <?php echo $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': ''?>">
+                                        <?php echo(($_html = $_column->getRowField($_i)) != '' ? $_html : '&nbsp;') ?>
                                     </td>
                                 <?php endforeach; ?>
                             </tr>
-                        <?php endif; ?>
-                    <?php endforeach; ?>
-                <?php elseif ($block->getEmptyText()): ?>
-                    <tr>
-                        <td class="<?php echo $block->getEmptyTextClass() ?>"
-                            colspan="<?php echo $numColumns ?>"><?php echo $block->getEmptyText() ?></td>
-                    </tr>
-                <?php endif; ?>
-                </tbody>
-            </table>
-        </div>
-        <?php if ($block->getPagerVisibility()): ?>
-            <div class="pager">
-                <label class="page"><?php echo __('Page') ?></label>
-
-                <?php $_curPage = $block->getCollection()->getCurPage() ?>
-                <?php $_lastPage = $block->getCollection()->getLastPageNumber() ?>
-
-                <?php if ($_curPage > 1): ?>
-                    <a href="#" title="<?php echo __('Previous page') ?>" class="action-previous"
-                       onclick="<?php echo $block->getJsObjectName() ?>.setPage('<?php echo($_curPage - 1) ?>');return false;"><span><?php echo __('Previous page') ?></span></a>
-                <?php else: ?>
-                    <span class="action-default action-previous disabled"><span><?php echo __('Previous page') ?></span></span>
-                <?php endif; ?>
-
-                <input type="text" name="<?php echo $block->getVarNamePage() ?>" value="<?php echo $_curPage ?>"
-                       class="input-text admin__control-text page"
-                       onkeypress="<?php echo $block->getJsObjectName() ?>.inputPage(event, '<?php echo $_lastPage ?>')"/>
+                        <?php endforeach; ?>
+                    <?php endif; ?>
 
-                <span class="pages-total">
-                    <?php echo __('of %1', $block->getCollection()->getLastPageNumber()) ?>
-                </span>
+                    <?php if ($block->shouldRenderSubTotal($_item)): ?>
+                        <tr class="subtotals">
+                            <?php $i = 0;
+                            foreach ($block->getSubTotalColumns() as $_column): ?>
+                                <td class="<?php echo $_column->getCssProperty() ?>
+                                           <?php echo $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': ''?>">
+                                    <?php echo($_column->hasSubtotalsLabel() ? $_column->getSubtotalsLabel() :
+                                        $_column->getRowField($block->getSubTotalItem($_item))
+                                    );
+                                    ?>
+                                </td>
+                            <?php endforeach; ?>
+                        </tr>
+                    <?php endif; ?>
+                <?php endforeach; ?>
+            <?php elseif ($block->getEmptyText()): ?>
+                <tr class="data-grid-tr-no-data">
+                    <td class="<?php echo $block->getEmptyTextClass() ?>"
+                        colspan="<?php echo $numColumns ?>"><?php echo $block->getEmptyText() ?></td>
+                </tr>
+            <?php endif; ?>
+            </tbody>
+        </table>
 
-                <?php if ($_curPage < $_lastPage): ?>
-                    <a href="#" title="<?php echo __('Next page') ?>" class="action-next"
-                       onclick="<?php echo $block->getJsObjectName() ?>.setPage('<?php echo($_curPage + 1) ?>');return false;"><span><?php echo __('Next page') ?></span></a>
-                <?php else: ?>
-                    <span class="action-default action-next disabled"><span><?php echo __('Next page') ?></span></span>
-                <?php endif; ?>
-                <?php if ($block->getChildBlock('grid.bottom.links')): ?>
-                    <?php echo $block->getChildHtml('grid.bottom.links') ?>
-                <?php endif; ?>
-            </div>
-        <?php endif ?>
     </div>
     <?php if ($block->canDisplayContainer()): ?>
 </div>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/massaction.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/massaction.phtml
index c759fdb6fac26..901d1f1e1f7db 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/massaction.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/massaction.phtml
@@ -7,70 +7,70 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<div id="<?php echo $block->getHtmlId() ?>">
-<div class="massaction">
-    <div class="entry-edit">
-        <?php if ($block->getHideFormElement() !== true):?>
-            <form action="" id="<?php echo $block->getHtmlId() ?>-form" method="post">
-        <?php endif ?>
-            <?php echo $block->getBlockHtml('formkey')?>
-                <span class="field-row">
-                    <label class="label"><?php echo __('Actions') ?></label>
-                        <select id="<?php echo $block->getHtmlId() ?>-select" class="required-entry select absolute-advice local-validation"<?php echo $block->getUiId('select') ?>>
-                            <option value=""></option>
-                            <?php foreach ($block->getItems() as $_item):?>
-                                <option value="<?php echo $_item->getId() ?>"<?php echo($_item->getSelected() ? ' selected="selected"' : '')?>><?php echo $_item->getLabel() ?></option>
-                            <?php endforeach; ?>
-                        </select>
-                </span>
-                <span class="outer-span" id="<?php echo $block->getHtmlId() ?>-form-hiddens"></span>
-                <span class="outer-span" id="<?php echo $block->getHtmlId() ?>-form-additional"></span>
-                <span class="field-row">
-                    <?php echo $block->getApplyButtonHtml() ?>
-                </span>
-        <?php if ($block->getHideFormElement() !== true):?>
-            </form>
-        <?php endif ?>
-        <div class="no-display">
-        <?php foreach ($block->getItems() as $_item): ?>
-            <div id="<?php echo $block->getHtmlId() ?>-item-<?php echo $_item->getId() ?>-block">
-                <?php if ('' != $_item->getBlockName()):?>
-                    <?php echo $block->getChildHtml($_item->getBlockName());?>
-                <?php endif;?>
-            </div>
-        <?php endforeach; ?>
+<?php echo $block->getSomething(); ?>
+<div id="<?php echo $block->getHtmlId() ?>" class="admin__grid-massaction">
+
+    <?php if ($block->getHideFormElement() !== true):?>
+    <form action="" id="<?php echo $block->getHtmlId() ?>-form" method="post">
+    <?php endif ?>
+        <div class="admin__grid-massaction-form">
+    <?php echo $block->getBlockHtml('formkey')?>
+            <select
+                id="<?php echo $block->getHtmlId() ?>-select"
+                class="required-entry local-validation admin__control-select"
+                <?php echo $block->getUiId('select') ?>>
+                <option class="admin__control-select-placeholder" value="" selected><?php echo __('Actions') ?></option>
+                <?php foreach ($block->getItems() as $_item):?>
+                    <option value="<?php echo $_item->getId() ?>"<?php echo($_item->getSelected() ? ' selected="selected"' : '')?>><?php echo $_item->getLabel() ?></option>
+                <?php endforeach; ?>
+            </select>
+            <span class="outer-span" id="<?php echo $block->getHtmlId() ?>-form-hiddens"></span>
+            <span class="outer-span" id="<?php echo $block->getHtmlId() ?>-form-additional"></span>
+            <?php echo $block->getApplyButtonHtml() ?>
+        </div>
+    <?php if ($block->getHideFormElement() !== true):?>
+    </form>
+    <?php endif ?>
+    <div class="no-display">
+    <?php foreach ($block->getItems() as $_item): ?>
+        <div id="<?php echo $block->getHtmlId() ?>-item-<?php echo $_item->getId() ?>-block">
+            <?php if ('' != $_item->getBlockName()):?>
+                <?php echo $block->getChildHtml($_item->getBlockName());?>
+            <?php endif;?>
         </div>
+    <?php endforeach; ?>
     </div>
-    <div class="entry-select">
-        <select id="massaction-select" class="select">
-            <option value="">
-                <?php echo __('Mass Actions')?>
-            </option>
-            <?php if ($block->getUseSelectAll()):?>
-                <option value="selectAll">
-                    <?php echo __('Select All') ?>
+
+    <div class="mass-select-wrap">
+        <select
+            id="<?php echo $block->getHtmlId() ?>-mass-select"
+            class="action-select-multiselect"
+            data-menu="grid-mass-select">
+            <optgroup label="<?php echo __('Mass Actions')?>">
+                <option disabled selected></option>
+                <?php if ($block->getUseSelectAll()):?>
+                    <option value="selectAll">
+                        <?php echo __('Select All') ?>
+                    </option>
+                    <option value="unselectAll">
+                        <?php echo __('Unselect All') ?>
+                    </option>
+                <?php endif; ?>
+                <option value="selectVisible">
+                    <?php echo __('Select Visible') ?>
                 </option>
-                <option value="unselectAll">
-                    <?php echo __('Unselect All') ?>
+                <option value="unselectVisible">
+                    <?php echo __('Unselect Visible') ?>
                 </option>
-            <?php endif; ?>
-            <option value="selectVisible">
-                <?php echo __('Select Visible') ?>
-            </option>
-            <option value="unselectVisible">
-                <?php echo __('Unselect Visible') ?>
-            </option>
+            </optgroup>
         </select>
-        <span class="items">
-            <strong id="<?php echo $block->getHtmlId() ?>-count">0</strong> <?php echo __('items selected') ?>
-        </span>
+        <label for="<?php echo $block->getHtmlId() ?>-mass-select"></label>
     </div>
-</div>
-<script>
 
+<script>
     require(['jquery'], function($){
         'use strict';
-        $('#massaction-select').change(function () {
+        $('#<?php echo $block->getHtmlId() ?>-mass-select').change(function () {
             var massAction = $('option:selected', this).val();
             switch (massAction) {
                 <?php if ($block->getUseSelectAll()):?>
@@ -88,6 +88,7 @@
                     return <?php echo $block->getJsObjectName() ?>.unselectVisible();
                     break;
             }
+            this.blur();
         });
     });
     <?php if (!$block->getParentBlock()->canDisplayContainer()): ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/massaction_extended.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/massaction_extended.phtml
index 62a4d4fe647cf..c30c3407ad649 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/massaction_extended.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/massaction_extended.phtml
@@ -10,43 +10,42 @@
 * @deprecated support Magento 1.x grid massaction implementation
  */
 ?>
-<div id="<?php echo $block->getHtmlId() ?>">
-<div class="massaction">
-    <div class="entry-edit">
-        <?php if ($block->getHideFormElement() !== true):?>
-            <form action="" id="<?php echo $block->getHtmlId() ?>-form" method="post">
-        <?php endif ?>
-                <?php echo $block->getBlockHtml('formkey')?>
-                <span class="field-row">
-                    <label class="label"><?php echo __('Actions') ?></label>
-                    <select id="<?php echo $block->getHtmlId() ?>-select" class="required-entry select absolute-advice local-validation">
-                        <option value=""></option>
-                        <?php foreach ($block->getItems() as $_item): ?>
-                            <option value="<?php echo $_item->getId() ?>"<?php echo($_item->getSelected() ? ' selected="selected"' : '')?>><?php echo $_item->getLabel() ?></option>
-                        <?php endforeach; ?>
-                    </select>
-                </span>
-                <span class="outer-span" id="<?php echo $block->getHtmlId() ?>-form-hiddens"></span>
-                <span class="outer-span" id="<?php echo $block->getHtmlId() ?>-form-additional"></span>
-                <span class="field-row">
-                    <?php echo $block->getApplyButtonHtml() ?>
-                </span>
-        <?php if ($block->getHideFormElement() !== true):?>
-            </form>
-        <?php endif ?>
-        <div class="no-display">
-            <?php foreach ($block->getItems() as $_item): ?>
-                <div id="<?php echo $block->getHtmlId() ?>-item-<?php echo $_item->getId() ?>-block">
-                    <?php echo $_item->getAdditionalActionBlockHtml() ?>
-                </div>
-            <?php endforeach; ?>
+<div id="<?php echo $block->getHtmlId() ?>" class="admin__grid-massaction">
+
+    <?php if ($block->getHideFormElement() !== true):?>
+    <form action="" id="<?php echo $block->getHtmlId() ?>-form" method="post">
+    <?php endif ?>
+        <div class="admin__grid-massaction-form">
+        <?php echo $block->getBlockHtml('formkey')?>
+            <select
+                id="<?php echo $block->getHtmlId() ?>-select"
+                class="required-entry local-validation admin__control-select">
+                <option class="admin__control-select-placeholder" value="" selected><?php echo __('Actions') ?></option>
+                <?php foreach ($block->getItems() as $_item): ?>
+                    <option value="<?php echo $_item->getId() ?>"<?php echo($_item->getSelected() ? ' selected="selected"' : '')?>><?php echo $_item->getLabel() ?></option>
+                <?php endforeach; ?>
+            </select>
+            <span class="outer-span" id="<?php echo $block->getHtmlId() ?>-form-hiddens"></span>
+            <span class="outer-span" id="<?php echo $block->getHtmlId() ?>-form-additional"></span>
+            <?php echo $block->getApplyButtonHtml() ?>
         </div>
+    <?php if ($block->getHideFormElement() !== true):?>
+    </form>
+    <?php endif ?>
+    <div class="no-display">
+        <?php foreach ($block->getItems() as $_item): ?>
+            <div id="<?php echo $block->getHtmlId() ?>-item-<?php echo $_item->getId() ?>-block">
+                <?php echo $_item->getAdditionalActionBlockHtml() ?>
+            </div>
+        <?php endforeach; ?>
     </div>
-    <div class="entry-select">
-        <select id="massaction-select" class="select">
-            <option value="">
-                <?php echo __('Mass Actions')?>
-            </option>
+    <div class="mass-select-wrap">
+        <select
+            id="<?php echo $block->getHtmlId() ?>-mass-select"
+            class="action-select-multiselect"
+            data-menu="grid-mass-select">
+            <optgroup label="<?php echo __('Mass Actions')?>">
+                <option disabled selected></option>
             <?php if ($block->getUseSelectAll()):?>
                 <option value="selectAll">
                     <?php echo __('Select All') ?>
@@ -55,22 +54,20 @@
                     <?php echo __('Unselect All') ?>
                 </option>
             <?php endif; ?>
-            <option value="selectVisible">
-                <?php echo __('Select Visible') ?>
-            </option>
-            <option value="unselectVisible">
-                <?php echo __('Unselect Visible') ?>
-            </option>
+                <option value="selectVisible">
+                    <?php echo __('Select Visible') ?>
+                </option>
+                <option value="unselectVisible">
+                    <?php echo __('Unselect Visible') ?>
+                </option>
+            </optgroup>
         </select>
-        <span class="items">
-            <strong id="<?php echo $block->getHtmlId() ?>-count">0</strong> <?php echo __('items selected') ?>
-        </span>
+        <label for="<?php echo $block->getHtmlId() ?>-mass-select"></label>
     </div>
-</div>
 <script>
     require(['jquery'], function($){
         'use strict';
-        $('#massaction-select').change(function () {
+        $('#<?php echo $block->getHtmlId() ?>-mass-select').change(function () {
             var massAction = $('option:selected', this).val();
             switch (massAction) {
                 <?php if ($block->getUseSelectAll()):?>
@@ -88,6 +85,7 @@
                     return <?php echo $block->getJsObjectName() ?>.unselectVisible();
                     break;
             }
+            this.blur();
         });
     });
 
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php
index 171d6477ad3c5..0742eff9352c4 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php
@@ -105,7 +105,7 @@ protected function _prepareLayout()
         $this->addChild(
             'selection_delete_button',
             'Magento\Backend\Block\Widget\Button',
-            ['label' => __('Delete'), 'class' => 'delete icon-btn', 'on_click' => 'bSelection.remove(event)']
+            ['label' => __('Delete'), 'class' => 'action-delete', 'on_click' => 'bSelection.remove(event)']
         );
         return parent::_prepareLayout();
     }
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/radio.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/radio.phtml
index 297bf38a39c99..aa91cf9e455ab 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/radio.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/radio.phtml
@@ -33,7 +33,7 @@
                            name="bundle_option[<?php echo $_option->getId() ?>]"<?php echo ($_default && $_default->isSalable()) ? '' : ' checked="checked" ' ?>
                            value=""
                            onclick="ProductConfigure.bundleControl.changeSelection(this)" />
-                    <label class="label"
+                    <label class="admin__field-label"
                            for="bundle-option-<?php echo $_option->getId() ?>"><span><?php echo __('None') ?></span></label>
                 </div>
             <?php endif; ?>
@@ -49,7 +49,7 @@
                            onclick="ProductConfigure.bundleControl.changeSelection(this)"
                            price="<?php echo $block->getSelectionPrice($_selection) ?>"
                            qtyId="bundle-option-<?php echo $_option->getId() ?>-qty-input" />
-                    <label class="label"
+                    <label class="admin__field-label"
                            for="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>"><span><?php echo $block->getSelectionTitlePrice($_selection) ?></span></label>
                 <?php if ($_option->getRequired()): ?>
                     <?php echo $block->setValidationContainer('bundle-option-'.$_option->getId().'-'.$_selection->getSelectionId(), 'bundle-option-'.$_option->getId().'-container') ?>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle.phtml
index 3ea591c9a303d..e7f66de3d88fe 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle.phtml
@@ -16,10 +16,12 @@ if(typeof Bundle=='undefined') {
 
 </script>
 
-<div class="entry-edit form-inline" id="bundle_product_container">
-    <div class="fieldset-wrapper collapsable-wrapper" id="bundle_product-wrapper">
+<div
+    id="bundle_product_container"
+    class="entry-edit form-inline">
+    <div class="fieldset-wrapper admin__collapsible-block-wrapper collapsible-block-wrapper-last" id="bundle_product-wrapper">
         <div class="fieldset-wrapper-title">
-            <strong class="title" data-toggle="collapse" data-target="#bundle_product-content">
+            <strong class="admin__collapsible-title" data-toggle="collapse" data-target="#bundle_product-content">
                 <span><?php echo $block->getTabLabel() ?></span>
             </strong>
         </div>
@@ -38,7 +40,9 @@ if(typeof Bundle=='undefined') {
                     </div>
                 </div>
 
-                <div class="entry-edit custom-options bundle" id="product_bundle_container">
+                <div
+                    id="product_bundle_container"
+                    class="entry-edit custom-options bundle sortable-wrapper">
                     <?php echo $block->getOptionsBoxHtml() ?>
                 </div>
 
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml
index 15746df355437..930f02bfe5e77 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml
@@ -10,9 +10,9 @@
 ?>
 <script id="bundle-option-template" type="text/x-magento-template">
     <div id="<?php echo $block->getFieldId() ?>_<%- data.index %>" class="option-box">
-        <div class="fieldset-wrapper collapsable-wrapper opened" id="<?php echo $block->getFieldId() ?>_<%- data.index %>-wrapper">
+        <div class="fieldset-wrapper admin__collapsible-block-wrapper opened" id="<?php echo $block->getFieldId() ?>_<%- data.index %>-wrapper">
             <div class="fieldset-wrapper-title">
-                <strong class="title" data-toggle="collapse" data-target="#<?php echo $block->getFieldId() ?>_<%- data.index %>-content">
+                <strong class="admin__collapsible-title" data-toggle="collapse" data-target="#<?php echo $block->getFieldId() ?>_<%- data.index %>-content">
                     <span><%- data.default_title %></span>
                 </strong>
                 <div class="actions">
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option/selection.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option/selection.phtml
index 1fb154b2a48b9..ef2f2645a5197 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option/selection.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option/selection.phtml
@@ -9,7 +9,7 @@
 /** @var $block \Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle\Option\Selection */
 ?>
 <script id="bundle-option-selection-box-template" type="text/x-magento-template">
-    <table class="data-table">
+    <table class="admin__control-table">
         <thead>
             <tr class="headings">
                 <th class="col-draggable"></th>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/create/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/create/items/renderer.phtml
index 1179737cea667..d436575a23706 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/create/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/create/items/renderer.phtml
@@ -67,7 +67,7 @@
         </td>
         <td class="col-ordered-qty">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <table class="data-table qty-table">
+                <table class="qty-table">
                     <tr>
                         <th><?php echo __('Ordered') ?></th>
                         <td><?php echo $_item->getOrderItem()->getQtyOrdered()*1 ?></td>
@@ -98,7 +98,7 @@
                     <?php endif; ?>
                 </table>
             <?php elseif ($block->isShipmentSeparately($_item)): ?>
-                <table class="data-table qty-table">
+                <table class="qty-table">
                     <tr>
                         <th><?php echo __('Ordered') ?></th>
                         <td><?php echo $_item->getOrderItem()->getQtyOrdered()*1 ?></td>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml
index ffabb6efc13dd..e3878b3eecc69 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml
@@ -68,10 +68,10 @@
         </td>
         <td class="col-qty">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <table class="data-table qty-table">
+                <table class="qty-table">
                     <tr>
                         <th><?php echo __('Ordered') ?></th>
-                        <td><strong><?php echo $_item->getOrderItem()->getQtyOrdered()*1 ?></strong></td>
+                        <td><span><?php echo $_item->getOrderItem()->getQtyOrdered()*1 ?></span></td>
                     </tr>
                     <?php if ((float) $_item->getOrderItem()->getQtyInvoiced()): ?>
                     <tr>
@@ -99,7 +99,7 @@
                     <?php endif; ?>
                 </table>
             <?php elseif ($block->isShipmentSeparately($_item)): ?>
-                <table class="data-table qty-table">
+                <table class="qty-table">
                     <tr>
                         <th><?php echo __('Ordered') ?></th>
                         <td><?php echo $_item->getOrderItem()->getQtyOrdered()*1 ?></td>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml
index 2f31655de1e2e..f8797a30f8938 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml
@@ -86,7 +86,7 @@
         </td>
         <td class="col-ordered-qty">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <table class="data-table qty-table">
+                <table class="qty-table">
                     <tr>
                         <th><?php echo __('Ordered') ?></th>
                         <td><?php echo $_item->getQtyOrdered()*1 ?></td>
@@ -117,7 +117,7 @@
                     <?php endif; ?>
                 </table>
             <?php elseif ($block->isShipmentSeparately($_item)): ?>
-                <table class="data-table qty-table">
+                <table class="qty-table">
                     <tr>
                         <th><?php echo __('Ordered') ?></th>
                         <td><?php echo $_item->getQtyOrdered()*1 ?></td>
diff --git a/app/code/Magento/Bundle/view/adminhtml/web/css/bundle-product.css b/app/code/Magento/Bundle/view/adminhtml/web/css/bundle-product.css
index 98bd7aea8d146..1e523be9723ff 100644
--- a/app/code/Magento/Bundle/view/adminhtml/web/css/bundle-product.css
+++ b/app/code/Magento/Bundle/view/adminhtml/web/css/bundle-product.css
@@ -3,10 +3,6 @@
  * See COPYING.txt for license details.
  */
 
-#product_bundle_container {
-    margin: 0 0 30px;
-}
-
 #bundle_product_container .tier {
     margin-bottom: 13px;
 }
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Frontend/Product/Watermark.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Frontend/Product/Watermark.php
index be2fb941d7fee..9f01a584648d6 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Frontend/Product/Watermark.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Frontend/Product/Watermark.php
@@ -138,7 +138,7 @@ protected function _getHeaderHtml($element)
         $html .= '<legend>' . $element->getLegend() . '</legend>';
 
         // field label column
-        $html .= '<table cellspacing="0"><colgroup class="label" /><colgroup class="value" />';
+        $html .= '<table><colgroup class="label" /><colgroup class="value" />';
         if (!$default) {
             $html .= '<colgroup class="use-default" />';
         }
diff --git a/app/code/Magento/Catalog/Helper/Image.php b/app/code/Magento/Catalog/Helper/Image.php
index 3d90ae634bd52..78ad63a8d56f8 100644
--- a/app/code/Magento/Catalog/Helper/Image.php
+++ b/app/code/Magento/Catalog/Helper/Image.php
@@ -428,6 +428,16 @@ public function save()
         return $this;
     }
 
+    /**
+     * Return resized product image information
+     *
+     * @return array
+     */
+    public function getResizedImageInfo()
+    {
+        return $this->_getModel()->getResizedImageInfo();
+    }
+
     /**
      * @return string
      */
diff --git a/app/code/Magento/Catalog/Model/Product/Image.php b/app/code/Magento/Catalog/Model/Product/Image.php
index 55008ddb855f1..3a72898c718b7 100644
--- a/app/code/Magento/Catalog/Model/Product/Image.php
+++ b/app/code/Magento/Catalog/Model/Product/Image.php
@@ -918,4 +918,23 @@ protected function _fileExists($filename)
             );
         }
     }
+
+    /**
+     * Return resized product image information
+     *
+     * @return array
+     */
+    public function getResizedImageInfo()
+    {
+        if ($this->_newFile === true) {
+            $fileInfo = getimagesize(
+                $this->_assetRepo->createAsset(
+                    "Magento_Catalog::images/product/placeholder/{$this->getDestinationSubdir()}.jpg"
+                )->getSourceFile()
+            );
+        } else {
+            $fileInfo = getimagesize($this->_mediaDirectory->getAbsolutePath($this->_newFile));
+        }
+        return $fileInfo;
+    }
 }
diff --git a/app/code/Magento/Catalog/Model/Product/Image/View.php b/app/code/Magento/Catalog/Model/Product/Image/View.php
index d31e7794c97ab..e2c4fab52a5ff 100644
--- a/app/code/Magento/Catalog/Model/Product/Image/View.php
+++ b/app/code/Magento/Catalog/Model/Product/Image/View.php
@@ -11,6 +11,16 @@
 
 class View extends \Magento\Framework\Object
 {
+    /**
+     * Index of width image information
+     */
+    const IMAGE_INFO_WIDTH_INDEX = 0;
+
+    /**
+     * Index of height image information
+     */
+    const IMAGE_INFO_HEIGHT_INDEX = 1;
+
     /**
      * Separator between location and suffix
      */
@@ -125,6 +135,37 @@ public function getUrl()
         return (string)$this->_helperImage;
     }
 
+    /**
+     * Return resized product image information
+     *
+     * @return array
+     */
+
+    public function getResizedImageInfo()
+    {
+        return $this->_helperImage->getResizedImageInfo();
+    }
+
+    /**
+     * Return resized product image width
+     *
+     * @return int
+     */
+    public function getResizedImageWidth()
+    {
+        return $this->getResizedImageInfo()[self::IMAGE_INFO_WIDTH_INDEX];
+    }
+
+    /**
+     * Return resized product image height
+     *
+     * @return int
+     */
+    public function getResizedImageHeight()
+    {
+        return $this->getResizedImageInfo()[self::IMAGE_INFO_HEIGHT_INDEX];
+    }
+
     /**
      * Return product image label
      *
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/labels.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/labels.phtml
index 03bad8a8cea34..6d647935733a2 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/labels.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/labels.phtml
@@ -9,15 +9,15 @@
 /** @var $block \Magento\Eav\Block\Adminhtml\Attribute\Edit\Options\Labels  */
 ?>
 
-<div class="fieldset-wrapper collapsable-wrapper opened" id="manage-titles-wrapper">
+<div class="fieldset-wrapper admin__collapsible-block-wrapper opened" id="manage-titles-wrapper">
     <div class="fieldset-wrapper-title">
-        <strong class="title" data-toggle="collapse" data-target="#manage-titles-content">
+        <strong class="admin__collapsible-title" data-toggle="collapse" data-target="#manage-titles-content">
             <span><?php echo __('Manage Titles (Size, Color, etc.)') ?></span>
         </strong>
     </div>
     <div class="fieldset-wrapper-content in collapse" id="manage-titles-content">
         <fieldset class="fieldset">
-            <table class="data-table" id="attribute-labels-table">
+            <table class="admin__control-table" id="attribute-labels-table">
                 <thead>
                 <tr>
                     <?php foreach ($block->getStores() as $_store): ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml
index cb96e8ffa5ea4..eac2f90acb1bd 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml
@@ -11,11 +11,11 @@
 <fieldset class="fieldset">
     <legend class="legend"><span><?php echo __('Manage Options (values of your attribute)') ?></span></legend>
     <div id="manage-options-panel">
-        <table class="data-table" cellspacing="0">
+        <table class="admin__control-table">
             <thead>
                 <tr id="attribute-options-table">
                     <th class="col-draggable"></th>
-                    <th class="col-default"><?php echo __('Is Default') ?></th>
+                    <th class="col-default control-table-actions-th"><?php echo __('Is Default') ?></th>
                     <?php
                     $storelist = $block->getStores();
                     foreach ($storelist as $_store):
@@ -49,7 +49,7 @@
                 <?php endif; ?>
                 <input data-role="order" type="hidden" name="option[order][<%- data.id %>]"  value="<%- data.sort_order %>" <?php if ($block->getReadOnly() || $block->canManageOptionDefaultOnly()): ?> disabled="disabled"<?php endif; ?>/>
             </td>
-            <td class="col-default">
+            <td class="col-default control-table-actions-cell">
                 <input class="input-radio" type="<%- data.intype %>" name="default[]" value="<%- data.id %>" <%- data.checked %><?php if ($block->getReadOnly()):?>disabled="disabled"<?php endif;?>/>
             </td>
             <?php foreach ($block->getStores() as $_store): ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options.phtml
index 7e06606146ab8..bb8770587f9f0 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options.phtml
@@ -25,7 +25,7 @@
                 </div>
             </div>
 
-            <div id="product_options_container">
+            <div id="product_options_container" class="sortable-wrapper">
                 <div id="product_options_container_top"></div>
                 <?php echo $block->getOptionsBoxHtml() ?>
             </div>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/option.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/option.phtml
index f6a4d3c30b2dd..505a3f19d3fce 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/option.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/option.phtml
@@ -10,9 +10,12 @@
 <?php /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Option */ ?>
 <?php echo $block->getTemplatesHtml() ?>
 <script id="custom-option-base-template" type="text/x-magento-template">
-    <div class="fieldset-wrapper collapsable-wrapper opened" id="option_<%- data.id %>">
+    <div class="fieldset-wrapper admin__collapsible-block-wrapper opened" id="option_<%- data.id %>">
         <div class="fieldset-wrapper-title">
-            <strong class="title" data-toggle="collapse" data-target="#<%- data.id %>-content">
+            <strong
+                class="admin__collapsible-title"
+                data-toggle="collapse"
+                data-target="#<%- data.id %>-content">
                 <span id="option_<%- data.id %>_header_title"><%- data.title %></span>
             </strong>
             <div class="actions">
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/date.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/date.phtml
index 106b6408c3035..1824268324a17 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/date.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/date.phtml
@@ -10,7 +10,7 @@
 <?php /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\Date */ ?>
 <script id="custom-option-date-type-template" type="text/x-magento-template">
     <div id="product_option_<%- data.option_id %>_type_<%- data.group %>" class="fieldset">
-        <table class="data-table" cellspacing="0">
+        <table class="data-table">
             <thead>
             <tr class="headings">
                 <?php if ($block->getCanReadPrice() !== false) : ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/file.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/file.phtml
index 0d0b729876da8..f35de05213b18 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/file.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/file.phtml
@@ -10,7 +10,7 @@
 <?php /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\File */ ?>
 <script id="custom-option-file-type-template" type="text/x-magento-template">
     <div id="product_option_<%- data.option_id %>_type_<%- data.group %>" class="fieldset">
-        <table class="data-table" cellspacing="0">
+        <table class="data-table">
             <thead>
             <tr>
                 <?php if ($block->getCanReadPrice() !== false) : ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/text.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/text.phtml
index 9ec2900c97488..0edce14be9b86 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/text.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/text.phtml
@@ -10,7 +10,7 @@
 <?php /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\Text */ ?>
 <script id="custom-option-text-type-template" type="text/x-magento-template">
     <div id="product_option_<%- data.option_id %>_type_<%- data.group %>" class="fieldset">
-        <table class="data-table" cellspacing="0">
+        <table class="data-table">
             <thead>
             <tr>
                 <?php if ($block->getCanReadPrice() !== false) : ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/group.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/group.phtml
index ed0e5a71fc8a3..2bda31bb0d5c7 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/group.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/group.phtml
@@ -26,7 +26,7 @@ $_showWebsite = $block->isMultiWebsites();
      )?>">
     <label class="label"><span><?php echo $block->getElement()->getLabel(); ?></span></label>
     <div class="control">
-        <table cellspacing="0" class="data-table" id="group_prices_table">
+        <table class="admin__control-table" id="group_prices_table">
             <thead>
                 <tr>
                     <th <?php if (!$_showWebsite): ?>style="display: none;"<?php endif; ?>><?php echo __('Web Site'); ?></th>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/tier.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/tier.phtml
index 88815c8734846..e52655b091656 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/tier.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/tier.phtml
@@ -28,7 +28,7 @@ $element = $block->getElement();
      )?>">
     <label class="label"><span><?php echo $block->getElement()->getLabel() ?></span></label>
     <div class="control">
-        <table cellspacing="0" class="data-table tiers_table" id="tiers_table">
+        <table class="admin__control-table tiers_table" id="tiers_table">
             <thead>
                 <tr>
                     <th class="col-websites" <?php if (!$_showWebsite): ?>style="display:none"<?php endif; ?>><?php echo __('Web Site') ?></th>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/massaction_extended.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/massaction_extended.phtml
index 2fd91377c7ec4..854e958d45e27 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/massaction_extended.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/massaction_extended.phtml
@@ -10,67 +10,62 @@
 * @deprecated support Magento 1.x grid massaction implementation (MAGETWO-11122)
  */
 ?>
-<div id="<?php echo $block->getHtmlId() ?>">
-<div class="massaction">
-    <div class="entry-edit">
-        <?php if ($block->getHideFormElement() !== true):?>
-            <form action="" id="<?php echo $block->getHtmlId() ?>-form" method="post">
-        <?php endif ?>
-                <?php echo $block->getBlockHtml('formkey')?>
-                <span class="field-row">
-                    <label class="label"><?php echo __('Select Product Actions') ?></label>
-                    <select id="<?php echo $block->getHtmlId() ?>-select" class="select absolute-advice local-validation">
-                        <option value=""><?php echo __('-- Please select --')?></option>
-                        <?php foreach ($block->getItems() as $_item): ?>
-                            <option value="<?php echo $_item->getId() ?>"<?php echo($_item->getSelected() ? ' selected="selected"' : '')?>><?php echo $_item->getLabel() ?></option>
-                        <?php endforeach; ?>
-                    </select>
-                </span>
-                <span class="outer-span" id="<?php echo $block->getHtmlId() ?>-form-hiddens"></span>
-                <span class="outer-span" id="<?php echo $block->getHtmlId() ?>-form-additional"></span>
-                <span class="field-row">
-                    <?php echo $block->getApplyButtonHtml() ?>
-                </span>
-        <?php if ($block->getHideFormElement() !== true):?>
-            </form>
-        <?php endif ?>
-        <div class="no-display">
-            <?php foreach ($block->getItems() as $_item): ?>
-                <div id="<?php echo $block->getHtmlId() ?>-item-<?php echo $_item->getId() ?>-block">
-                    <?php echo $_item->getAdditionalActionBlockHtml() ?>
-                </div>
-            <?php endforeach; ?>
+<div id="<?php echo $block->getHtmlId() ?>" class="admin__grid-massaction">
+    <?php if ($block->getHideFormElement() !== true):?>
+    <form action="" id="<?php echo $block->getHtmlId() ?>-form" method="post">
+    <?php endif ?>
+        <div class="admin__grid-massaction-form">
+            <?php echo $block->getBlockHtml('formkey')?>
+            <select
+                id="<?php echo $block->getHtmlId() ?>-select"
+                class="local-validation admin__control-select">
+                <option class="admin__control-select-placeholder" value="" selected><?php echo __('Actions') ?></option>
+                <?php foreach ($block->getItems() as $_item): ?>
+                    <option value="<?php echo $_item->getId() ?>"<?php echo($_item->getSelected() ? ' selected="selected"' : '')?>><?php echo $_item->getLabel() ?></option>
+                <?php endforeach; ?>
+            </select>
+            <span class="outer-span" id="<?php echo $block->getHtmlId() ?>-form-hiddens"></span>
+            <span class="outer-span" id="<?php echo $block->getHtmlId() ?>-form-additional"></span>
+            <?php echo $block->getApplyButtonHtml() ?>
         </div>
+    <?php if ($block->getHideFormElement() !== true):?>
+    </form>
+    <?php endif ?>
+    <div class="no-display">
+    <?php foreach ($block->getItems() as $_item): ?>
+        <div id="<?php echo $block->getHtmlId() ?>-item-<?php echo $_item->getId() ?>-block">
+            <?php echo $_item->getAdditionalActionBlockHtml() ?>
+        </div>
+    <?php endforeach; ?>
     </div>
-    <div class="entry-select">
-        <select id="massaction-select" class="select">
-            <option value="">
-                <?php echo __('Mass Actions')?>
-            </option>
-            <?php if ($block->getUseSelectAll()):?>
-                <option value="selectAll">
-                    <?php echo __('Select All') ?>
+
+    <div class="mass-select-wrap">
+        <select id="<?php echo $block->getHtmlId() ?>-mass-select" data-menu="grid-mass-select">
+            <optgroup label="<?php echo __('Mass Actions')?>">
+                <option disabled selected></option>
+                <?php if ($block->getUseSelectAll()):?>
+                    <option value="selectAll">
+                        <?php echo __('Select All') ?>
+                    </option>
+                    <option value="unselectAll">
+                        <?php echo __('Unselect All') ?>
+                    </option>
+                <?php endif; ?>
+                <option value="selectVisible">
+                    <?php echo __('Select Visible') ?>
                 </option>
-                <option value="unselectAll">
-                    <?php echo __('Unselect All') ?>
+                <option value="unselectVisible">
+                    <?php echo __('Unselect Visible') ?>
                 </option>
-            <?php endif; ?>
-            <option value="selectVisible">
-                <?php echo __('Select Visible') ?>
-            </option>
-            <option value="unselectVisible">
-                <?php echo __('Unselect Visible') ?>
-            </option>
+            </optgroup>
         </select>
-        <span class="items">
-            <strong id="<?php echo $block->getHtmlId() ?>-count">0</strong> <?php echo __('items selected') ?>
-        </span>
+        <label for="<?php echo $block->getHtmlId() ?>-mass-select"></label>
     </div>
-</div>
+
 <script>
     require(['jquery'], function($){
         'use strict';
-        $('#massaction-select').change(function () {
+        $('#<?php echo $block->getHtmlId() ?>-mass-select').change(function () {
             var massAction = $('option:selected', this).val();
             switch (massAction) {
                 <?php if ($block->getUseSelectAll()):?>
@@ -88,6 +83,7 @@
                     return <?php echo $block->getJsObjectName() ?>.unselectVisible();
                     break
             }
+            this.blur();
         });
 
     });
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/custom-options.js b/app/code/Magento/Catalog/view/adminhtml/web/js/custom-options.js
index 29ef5d3ca95c9..cb65d9dcee1c1 100644
--- a/app/code/Magento/Catalog/view/adminhtml/web/js/custom-options.js
+++ b/app/code/Magento/Catalog/view/adminhtml/web/js/custom-options.js
@@ -65,7 +65,7 @@ define([
             }
             var syncOptionTitle = function (event) {
                 var currentValue = $(event.target).val(),
-                    optionBoxTitle = $('.title > span', $(event.target).closest('.fieldset-wrapper')),
+                    optionBoxTitle = $('.admin__collapsible-title > span', $(event.target).closest('.fieldset-wrapper')),
                     newOptionTitle = $.mage.__('New Option');
 
                 optionBoxTitle.text(currentValue === '' ? newOptionTitle : currentValue);
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/image.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/image.phtml
index e7f36852a9a97..5131b06ba0594 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/image.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/image.phtml
@@ -7,8 +7,8 @@
 <?php /** @var $block \Magento\Catalog\Block\Product\Image */ ?>
 
 <img class="photo image"
-     style="width:<?php echo $block->getProductImageView()->getWidth()?>px;
-     height:<?php echo $block->getProductImageView()->getHeight()?>px;"
      <?php echo $block->getAddAttribute(); ?>
      src="<?php echo $block->getProductImageView()->getUrl() ?>"
+     width="<?php echo $block->getProductImageView()->getWidth();?>"
+     height="<?php echo $block->getProductImageView()->getHeight();?>"
      alt="<?php echo $block->stripTags($block->getProductImageView()->getLabel(), null, true) ?>" />
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml
index 9f3c28041885a..8657a2410affc 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml
@@ -15,5 +15,7 @@ $ratio = $block->getProductImageView()->getHeight() / $block->getProductImageVie
         <img class="product-image-photo"
              <?php echo $block->getAddAttribute(); ?>
              src="<?php echo $block->getProductImageView()->getUrl() ?>"
+             width="<?php echo $block->getProductImageView()->getResizedImageWidth()?>"
+             height="<?php echo $block->getProductImageView()->getResizedImageHeight()?>"
              alt="<?php echo $block->stripTags($block->getProductImageView()->getLabel(), null, true) ?>"/></span>
 </span>
diff --git a/app/code/Magento/Config/Block/System/Config/Form/Fieldset.php b/app/code/Magento/Config/Block/System/Config/Form/Fieldset.php
index abcf35b66fb6f..255b15177f97a 100644
--- a/app/code/Magento/Config/Block/System/Config/Form/Fieldset.php
+++ b/app/code/Magento/Config/Block/System/Config/Form/Fieldset.php
@@ -86,7 +86,7 @@ protected function _getHeaderHtml($element)
             $html = '<div class="' . $this->_getFrontendClass($element) . '">';
         }
 
-        $html .= '<div class="entry-edit-head collapseable">' .
+        $html .= '<div class="entry-edit-head admin__collapsible-block">' .
             '<span id="' .
             $element->getHtmlId() .
             '-link" class="entry-edit-head-link"></span>';
@@ -171,7 +171,7 @@ protected function _getFieldsetCss()
         /** @var \Magento\Config\Model\Config\Structure\Element\Group $group */
         $group = $this->getGroup();
         $configCss = $group->getFieldsetCss();
-        return 'config collapseable' . ($configCss ? ' ' . $configCss : '');
+        return 'config admin__collapsible-block' . ($configCss ? ' ' . $configCss : '');
     }
 
     /**
diff --git a/app/code/Magento/Config/view/adminhtml/templates/system/config/form/field/array.phtml b/app/code/Magento/Config/view/adminhtml/templates/system/config/form/field/array.phtml
index 089f5a6eb8cfe..c85f9314837ff 100644
--- a/app/code/Magento/Config/view/adminhtml/templates/system/config/form/field/array.phtml
+++ b/app/code/Magento/Config/view/adminhtml/templates/system/config/form/field/array.phtml
@@ -14,7 +14,7 @@ $_colspan = $block->isAddAfter() ? 2 : 1;
 ?>
 
 <div class="design_theme_ua_regexp" id="grid<?php echo $_htmlId; ?>">
-    <table cellspacing="0" class="data-table">
+    <table class="admin__control-table">
         <thead>
         <tr>
             <?php foreach ($block->getColumns() as $columnName => $column): ?>
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/attribute-js-template.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/attribute-js-template.phtml
index 253b53dca5986..2865b30b77107 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/attribute-js-template.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/attribute-js-template.phtml
@@ -21,9 +21,9 @@
         <input value="<%- data.attribute.code %>" type="hidden"
             name="product[configurable_attributes_data][<%- data.attribute.id %>][code]"/>
 
-        <div class="fieldset-wrapper collapsable-wrapper" id="<%- data.attribute.id %>-wrapper">
+        <div class="fieldset-wrapper admin__collapsible-block-wrapper" id="<%- data.attribute.id %>-wrapper">
             <div class="fieldset-wrapper-title">
-                <strong class="title" data-toggle="collapse" data-target="#<%- data.attribute.id %>-content">
+                <strong class="admin__collapsible-title" data-toggle="collapse" data-target="#<%- data.attribute.id %>-content">
                     <span><%- data.attribute.label %></span>
                 </strong>
                 <div class="actions">
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/attribute-template.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/attribute-template.phtml
index 420096d462a60..9a50b287313e9 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/attribute-template.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/attribute-template.phtml
@@ -38,9 +38,9 @@ $id = $block->escapeHtml($attribute['attribute_id']);
            * @TODO refactor collapsable and remove this <div> */?>
     <div class="collapse hidden"></div>
 
-    <div class="fieldset-wrapper collapsable-wrapper" id="<?php echo $id ?>-wrapper">
+    <div class="fieldset-wrapper admin__collapsible-block-wrapper" id="<?php echo $id ?>-wrapper">
         <div class="fieldset-wrapper-title">
-            <strong class="title" data-toggle="collapse" data-target="#<?php echo $id ?>-content">
+            <strong class="admin__collapsible-title" data-toggle="collapse" data-target="#<?php echo $id ?>-content">
                 <span><?php echo $block->escapeHtml($attribute['label']); ?></span>
             </strong>
             <div class="actions">
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/config.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/config.phtml
index 804195c9776f9..cf9f3ffa35a77 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/config.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/config.phtml
@@ -11,9 +11,9 @@
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 ?>
 <div class="entry-edit form-inline" id="<?php echo $block->getId() ?>">
-    <div class="fieldset-wrapper collapsable-wrapper" id="<?php echo $block->getId() ?>-wrapper" data-panel="product-variations">
+    <div class="fieldset-wrapper admin__collapsible-block-wrapper" id="<?php echo $block->getId() ?>-wrapper" data-panel="product-variations">
         <div class="fieldset-wrapper-title">
-            <strong class="title" data-toggle="collapse" data-target="#<?php echo $block->getId() ?>-content">
+            <strong class="admin__collapsible-title" data-toggle="collapse" data-target="#<?php echo $block->getId() ?>-content">
                 <span><?php echo __('Variations') ?></span>
             </strong>
         </div>
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/matrix.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/matrix.phtml
index 8f4713df58ef5..b7beb5d05ede6 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/matrix.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/matrix.phtml
@@ -21,7 +21,7 @@ $productByUsedAttributes = $block->getAssociatedProducts();
 
 <div class="field">
     <div class="control">
-        <table class="data-table">
+        <table class="admin__table-secondary">
             <thead>
                 <tr>
                     <th class="col-display" data-column="display">
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/product/product.css b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/product/product.css
index 4af99352c7abc..c712e10884589 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/product/product.css
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/product/product.css
@@ -25,10 +25,6 @@
     width: 43%;
 }
 
-#configurable-attributes-container {
-    margin-bottom: 23px;
-}
-
 #configurable-attributes-container .col-include {
     width: 80px;
 }
@@ -73,6 +69,7 @@
 }
 
 #product-variations-matrix > .title {
+    margin-top: 2rem;
     margin-bottom: 10px;
 }
 
diff --git a/app/code/Magento/CurrencySymbol/view/adminhtml/layout/adminhtml_system_currencysymbol_index.xml b/app/code/Magento/CurrencySymbol/view/adminhtml/layout/adminhtml_system_currencysymbol_index.xml
index d66ae1fb23a2f..72d6afb67e40d 100644
--- a/app/code/Magento/CurrencySymbol/view/adminhtml/layout/adminhtml_system_currencysymbol_index.xml
+++ b/app/code/Magento/CurrencySymbol/view/adminhtml/layout/adminhtml_system_currencysymbol_index.xml
@@ -6,6 +6,7 @@
  */
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
+    <update handle="styles" />
     <body>
         <referenceContainer name="content">
             <block class="Magento\CurrencySymbol\Block\Adminhtml\System\Currencysymbol" name="mage.system.currencysymbol" template="grid.phtml"/>
diff --git a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/grid.phtml b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/grid.phtml
index 2d61bf600ff4f..8e47b51aecb40 100644
--- a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/grid.phtml
+++ b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/grid.phtml
@@ -17,33 +17,32 @@
 
 <form id="currency-symbols-form" action="<?php echo $block->getFormActionUrl() ?>" method="post">
     <input name="form_key" type="hidden" value="<?php echo $block->getFormKey() ?>" />
-
-    <div class="grid">
-        <table class="data">
-            <thead>
-                <tr class="headings">
-                    <th class="no-link col-currency"><span><label><?php echo __('Currency'); ?></label></span></th>
-                    <th class="no-link col-symbol"><span><label class="required"><?php echo __('Symbol'); ?></label></span></th>
-                </tr>
-            </thead>
-            <tbody>
-                <?php foreach ($block->getCurrencySymbolsData() as $code => $data): ?>
-                <tr>
-                    <td class="col-currency">
-                        <label class="label" for="custom_currency_symbol<?php echo $code; ?>"><?php echo $code; ?> (<?php echo $data['displayName']; ?>)</label>
-                    </td>
-                    <td class="col-symbol">
-                        <div class="control">
-                            <input id="custom_currency_symbol<?php echo $code; ?>" class=" required-entry input-text" type="text" value="<?php echo $block->escapeQuote($data['displaySymbol']); ?>"<?php echo $data['inherited'] ? ' disabled="disabled"' : '';?> name="custom_currency_symbol[<?php echo $code; ?>]">
-                            <input id="custom_currency_symbol_inherit<?php echo $code; ?>" class="checkbox config-inherit" type="checkbox" onclick="toggleUseDefault(<?php echo '\'' . $code . '\',\'' . $block->escapeQuote($data['parentSymbol'], true) . '\''; ?>)"<?php echo $data['inherited'] ? ' checked="checked"' : ''; ?> value="1" name="inherit_custom_currency_symbol[<?php echo $code; ?>]">
-                            <label class="label" for="custom_currency_symbol_inherit<?php echo $code; ?>"><?php echo $block->getInheritText(); ?></label>
-                        </div>
-                    </td>
-                </tr>
-                <?php endforeach; ?>
-            </tbody>
-        </table>
-    </div>
+    <fieldset class="admin__fieldset">
+        <?php foreach ($block->getCurrencySymbolsData() as $code => $data): ?>
+        <div class="admin__field _required">
+            <label class="admin__field-label" for="custom_currency_symbol<?php echo $code; ?>">
+                <span><?php echo $code; ?> (<?php echo $data['displayName']; ?>)</span>
+            </label>
+            <div class="admin__field-control">
+                <input id="custom_currency_symbol<?php echo $code; ?>"
+                       class="required-entry admin__control-text"
+                       type="text"
+                       value="<?php echo $block->escapeQuote($data['displaySymbol']); ?>"
+                       <?php echo $data['inherited'] ? ' disabled="disabled"' : '';?>
+                       name="custom_currency_symbol[<?php echo $code; ?>]">
+                <div class="admin__field admin__field-option">
+                    <input id="custom_currency_symbol_inherit<?php echo $code; ?>"
+                           class="admin__control-checkbox" type="checkbox"
+                           onclick="toggleUseDefault(<?php echo '\'' . $code . '\',\'' . $block->escapeQuote($data['parentSymbol'], true) . '\''; ?>)"
+                            <?php echo $data['inherited'] ? ' checked="checked"' : ''; ?>
+                           value="1"
+                           name="inherit_custom_currency_symbol[<?php echo $code; ?>]">
+                    <label class="admin__field-label" for="custom_currency_symbol_inherit<?php echo $code; ?>"><span><?php echo $block->getInheritText(); ?></span></label>
+                </div>
+            </div>
+        </div>
+        <?php endforeach; ?>
+    </fieldset>
 </form>
 <script>
 require(['jquery', "mage/mage", 'prototype'], function(jQuery){
diff --git a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/matrix.phtml b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/matrix.phtml
index b638f4dd28053..ec8f0e5599038 100644
--- a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/matrix.phtml
+++ b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/matrix.phtml
@@ -19,43 +19,49 @@ $_rates = ($_newRates) ? $_newRates : $_oldRates;
 ?>
 <form name="rateForm" id="rate-form" method="post" action="<?php echo $block->getRatesFormAction(); ?>">
     <?php echo $block->getBlockHtml('formkey')?>
-    <div class="grid">
-        <div class="hor-scroll">
-            <table cellspacing="0">
-                <thead>
-                    <tr class="headings">
-                        <th>&nbsp;</th>
-                        <?php $_i = 0; foreach ($block->getAllowedCurrencies() as $_currencyCode): ?>
-                            <th class="<?php echo((++$_i == (sizeof($block->getAllowedCurrencies()))) ? 'last' : '') ?> a-right"><span><?php echo $_currencyCode ?></span></th>
-                        <?php endforeach; ?>
-                    </tr>
-                </thead>
-                <?php $_j = 0; foreach ($block->getDefaultCurrencies() as $_currencyCode): ?>
+    <div class="admin__control-table-wrapper">
+        <table class="admin__control-table">
+            <thead>
                 <tr>
-                    <?php if (isset($_rates[$_currencyCode]) && is_array($_rates[$_currencyCode])): ?>
-                        <?php foreach ($_rates[$_currencyCode] as $_rate => $_value): ?>
-                            <?php if (++$_j == 1): ?>
-                                <td class="col-base-currency"><?php echo $_currencyCode ?></td>
-                                <td class="col-currency-edit-rate">
-                                    <input type="text" name="rate[<?php echo $_currencyCode ?>][<?php echo $_rate ?>]" value="<?php echo($_currencyCode == $_rate) ? '1.0000' : ($_value>0 ? $_value : (isset($_oldRates[$_currencyCode][$_rate]) ? $_oldRates[$_currencyCode][$_rate] : '')) ?>" <?php echo($_currencyCode == $_rate) ? 'class="input-text input-text-disabled" readonly="true"' : 'class="input-text"' ?> />
-                                    <?php if (isset($_newRates) && $_currencyCode != $_rate && isset($_oldRates[$_currencyCode][$_rate])): ?>
-                                    <span class="old-rate"><?php echo __('Old rate:') ?> <b><?php echo $_oldRates[$_currencyCode][$_rate] ?></b></span>
-                                    <?php endif; ?>
-                                </td>
-                            <?php else: ?>
-                                <td class="col-currency-edit-rate">
-                                    <input type="text" name="rate[<?php echo $_currencyCode ?>][<?php echo $_rate ?>]" value="<?php echo($_currencyCode == $_rate) ? '1.0000' : ($_value>0 ? $_value : (isset($_oldRates[$_currencyCode][$_rate]) ? $_oldRates[$_currencyCode][$_rate] : '')) ?>" <?php echo($_currencyCode == $_rate) ? 'class="input-text input-text-disabled" readonly="true"' : 'class="input-text"' ?> />
-                                    <?php if (isset($_newRates)  && $_currencyCode != $_rate && isset($_oldRates[$_currencyCode][$_rate])): ?>
-                                    <span class="old-rate"><?php echo __('Old rate:') ?> <b><?php echo $_oldRates[$_currencyCode][$_rate] ?></b></span>
-                                    <?php endif; ?>
-                                </td>
-                            <?php endif; ?>
-                        <?php endforeach; $_j = 0; ?>
-                    <?php endif; ?>
+                    <th>&nbsp;</th>
+                    <?php $_i = 0; foreach ($block->getAllowedCurrencies() as $_currencyCode): ?>
+                        <th><span><?php echo $_currencyCode ?></span></th>
+                    <?php endforeach; ?>
                 </tr>
-                <?php endforeach; ?>
-            </table>
-        </div>
+            </thead>
+            <?php $_j = 0; foreach ($block->getDefaultCurrencies() as $_currencyCode): ?>
+            <tr>
+                <?php if (isset($_rates[$_currencyCode]) && is_array($_rates[$_currencyCode])): ?>
+                    <?php foreach ($_rates[$_currencyCode] as $_rate => $_value): ?>
+                        <?php if (++$_j == 1): ?>
+                            <td><span class="admin__control-support-text"><?php echo $_currencyCode ?></span></td>
+                            <td>
+                                <input type="text"
+                                       name="rate[<?php echo $_currencyCode ?>][<?php echo $_rate ?>]"
+                                       value="<?php echo($_currencyCode == $_rate) ? '1.0000' : ($_value>0 ? $_value : (isset($_oldRates[$_currencyCode][$_rate]) ? $_oldRates[$_currencyCode][$_rate] : '')) ?>"
+                                       class="admin__control-text"
+                                        <?php echo($_currencyCode == $_rate) ? ' disabled' : '' ?> />
+                                <?php if (isset($_newRates) && $_currencyCode != $_rate && isset($_oldRates[$_currencyCode][$_rate])): ?>
+                                <div class="admin__field-note"><?php echo __('Old rate:') ?> <b><?php echo $_oldRates[$_currencyCode][$_rate] ?></b></div>
+                                <?php endif; ?>
+                            </td>
+                        <?php else: ?>
+                            <td>
+                                <input type="text"
+                                       name="rate[<?php echo $_currencyCode ?>][<?php echo $_rate ?>]"
+                                       value="<?php echo($_currencyCode == $_rate) ? '1.0000' : ($_value>0 ? $_value : (isset($_oldRates[$_currencyCode][$_rate]) ? $_oldRates[$_currencyCode][$_rate] : '')) ?>"
+                                       class="admin__control-text"
+                                       <?php echo($_currencyCode == $_rate) ? ' disabled' : '' ?> />
+                                <?php if (isset($_newRates)  && $_currencyCode != $_rate && isset($_oldRates[$_currencyCode][$_rate])): ?>
+                                <div class="admin__field-note"><?php echo __('Old rate:') ?> <b><?php echo $_oldRates[$_currencyCode][$_rate] ?></b></div>
+                                <?php endif; ?>
+                            </td>
+                        <?php endif; ?>
+                    <?php endforeach; $_j = 0; ?>
+                <?php endif; ?>
+            </tr>
+            <?php endforeach; ?>
+        </table>
     </div>
 </form>
 <script>
diff --git a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/services.phtml b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/services.phtml
index 6c918e97c7abc..fa11e6fe5da2e 100644
--- a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/services.phtml
+++ b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/services.phtml
@@ -12,5 +12,9 @@
  * @var $block \Magento\CurrencySymbol\Block\Adminhtml\System\Currency\Rate\Services
  */
 ?>
-<label class="label"><?php echo __('Import Service') ?></label>
-<?php echo $block->getChildHtml('import_services') ?>
+<div class="admin__field">
+    <label class="admin__field-label"><span><?php echo __('Import Service') ?></span></label>
+    <div class="admin__field-control">
+        <?php echo $block->getChildHtml('import_services') ?>
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rates.phtml b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rates.phtml
index a867f463cb70e..53cf44e1e0ea7 100644
--- a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rates.phtml
+++ b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rates.phtml
@@ -12,16 +12,14 @@
  * @var $block \Magento\CurrencySymbol\Block\Adminhtml\System\Currency
  */
 ?>
-<div class="grid-actions">
-    <form action="<?php echo $block->getImportFormAction() ?>" method="post" class="import-service">
-        <?php echo $block->getBlockHtml('formkey')?>
-        <dix class="import">
-            <?php echo $block->getServicesHtml() ?>
-            <?php echo $block->getImportButtonHtml() ?>
-        </dix>
-    </form>
-    <?php echo $block->getResetButtonHtml() ?>
-    <?php echo $block->getSaveButtonHtml() ?>
-</div>
 
+<form action="<?php echo $block->getImportFormAction() ?>" method="post" class="import-service">
+    <?php echo $block->getBlockHtml('formkey')?>
+    <fieldset class="admin__fieldset">
+        <?php echo $block->getServicesHtml() ?>
+        <?php echo $block->getImportButtonHtml() ?>
+    </fieldset>
+</form>
+<?php echo $block->getResetButtonHtml() ?>
+<?php echo $block->getSaveButtonHtml() ?>
 <?php echo $block->getRatesMatrixHtml() ?>
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Grid/Renderer/Item.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Grid/Renderer/Item.php
index 62d1007aeab6c..2d80c04bce153 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Grid/Renderer/Item.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Grid/Renderer/Item.php
@@ -135,15 +135,15 @@ public function render(\Magento\Framework\Object $item)
      */
     protected function _renderItemOptions(Product $product, array $options)
     {
-        $html = '<div class="bundle-product-options">' . '<strong>' . $this->escapeHtml(
+        $html = '<div class="product-title">' . $this->escapeHtml(
             $product->getName()
-        ) . '</strong>' . '<dl>';
+        ) . '</div>' . '<dl class="item-options">';
         foreach ($options as $option) {
             $formattedOption = $this->getFormattedOptionValue($option);
             $html .= '<dt>' . $this->escapeHtml($option['label']) . '</dt>';
             $html .= '<dd>' . $formattedOption['value'] . '</dd>';
         }
-        $html .= '</dl></div>';
+        $html .= '</dl>';
 
         return $html;
     }
diff --git a/app/code/Magento/Customer/Test/Unit/Block/Adminhtml/Edit/Tab/View/Grid/Renderer/ItemTest.php b/app/code/Magento/Customer/Test/Unit/Block/Adminhtml/Edit/Tab/View/Grid/Renderer/ItemTest.php
index 70f20d503101b..1bdb074a79c8f 100644
--- a/app/code/Magento/Customer/Test/Unit/Block/Adminhtml/Edit/Tab/View/Grid/Renderer/ItemTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Block/Adminhtml/Edit/Tab/View/Grid/Renderer/ItemTest.php
@@ -86,7 +86,11 @@ public function configure($amountOption, $withoutOptions = false)
             ->with('Magento\Catalog\Helper\Product\Configuration')
             ->will($this->returnValue($helper));
 
-        $this->itemBlock = new \Magento\Customer\Block\Adminhtml\Edit\Tab\View\Grid\Renderer\Item($context, $productConfig, $productConfigPool);
+        $this->itemBlock = new \Magento\Customer\Block\Adminhtml\Edit\Tab\View\Grid\Renderer\Item(
+            $context,
+            $productConfig,
+            $productConfigPool
+        );
     }
 
     public function testRenderWithoutOptions()
@@ -101,7 +105,7 @@ public function testRenderWithoutOptions()
     public function testRender($amountOption, $expectedHtml)
     {
         $this->configure($amountOption);
-        $realHtml = $this->itemBlock->render($this->item);
+        $realHtml = '<xhtml>' . $this->itemBlock->render($this->item) . '</xhtml>';
         $this->assertXmlStringEqualsXmlString($expectedHtml, $realHtml);
     }
 
@@ -111,27 +115,27 @@ public function optionHtmlProvider()
             [
                 2,
                 <<<HTML
-                        <div class="bundle-product-options">
-                            <strong>testProductName</strong>
-                            <dl>
+                        <xhtml>
+                            <div class="product-title">testProductName</div>
+                            <dl class="item-options">
                                 <dt>testLabel1</dt>
                                 <dd>1 x Configurable Product 49-option 3 <span class="price">$10.00</span></dd>
                                 <dt>testLabel2</dt>
                                 <dd>1 x Configurable Product 49-option 3 <span class="price">$10.00</span></dd>
                             </dl>
-                        </div>
+                        </xhtml>
 HTML
             ],
             [
                 1,
                 <<<HTML
-                        <div class="bundle-product-options">
-                            <strong>testProductName</strong>
-                            <dl>
+                        <xhtml>
+                            <div class="product-title">testProductName</div>
+                            <dl class="item-options">
                                 <dt>testLabel1</dt>
                                 <dd>1 x Configurable Product 49-option 3 <span class="price">$10.00</span></dd>
                             </dl>
-                        </div>
+                        </xhtml>
 HTML
             ],
         ];
diff --git a/app/code/Magento/Customer/view/adminhtml/templates/tab/cart.phtml b/app/code/Magento/Customer/view/adminhtml/templates/tab/cart.phtml
index f933bc254695a..a25f849851d82 100644
--- a/app/code/Magento/Customer/view/adminhtml/templates/tab/cart.phtml
+++ b/app/code/Magento/Customer/view/adminhtml/templates/tab/cart.phtml
@@ -10,7 +10,7 @@
 <?php /* @var $block \Magento\Customer\Block\Adminhtml\Edit\Tab\Cart */ ?>
 <?php if ($block->getCartHeader()): ?>
 <div class="content-header skip-header">
-    <table cellspacing="0">
+    <table>
         <tr>
             <td style="width:50%;"><h4><?php echo $block->getCartHeader(); ?></h4></td>
         </tr>
diff --git a/app/code/Magento/Customer/view/adminhtml/templates/tab/view/personal_info.phtml b/app/code/Magento/Customer/view/adminhtml/templates/tab/view/personal_info.phtml
index e87d3005a1dad..90d849d33f5d0 100644
--- a/app/code/Magento/Customer/view/adminhtml/templates/tab/view/personal_info.phtml
+++ b/app/code/Magento/Customer/view/adminhtml/templates/tab/view/personal_info.phtml
@@ -21,7 +21,7 @@ $createDateStore = $block->getStoreCreateDate();
     <div class="fieldset-wrapper-title">
         <span class="title"><?php echo __('Personal Information') ?></span>
     </div>
-    <table class="data-table">
+    <table class="admin__table-secondary">
         <tbody>
         <?php echo $block->getChildHtml(); ?>
         <tr>
diff --git a/app/code/Magento/Email/Test/Unit/Block/Adminhtml/Template/Grid/Renderer/ActionTest.php b/app/code/Magento/Email/Test/Unit/Block/Adminhtml/Template/Grid/Renderer/ActionTest.php
index fc41f9ff4aaf2..b1c163befab16 100644
--- a/app/code/Magento/Email/Test/Unit/Block/Adminhtml/Template/Grid/Renderer/ActionTest.php
+++ b/app/code/Magento/Email/Test/Unit/Block/Adminhtml/Template/Grid/Renderer/ActionTest.php
@@ -58,6 +58,6 @@ public function testRender()
         $this->action->setColumn($this->columnMock);
         $row = new \Magento\Framework\Object();
         $row->setId(1);
-        $this->assertContains('action-select', $this->action->render($row));
+        $this->assertContains('admin__control-select', $this->action->render($row));
     }
 }
diff --git a/app/code/Magento/GoogleShopping/view/adminhtml/templates/types/edit/attributes.phtml b/app/code/Magento/GoogleShopping/view/adminhtml/templates/types/edit/attributes.phtml
index 03790f402f19a..d40677511d741 100644
--- a/app/code/Magento/GoogleShopping/view/adminhtml/templates/types/edit/attributes.phtml
+++ b/app/code/Magento/GoogleShopping/view/adminhtml/templates/types/edit/attributes.phtml
@@ -93,7 +93,7 @@ gContentAttribute = new Gcontent.Attribute(attributesSelectTemplate);
 </script>
 
 <div id="gcontent_attributes_container">
-    <table class="data-table" id="gcontent_attribute">
+    <table class="admin__control-table" id="gcontent_attribute">
         <thead>
             <tr>
                 <th class="col-type"><?php echo __('Attribute') ?></th>
diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/container.phtml b/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/container.phtml
index 4849d6d6a970f..06ada7b210415 100644
--- a/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/container.phtml
+++ b/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/container.phtml
@@ -7,9 +7,12 @@
 
 <?php /* @var $block \Magento\GroupedProduct\Block\Product\Grouped\AssociatedProducts  */ ?>
 <div class="entry-edit" id="<?php echo $block->getId() ?>">
-    <div class="fieldset-wrapper collapsable-wrapper" id="<?php echo $block->getId() ?>-wrapper">
+    <div class="fieldset-wrapper admin__collapsible-block-wrapper" id="<?php echo $block->getId() ?>-wrapper">
         <div class="fieldset-wrapper-title">
-            <strong class="title" data-toggle="collapse" data-target="#<?php echo $block->getId() ?>-content">
+            <strong
+                class="admin__collapsible-title"
+                data-toggle="collapse"
+                data-target="#<?php echo $block->getId() ?>-content">
                 <span><?php echo $block->getTabLabel() ?></span>
             </strong>
         </div>
diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/list.phtml b/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/list.phtml
index de0a513ca8482..091b9941e00ad 100644
--- a/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/list.phtml
+++ b/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/list.phtml
@@ -32,17 +32,20 @@
     <td data-column="qty" class="editable col-qty col-number">
         <input
             type="text"
-            class="input-text "
+            class="admin__control-text"
             name="links[associated][<%- data.id %>][qty]"
             value="<%- data.qty %>">
     </td>
     <td data-column="actions" class="col-actions">
-        <button type="button" class="action- delete" data-role="delete"></button>
+        <button
+            type="button"
+            class="action-delete"
+            data-role="delete"></button>
     </td>
 </tr>
 </script>
-<div class="grid-container" class="no-display">
-    <table class="data-table" data-role="grouped-product-grid"
+<div class="grid-container no-display">
+    <table class="admin__control-table" data-role="grouped-product-grid"
         data-products="<?php echo $block->escapeHtml($this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode(
                 $block->getAssociatedProducts()
         )); ?>">
diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php b/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
index 0dfd086c2d0fe..c7d648b4d54e6 100644
--- a/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
+++ b/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
@@ -76,7 +76,7 @@ protected function _getDateFromToHtmlWithValue(Attribute $attribute, $value)
         $arguments = [
             'name' => $this->getFilterElementName($attribute->getAttributeCode()) . '[]',
             'id' => $this->getFilterElementId($attribute->getAttributeCode()),
-            'class' => 'input-text input-text-range-date',
+            'class' => 'admin__control-text',
             'date_format' => $this->_localeDate->getDateFormat(
                 \IntlDateFormatter::SHORT
             ),
@@ -94,17 +94,10 @@ protected function _getDateFromToHtmlWithValue(Attribute $attribute, $value)
             $toValue = $this->escapeHtml(next($value));
         }
 
-        return '<strong>' . __(
-            'From'
-        ) . ':</strong>&nbsp;' . $dateBlock->setValue(
-            $fromValue
-        )->getHtml() . '&nbsp;<strong>' . __(
-            'To'
-        ) . ':</strong>&nbsp;' . $dateBlock->setId(
-            $dateBlock->getId() . '_to'
-        )->setValue(
-            $toValue
-        )->getHtml();
+        return '<strong class="admin__control-support-text">' . __('From') . ':</strong>&nbsp;'
+            . $dateBlock->setValue($fromValue)->getHtml()
+            . '&nbsp;<strong class="admin__control-support-text">' . __('To') . ':</strong>&nbsp;'
+            . $dateBlock->setId($dateBlock->getId() . '_to')->setValue($toValue)->getHtml();
     }
 
     /**
@@ -182,7 +175,7 @@ protected function _getNumberFromToHtmlWithValue(Attribute $attribute, $value)
             $toValue = $this->escapeHtml(next($value));
         }
 
-        return '<strong>' . __(
+        return '<strong class="admin__control-support-text">' . __(
             'From'
         ) .
         ':</strong>&nbsp;' .
@@ -192,7 +185,7 @@ protected function _getNumberFromToHtmlWithValue(Attribute $attribute, $value)
         ' value="' .
         $fromValue .
         '"/>&nbsp;' .
-        '<strong>' .
+        '<strong class="admin__control-support-text">' .
         __(
             'To'
         ) .
@@ -268,7 +261,7 @@ protected function _prepareColumns()
                 'sortable' => false,
                 'index' => 'attribute_id',
                 'header_css_class' => 'col-id',
-                'column_css_class' => 'col-id'
+                'column_css_class' => 'col-id data-grid-checkbox-cell'
             ]
         );
         $this->addColumn(
diff --git a/app/code/Magento/Integration/view/adminhtml/templates/integration/popup_container.phtml b/app/code/Magento/Integration/view/adminhtml/templates/integration/popup_container.phtml
index c30380511ed23..8e9d1d18451e6 100644
--- a/app/code/Magento/Integration/view/adminhtml/templates/integration/popup_container.phtml
+++ b/app/code/Magento/Integration/view/adminhtml/templates/integration/popup_container.phtml
@@ -32,8 +32,7 @@ require([
                 modal: true,
                 autoOpen: true,
                 resizable: false,
-                minHeight: 200,
-                minWidth: 300,
+                minHeight: 0,
                 width: '75%',
                 dialogClass: 'no-close ui-popup-message',
                 position: {
diff --git a/app/code/Magento/Payment/view/adminhtml/templates/info/default.phtml b/app/code/Magento/Payment/view/adminhtml/templates/info/default.phtml
index f2db06784d9fa..b4538bd9f23f7 100644
--- a/app/code/Magento/Payment/view/adminhtml/templates/info/default.phtml
+++ b/app/code/Magento/Payment/view/adminhtml/templates/info/default.phtml
@@ -15,7 +15,7 @@
 <?php echo $block->escapeHtml($block->getMethod()->getTitle()) ?>
 
 <?php if ($_specificInfo = $block->getSpecificInformation()):?>
-<table class="data-table" cellspacing="0">
+<table class="data-table">
 <?php foreach ($_specificInfo as $_label => $_value):?>
     <tr>
         <th><?php echo $block->escapeHtml($_label)?>:</th>
diff --git a/app/code/Magento/Reports/view/adminhtml/templates/grid.phtml b/app/code/Magento/Reports/view/adminhtml/templates/grid.phtml
index 8d8ee2a1a08b6..14fc3f130fd10 100644
--- a/app/code/Magento/Reports/view/adminhtml/templates/grid.phtml
+++ b/app/code/Magento/Reports/view/adminhtml/templates/grid.phtml
@@ -12,147 +12,147 @@
 $numColumns = sizeof($block->getColumns());
 ?>
 <?php if ($block->getCollection()): ?>
-<?php if ($block->canDisplayContainer()): ?>
+    <?php if ($block->canDisplayContainer()): ?>
     <div id="<?php echo $block->getId() ?>">
-<?php else: ?>
-    <?php echo $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?>
-<?php endif; ?>
-<?php if ($block->getStoreSwitcherVisibility() || $block->getDateFilterVisibility()): ?>
-    <div class="grid-actions">
-        <?php if ($block->getChildBlock('grid.export')): ?>
-        <div class="export">
-            <?php echo $block->getChildHtml('grid.export');?>
-        </div>
+        <?php else: ?>
+            <?php echo $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?>
         <?php endif; ?>
-        <?php if ($block->getDateFilterVisibility()): ?>
-        <div class="filter required" id="<?php echo $block->getSuffixId('period_date_range')?>">
-            <div class="field date">
-                <label class="label">
-                    <span><?php echo __('From') ?>:</span>
-                    <input class="input-text no-changes required-entry"
-                           type="text"
-                           id="<?php echo $block->getSuffixId('period_date_from') ?>"
-                           name="report_from"
-                           value="<?php echo $block->getFilter('report_from') ?>">
-                    <div id="<?php echo $block->getSuffixId('period_date_from_advice')?>"></div>
-                </label>
-            </div>
+        <?php if ($block->getStoreSwitcherVisibility() || $block->getDateFilterVisibility()): ?>
+            <div class="admin__data-grid-header admin__data-grid-toolbar">
+                <div class="admin__data-grid-header-row">
+                    <?php if ($block->getDateFilterVisibility()): ?>
+                        <div class="admin__filter-actions" id="<?php echo $block->getSuffixId('period_date_range')?>">
+                            <span class="field-row">
+                                <label for="<?php echo $block->getSuffixId('period_date_from') ?>"
+                                       class="admin__control-support-text">
+                                    <span><?php echo __('From') ?>:</span>
+                                </label>
+                                <input class="input-text no-changes required-entry admin__control-text"
+                                       type="text"
+                                       id="<?php echo $block->getSuffixId('period_date_from') ?>"
+                                       name="report_from"
+                                       value="<?php echo $block->getFilter('report_from') ?>">
+                                <span id="<?php echo $block->getSuffixId('period_date_from_advice')?>"></span>
+                            </span>
 
-            <div class="field date">
-                <label class="label">
-                    <span><?php echo __('To') ?>:</span>
-                    <input class="input-text no-changes required-entry"
-                           type="text"
-                           id="<?php echo $block->getSuffixId('period_date_to') ?>"
-                           name="report_to"
-                           value="<?php echo $block->getFilter('report_to') ?>"/>
-                    <div id="<?php echo $block->getSuffixId('period_date_to_advice')?>"></div>
-                </label>
-            </div>
+                            <span class="field-row">
+                                <label for="<?php echo $block->getSuffixId('period_date_to') ?>"
+                                       class="admin__control-support-text">
+                                    <span><?php echo __('To') ?>:</span>
+                                </label>
+                                <input class="input-text no-changes required-entry admin__control-text"
+                                       type="text"
+                                       id="<?php echo $block->getSuffixId('period_date_to') ?>"
+                                       name="report_to"
+                                       value="<?php echo $block->getFilter('report_to') ?>"/>
+                                <span id="<?php echo $block->getSuffixId('period_date_to_advice')?>"></span>
+                            </span>
 
-            <div class="show-by">
-                <label class="label">
-                    <span><?php echo __('Show By') ?>:</span>
-                    <select name="report_period" id="<?php echo $block->getSuffixId('report_period')?>" class="select">
-                        <?php foreach ($block->getPeriods() as $_value => $_label): ?>
-                        <option value="<?php echo $_value ?>" <?php if ($block->getFilter('report_period') == $_value): ?> selected<?php endif; ?>><?php echo $_label ?></option>
-                        <?php endforeach; ?>
-                    </select>
-                </label>
-                <?php echo $block->getRefreshButtonHtml() ?>
-            </div>
-            <script>
-require([
-    "jquery",
-    "mage/calendar"
-], function($){
+                            <span class="field-row">
+                                 <label for="<?php echo $block->getSuffixId('report_period')?>"
+                                        class="admin__control-support-text">
+                                     <span><?php echo __('Show By') ?>:</span>
+                                 </label>
+                                <select name="report_period" id="<?php echo $block->getSuffixId('report_period')?>" class="select">
+                                    <?php foreach ($block->getPeriods() as $_value => $_label): ?>
+                                        <option value="<?php echo $_value ?>" <?php if ($block->getFilter('report_period') == $_value): ?> selected<?php endif; ?>><?php echo $_label ?></option>
+                                    <?php endforeach; ?>
+                                </select>
+                                <?php echo $block->getRefreshButtonHtml() ?>
+                            </span>
+                            <script>
+                                require([
+                                    "jquery",
+                                    "mage/calendar"
+                                ], function($){
 
-    $("#<?php echo $block->getSuffixId('period_date_range') ?>").dateRange({
-        dateFormat:"<?php echo $block->getDateFormat() ?>",
-        buttonText:"<?php echo __('Select Date') ?>",
-        from:{
-            id:"<?php echo $block->getSuffixId('period_date_from')?>"
-        },
-        to:{
-            id:"<?php echo $block->getSuffixId('period_date_to')?>"
-        }
-    });
-});
-</script>
-        </div>
+                                    $("#<?php echo $block->getSuffixId('period_date_range') ?>").dateRange({
+                                        dateFormat:"<?php echo $block->getDateFormat() ?>",
+                                        buttonText:"<?php echo __('Select Date') ?>",
+                                        from:{
+                                            id:"<?php echo $block->getSuffixId('period_date_from')?>"
+                                        },
+                                        to:{
+                                            id:"<?php echo $block->getSuffixId('period_date_to')?>"
+                                        }
+                                    });
+                                });
+                            </script>
+                        </div>
+                    <?php endif; ?>
+                    <?php if ($block->getChildBlock('grid.export')): ?>
+                        <?php echo $block->getChildHtml('grid.export');?>
+                    <?php endif; ?>
+                </div>
+            </div>
         <?php endif; ?>
-    </div>
-<?php endif; ?>
-    <div class="grid">
-        <div class="hor-scroll">
-            <table cellspacing="0" class="data" id="<?php echo $block->getId() ?>_table">
-                <!-- Rendering column set -->
+        <div class="admin__data-grid-wrap">
+            <table class="data-grid" id="<?php echo $block->getId() ?>_table">
                 <?php echo $block->getChildHtml('grid.columnSet'); ?>
             </table>
         </div>
     </div>
-</div>
-<?php if ($block->canDisplayContainer()): ?>
-    <script>
-require([
-    "jquery",
-    "validation",
-    "mage/mage",
-    "mage/adminhtml/grid"
-], function(jQuery){
+    <?php if ($block->canDisplayContainer()): ?>
+        <script>
+            require([
+                "jquery",
+                "validation",
+                "mage/mage",
+                "mage/adminhtml/grid"
+            ], function(jQuery){
 
-        //<![CDATA[
-            <?php echo $block->getJsObjectName() ?> = new varienGrid('<?php echo $block->getId() ?>', '<?php echo $block->getGridUrl() ?>', '<?php echo $block->getVarNamePage() ?>', '<?php echo $block->getVarNameSort() ?>', '<?php echo $block->getVarNameDir() ?>', '<?php echo $block->getVarNameFilter() ?>');
-            <?php echo $block->getJsObjectName() ?>.useAjax = '<?php if ($block->getUseAjax()): echo $block->getUseAjax(); endif; ?>';
-            <?php if ($block->getDateFilterVisibility()): ?>
-            <?php echo $block->getJsObjectName() ?>.doFilterCallback = validateFilterDate;
-        var period_date_from = $('<?php echo $block->getSuffixId('period_date_from')?>');
-        var period_date_to = $('<?php echo $block->getSuffixId('period_date_to')?>');
-        period_date_from.adviceContainer = $('<?php echo $block->getSuffixId('period_date_from_advice')?>');
-        period_date_to.adviceContainer = $('<?php echo $block->getSuffixId('period_date_to_advice')?>');
+                //<![CDATA[
+                <?php echo $block->getJsObjectName() ?> = new varienGrid('<?php echo $block->getId() ?>', '<?php echo $block->getGridUrl() ?>', '<?php echo $block->getVarNamePage() ?>', '<?php echo $block->getVarNameSort() ?>', '<?php echo $block->getVarNameDir() ?>', '<?php echo $block->getVarNameFilter() ?>');
+                <?php echo $block->getJsObjectName() ?>.useAjax = '<?php if ($block->getUseAjax()): echo $block->getUseAjax(); endif; ?>';
+                <?php if ($block->getDateFilterVisibility()): ?>
+                <?php echo $block->getJsObjectName() ?>.doFilterCallback = validateFilterDate;
+                var period_date_from = $('<?php echo $block->getSuffixId('period_date_from')?>');
+                var period_date_to = $('<?php echo $block->getSuffixId('period_date_to')?>');
+                period_date_from.adviceContainer = $('<?php echo $block->getSuffixId('period_date_from_advice')?>');
+                period_date_to.adviceContainer = $('<?php echo $block->getSuffixId('period_date_to_advice')?>');
 
-        var validateFilterDate = function() {
-            if (period_date_from && period_date_to) {
-                var valid = true;
-                jQuery(period_date_from).add(period_date_to).each(function() {
-                    valid = Validation.validate(this) && valid;
-                });
-                return valid;
-            }
-            else {
-                return true;
-            }
-        }
-            <?php endif;?>
-            <?php if ($block->getStoreSwitcherVisibility()): ?>
-        /* Overwrite function from switcher.phtml widget*/
-        switchStore = function(obj) {
-            if (obj.options[obj.selectedIndex].getAttribute('website') == 'true') {
-                var selectionType = 'website';
-            } else if (obj.options[obj.selectedIndex].getAttribute('group') == 'true') {
-                var selectionType = 'group';
-            } else {
-                var selectionType = 'store';
-            }
-            var storeParam = obj.value ? selectionType + '/' + obj.value + '/' : '';
-            if (obj.switchParams) {
-                storeParam += obj.switchParams;
-            }
-            var formParam = new Array('<?php echo $block->getSuffixId('period_date_from')?>', '<?php echo $block->getSuffixId('period_date_to')?>', '<?php echo $block->getSuffixId('report_period')?>');
-            var paramURL = '';
-            var switchURL = '<?php echo $block->getAbsoluteGridUrl(['_current' => false]); ?>'.replace(/(store|group|website)\/\d+\//, '');
+                var validateFilterDate = function() {
+                    if (period_date_from && period_date_to) {
+                        var valid = true;
+                        jQuery(period_date_from).add(period_date_to).each(function() {
+                            valid = Validation.validate(this) && valid;
+                        });
+                        return valid;
+                    }
+                    else {
+                        return true;
+                    }
+                }
+                <?php endif;?>
+                <?php if ($block->getStoreSwitcherVisibility()): ?>
+                /* Overwrite function from switcher.phtml widget*/
+                switchStore = function(obj) {
+                    if (obj.options[obj.selectedIndex].getAttribute('website') == 'true') {
+                        var selectionType = 'website';
+                    } else if (obj.options[obj.selectedIndex].getAttribute('group') == 'true') {
+                        var selectionType = 'group';
+                    } else {
+                        var selectionType = 'store';
+                    }
+                    var storeParam = obj.value ? selectionType + '/' + obj.value + '/' : '';
+                    if (obj.switchParams) {
+                        storeParam += obj.switchParams;
+                    }
+                    var formParam = new Array('<?php echo $block->getSuffixId('period_date_from')?>', '<?php echo $block->getSuffixId('period_date_to')?>', '<?php echo $block->getSuffixId('report_period')?>');
+                    var paramURL = '';
+                    var switchURL = '<?php echo $block->getAbsoluteGridUrl(['_current' => false]); ?>'.replace(/(store|group|website)\/\d+\//, '');
 
-            for (var i = 0; i < formParam.length; i++) {
-                if ($(formParam[i]).value && $(formParam[i]).name) {
-                    paramURL += $(formParam[i]).name + '=' + escape($(formParam[i]).value) + '&';
+                    for (var i = 0; i < formParam.length; i++) {
+                        if ($(formParam[i]).value && $(formParam[i]).name) {
+                            paramURL += $(formParam[i]).name + '=' + escape($(formParam[i]).value) + '&';
+                        }
+                    }
+                    setLocation(switchURL + storeParam + '?' + paramURL);
                 }
-            }
-            setLocation(switchURL + storeParam + '?' + paramURL);
-        }
-            <?php endif; ?>
-        //]]>
+                <?php endif; ?>
+                //]]>
 
-});
-</script>
+            });
+        </script>
     <?php endif; ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/items/column/qty.phtml b/app/code/Magento/Sales/view/adminhtml/templates/items/column/qty.phtml
index 46b39dc3a78af..5cf772879bed1 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/items/column/qty.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/items/column/qty.phtml
@@ -8,7 +8,7 @@
 
 ?>
 <?php if ($_item = $block->getItem()): ?>
-<table class="data-table qty-table">
+<table class="qty-table">
     <tr>
         <th><?php echo __('Ordered') ?></th>
         <td><?php echo $_item->getQtyOrdered()*1 ?></td>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/comments/view.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/comments/view.phtml
index 096b709861235..d07aa26f62841 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/comments/view.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/comments/view.phtml
@@ -13,11 +13,13 @@
         <div class="admin__field field-row">
             <label class="admin__field-label"
                    for="history_comment"><?php echo __('Comment Text') ?></label>
-            <textarea name="comment[comment]"
-                      class="admin__control-textarea"
-                      rows="3"
-                      cols="5"
-                      id="history_comment"></textarea>
+            <div class="admin__field-control">
+                <textarea name="comment[comment]"
+                          class="admin__control-textarea"
+                          rows="3"
+                          cols="5"
+                          id="history_comment"></textarea>
+            </div>
         </div>
         <div class="admin__field">
             <div class="order-history-comments-options">
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/comment.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/comment.phtml
index bd3da1a28327e..4163d1ad7890d 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/comment.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/comment.phtml
@@ -12,8 +12,10 @@
 <div class="admin__field field-comment">
     <label for="order-comment" class="admin__field-label"><span><?php echo __('Order Comments') ?></span></label>
     <div class="admin__field-control">
-        <textarea id="order-comment" name="order[comment][customer_note]"
-              class="admin__control-textarea"><?php echo $block->getCommentNote() ?></textarea>
+        <textarea
+            id="order-comment"
+            name="order[comment][customer_note]"
+            class="admin__control-textarea"><?php echo $block->getCommentNote() ?></textarea>
     </div>
 </div>
 <script>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml
index aaf605a22ce9a..5b56da82d491c 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml
@@ -15,30 +15,30 @@
 
 <?php $_items = $block->getItems() ?>
 <?php if (empty($_items)): ?>
-    <div class="grid" id="order-items_grid">
-        <table class="data-table admin__table-primary order-tables">
-            <thead>
-                <tr class="headings">
-                    <th class="col-product"><span><?php echo __('Product') ?></span></th>
-                    <th class="col-price"><span><?php echo __('Price') ?></span></th>
-                    <th class="col-qty"><span><?php echo __('Qty') ?></span></th>
-                    <th class="col-subtotal"><span><?php echo __('Subtotal') ?></span></th>
-                    <th class="col-discount"><span><?php echo __('Discount') ?></span></th>
-                    <th class="col-row-total"><span><?php echo __('Row Subtotal') ?></span></th>
-                    <th class="col-action"><span><?php echo __('Action') ?></span></th>
-                </tr>
-            </thead>
-            <tbody>
-                <tr class="even">
-                    <td class="empty-text" colspan="100"><?php echo __('No ordered items') ?></td>
-                </tr>
-            </tbody>
-        </table>
+    <div id="order-items_grid">
+        <div class="admin__table-wrapper">
+            <table class="data-table admin__table-primary order-tables">
+                <thead>
+                    <tr class="headings">
+                        <th class="col-product"><span><?php echo __('Product') ?></span></th>
+                        <th class="col-price"><span><?php echo __('Price') ?></span></th>
+                        <th class="col-qty"><span><?php echo __('Qty') ?></span></th>
+                        <th class="col-subtotal"><span><?php echo __('Subtotal') ?></span></th>
+                        <th class="col-discount"><span><?php echo __('Discount') ?></span></th>
+                        <th class="col-row-total"><span><?php echo __('Row Subtotal') ?></span></th>
+                        <th class="col-action"><span><?php echo __('Action') ?></span></th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr class="even">
+                        <td class="empty-text" colspan="100"><?php echo __('No ordered items') ?></td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
     </div>
 <?php else: ?>
-
-<div class="grid" id="order-items_grid">
-    <div class="hor-scroll">
+    <div class="admin__table-wrapper" id="order-items_grid">
     <?php if (count($_items)>10): ?>
         <div class="actions update actions-update">
             <?php echo $block->getButtonHtml(__('Update Items and Qty\'s'), 'order.itemsUpdate()', 'action-secondary'); ?>
@@ -101,7 +101,11 @@
                                            id="item_use_custom_price_<?php echo $_item->getId() ?>"
                                            <?php if ($_isCustomPrice): ?> checked="checked"<?php endif; ?>
                                            onclick="order.toggleCustomPrice(this, 'item_custom_price_<?php echo $_item->getId() ?>', 'item_tier_block_<?php echo $_item->getId() ?>');"/>
-                                    <label class="normal" for="item_use_custom_price_<?php echo $_item->getId() ?>"><?php echo __('Custom Price') ?>*</label>
+                                    <label
+                                        class="normal admin__field-label"
+                                        for="item_use_custom_price_<?php echo $_item->getId() ?>">
+                                        <?php echo __('Custom Price') ?>*
+                                    </label>
                                 </div>
                             <?php endif; ?>
                             <input id="item_custom_price_<?php echo $_item->getId() ?>"
@@ -131,7 +135,9 @@
                                        <?php if (!$_item->getNoDiscount()): ?>checked="checked"<?php endif; ?>
                                        value="1"
                                        type="checkbox" />
-                                <label for="item_use_discount_<?php echo $_item->getId() ?>" class="normal"><?php echo __('Apply') ?></label>
+                                <label
+                                    for="item_use_discount_<?php echo $_item->getId() ?>"
+                                    class="normal admin__field-label"><?php echo __('Apply') ?></label>
                             </div>
 
                         </td>
@@ -204,7 +210,6 @@
             order.itemsOnchangeBind()
         });
     </script>
-</div>
 
 <?php if ($block->isGiftMessagesAvailable()) : ?>
 <script>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals.phtml
index a309c817ee92f..9bfa7eb2fe636 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals.phtml
@@ -10,7 +10,7 @@
 <legend class="admin__legend"><span><?php echo __('Order Totals') ?></span></legend>
 <br>
 
-<table class="admin__table-secondary data-table" cellspacing="0">
+<table class="admin__table-secondary data-table">
     <tbody>
         <?php echo $block->renderTotals(); ?>
         <?php echo $block->renderTotals('footer'); ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items.phtml
index 82770b4f3fa45..70bdcbeb02068 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items.phtml
@@ -15,7 +15,7 @@
     </div>
 
     <?php if (count($_items)) : ?>
-    <div class="grid">
+    <div class="admin__table-wrapper">
         <table class="data-table admin__table-primary order-creditmemo-tables">
             <thead>
                 <tr class="headings">
@@ -45,10 +45,10 @@
             <?php endif; ?>
             <?php $i = 0; foreach ($_items as $_item): ?>
                 <?php if ($_item->getOrderItem()->getParentItem()) {
-    continue;
-} else {
-    $i++;
-} ?>
+                continue;
+            } else {
+                $i++;
+            } ?>
                 <tbody class="<?php echo $i%2 ? 'even' : 'odd' ?>">
                     <?php echo $block->getItemHtml($_item) ?>
                     <?php echo $block->getItemExtraInfoHtml($_item->getOrderItem()) ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items.phtml
index 3618871f0c7ca..7cc0f0e5e4bd2 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items.phtml
@@ -13,29 +13,31 @@
         <span class="title"><?php echo __('Items Refunded') ?></span>
     </div>
     <div class="admin__page-section-content">
-        <table class="data-table admin__table-primary order-creditmemo-tables">
-            <thead>
-                <tr class="headings">
-                    <th class="col-product"><span><?php echo __('Product') ?></span></th>
-                    <th class="col-price"><span><?php echo __('Price') ?></span></th>
-                    <th class="col-qty"><span><?php echo __('Qty') ?></span></th>
-                    <th class="col-subtotal"><span><?php echo __('Subtotal') ?></span></th>
-                    <th class="col-tax"><span><?php echo __('Tax Amount') ?></span></th>
-                    <th class="col-discount"><span><?php echo __('Discount Amount') ?></span></th>
-                    <th class="col-total last"><span><?php echo __('Row Total') ?></span></th>
-                </tr>
-            </thead>
-            <?php $i = 0; foreach ($_items as $_item): ?>
-                <?php if ($_item->getOrderItem()->getParentItem()) {
-    continue;
-} else {
-    $i++;
-} ?>
-                <tbody class="<?php echo $i%2 ? 'even' : 'odd' ?>">
-                    <?php echo $block->getItemHtml($_item) ?>
-                    <?php echo $block->getItemExtraInfoHtml($_item->getOrderItem()) ?>
-                </tbody>
-            <?php endforeach; ?>
-        </table>
+        <div class="admin__table-wrapper">
+            <table class="data-table admin__table-primary order-creditmemo-tables">
+                <thead>
+                    <tr class="headings">
+                        <th class="col-product"><span><?php echo __('Product') ?></span></th>
+                        <th class="col-price"><span><?php echo __('Price') ?></span></th>
+                        <th class="col-qty"><span><?php echo __('Qty') ?></span></th>
+                        <th class="col-subtotal"><span><?php echo __('Subtotal') ?></span></th>
+                        <th class="col-tax"><span><?php echo __('Tax Amount') ?></span></th>
+                        <th class="col-discount"><span><?php echo __('Discount Amount') ?></span></th>
+                        <th class="col-total last"><span><?php echo __('Row Total') ?></span></th>
+                    </tr>
+                </thead>
+                <?php $i = 0; foreach ($_items as $_item): ?>
+                    <?php if ($_item->getOrderItem()->getParentItem()) {
+                        continue;
+                    } else {
+                        $i++;
+                    } ?>
+                    <tbody class="<?php echo $i%2 ? 'even' : 'odd' ?>">
+                        <?php echo $block->getItemHtml($_item) ?>
+                        <?php echo $block->getItemExtraInfoHtml($_item->getOrderItem()) ?>
+                    </tbody>
+                <?php endforeach; ?>
+            </table>
+        </div>
     </div>
 </div>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/details.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/details.phtml
index 40f17efc40e9a..196c1d42977c1 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/details.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/details.phtml
@@ -17,7 +17,7 @@ store name = $_order->getStore()->getGroup()->getName()
 <?php echo __('Customer Name: %1', $_order->getCustomerFirstname() ? $_order->getCustomerName() : $_order->getBillingAddress()->getName()) ?><br />
 <?php echo __('Purchased From: %1', $_order->getStore()->getGroup()->getName()) ?><br />
 </div>
-<table cellspacing="0" cellpadding="0" border="0" width="100%" style="border:1px solid #bebcb7; background:#f8f7f5;">
+<table cellpadding="0" border="0" width="100%" style="border:1px solid #bebcb7; background:#f8f7f5;">
     <thead>
         <tr>
             <th align="left" bgcolor="#d9e5ee" style="padding:3px 9px">Item</th>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml
index 883f04cb7f3eb..fff76e569226d 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml
@@ -14,41 +14,43 @@
         <span class="title"><?php echo __('%1', $_itemsGridLabel) ?></span>
     </div>
     <div class="admin__page-section-content grid">
-        <table class="data-table admin__table-primary order-invoice-tables">
-            <thead>
-                <tr class="headings">
-                    <th class="col-product"><span><?php echo __('Product') ?></span></th>
-                    <th class="col-price"><span><?php echo __('Price') ?></span></th>
-                    <th class="col-ordered-qty"><span><?php echo __('Qty') ?></span></th>
-                    <th class="col-qty-invoice"><span><?php echo __('Qty to Invoice') ?></span></th>
-                    <th class="col-subtotal"><span><?php echo __('Subtotal') ?></span></th>
-                    <th class="col-tax"><span><?php echo __('Tax Amount') ?></span></th>
-                    <th class="col-discount"><span><?php echo __('Discount Amount') ?></span></th>
-                    <th class="col-total last"><span><?php echo __('Row Total') ?></span></th>
-                </tr>
-            </thead>
-            <?php if ($block->canEditQty()): ?>
-            <tfoot>
-                <tr>
-                    <td colspan="2">&nbsp;</td>
-                    <td colspan="3"><?php echo $block->getUpdateButtonHtml() ?></td>
-                    <td colspan="3">&nbsp;</td>
-                </tr>
-            </tfoot>
-            <?php endif; ?>
-            <?php $_items = $block->getInvoice()->getAllItems() ?>
-            <?php $_i = 0; foreach ($_items as $_item): ?>
-            <?php if ($_item->getOrderItem()->getParentItem()) {
-    continue;
-} else {
-    $_i++;
-} ?>
-                <tbody class="<?php echo $_i%2 ? 'even' : 'odd' ?>">
-                    <?php echo $block->getItemHtml($_item) ?>
-                    <?php echo $block->getItemExtraInfoHtml($_item->getOrderItem()) ?>
-                </tbody>
-            <?php endforeach; ?>
-        </table>
+        <div class="admin__table-wrapper">
+            <table class="data-table admin__table-primary order-invoice-tables">
+                <thead>
+                    <tr class="headings">
+                        <th class="col-product"><span><?php echo __('Product') ?></span></th>
+                        <th class="col-price"><span><?php echo __('Price') ?></span></th>
+                        <th class="col-ordered-qty"><span><?php echo __('Qty') ?></span></th>
+                        <th class="col-qty-invoice"><span><?php echo __('Qty to Invoice') ?></span></th>
+                        <th class="col-subtotal"><span><?php echo __('Subtotal') ?></span></th>
+                        <th class="col-tax"><span><?php echo __('Tax Amount') ?></span></th>
+                        <th class="col-discount"><span><?php echo __('Discount Amount') ?></span></th>
+                        <th class="col-total last"><span><?php echo __('Row Total') ?></span></th>
+                    </tr>
+                </thead>
+                <?php if ($block->canEditQty()): ?>
+                <tfoot>
+                    <tr>
+                        <td colspan="2">&nbsp;</td>
+                        <td colspan="3"><?php echo $block->getUpdateButtonHtml() ?></td>
+                        <td colspan="3">&nbsp;</td>
+                    </tr>
+                </tfoot>
+                <?php endif; ?>
+                <?php $_items = $block->getInvoice()->getAllItems() ?>
+                <?php $_i = 0; foreach ($_items as $_item): ?>
+                <?php if ($_item->getOrderItem()->getParentItem()) {
+                    continue;
+                } else {
+                    $_i++;
+                } ?>
+                    <tbody class="<?php echo $_i%2 ? 'even' : 'odd' ?>">
+                        <?php echo $block->getItemHtml($_item) ?>
+                        <?php echo $block->getItemExtraInfoHtml($_item->getOrderItem()) ?>
+                    </tbody>
+                <?php endforeach; ?>
+            </table>
+        </div>
     </div>
 </section>
 
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items.phtml
index 9298795db0b62..7b4b17815992c 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items.phtml
@@ -7,7 +7,7 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<div class="grid">
+<div class="admin__table-wrapper">
     <table class="data-table admin__table-primary order-invoice-tables">
         <thead>
             <tr class="headings">
@@ -23,10 +23,10 @@
         <?php $_items = $block->getInvoice()->getAllItems() ?>
         <?php $i = 0; foreach ($_items as $_item): ?>
             <?php if ($_item->getOrderItem()->getParentItem()) {
-    continue;
-} else {
-    $i++;
-} ?>
+            continue;
+        } else {
+            $i++;
+        } ?>
             <tbody class="<?php echo $i%2 ? 'even' : 'odd' ?>">
                 <?php echo $block->getItemHtml($_item) ?>
                 <?php echo $block->getItemExtraInfoHtml($_item->getOrderItem()) ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totalbar.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totalbar.phtml
index f24b3f258aefc..403402bee0a83 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/totalbar.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totalbar.phtml
@@ -8,7 +8,7 @@
 
 ?>
 <?php if (sizeof($block->getTotals()) > 0): ?>
-<table cellspacing="0" class="items-to-invoice">
+<table class="items-to-invoice">
     <tr>
     <?php foreach ($block->getTotals() as $_total): ?>
         <td <?php if ($_total['grand']): ?>class="grand-total"<?php endif; ?>>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals.phtml
index 45b816084520b..f0a58fdb85123 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals.phtml
@@ -10,7 +10,7 @@
 <?php /*$_source = $block->getSource(); ?>
 <?php $block->setPriceDataObject($_source) ?>
 <?php if ($_source): ?>
-<table cellspacing="0" width="100%">
+<table width="100%">
     <?php echo $block->getChildHtml('main'); ?>
     <?php echo $block->getChildHtml('footer'); ?>
 </table>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/giftmessage.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/giftmessage.phtml
index 9fa3eda8f0d7a..25e385ab2c58e 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/giftmessage.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/giftmessage.phtml
@@ -46,7 +46,6 @@
             <div class="admin__field field-gift-message">
                 <label class="admin__field-label"
                        for="<?php echo $block->getFieldId('message'); ?>"><span><?php echo __('Gift Message'); ?></span></label>
-
                 <div class="admin__field-control">
                     <textarea id="<?php echo $block->getFieldId('message'); ?>"
                               name="<?php echo $block->getFieldName('message') ?>"
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/info.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/info.phtml
index afd5fc24ba3e9..f27dc9bd43456 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/info.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/info.phtml
@@ -45,7 +45,7 @@ $orderStoreDate = $block->formatDate(
                 </span>
             </div>
             <div class="admin__page-section-item-content">
-                <table class="data-table admin__table-secondary order-information-table">
+                <table class="admin__table-secondary order-information-table">
                 <tr>
                     <th><?php echo __('Order Date') ?></th>
                     <td><?php echo $orderAdminDate ?></td>
@@ -117,7 +117,7 @@ $orderStoreDate = $block->formatDate(
                 <div class="actions"><?php echo $block->getAccountEditLink()?></div>
             </div>
             <div class="admin__page-section-item-content">
-                <table class="data-table admin__table-secondary order-account-information-table">
+                <table class="admin__table-secondary order-account-information-table">
                     <tr>
                         <th><?php echo __('Customer Name') ?></th>
                         <td>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/items.phtml
index 7fc02861eff16..87cd90dca4c62 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/items.phtml
@@ -8,8 +8,7 @@
 
 ?>
 <?php $_order = $block->getOrder() ?>
-<div class="grid">
-  <div class="hor-scroll">
+<div class="admin__table-wrapper">
     <table class="data-table admin__table-primary edit-order-table">
         <thead>
             <tr class="headings">
@@ -38,5 +37,4 @@
             </tbody>
         <?php endforeach; ?>
     </table>
-  </div>
 </div>
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml
index b2001f9ac88a4..d871532f2d44a 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml
@@ -12,7 +12,7 @@
     <div class="admin__page-section-title">
         <span class="title"><?php echo __('Items to Ship') ?></span>
     </div>
-    <div class="grid">
+    <div class="admin__table-wrapper">
         <table class="data-table admin__table-primary order-shipment-table">
             <thead>
                 <tr class="headings">
@@ -51,56 +51,63 @@
                     <label class="admin__field-label"
                            for="shipment_comment_text">
                         <span><?php echo __('Comment Text') ?></span></label>
-                    <textarea id="shipment_comment_text"
-                              class="admin__control-textarea"
-                              name="shipment[comment_text]"
-                              rows="3"
-                              cols="5"><?php echo $block->getShipment()->getCommentText(); ?></textarea>
+                    <div class="admin__field-control">
+                        <textarea id="shipment_comment_text"
+                                  class="admin__control-textarea"
+                                  name="shipment[comment_text]"
+                                  rows="3"
+                                  cols="5"><?php echo $block->getShipment()->getCommentText(); ?></textarea>
+                    </div>
                 </div>
             </div>
         </div>
     </div>
-    <div class="admin__page-section-item order-totals">
-        <?php if ($block->canCreateShippingLabel()): ?>
-            <div class="field choice admin__field admin__field-option field-create">
-                <input id="create_shipping_label"
-                       class="admin__control-checkbox"
-                       name="shipment[create_shipping_label]"
-                       value="1"
-                       type="checkbox"
-                       onclick="toggleCreateLabelCheckbox();"/>
-                <label class="admin__field-label"
-                       for="create_shipping_label">
-                    <span><?php echo __('Create Shipping Label') ?></span></label>
-            </div>
-        <?php endif ?>
-
-        <div class="field choice admin__field admin__field-option field-append">
-            <input id="notify_customer"
-                   class="admin__control-checkbox"
-                   name="shipment[comment_customer_notify]"
-                   value="1"
-                   type="checkbox"/>
-            <label class="admin__field-label"
-                   for="notify_customer">
-                <span><?php echo __('Append Comments') ?></span></label>
+    <div class="admin__page-section-item order-totals order-totals-actions">
+        <div class="admin__page-section-item-title">
+            <span class="title"><?php echo __('Shipment Options') ?></span>
         </div>
+        <div class="admin__page-section-item-content">
+            <?php if ($block->canCreateShippingLabel()): ?>
+                <div class="field choice admin__field admin__field-option field-create">
+                    <input id="create_shipping_label"
+                           class="admin__control-checkbox"
+                           name="shipment[create_shipping_label]"
+                           value="1"
+                           type="checkbox"
+                           onclick="toggleCreateLabelCheckbox();"/>
+                    <label class="admin__field-label"
+                           for="create_shipping_label">
+                        <span><?php echo __('Create Shipping Label') ?></span></label>
+                </div>
+            <?php endif ?>
 
-        <?php if ($block->canSendShipmentEmail()): ?>
-            <div class="field choice admin__field admin__field-option field-email">
-                <input id="send_email"
+            <div class="field choice admin__field admin__field-option field-append">
+                <input id="notify_customer"
                        class="admin__control-checkbox"
-                       name="shipment[send_email]"
+                       name="shipment[comment_customer_notify]"
                        value="1"
                        type="checkbox"/>
                 <label class="admin__field-label"
-                       for="send_email">
-                    <span><?php echo __('Email Copy of Shipment') ?></span></label>
+                       for="notify_customer">
+                    <span><?php echo __('Append Comments') ?></span></label>
             </div>
-        <?php endif; ?>
 
-        <div class="order-history-comments-actions actions">
-            <?php echo $block->getChildHtml('submit_button') ?>
+            <?php if ($block->canSendShipmentEmail()): ?>
+                <div class="field choice admin__field admin__field-option field-email">
+                    <input id="send_email"
+                           class="admin__control-checkbox"
+                           name="shipment[send_email]"
+                           value="1"
+                           type="checkbox"/>
+                    <label class="admin__field-label"
+                           for="send_email">
+                        <span><?php echo __('Email Copy of Shipment') ?></span></label>
+                </div>
+            <?php endif; ?>
+
+            <div class="order-history-comments-actions actions">
+                <?php echo $block->getChildHtml('submit_button') ?>
+            </div>
         </div>
     </div>
 </section>
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/packed.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/packed.phtml
index 822562c345d8a..595ec01356abc 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/packed.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/packed.phtml
@@ -23,7 +23,7 @@
                         <div class="title"><?php echo __('Package') . ' ' . $packageId ?></div>
                     </div>
                     <div class="package-info">
-                        <table class="package-options" cellspacing="0">
+                        <table class="package-options">
                             <tbody>
                                 <tr>
                                     <th><?php echo __('Type') ?></th>
@@ -116,7 +116,7 @@
                         <div class="title"><?php echo __('Items in the Package') ?></div>
                     </div>
                     <div class="grid">
-                        <table cellspacing="0" class="data">
+                        <table class="data">
                             <thead>
                             <tr class="headings">
                                 <th class="col-product no-link"><span><?php echo __('Product') ?></span></th>
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/tracking.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/tracking.phtml
index cb8d042a65f47..ed1580194287a 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/order/tracking.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/tracking.phtml
@@ -73,9 +73,29 @@ require(['prototype'], function(){
                 <?php endforeach; ?>
             </select>
         </td>
-        <td class="col-title"><input class="input-text admin__control-text number-title" type="text" name="tracking[<%- data.index %>][title]" id="trackingT<%- data.index %>" value="" disabled="disabled" /></td>
-        <td class="col-number"><input class="input-text admin__control-text required-entry" type="text" name="tracking[<%- data.index %>][number]" id="trackingN<%- data.index %>" value="" disabled="disabled" /></td>
-        <td class="col-delete"><a href="#" class="action-delete" onclick="trackingControl.deleteRow(event);return false"><span><?php echo __('Delete') ?></span></a></td>
+        <td class="col-title">
+            <input class="input-text admin__control-text number-title"
+                   type="text"
+                   name="tracking[<%- data.index %>][title]"
+                   id="trackingT<%- data.index %>"
+                   value=""
+                   disabled="disabled" />
+        </td>
+        <td class="col-number">
+            <input class="input-text admin__control-text required-entry"
+                   type="text"
+                   name="tracking[<%- data.index %>][number]"
+                   id="trackingN<%- data.index %>"
+                   value=""
+                   disabled="disabled" />
+        </td>
+        <td class="col-delete">
+            <a href="#"
+               class="action-default action-delete"
+               onclick="trackingControl.deleteRow(event);return false">
+                <span><?php echo __('Delete') ?></span>
+            </a>
+        </td>
     </tr>
 </script>
 
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/view/items.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/view/items.phtml
index 1ebeae21eb75e..07e9a9876f358 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/view/items.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/view/items.phtml
@@ -7,7 +7,7 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<div class="grid">
+<div class="admin__table-wrapper">
     <table class="data-table admin__table-primary order-shipment-table">
         <thead>
             <tr class="headings">
diff --git a/app/code/Magento/Theme/Block/Html/Header/Logo.php b/app/code/Magento/Theme/Block/Html/Header/Logo.php
index d496e358bd523..96c41f8defae5 100644
--- a/app/code/Magento/Theme/Block/Html/Header/Logo.php
+++ b/app/code/Magento/Theme/Block/Html/Header/Logo.php
@@ -78,6 +78,38 @@ public function getLogoAlt()
         return $this->_data['logo_alt'];
     }
 
+    /**
+     * Retrieve logo width
+     *
+     * @return int
+     */
+    public function getLogoWidth()
+    {
+        if (empty($this->_data['logo_width'])) {
+            $this->_data['logo_width'] = $this->_scopeConfig->getValue(
+                'design/header/logo_width',
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            );
+        }
+        return (int)$this->_data['logo_width'] ? : (int)$this->getLogoImgWidth();
+    }
+
+    /**
+     * Retrieve logo height
+     *
+     * @return int
+     */
+    public function getLogoHeight()
+    {
+        if (empty($this->_data['logo_height'])) {
+            $this->_data['logo_height'] = $this->_scopeConfig->getValue(
+                'design/header/logo_height',
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            );
+        }
+        return (int)$this->_data['logo_height'] ? : (int)$this->getLogoImgHeight();
+    }
+
     /**
      * Retrieve logo image URL
      *
diff --git a/app/code/Magento/Theme/etc/adminhtml/system.xml b/app/code/Magento/Theme/etc/adminhtml/system.xml
index cd7a73c2a3116..241a28a7d828e 100644
--- a/app/code/Magento/Theme/etc/adminhtml/system.xml
+++ b/app/code/Magento/Theme/etc/adminhtml/system.xml
@@ -65,6 +65,12 @@
                     <backend_model>Magento\Config\Model\Config\Backend\Image\Logo</backend_model>
                     <base_url type="media" scope_info="1">logo</base_url>
                 </field>
+                <field id="logo_width" translate="label" type="text" sortOrder="11" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>Logo Image Width</label>
+                </field>
+                <field id="logo_height" translate="label" type="text" sortOrder="12" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>Logo Image Height</label>
+                </field>
                 <field id="logo_alt" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Logo Image Alt</label>
                 </field>
diff --git a/app/code/Magento/Theme/view/adminhtml/templates/browser/content.phtml b/app/code/Magento/Theme/view/adminhtml/templates/browser/content.phtml
index 1ccfa7dced43e..771617e828629 100644
--- a/app/code/Magento/Theme/view/adminhtml/templates/browser/content.phtml
+++ b/app/code/Magento/Theme/view/adminhtml/templates/browser/content.phtml
@@ -14,7 +14,7 @@
 <?php echo $block->getChildHtml('wysiwyg_files.js') ?>
 
 <div class="content-header skip-header" id="content_header">
-    <table cellspacing="0">
+    <table>
         <tr>
             <td><h3 id="content_header_text"><?php echo $block->getHeaderText() ?></h3></td>
             <td class="form-buttons">
diff --git a/app/code/Magento/Theme/view/frontend/layout/default.xml b/app/code/Magento/Theme/view/frontend/layout/default.xml
index efce6ce1922d0..4298635119bbf 100644
--- a/app/code/Magento/Theme/view/frontend/layout/default.xml
+++ b/app/code/Magento/Theme/view/frontend/layout/default.xml
@@ -39,7 +39,12 @@
                 <block class="Magento\Store\Block\Switcher" name="store_language" as="store_language" template="switch/languages.phtml"/>
             </container>
             <container name="header-wrapper" label="Page Header" as="header-wrapper" htmlTag="div" htmlClass="header content">
-                <block class="Magento\Theme\Block\Html\Header\Logo" name="logo" />
+                <block class="Magento\Theme\Block\Html\Header\Logo" name="logo">
+                    <arguments>
+                        <argument name="logo_img_width" xsi:type="number">189</argument>
+                        <argument name="logo_img_height" xsi:type="number">64</argument>
+                    </arguments>
+                </block>
                 <block class="Magento\Framework\View\Element\Html\Links" name="top.links">
                     <arguments>
                         <argument name="css_class" xsi:type="string">header links</argument>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/header/logo.phtml b/app/code/Magento/Theme/view/frontend/templates/html/header/logo.phtml
index 5eb0c6928f4d4..117702ec31208 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/header/logo.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/header/logo.phtml
@@ -14,10 +14,16 @@
 <span data-action="toggle-nav" class="action nav-toggle"><span><?php echo __('Toggle Nav') ?></span></span>
 <?php if ($block->isHomePage()):?>
     <strong class="logo">
-        <img src="<?php echo $block->getLogoSrc() ?>" alt="<?php echo $block->getLogoAlt() ?>" />
+<?php else: ?>
+    <a class="logo" href="<?php echo $block->getUrl(''); ?>" title="<?php echo $storeName ?>">
+<?php endif ?>
+        <img src="<?php echo $block->getLogoSrc() ?>"
+             alt="<?php echo $block->getLogoAlt() ?>"
+             <?php echo $block->getLogoWidth() ? 'width="' . $block->getLogoWidth() . '"' : '' ?>
+             <?php echo $block->getLogoHeight() ? 'height="' . $block->getLogoHeight() . '"' : '' ?>
+        />
+<?php if ($block->isHomePage()):?>
     </strong>
 <?php else:?>
-    <a class="logo" href="<?php echo $block->getUrl(''); ?>" title="<?php echo $storeName ?>">
-        <img src="<?php echo $block->getLogoSrc() ?>" alt="<?php echo $storeName ?>" />
     </a>
 <?php endif?>
diff --git a/app/code/Magento/Translation/view/adminhtml/templates/translate_inline.phtml b/app/code/Magento/Translation/view/adminhtml/templates/translate_inline.phtml
index cda8dd45d92fb..a9c176068e08e 100644
--- a/app/code/Magento/Translation/view/adminhtml/templates/translate_inline.phtml
+++ b/app/code/Magento/Translation/view/adminhtml/templates/translate_inline.phtml
@@ -18,7 +18,7 @@
     <form id="<%- data.id %>">
         <% _.each(data.items, function(item, i) { %>
             <div class="magento_table_container">
-                <table cellspacing="0" class="table">
+                <table class="table">
                     <% _.each(item, function(value, index) { %>
                         <tr>
                             <th class="label" style="text-transform: capitalize;"><%- index %>:</th>
diff --git a/app/code/Magento/Ui/view/base/ui_component/templates/listing/default.xhtml b/app/code/Magento/Ui/view/base/ui_component/templates/listing/default.xhtml
index c56eea763192e..736ef6fc5a0c4 100644
--- a/app/code/Magento/Ui/view/base/ui_component/templates/listing/default.xhtml
+++ b/app/code/Magento/Ui/view/base/ui_component/templates/listing/default.xhtml
@@ -5,8 +5,11 @@
  * See COPYING.txt for license details.
  */
 -->
-<div data-bind="scope: '{{getName()}}.{{getName()}}'" class="admin__data-grid-wrap"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../Ui/etc/ui_template.xsd">
+<div
+    class="admin__data-grid-outer-wrap"
+    data-bind="scope: '{{getName()}}.{{getName()}}'"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="../../../../../../Ui/etc/ui_template.xsd">
     <div data-role="spinner" data-component="{{getName()}}.{{getName()}}.{{spinner}}" class="admin__data-grid-loading-mask">
         <div class="grid-loader"></div>
     </div>
diff --git a/app/code/Magento/Ui/view/base/web/templates/form/element/input.html b/app/code/Magento/Ui/view/base/web/templates/form/element/input.html
index 124b398235c2d..2a56bbe1e4cf7 100644
--- a/app/code/Magento/Ui/view/base/web/templates/form/element/input.html
+++ b/app/code/Magento/Ui/view/base/web/templates/form/element/input.html
@@ -4,13 +4,16 @@
  * See COPYING.txt for license details.
  */
 -->
-<input class="admin__control-text" type="text" data-bind="
-    value: value,
-    hasFocus: focused,
-    attr: {
-        name: inputName,
-        placeholder: placeholder,
-        'aria-describedby': noticeId,
-        id: uid,
-        disabled: disabled
+<input
+    class="admin__control-text"
+    type="text"
+    data-bind="
+        value: value,
+        hasFocus: focused,
+        attr: {
+            name: inputName,
+            placeholder: placeholder,
+            'aria-describedby': noticeId,
+            id: uid,
+            disabled: disabled
     }" />
diff --git a/app/code/Magento/Ui/view/base/web/templates/form/fieldset.html b/app/code/Magento/Ui/view/base/web/templates/form/fieldset.html
index 159511ae9c30c..b42df55a146e9 100644
--- a/app/code/Magento/Ui/view/base/web/templates/form/fieldset.html
+++ b/app/code/Magento/Ui/view/base/web/templates/form/fieldset.html
@@ -5,8 +5,13 @@
  */
 -->
 
-<div class="admin__fieldset-wrapper" data-bind="css: {'collapsable-wrapper': collapsible, 'opened': opened}">
-    <div class="admin__fieldset-wrapper-title" tabindex="3" data-bind="click: toggleOpened, keyboard: { 13: toggleOpened }">
+<div 
+    class="admin__fieldset-wrapper"
+    data-bind="css: {'admin__collapsible-block-wrapper': collapsible, 'opened': opened}">
+    <div 
+        class="admin__fieldset-wrapper-title"
+        tabindex="3"
+        data-bind="click: toggleOpened, keyboard: { 13: toggleOpened }">
         <strong class="title">
             <span data-bind="text: label"></span>
         </strong>
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/cells/text.html b/app/code/Magento/Ui/view/base/web/templates/grid/cells/text.html
index aff66b7cc2c68..651be9673b540 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/cells/text.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/cells/text.html
@@ -6,7 +6,8 @@
 -->
 
 <!-- ko if: isClickable(row) -->
-<td 
+<td
+    class="_clickable"
     data-bind="click: redirect.bind($data, getClickUrl(row)),
                html: getLabel(row[field.index])"
     data-action="grid-row-edit"></td>
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/filters/filters.html b/app/code/Magento/Ui/view/base/web/templates/grid/filters/filters.html
index ddda29706153a..816eff73b8beb 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/filters/filters.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/filters/filters.html
@@ -39,7 +39,7 @@
 
 <div
     class="admin__data-grid-filters-current"
-    data-bind="css: {_show: active().length && !opened()}">
+    data-bind="css: {_show: active().length}">
     <div class="admin__current-filters-title-wrap">
         <span
             class="admin__current-filters-title"
@@ -61,6 +61,12 @@
             <!-- /ko -->
         </ul>
     </div>
+    <div class="admin__current-filters-actions-wrap">
+        <button
+            class="action-tertiary action-clear"
+            type="button"
+            data-bind="text: $t('Clear all')"></button>
+    </div>
 </div>
 
 <div
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/listing.html b/app/code/Magento/Ui/view/base/web/templates/grid/listing.html
index 544a998a4dbc7..c3de27d5c7e52 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/listing.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/listing.html
@@ -5,34 +5,36 @@
  */
 -->
 
-<table class="data-grid">
-    <thead data-part="head">
-        <tr data-part="head.row">
-            <!-- ko foreach: elems -->
-                <!-- ko if: visible -->
-                    <!-- ko template: getHeader() --><!-- /ko -->
+<div class="admin__data-grid-wrap">
+    <table class="data-grid">
+        <thead data-part="head">
+            <tr data-part="head.row">
+                <!-- ko foreach: elems -->
+                    <!-- ko if: visible -->
+                        <!-- ko template: getHeader() --><!-- /ko -->
+                    <!-- /ko -->
                 <!-- /ko -->
-            <!-- /ko -->
-        </tr>
-    </thead>
-    <tbody data-part="body">
-        <!-- ko if: hasData() -->
-            <!-- ko foreach: { data: rows, as: 'row' } -->
-                <tr data-part="body.row">
-                    <!-- ko foreach: { data: $parent.elems, as: 'field' }  -->
-                        <!-- ko if: visible -->
-                            <!-- ko template: getBody() --><!-- /ko -->
+            </tr>
+        </thead>
+        <tbody data-part="body">
+            <!-- ko if: hasData() -->
+                <!-- ko foreach: { data: rows, as: 'row' } -->
+                    <tr data-part="body.row">
+                        <!-- ko foreach: { data: $parent.elems, as: 'field' }  -->
+                            <!-- ko if: visible -->
+                                <!-- ko template: getBody() --><!-- /ko -->
+                            <!-- /ko -->
                         <!-- /ko -->
-                    <!-- /ko -->
-                </tr>
+                    </tr>
+                <!-- /ko -->
             <!-- /ko -->
-        <!-- /ko -->
 
-        <!-- ko ifnot: hasData() -->
-            <tr class="data-grid-tr-no-data">
-                <td data-bind="attr: { colspan: getColspan() },
-                               text: $t('We couldn\'t find any records.')"></td>
-            </tr>
-        <!-- /ko -->
-    </tbody>
-</table>
+            <!-- ko ifnot: hasData() -->
+                <tr class="data-grid-tr-no-data">
+                    <td data-bind="attr: { colspan: getColspan() },
+                                   text: $t('We couldn\'t find any records.')"></td>
+                </tr>
+            <!-- /ko -->
+        </tbody>
+    </table>
+</div>
\ No newline at end of file
diff --git a/app/code/Magento/User/Block/User/Edit/Tab/Main.php b/app/code/Magento/User/Block/User/Edit/Tab/Main.php
index 5eec5e84e013e..86a6512676577 100644
--- a/app/code/Magento/User/Block/User/Edit/Tab/Main.php
+++ b/app/code/Magento/User/Block/User/Edit/Tab/Main.php
@@ -153,7 +153,6 @@ protected function _prepareForm()
                     'id' => 'is_active',
                     'title' => __('Account Status'),
                     'class' => 'input-select',
-                    'style' => 'width: 80px',
                     'options' => ['1' => __('Active'), '0' => __('Inactive')]
                 ]
             );
diff --git a/app/code/Magento/User/Block/User/Edit/Tab/Roles.php b/app/code/Magento/User/Block/User/Edit/Tab/Roles.php
index 2245f8772a955..d4a3e2e4f8389 100644
--- a/app/code/Magento/User/Block/User/Edit/Tab/Roles.php
+++ b/app/code/Magento/User/Block/User/Edit/Tab/Roles.php
@@ -106,7 +106,7 @@ protected function _prepareColumns()
         $this->addColumn(
             'assigned_user_role',
             [
-                'header_css_class' => 'a-center',
+                'header_css_class' => 'data-grid-actions-cell',
                 'header' => __('Assigned'),
                 'type' => 'radio',
                 'html_name' => 'roles[]',
diff --git a/app/code/Magento/Weee/view/adminhtml/templates/renderer/tax.phtml b/app/code/Magento/Weee/view/adminhtml/templates/renderer/tax.phtml
index 6208eb2f551cf..dab9df556b76a 100644
--- a/app/code/Magento/Weee/view/adminhtml/templates/renderer/tax.phtml
+++ b/app/code/Magento/Weee/view/adminhtml/templates/renderer/tax.phtml
@@ -23,7 +23,7 @@ $data = ['fptAttribute' => [
     <label class="label"><span><?php echo $block->getElement()->getLabel() ?></span></label>
 
     <div class="control">
-        <table class="data-table" cellspacing="0">
+        <table class="data-table">
             <thead>
                 <tr>
                     <th class="col-website" <?php if (!$block->isMultiWebsites()): ?>style="display: none;"<?php endif; ?>><?php echo __('Website'); ?></th>
diff --git a/app/code/Magento/Widget/view/adminhtml/templates/instance/edit/layout.phtml b/app/code/Magento/Widget/view/adminhtml/templates/instance/edit/layout.phtml
index 497e17ccd7492..94cc3c75709bd 100644
--- a/app/code/Magento/Widget/view/adminhtml/templates/instance/edit/layout.phtml
+++ b/app/code/Magento/Widget/view/adminhtml/templates/instance/edit/layout.phtml
@@ -42,7 +42,7 @@ var pageGroupTemplate = '<div class="fieldset-wrapper page_group_container" id="
         '<input disabled="disabled" type="hidden" class="container_name" name="__[container_name]" value="widget_instance[<%- data.id %>][<?php echo $container['name'] ?>]" />'+
         '<input disabled="disabled" type="hidden" name="widget_instance[<%- data.id %>][<?php echo $container['name'] ?>][page_id]" value="<%- data.page_id %>" />'+
         '<input disabled="disabled" type="hidden" class="layout_handle_pattern" name="widget_instance[<%- data.id %>][<?php echo $container['name'] ?>][layout_handle]" value="<?php echo $container['layout_handle'] ?>" />'+
-        '<table cellspacing="0" class="data-table">'+
+        '<table class="data-table">'+
             '<col width="200" />'+
             '<thead>'+
                 '<tr>'+
@@ -93,7 +93,7 @@ var pageGroupTemplate = '<div class="fieldset-wrapper page_group_container" id="
     '<input disabled="disabled" type="hidden" name="widget_instance[<%- data.id %>][all_pages][page_id]" value="<%- data.page_id %>" />'+
     '<input disabled="disabled" type="hidden" class="layout_handle_pattern" name="widget_instance[<%- data.id %>][all_pages][layout_handle]" value="default" />'+
     '<input disabled="disabled" type="hidden" class="for_all" name="widget_instance[<%- data.id %>][all_pages][for]" value="all" />'+
-    '<table cellspacing="0" class="data-table">'+
+    '<table class="data-table">'+
         '<col width="200" />'+
         '<thead>'+
             '<tr>'+
@@ -123,7 +123,7 @@ var pageGroupTemplate = '<div class="fieldset-wrapper page_group_container" id="
     '<input disabled="disabled" type="hidden" class="container_name" name="__[container_name]" value="widget_instance[<%- data.id %>][pages]" />'+
     '<input disabled="disabled" type="hidden" name="widget_instance[<%- data.id %>][pages][page_id]" value="<%- data.page_id %>" />'+
     '<input disabled="disabled" type="hidden" class="for_all" name="widget_instance[<%- data.id %>][pages][for]" value="all" />'+
-    '<table cellspacing="0" class="data-table">'+
+    '<table class="data-table">'+
         '<col width="200" />'+
         '<thead>'+
             '<tr>'+
@@ -154,7 +154,7 @@ var pageGroupTemplate = '<div class="fieldset-wrapper page_group_container" id="
     '<input disabled="disabled" type="hidden" class="container_name" name="__[container_name]" value="widget_instance[<%- data.id %>][page_layouts]" />'+
     '<input disabled="disabled" type="hidden" name="widget_instance[<%- data.id %>][page_layouts][page_id]" value="<%- data.page_id %>" />'+
     '<input disabled="disabled" type="hidden" class="for_all" name="widget_instance[<%- data.id %>][page_layouts][for]" value="all" />'+
-    '<table cellspacing="0" class="data-table">'+
+    '<table class="data-table">'+
         '<col width="200" />'+
         '<thead>'+
             '<tr>'+
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_main.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_main.less
index ce8cabfbf381e..32f42c5055855 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_main.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_main.less
@@ -13,3 +13,4 @@
 
 @import 'main/_actions-bar.less';
 @import 'main/_page-nav.less';
+@import 'main/_collapsible-blocks.less';
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less
new file mode 100644
index 0000000000000..433873096a7c1
--- /dev/null
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less
@@ -0,0 +1,436 @@
+// /**
+//  * Copyright © 2015 Magento. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+//  ToDo UI: Consider all accordions, should be separated
+
+//
+//  Variables
+//  _____________________________________________
+
+@collapsible__border-color: @color-gray80;
+
+@collapsible-title__color: @color-very-dark-gray-black;
+@collapsible-title__font-size: 1.7rem;
+@collapsible-title__padding-top: 1.9rem;
+@collapsible-title__padding-bottom: @collapsible-title__padding-top;
+@collapsible-title__hover__color: darken(@collapsible-title__color, 15%);
+@collapsible-title__disabled__color: lighten(@collapsible-title__color, 30%);
+
+@collapsible-title-icon__size: @collapsible-title__font-size;
+@collapsible-title-support-text__font-size: 1.4rem;
+
+@collapsible-sub-block__indent: 4rem;
+
+@collapsible-content__indent: 2.6rem;
+
+//
+//  Mixins
+//  _____________________________________________
+
+.admin__collapsible-block-wrapper() {
+    border-bottom: 1px solid @collapsible__border-color;
+}
+
+.admin__collapsible-sub-block-wrapper() {
+    margin-left: @collapsible-sub-block__indent;
+}
+
+.admin__collapsible-content() {
+    border: 0;
+    padding: 0 0 @collapsible-content__indent;
+}
+
+.admin__collapsible-title() {
+    clear: both;
+    color: @collapsible-title__color;
+    cursor: pointer;
+    display: block;
+    font-size: @collapsible-title__font-size;
+    font-weight: @font-weight__semibold;
+    letter-spacing: .025em;
+    padding: @collapsible-title__padding-top (@collapsible-title-icon__size + 1rem) @collapsible-title__padding-bottom 0;
+    position: relative;
+    text-decoration: none;
+    transition: color .15s linear;
+    &:hover {
+        color: @collapsible-title__hover__color;
+        text-decoration: none;
+    }
+    &:active {
+        &:before {
+            .scale();
+        }
+    }
+    &._disabled,
+    &.disabled {
+        color: @collapsible-title__disabled__color;
+        cursor: default;
+    }
+    &:before {
+        &:extend(.abs-icon all);
+        content: @icon-expand-open__content;
+        font-size: @collapsible-title-icon__size;
+        position: absolute;
+        right: 1.3rem;
+        top: 2.3rem;
+    }
+}
+
+.admin__collapsible-sub-title() {
+    padding-left: (@collapsible-title-icon__size + 1rem);
+    padding-right: 0;
+    &:before {
+        left: 0;
+        right: auto;
+    }
+}
+
+.admin__collapsible-text() {
+    margin-bottom: .5em;
+    margin-top: 1rem;
+}
+
+//
+
+.admin__collapsible-block-wrapper {
+    .admin__collapsible-block-wrapper();
+    .admin__collapsible-title {
+        .admin__collapsible-title();
+    }
+    &.opened {
+        > .fieldset-wrapper-title {
+            .admin__collapsible-title {
+                &:before {
+                    content: @icon-expand-close__content;
+                }
+            }
+        }
+        &.fieldset-wrapper {
+            .fieldset-wrapper-title {
+                .actions {
+                    display: block;
+                }
+            }
+        }
+    }
+    &.fieldset-wrapper {
+        border-bottom: 1px solid @collapsible__border-color;
+        padding: 0;
+        .fieldset-wrapper-title {
+            border: 0;
+            margin: 0;
+            padding: 0;
+            .actions {
+                display: none;
+            }
+        }
+        .fieldset-wrapper-content {
+            padding-bottom: @collapsible-title__padding-bottom;
+        }
+    }
+    &.collapsible-block-wrapper-last {
+        border-bottom: 0;
+    }
+}
+
+.fieldset-wrapper {
+    .admin__collapsible-block-wrapper {
+        .fieldset-wrapper-title {
+            .actions {
+                position: absolute;
+                right: 1.3rem;
+                top: 1.4rem;
+            }
+            .draggable-handle {
+                top: 2.4rem;
+            }
+        }
+        .admin__collapsible-title {
+            font-size: 1.6rem;
+            padding-left: (@collapsible-title-icon__size + 1rem);
+            &:before {
+                left: 0;
+                right: auto;
+                top: 2.2rem;
+            }
+        }
+    }
+}
+
+//
+//  Legacy code
+//  ---------------------------------------------
+
+.admin__collapsible-block {
+    .comment {
+        // ToDo UI: rename to .collapsible-text
+        .admin__collapsible-text();
+    }
+    //  Second level
+    .admin__collapsible-block {
+        border: 0;
+        .entry-edit-head {
+            > a {
+                .admin__collapsible-sub-title();
+            }
+        }
+    }
+    ~ .admin__collapsible-block {
+        // ToDo UI: rename to .collapsible-content
+        .admin__collapsible-content();
+    }
+}
+
+.section-config > .admin__collapsible-block > a,
+.accordion > dt a,
+.accordion .admin__collapsible-block > a {
+    .admin__collapsible-title();
+    > i {
+        // ToDo UI: change to .collapsible-sub-title
+        display: block;
+        font-size: @collapsible-title-support-text__font-size;
+        font-style: italic;
+        font-weight: @font-weight__regular;
+        padding-top: .4rem;
+    }
+}
+
+.section-config.active > .admin__collapsible-block > a:before,
+.accordion > dt.open a:before,
+.accordion .admin__collapsible-block.open a:before {
+    content: @icon-expand-close__content;
+}
+
+.section-config.active > .admin__collapsible-block + input + fieldset,
+.accordion > dt + dd.open,
+.accordion .admin__collapsible-block.open + input + fieldset {
+    display: block;
+    margin: 0;
+}
+
+//  Sortable collapsible blocks
+
+.sortable-wrapper {
+    margin-bottom: 1.5rem;
+}
+
+//
+//  Accordion
+//  ---------------------------------------------
+
+.accordion {
+    margin: 0 0 .8rem;
+    padding: 0;
+    dt {
+        border-bottom: 1px solid @collapsible__border-color;
+        &.open {
+            border-bottom: none;
+        }
+    }
+    dd {
+        border-bottom: 1px solid @collapsible__border-color;
+        display: none;
+        &.open {
+            &:empty {
+                background: #fff url(../../../../../../web/mui/images/ajax-loader-big.gif) no-repeat center;
+                height: 100px;
+            }
+        }
+    }
+    dt,
+    dd {
+        &:last-of-type {
+            border-bottom: none;
+        }
+    }
+    .form-inline {
+        .config {
+            td {
+                padding: 2.2rem 1.5rem 0 0;
+            }
+            .scope-label {
+                padding: 31px 1.5rem 0 0;
+            }
+            .value {
+                padding-right: 4rem;
+            }
+        }
+        > .section-config {
+            &:last-child {
+                border-bottom: 0;
+            }
+        }
+    }
+    .config {
+        .comment a,
+        .link-more {
+            color: #007dbd;
+            font-size: @font-size__base;
+            font-weight: 400;
+            &:focus,
+            &:hover {
+                text-decoration: underline;
+            }
+        }
+        legend {
+            display: none;
+        }
+        table {
+            width: 100%;
+        }
+        td {
+            padding: 2.2rem 1.5rem 0 0;
+            vertical-align: top;
+        }
+        td[colspan] {
+            padding: 0;
+        }
+        input[type='text'],
+        input[type='password'],
+        select,
+        textarea {
+            width: 100%;
+        }
+        input {
+            &.input-file {
+                margin-top: 4px;
+            }
+        }
+        select {
+            &.select-date {
+                width: 27%;
+            }
+        }
+        .label {
+            color: #303030;
+            float: none;
+            font-size: 14px;
+            font-weight: 600;
+            padding-right: 30px;
+            text-align: right;
+            width: 33%;
+            label {
+                padding-top: 7px;
+            }
+        }
+        .scope-label {
+            color: #999;
+            font-size: @font-size__s;
+            letter-spacing: .05em;
+            padding: 31px 1.5rem 0 0;
+        }
+        .note {
+            color: #303030;
+            font-size: 12px;
+            margin: 5px 0;
+            a {
+                color: #007dbd;
+                font-size: 12px;
+                font-weight: 400;
+                &:focus,
+                &:hover {
+                    text-decoration: underline;
+                }
+            }
+        }
+        .system-tooltip-box {
+            position: absolute;
+        }
+        .value {
+            padding-right: 40px;
+            vertical-align: middle;
+            width: 44%;
+            &.with-tooltip {
+                .tooltip {
+                    bottom: 0;
+                    float: right;
+                    left: 0;
+                    margin: 6px -28px 0 0;
+                    position: relative;
+                    right: 0;
+                    top: 0;
+                }
+                .tooltip-content {
+                    background: #31302b;
+                    background: rgba(49, 48, 43, .8);
+                    border-radius: 5px;
+                    bottom: 100%;
+                    font-size: 13px;
+                    line-height: 1.4;
+                    margin: 0 -17px 10px 0;
+                    max-width: 239px;
+                    padding: 18px;
+                    right: 0;
+                    width: 239px;
+                    &:before {
+                        border-bottom: 0;
+                        border-left: 5px solid transparent;
+                        border-right: 5px solid transparent;
+                        border-top: 5px solid #31302b;
+                        bottom: -5px;
+                        content: '';
+                        height: 0;
+                        left: auto;
+                        opacity: .8;
+                        position: absolute;
+                        right: 20px;
+                        top: auto;
+                        width: 0;
+                    }
+                }
+                .help {
+                    margin: 0;
+                    position: relative;
+                    width: auto;
+                }
+            }
+            .checkboxes {
+                list-style: none;
+                margin: -3px 0 0;
+                padding: 0;
+                li {
+                    margin: 7px 0;
+                }
+                input,
+                label {
+                    vertical-align: middle;
+                }
+                label {
+                    margin-left: 5px;
+                }
+            }
+            .label {
+                padding: 6px 5px 0 1.5rem;
+                vertical-align: top;
+                width: auto;
+                &:first-child {
+                    padding-left: 0;
+                }
+            }
+        }
+    }
+    .paypal-selection-simplified {
+        padding-left: 30px;
+    }
+    .paypal-selection {
+        border-bottom: 2px solid #c0bbaf;
+        margin: 10px;
+        width: 98%;
+        th {
+            padding: 6px 10px 7px;
+        }
+        input[type='checkbox'] {
+            margin: -4px 7px 0 0;
+        }
+    }
+    .paypal-payment-notice {
+        margin: 10px;
+    }
+    .custom-options {
+        border: 1px solid #999;
+        margin: 0 0 20px;
+        padding: 0 10px;
+    }
+}
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_page-nav.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_page-nav.less
index 0071951108a8b..20f9fd8ed9709 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_page-nav.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_page-nav.less
@@ -18,7 +18,7 @@
 
 @admin__page-nav-item__border-color: @border__color;
 @admin__page-nav-item__margin-vertical: 1.3rem;
-@admin__page-nav-item__margin-horizontal: .7rem;
+@admin__page-nav-item__margin-horizontal: @action__outer-indent;
 @admin__page-nav-item__active__color: @color-phoenix;
 @admin__page-nav-item__hover__background-color: darken(@admin__page-nav__background-color, 5%);
 
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/pages/_login.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/pages/_login.less
index bf9bfec974326..c6966df69c5c1 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/pages/_login.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/pages/_login.less
@@ -61,13 +61,13 @@
         font-size: 2.6rem;
         font-weight: @font-weight__light;
         line-height: @line-height__s;
-        margin: -1rem 0 .5rem;
+        margin: -1rem 0 2.5rem;
     }
     .admin__field-info {
         margin-bottom: 3rem;
     }
     .admin__field {
-        .extend__field-rows();
+        &:extend(.abs-field-rows all);
     }
     .messages {
         margin-top: -1rem;
diff --git a/app/design/adminhtml/Magento/backend/Magento_Config/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_Config/web/css/source/_module.less
new file mode 100644
index 0000000000000..14279a0ecfd92
--- /dev/null
+++ b/app/design/adminhtml/Magento/backend/Magento_Config/web/css/source/_module.less
@@ -0,0 +1,129 @@
+// /**
+//  * Copyright © 2015 Magento. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+//
+//  Stores -> Configuration
+//  _____________________________________________
+
+.section-config {
+    .admin__collapsible-block-wrapper();
+    .admin__collapsible-block {
+        tr {
+            &:last-child {
+                > td {
+                    > .section-config {
+                        border-bottom-color: transparent;
+                        padding-bottom: 0;
+                        > .config {
+                            padding-bottom: 0;
+                        }
+                    }
+                }
+            }
+        }
+    }
+    //  Sub blocks
+    .section-config {
+        .admin__collapsible-sub-block-wrapper();
+        .entry-edit-head {
+            > a {
+                .admin__collapsible-sub-title();
+            }
+        }
+    }
+    &.complex .section-config.with-button.enabled > .entry-edit-head, // PayPal connected
+    .config td.label label.enabled {
+        &:before {
+            &:extend(.abs-icon all);
+            background-color: @success__color;
+            border-radius: 100%;
+            color: @color-white;
+            content: @icon-check-mage__content; // ex "\e01e"
+            display: block;
+            float: left;
+            font-size: 1.6rem;
+            font-weight: @font-weight__regular;
+            height: 1em;
+            margin-left: -25px;
+            margin-top: .2rem;
+            overflow: hidden;
+            width: 1em;
+        }
+    }
+    &.config-advanced {
+        padding-top: @collapsible-content__indent;
+        .section-config {
+            padding-top: @collapsible-content__indent;
+        }
+    }
+    &.with-button {
+        padding: 2rem 0;
+        &.active {
+            padding-bottom: 0;
+            .config-heading {
+                margin-bottom: 2rem;
+            }
+        }
+        .section-config {
+            margin-left: 0;
+            .section-config {
+                margin-left: @collapsible-sub-block__indent;
+            }
+        }
+        .config-heading {
+            strong {
+                display: block;
+                font-size: @font-size__base;
+                font-weight: @font-weight__bold;
+                margin-bottom: .5rem;
+            }
+            .button-container {
+                margin: 1.5rem 0 0;
+            }
+        }
+        .button-container {
+            line-height: 28px;
+            a {
+                margin-left: 20px;
+            }
+        }
+        .action-configure {
+            &.open {
+                .state-opened {
+                    height: auto;
+                    overflow: auto;
+                    visibility: visible;
+                }
+            }
+            &.open .state-closed,
+            .state-opened {
+                height: 0;
+                overflow: hidden;
+                visibility: hidden;
+            }
+            span {
+                display: block;
+                position: relative;
+                text-align: center;
+            }
+        }
+    }
+    .config {
+        padding-bottom: @collapsible-content__indent;
+        h4 {
+            color: @collapsible-title__color;
+            font-size: @collapsible-title__font-size;
+            font-weight: @font-weight__semibold;
+            margin-bottom: 0;
+            padding-left: (@collapsible-title-icon__size + 1rem);
+            padding-top: @collapsible-content__indent;
+        }
+    }
+    > .config {
+        &.admin__collapsible-block {
+            display: none;
+        }
+    }
+}
diff --git a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order.less b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order.less
index 2b4e2e6093170..905245cc06bce 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order.less
@@ -102,12 +102,6 @@
     address {
         font-style: normal;
     }
-
-    .admin__table-secondary {
-        .admin__control-text {
-            width: 5.4rem;
-        }
-    }
 }
 
 .admin__page-section-title {
@@ -167,7 +161,6 @@
 //  ---------------------------------------------
 
 .tree-store-scope {
-    max-width: 50rem;
     .admin__field {
         margin: 0 0 1rem;
     }
diff --git a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_items.less b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_items.less
index 0f621df99f43c..d7e53b974b8d8 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_items.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_items.less
@@ -32,7 +32,7 @@
 }
 
 .order-search-items {
-    .grid {
+    .data-grid {
         .action-configure {
             float: right;
         }
diff --git a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_sidebar.less b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_sidebar.less
index 8ef7ff03c7c52..5b9f4d10b8cf4 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_sidebar.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_sidebar.less
@@ -34,6 +34,7 @@
         margin: 0 0 @order-create-sidebar__margin;
         .admin__field-label {
             display: block;
+            margin: 0 0 @order-create-sidebar__margin__m;
             text-align: left;
         }
     }
diff --git a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_total.less b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_total.less
index 699576bde84c7..9503592265553 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_total.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_total.less
@@ -7,6 +7,21 @@
 //  Totals
 //  ---------------------------------------------
 
+.order-subtotal-table {
+    .admin__control-text {
+        width: 5.4rem;
+    }
+    .admin__total-amount {
+        text-align: right;
+    }
+}
+
+.order-totals {
+    .admin__total-amount {
+        text-align: right;
+    }
+}
+
 .order-totals-actions {
     margin-top: @indent__s;
     .actions {
diff --git a/app/design/adminhtml/Magento/backend/Magento_Shipping/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_Shipping/web/css/source/_module.less
index c1ff50783ee78..73f61bc489957 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Shipping/web/css/source/_module.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Shipping/web/css/source/_module.less
@@ -75,7 +75,7 @@
     }
     .package-add-products {
         margin: @indent__base 0 0;
-        .grid {
+        .data-grid {
             padding: 0;
             button {
                 vertical-align: middle;
@@ -106,9 +106,21 @@
         }
     }
     .action-secondary {
+        &:extend(.abs-action-l all);
         float: right;
+        margin: 0 0 0 @popup__padding__horizontal;
     }
     .action-close {
         &:extend(.abs-action-tertiary all);
+        font-size: @button__large__font-size;
+        margin: 0 0 0 @popup__padding__horizontal;
+        padding: @button__large__padding-vertical 0;
+        &:before {
+            content: normal;
+        }
+        span {
+            position: static;
+            overflow: auto;
+        }
     }
 }
diff --git a/app/design/adminhtml/Magento/backend/Magento_Tax/web/css/source/module.less b/app/design/adminhtml/Magento/backend/Magento_Tax/web/css/source/module.less
index c987e84d5ba9b..7808918dfd846 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Tax/web/css/source/module.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Tax/web/css/source/module.less
@@ -3,10 +3,6 @@
 //  * See COPYING.txt for license details.
 //  */
 
-.block-footer .action-add {
-    &:extend(.admin__scope-old button all);
-}
-
 .mselect-items-wrapper {
     button {
         .button-reset();
diff --git a/app/design/adminhtml/Magento/backend/Magento_Theme/web/css/source/module.less b/app/design/adminhtml/Magento/backend/Magento_Theme/web/css/source/module.less
index 478bb5847fce9..a0f20e304a680 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Theme/web/css/source/module.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Theme/web/css/source/module.less
@@ -5,14 +5,6 @@
 
 // @group Header
 
-button {
-    border-radius: 2px;
-    .button();
-    &.primary {
-        .button-primary();
-    }
-}
-
 .main-col {
     min-height: 20rem; // ToDo UI: delete if sticky footer
 }
diff --git a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less
index d01685e141655..d3ef739a9435a 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less
@@ -41,6 +41,7 @@
 @data-grid-th__hover__background-color: lighten(@data-grid-th__background-color, 5%);
 
 @data-grid-th-marker__width: .7rem;
+@data-grid-th-marker__required__color: lighten(@color-light-phoenix, 10%);
 
 @data-grid-checkbox-cell-inner__padding-top: 1.1rem;
 @data-grid-checkbox-cell-inner__padding-horizontal: 1.8rem;
@@ -49,9 +50,15 @@
 
 //
 
+.admin__data-grid-outer-wrap {
+    position: relative; // Used to keep spinner inside
+}
+
 .admin__data-grid-wrap {
+    margin-bottom: 2rem;
+    max-width: 100%;
+    overflow-x: auto;
     padding-top: 0;
-    position: relative;
 }
 
 .admin__data-grid-loading-mask {
@@ -81,31 +88,26 @@
     border-left: none;
     border-right: none;
     border-top: none;
+    box-sizing: border-box; // ToDo UI: Rewrite old styles. Should be deleted afterwards
     font-size: @data-grid__font-size;
-    margin-bottom: 2rem;
     max-width: 100%;
+    margin-bottom: 0;
     width: 100%;
     thead {
-        background-color: transparent; // ToDo UI: Rewrite old styles. Should be deleted afterwards
+        background-color: transparent;
         color: @text__color; // ToDo UI: Rewrite old styles. Should be deleted afterwards
     }
+    tfoot {
+        th {
+            padding: @data-grid-cell__padding-vertical @data-grid-cell__padding-horizontal;
+        }
+    }
     tr {
         &:nth-child(even) {
             td {
                 background-color: @data-grid-td__even__background-color;
             }
         }
-        &:active {
-            td {
-                background-color: @data-grid-tr__active__background-color;
-            }
-        }
-        &:hover {
-            td {
-                background-color: @data-grid-tr__hover__background-color;
-                cursor: pointer;
-            }
-        }
         &.data-grid-tr-no-data {
             &:hover {
                 td {
@@ -115,6 +117,24 @@
             }
         }
     }
+    tbody {
+        tr {
+            &:active {
+                td {
+                    background-color: @data-grid-tr__active__background-color;
+                }
+            }
+            &:hover {
+                td {
+                    background-color: @data-grid-tr__hover__background-color;
+                }
+            }
+            &._clickable,
+            ._clickable {
+                cursor: pointer;
+            }
+        }
+    }
     th,
     td {
         font-size: @data-grid__font-size; // ToDo UI: Rewrite old styles. Should be deleted afterwards
@@ -173,11 +193,14 @@
     .data-grid-th {
         color: @data-grid-th__color;
         padding: @data-grid-th__padding-vertical @data-grid-th__padding-horizontal;
+        vertical-align: middle;
         &._sortable {
+            background-clip: padding-box; // Fix for border overlay in Firefox
             cursor: pointer;
             padding-right: @data-grid-th__padding-horizontal * 2 + @data-grid-th-marker__width;
             position: relative;
             transition: @smooth__background-color;
+            z-index: 1;
             &:focus,
             &:hover {
                 background-color: @data-grid-th__hover__background-color;
@@ -187,9 +210,20 @@
                 padding-top: @data-grid-th__padding-vertical + .1rem;
             }
         }
+        //  Required column
+        &.required {
+            > span {
+                &:after {
+                    content: '*';
+                    margin-left: .3rem;
+                    color: @data-grid-th-marker__required__color;
+                }
+            }
+        }
     }
     .data-grid-checkbox-cell {
         padding: 0;
+        width: @control-checkbox-radio__size + @data-grid-checkbox-cell-inner__padding-horizontal * 2;
         &:hover {
             cursor: default;
         }
@@ -197,7 +231,6 @@
     .data-grid-multiselect-cell {
         padding: @data-grid-th__padding-horizontal @data-grid-th__padding-vertical @data-grid-th__padding-horizontal - .1rem;
         text-align: center;
-        width: @control-checkbox-radio__size + @data-grid-checkbox-cell-inner__padding-horizontal * 2;
     }
     .data-grid-actions-cell {
         padding-left: @data-grid-cell__padding-horizontal * 2;
@@ -258,7 +291,8 @@
             &:before {
                 position: absolute;
                 right: @data-grid-th__padding-horizontal;
-                top: @data-grid-th__padding-vertical - .1rem;
+                top: 50%;
+                margin-top: -.75em;
             }
         }
         &._ascend {
@@ -311,3 +345,8 @@
         }
     }
 }
+.data-grid-th {
+    &._col-xs {
+        width: 1%;
+    }
+}
diff --git a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/data-grid/_data-grid-header.less b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/data-grid/_data-grid-header.less
index 6d5ecd492f8b6..a2dce53bec754 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/data-grid/_data-grid-header.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/data-grid/_data-grid-header.less
@@ -32,15 +32,15 @@
 
 .admin__data-grid-header {
     font-size: @font-size__base; // ToDo UI: should be deleted, added to prevent fz override with .grid
-    position: relative;
-    z-index: @data-grid-header__z-index - 1;
 }
 
 .admin__data-grid-header-row {
     &:extend(.abs-clearfix all);
-    margin-bottom: @data-grid-header-row__margin-bottom;
-    &:first-child {
-        margin-bottom: @data-grid-header-row__margin-bottom - @data-grid-header-add-indent__bottom;
+    + .admin__data-grid-header-row {
+        margin-top: @data-grid-header-row__margin-bottom - @data-grid-header-add-indent__bottom;
+    }
+    &:last-child {
+        margin-bottom: @data-grid-header-row__margin-bottom;
     }
     .action-select-wrap {
         display: block;
diff --git a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/data-grid/data-grid-header/_data-grid-action-columns.less b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/data-grid/data-grid-header/_data-grid-action-columns.less
index e4148e87f4dbb..fe7365ba224c4 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/data-grid/data-grid-header/_data-grid-action-columns.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/data-grid/data-grid-header/_data-grid-action-columns.less
@@ -34,7 +34,7 @@
             content: @icon-systems__content;
             font-size: 1.8rem; // Static
             left: .3rem;
-            margin-right: .7rem;
+            margin-right: @action__outer-indent;
             vertical-align: top;
         }
     }
diff --git a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/data-grid/data-grid-header/_data-grid-filters.less b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/data-grid/data-grid-header/_data-grid-filters.less
index 66df9bda92aae..7689e57c9b1d1 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/data-grid/data-grid-header/_data-grid-filters.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/data-grid/data-grid-header/_data-grid-filters.less
@@ -26,6 +26,7 @@
 @data-grid-filters-action__active__border-color: @color-gray80;
 @data-grid-filters-action__active__color: @color-phoenix;
 
+@data-grid-filters-current__margin-borrom: .9rem;
 @data-grid-filters-current-action-remove__background-color: @color-gray68;
 @data-grid-filters-current-action-remove__hover__background-color: darken(@data-grid-filters-current-action-remove__background-color, 10%);
 @data-grid-filters-current-action-remove__size: 1.6rem;
@@ -144,7 +145,7 @@
     clear: both;
     font-size: @data-grid-filters__font-size;
     max-height: 0;
-    transition: opacity .3s ease, padding .3s ease;
+    transition: opacity .3s ease;
     &._show {
         .appearing__on();
         border-bottom: 1px solid @data-grid-filters-action__active__border-color;
@@ -255,21 +256,30 @@
 
 //  Current chips
 .admin__data-grid-filters-current {
-    border-bottom: 1px solid @data-grid-filters-action__active__border-color;
-    border-top: 1px solid @data-grid-filters-action__active__border-color;
+    border-bottom: .1rem solid @data-grid-filters-action__active__border-color;
+    border-top: .1rem solid @data-grid-filters-action__active__border-color;
     display: none;
     font-size: @data-grid-filters__font-size;
-    margin-bottom: .9rem;
+    margin-bottom: @data-grid-filters-current__margin-borrom;
     padding-bottom: .8rem;
     padding-top: 1.1rem;
     width: 100%;
     &._show {
         display: table;
+        position: relative;
+        top: -1px;
+        z-index: 3;
+        + .admin__data-grid-filters-wrap {
+            &._show {
+                margin-top: -(@data-grid-filters-current__margin-borrom + .1rem);
+            }
+        }
     }
 }
 
 .admin__current-filters-list-wrap,
-.admin__current-filters-title-wrap {
+.admin__current-filters-title-wrap,
+.admin__current-filters-actions-wrap {
     display: table-cell;
     vertical-align: top;
 }
@@ -318,3 +328,12 @@
         }
     }
 }
+
+.admin__current-filters-actions-wrap {
+    .action-clear {
+        border: none;
+        padding-bottom: 0;
+        padding-top: 0;
+        white-space: nowrap;
+    }
+}
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/_actions.less b/app/design/adminhtml/Magento/backend/web/css/source/_actions.less
index 0353568d0e94a..a0e4de74eaa16 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/_actions.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/_actions.less
@@ -47,10 +47,11 @@
 
 //  Secondary button
 @button-secondary__background-color: @color-brownie;
-@button-secondary__border-color: @color-brownie;
+@button-secondary__border-color: @button-secondary__background-color;
 @button-secondary__color: @color-white;
 @button-secondary__active__background-color: @color-very-dark-gray-black2;
 @button-secondary__hover__background-color: @color-very-dark-gray-black2;
+@button-secondary__hover__border-color: @button-secondary__hover__background-color;
 
 //  Triangle marker
 @button-marker-triangle__height: .5rem;
@@ -77,6 +78,17 @@
     }
 }
 
+.action-icon() {
+    background-color: transparent;
+    border-color: transparent;
+    box-shadow: none;
+    &:hover {
+        background-color: transparent;
+        border-color: transparent;
+        box-shadow: none;
+    }
+}
+
 //  Used in action dropdown, actions split & all other actions with triangle marker
 .action-toggle-triangle (
     @_dropdown__padding-right: 3rem;
@@ -257,6 +269,7 @@ button {
     &:active,
     &:focus {
         background-color: @button-secondary__hover__background-color;
+        border-color: @button-secondary__hover__border-color;
         box-shadow: @button__hover__box-shadow;
         color: @button-secondary__color;
         text-decoration: none;
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/_classes.less b/app/design/adminhtml/Magento/backend/web/css/source/_classes.less
index 2b420d0e88ff9..7562f5de527b2 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/_classes.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/_classes.less
@@ -14,3 +14,8 @@
         .disabled();
     }
 }
+
+//  Text align classes
+.a-center { //  ToDo UI: should be renamed to ._text-center
+    text-align: center;
+}
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/_components.less b/app/design/adminhtml/Magento/backend/web/css/source/_components.less
index a70fc496ce35d..906c538fc04f7 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/_components.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/_components.less
@@ -11,6 +11,3 @@
 @import 'components/_calendar-temp.less';
 @import 'components/_messages.less';
 @import 'components/_popups.less';
-
-@import 'components/_data-grid-temp.less';
-
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/_forms.less b/app/design/adminhtml/Magento/backend/web/css/source/_forms.less
index 624092c1068bb..2e18751ca4955 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/_forms.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/_forms.less
@@ -3,8 +3,7 @@
 //  * See COPYING.txt for license details.
 //  */
 
+@import (reference) 'forms/_extends.less';
 @import 'forms/_controls.less';
 @import 'forms/_fields.less';
-@import 'forms/_tooltip.less';
 @import 'forms/_temp.less';
-@import 'forms/_checkbox-radio.less';
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/_sources.less b/app/design/adminhtml/Magento/backend/web/css/source/_sources.less
index 197d0d89a271c..90feff4f7b55a 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/_sources.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/_sources.less
@@ -20,6 +20,7 @@
 @import '_extends.less';
 @import '_tabs.less';
 @import '_structure.less';
+@import '_classes.less';
 
 //
 //  Components
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/_tables.less b/app/design/adminhtml/Magento/backend/web/css/source/_tables.less
index c72dda6889519..5e53b58063d53 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/_tables.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/_tables.less
@@ -38,6 +38,10 @@ table {
     }
 }
 
+.admin__table-wrapper {
+    .table-overflow();
+}
+
 .admin__table-primary,
 .admin__table-secondary {
     width: 100%;
@@ -91,28 +95,25 @@ table {
         margin-bottom: .75em;
         text-align: left;
     }
+    thead {
+        th {
+            background-color: transparent;
+            font-weight: @font-weight__semibold;
+        }
+    }
     tbody {
         th {
             vertical-align: top;
         }
-    }
-    tr {
-        &:nth-child(odd) {
-            th,
-            td {
-                background-color: @admin__table-secondary-cell__odd__color;
+        tr {
+            &:nth-child(odd) {
+                th,
+                td {
+                    background-color: @admin__table-secondary-cell__odd__color;
+                }
             }
         }
     }
-    th,
-    td {
-        padding: @admin__table-secondary__padding-horizontal @admin__table-secondary__padding-vertical;
-        text-align: left;
-    }
-    th {
-        color: @admin__table-secondary-th__color;
-        font-weight: @font-weight__regular;
-    }
     tfoot {
         tr {
             &:nth-child(odd) {
@@ -126,7 +127,13 @@ table {
             }
         }
     }
-    .admin__total-amount {
-        text-align: right;
+    th,
+    td {
+        padding: @admin__table-secondary__padding-horizontal @admin__table-secondary__padding-vertical;
+        text-align: left;
+    }
+    th {
+        color: @admin__table-secondary-th__color;
+        font-weight: @font-weight__regular;
     }
 }
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-select.less b/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-select.less
index 496f6269e8b3d..774c67ff905c5 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-select.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-select.less
@@ -51,6 +51,7 @@
         }
     }
     &._active {
+        z-index: @action-select__z-index;
         .action-select {
             border-color: @field-control__active__border-color;
             &:before {
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_calendar-temp.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_calendar-temp.less
index 621b01524dcee..1df52149aa19d 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/components/_calendar-temp.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/components/_calendar-temp.less
@@ -22,29 +22,38 @@
 //  Datepicker control
 //  ---------------------------------------------
 
-.admin__control-text {
-    &.hasDatepicker {
+.hasDatepicker {
+    &.admin__control-text {
         width: 15rem;
     }
     + .ui-datepicker-trigger {
         .button-reset();
         .icon-font(
-            @_icon-font-content: @icon-calendar__content,
-            @_icon-font: @icons-admin__font-name,
-            @_icon-font-size: 2.1rem,
-            @_icon-font-line-height: @action__height,
-            @_icon-font-text-hide: true,
-            @_icon-font-position: after,
-            @_icon-font-color: @ui-datepicker-icon__color
+        @_icon-font-content: @icon-calendar__content,
+        @_icon-font: @icons-admin__font-name,
+        @_icon-font-size: 2.1rem,
+        @_icon-font-line-height: @action__height,
+        @_icon-font-text-hide: true,
+        @_icon-font-position: after,
+        @_icon-font-color: @ui-datepicker-icon__color
         );
+        display: inline-block;
         height: @action__height;
+        margin-left: -@action__height;
         overflow: hidden;
+        position: absolute;
         vertical-align: top;
-        margin-left: -@action__height;
-        display: inline-block;
+        z-index: 1;
         &:active {
             .scale(.975);
         }
+        + .admin__control-support-text,
+        + .admin__control-label {
+            margin-left: @action__height + .5rem;
+        }
+        img {
+            display: none;
+        }
     }
 }
 
@@ -83,6 +92,7 @@
 //
 //  Previous, next buttons
 //  ---------------------------------------------
+
 .ui-datepicker-prev,
 .ui-datepicker-next {
     cursor: pointer;
@@ -294,6 +304,7 @@
 
 .ui-timepicker-div {
     padding: 10px 0 5px 0;
+    position: relative;
 }
 
 .ui-datepicker-rtl {
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_data-grid-temp.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_data-grid-temp.less
deleted file mode 100644
index 2dded4e6efea6..0000000000000
--- a/app/design/adminhtml/Magento/backend/web/css/source/components/_data-grid-temp.less
+++ /dev/null
@@ -1,321 +0,0 @@
-// /**
-//  * Copyright © 2015 Magento. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
-
-//
-//  Variables
-//  ---------------------------------------------
-
-@data-grid-temp__font-size: 1.3rem;
-@data-grid-temp__margin-xs: 1rem;
-@data-grid-temp__margin: 2rem;
-@data-grid-temp__color: @text__color;
-
-@data-grid-temp-cell__border-width: 1px;
-@data-grid-temp-cell__padding-horizontal: @data-grid-temp__margin-xs;
-@data-grid-temp-cell__padding-vertical: @data-grid-temp__margin-xs;
-
-@data-grid-temp-td__border-color: @color-gray84;
-@data-grid-temp-td__border-inner-style: dashed;
-@data-grid-temp-td__border-outer-style: solid;
-@data-grid-temp-td__even__background-color: @color-white-smoke;
-@data-grid-temp-td__hover__background-color: #e5f7fe;
-@data-grid-temp-td__odd__background-color: @page__background-color;
-
-@data-grid-temp-th__border-color: #8a837f;
-@data-grid-temp-th__border-style: solid;
-@data-grid-temp-th__background-color: @color-brownie;
-@data-grid-temp-th__color: @color-white;
-@data-grid-temp-th__padding-horizontal: @data-grid-temp-cell__padding-horizontal;
-@data-grid-temp-th__padding-vertical: @data-grid-temp-cell__padding-vertical;
-@data-grid-temp-th__hover__background-color: lighten(@data-grid-temp-th__background-color, 5%);
-
-//  Pager
-@data-grid-temp-pager__width: 4rem;
-@data-grid-temp-pager-icon__color: @data-grid-temp-th__background-color;
-@data-grid-temp-pager-icon-previous__content: @icon-caret-left__content;
-@data-grid-temp-pager-icon-next__content: @icon-caret-right__content;
-
-//
-//  Temporary grid styles
-//  ---------------------------------------------
-
-.grid {
-    .hor-scroll {
-        overflow-x: auto;
-    }
-    table {
-        &:not(.data-table) {
-            border: none;
-            font-size: @data-grid-temp__font-size;
-            margin-bottom: @data-grid-temp__margin;
-            max-width: 100%;
-            width: 100%;
-
-            thead {
-                background-color: transparent;
-                color: @data-grid-temp__color;
-            }
-
-            tr {
-                &:nth-child(even) {
-                    td {
-                        background-color: @data-grid-temp-td__even__background-color;
-                    }
-                }
-                &:last-child {
-                    td {
-                        border-bottom: @data-grid-temp-cell__border-width @data-grid-temp-td__border-outer-style @data-grid-temp-td__border-color;
-                    }
-                }
-                &:hover {
-                    td {
-                        background-color: @data-grid-temp-td__hover__background-color;
-                        cursor: pointer;
-                    }
-                }
-            }
-
-            th,
-            td {
-                font-size: @data-grid-temp__font-size;
-                line-height: @line-height__base;
-                transition: background-color .3s;
-                vertical-align: top;
-                &:last-child {
-                    padding-left: @data-grid-temp__margin;
-                    padding-right: @data-grid-temp__margin;
-                }
-            }
-
-            td {
-                background-color: @data-grid-temp-td__odd__background-color;
-                border-left: @data-grid-temp-cell__border-width @data-grid-temp-td__border-inner-style @data-grid-temp-td__border-color;
-                border-right: @data-grid-temp-cell__border-width @data-grid-temp-td__border-inner-style @data-grid-temp-td__border-color;
-                color: @table__color;
-                padding: @data-grid-temp-cell__padding-vertical @data-grid-temp-cell__padding-horizontal;
-                &:first-child {
-                    border-left-style: @data-grid-temp-td__border-outer-style;
-                }
-                &:last-child {
-                    border-right-style: @data-grid-temp-td__border-outer-style;
-                    width: 1%; // Making last action smallest column
-                }
-                .action-menu {
-                    left: auto;
-                    z-index: 1;
-                }
-            }
-
-            th {
-                background-color: @data-grid-temp-th__background-color;
-                border-left-color: transparent;
-                border: @data-grid-temp-cell__border-width @data-grid-temp-th__border-style @data-grid-temp-th__border-color;
-                color: @data-grid-temp-th__color;
-                font-weight: @font-weight__semibold;
-                padding: @data-grid-temp-cell__padding-vertical @data-grid-temp-cell__padding-horizontal;
-                text-align: left;
-                &:first-child {
-                    border-left-color: @data-grid-temp-th__border-color;
-                }
-                a {
-                    color: @data-grid-temp-th__color;
-                    &:active,
-                    &:visited {
-                        color: @data-grid-temp-th__color;
-                    }
-                    &:hover {
-                        color: @data-grid-temp-th__color;
-                        text-decoration: none;
-                    }
-                }
-            }
-
-            //  Filters from mui/table.less
-            .filter {
-                th {
-                    padding: 6px 3px;
-                    vertical-align: top;
-                }
-                .ui-datepicker-trigger {
-                    cursor: pointer;
-                    margin-top: 2px;
-                    img {
-                        display: none;
-                    }
-                }
-                .range-line:not(:last-child) {
-                    margin-bottom: 5px;
-                }
-                .date {
-                    padding-right: 28px;
-                    position: relative;
-                    .hasDatepicker {
-                        vertical-align: top;
-                        width: 99%;
-                    }
-                    .ui-datepicker-trigger {
-                        .icon-font(
-                        @icon-calendar,
-                            @_icon-font-color: @data-grid-temp-td__even__background-color,
-                            @_icon-font-color-hover: @data-grid-temp-td__hover__background-color,
-                            @_icon-font-size: 42px,
-                            @_icon-font-line-height: 30px
-                        );
-                        background-color: transparent;
-                        border: none;
-                        margin: 0;
-                        padding: 0;
-                        position: absolute;
-                        right: -3px;
-                        top: -3px;
-                        > span {
-                            position: absolute;
-                            visibility: hidden;
-                            z-index: -1;
-                        }
-                        &:active {
-                            top: -2px;
-                        }
-                        &:focus {
-                            box-shadow: none;
-                            outline: 0;
-                        }
-                        &:before {
-                            height: 2.9rem;
-                            margin-left: .5rem;
-                            width: 3.5rem;
-                        }
-                        &:after {
-                            display: none;
-                        }
-                    }
-                }
-            }
-            //  Filters from mui/table.less
-        }
-    }
-
-    .not-sort {
-        padding-right: @data-grid-temp__margin-xs;
-    }
-
-    .sort-arrow-asc,
-    .sort-arrow-desc {
-        padding-right: @data-grid-temp__margin;
-        position: relative;
-        &:after {
-            position: absolute;
-            right: 0;
-            top: -1px;
-        }
-    }
-
-    .sort-arrow-asc {
-        .icon-font(
-        @icon-caret-down__content,
-        @_icon-font: @icons-admin__font-name,
-        @_icon-font-color: @data-grid-temp-th__color,
-        @_icon-font-size: 15px,
-        @_icon-font-position: after
-        );
-    }
-
-    .sort-arrow-desc {
-        .icon-font(
-        @icon-caret-up__content,
-        @_icon-font: @icons-admin__font-name,
-        @_icon-font-color: @data-grid-temp-th__color,
-        @_icon-font-size: 15px,
-        @_icon-font-position: after
-        );
-    }
-
-    .pager {
-        float: none;
-        text-align: center;
-    }
-}
-
-//
-//  Grid actions
-//  ---------------------------------------------
-
-.grid-actions {
-    &:extend(.abs-clearfix all);
-    margin: 0 0 @data-grid-temp__margin;
-    position: relative;
-
-    .export,
-    .filter-actions {
-        float: right;
-        margin-left: @data-grid-temp__margin-xs;
-        vertical-align: top;
-    }
-}
-
-//
-//  Pager
-//  ---------------------------------------------
-
-.pager {
-    float: left;
-    margin: 0 1.5rem 0 0;
-    position: relative;
-
-    .pages-total-found {
-        margin-right: 2.5rem
-    }
-    .pages-total {
-        margin: 0 @data-grid-temp__margin-xs 0 0;
-    }
-
-    .view-pages {
-        .admin__control-select {
-            margin: 0 @data-grid-temp__margin-xs;
-        }
-    }
-
-    label {
-        &.page {
-            &:extend(.abs-visually-hidden all);
-        }
-    }
-
-    .input-text,
-    .admin__control-text {
-        margin: 0 1rem;
-        min-width: 0;
-        text-align: center;
-        width: @data-grid-temp-pager__width;
-    }
-
-    .action-previous {
-        .icon-font(
-            @data-grid-temp-pager-icon-previous__content,
-            @_icon-font: @icons-admin__font-name,
-            @_icon-font-color: @data-grid-temp-pager-icon__color,
-            @_icon-font-size: 17px,
-            @_icon-font-text-hide: true
-        );
-
-    }
-    .action-next {
-        .icon-font(
-            @data-grid-temp-pager-icon-next__content,
-            @_icon-font: @icons-admin__font-name,
-            @_icon-font-color: @data-grid-temp-pager-icon__color,
-            @_icon-font-size: 17px,
-            @_icon-font-text-hide: true
-        );
-    }
-    .action-default {
-        margin-right: @data-grid-temp__margin-xs;
-        padding: .3em .9em;
-        vertical-align: top;
-        &:before {
-            font-weight: @font-weight__bold;
-        }
-    }
-}
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_popups.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_popups.less
index b6d5c27d02ce0..bd58db5506638 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/components/_popups.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/components/_popups.less
@@ -91,14 +91,14 @@
     .ui-dialog-buttonpane {
         padding: 0 @popup__padding__horizontal @popup__padding__vertical;
     }
-    
+
     .content + .ui-dialog-buttonset {
         padding-top: @popup__padding__vertical;
         text-align: right;
     }
 
     .ui-dialog-buttonset {
-        .extend__clearfix();
+        &:extend(.abs-clearfix all);
     }
 
     .action-close {
@@ -106,6 +106,13 @@
         font-size: @button__large__font-size;
         margin: 0 0 0 @popup__padding__horizontal;
         padding: @button__large__padding-vertical 0;
+        &:before {
+            content: normal;
+        }
+        span {
+            position: static;
+            overflow: auto;
+        }
     }
 
     .ui-button,
@@ -115,7 +122,7 @@
         float: right;
         margin: 0 0 0 @popup__padding__horizontal;
     }
-    
+
     .fieldset {
         &:last-child {
             padding-bottom: 0;
@@ -144,7 +151,7 @@
     .pager {
         padding-bottom: 0;
     }
-    
+
     .grid-actions {
         padding-top: 0;
     }
@@ -237,10 +244,10 @@
     .main-col,
     .magento_message {
         .insert-title-inner {
+            &:extend(.abs-clearfix all);
             border-bottom: 1px solid @color-gray68;
             margin: 0 0 @indent__base;
             padding-bottom: @indent__xs;
-            .extend__clearfix();
         }
         .insert-actions {
             float: right;
@@ -257,8 +264,11 @@
         }
 
         .breadcrumbs {
+            list-style: none;
             padding-left: 0;
             li {
+                display: inline-block;
+                margin: 0 @indent__xs @indent__xs 0;
                 &:after {
                     content: '';
                     margin: 0 @indent__xs 0 0;
@@ -308,7 +318,7 @@
         }
 
         #contents-uploader {
-            .extend__clearfix()
+            &:extend(.abs-clearfix all);
         }
 
         .x-tree {
@@ -343,12 +353,13 @@
     top: 0;
 }
 
+//  The message/dialog popup
 .ui-popup-message {
     .ui-dialog-titlebar {
         background: @color-lazy-sun;
-        font-size: 1.6rem;
+        font-size: 1.4rem;
         font-weight: @font-weight__bold;
-        padding: 2rem 2rem 0;
+        padding: 2rem 2rem 0 7.5rem;
     }
     .ui-dialog-titlebar-close {
         right: 1.5rem;
@@ -360,6 +371,7 @@
     .ui-dialog-content {
         background: @color-lazy-sun;
         margin-bottom: 0;
+        overflow: inherit;
         padding: 0 2rem 2rem;
         .messages,
         .message {
@@ -367,6 +379,17 @@
                 margin-bottom: 0;
             }
         }
+        .message {
+            &:first-child {
+                padding-top: 0;
+                &:before {
+                    top: 0;
+                }
+            }
+            &:last-child {
+                padding-bottom: 0;
+            }
+        }
     }
     .ui-dialog-buttonpane {
         background: @color-lazy-sun;
@@ -473,9 +496,9 @@
     }
 
     .magento_buttons {
+        &:extend(.abs-clearfix all);
         padding: 0 @popup__padding__horizontal @popup__padding__vertical;
         text-align: right;
-        .extend__clearfix();
 
         .ok_button {
             &:extend(.ui-dialog .action-primary all);
@@ -526,9 +549,9 @@
     .popup-title {
         &:extend(.ui-dialog .ui-dialog-titlebar all);
         background: @color-lazy-sun;
-        font-size: 1.6rem;
+        font-size: 1.4rem;
         font-weight: @font-weight__bold;
-        padding: 2rem 2rem 0;
+        padding: 2rem 2rem 0 7.5rem;
     }
 
     .popup-header {
@@ -538,8 +561,8 @@
     }
 
     .popup-content {
+        &:extend(.abs-clearfix all);
         background: @color-lazy-sun;
-        .extend__clearfix();
         padding: 0 2rem 2rem;
         p {
             margin-top: 0;
@@ -549,8 +572,19 @@
                 margin-bottom: 0;
             }
         }
+        .message {
+            &:first-child {
+                padding-top: 0;
+                &:before {
+                    top: 0;
+                }
+            }
+            &:last-child {
+                padding-bottom: 0;
+            }
+        }
     }
-    
+
     .fieldset {
         background: @color-lazy-sun;
         border: 0;
@@ -565,16 +599,16 @@
     .messages {
         margin: 0 !important;
     }
-    
+
     .actions {
+        &:extend(.abs-clearfix all);
         margin: 0;
         text-align: right;
-        .extend__clearfix();
 
         .primary {
             &:extend(.ui-dialog .action-primary all);
-            font-size: 1.4rem;
             float: right;
+            line-height: inherit;
             margin: 0 0 0 @popup__padding__horizontal;
             &:hover {
                 box-shadow: none;
@@ -582,8 +616,8 @@
         }
 
         .cancel {
+            line-height: inherit;
             &:extend(.ui-dialog .action-close all);
-            font-size: 1.4rem;
             &:hover {
                 box-shadow: none;
             }
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_spinner.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_spinner.less
index c9eb6f63a9e7e..e0a5ae51bbd46 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/components/_spinner.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/components/_spinner.less
@@ -101,7 +101,7 @@
 .loading-old,
 .loading-mask {
     background: rgba(255, 255, 255, .4);
-    z-index: 999;
+    z-index: 2003;
 }
 
 .loading-old,
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_control-table.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/_control-table.less
deleted file mode 100644
index 4d4875471506f..0000000000000
--- a/app/design/adminhtml/Magento/backend/web/css/source/forms/_control-table.less
+++ /dev/null
@@ -1,58 +0,0 @@
-// /**
-//  * Copyright © 2015 Magento. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
-
-//
-//  Variables
-//  _____________________________________________
-
-// @todo ui - rebuilt dynamic table control
-
-//
-//  Table control
-//  ---------------------------------------------
-
-.admin__control-table-wrapper {
-    max-width: 100%;
-    overflow-x: auto;
-    overflow-y: hidden;
-}
-
-.admin__control-table {
-    width: 100%;
-    thead {
-        background: none;
-    }
-    td,
-    th {
-        background: @color-white-dark-smoke;
-        border: 0;
-        border-bottom: 1px solid @color-white;
-        padding: 1.3rem 2.5rem 1.3rem 0;
-        text-align: left;
-        vertical-align: top;
-        &:first-child {
-            padding-left: 1.5rem;
-        }
-    }
-    th {
-        border: 0;
-        vertical-align: bottom;
-        color: @color-very-dark-gray-black;
-        font-size: @font-size__base;
-        font-weight: @font-weight__semibold;
-        padding-bottom: 0;
-        &._required {
-            span {
-                &:after {
-                    color: @field-label__required__color;
-                    content: '*';
-                }
-            }
-        }
-    }
-    .action-delete {
-        &:extend(.abs-action-delete all);
-    }
-}
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_controls.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/_controls.less
index 3c8edc3286994..9eead6e701250 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/forms/_controls.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/_controls.less
@@ -3,8 +3,11 @@
 //  * See COPYING.txt for license details.
 //  */
 
-@import (reference) '_extends.less';
-@import '_control-table.less';
+//
+//  Components
+//  _____________________________________________
+
+@import 'controls/_checkbox-radio.less';
 
 //
 //  Variables
@@ -99,7 +102,6 @@
     background-position+: ~'calc(100% - 33px)' 0;
     background-size+: 1px 100%;
 
-    height: @field-control__height;
     padding-right: 4.4rem; // Distance between select switch and inner text
     transition: @smooth__border-color;
 
@@ -190,11 +192,14 @@ option:empty {
     line-height: @field-control__line-height;
     padding-top: @field-control__padding-top;
     padding-bottom: @field-control__padding-bottom;
+    + [class*='admin__control-'] {
+        margin-left: @action__outer-indent;
+    }
 }
 
 [class*='admin__control-'] {
     + .admin__control-support-text {
-        margin-left: .7rem;
+        margin-left: @action__outer-indent;
     }
 }
 
@@ -304,7 +309,7 @@ option:empty {
         }
     }
     .admin__addon {
-        min-width: auto;
+        min-width: 0;
         overflow: hidden;
         text-align: right;
         white-space: nowrap;
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_extends.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/_extends.less
index 0a883946949c2..b3418c97be279 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/forms/_extends.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/_extends.less
@@ -24,10 +24,6 @@
 //  Transformation to rows form layout
 //  ---------------------------------------------
 
-.extend__field-rows() {
-    &:extend(.abs-field-rows all);
-}
-
 .abs-field-rows[class] {
     > .admin__field-control {
         float: none;
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less
index def207f2a0bb7..9bece984eb4ef 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less
@@ -3,6 +3,13 @@
 //  * See COPYING.txt for license details.
 //  */
 
+//
+//  Components
+//  _____________________________________________
+
+@import 'fields/_control-table.less';
+@import 'fields/_field-tooltips.less';
+
 //
 //  Variables
 //  _____________________________________________
@@ -44,7 +51,7 @@
         #mix-grid .row();
 
         &.admin__field-wide {
-            .extend__field-rows();
+            &:extend(.abs-field-rows all);
         }
         > .admin__field-control {
             #mix-grid .column(4,9);
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_temp.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/_temp.less
index 53a728106a5af..2ba9ee7f8678f 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/forms/_temp.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/_temp.less
@@ -39,19 +39,21 @@
 //  _____________________________________________
 
 .admin__fieldset-wrapper-title {
-    .extend__clearfix();
+    &:extend(.abs-clearfix all);
     border-bottom: 1px solid @color-gray80;
+    font-size: 1.7rem;
     margin-bottom: 30px;
     padding: 14px 0 16px;
-    strong,
     .title {
-        &:extend(h2);
-    }
-    .title {
-        float: left;
-        margin: .7rem 0 0;
+        font-weight: 600;
+        &.active {
+            ~ .actions {
+                display: none;
+            }
+        }
     }
     .actions {
+        display: block;
         float: right;
     }
 }
@@ -66,7 +68,7 @@
     max-width: 500px;
     padding: 15px 30px;
     .admin__field {
-        .extend__field-rows();
+        &:extend(.abs-field-rows all);
     }
     .admin__legend {
         display: none;
@@ -229,6 +231,7 @@ label.mage-error {
 //
 //  Login page captcha field @todo ui - Create new captcha markup - Change reload button
 //  _____________________________________________
+
 .page-layout-admin-login {
     .field-captcha {
         padding-left: 30px;
@@ -245,3 +248,272 @@ label.mage-error {
 //  _____________________________________________
 
 .ui-datepicker .ui-datepicker-title select:extend(.admin__control-select all) {};
+
+//
+//  Data grid
+//  _____________________________________________
+
+.data-grid {
+    .head-massaction {
+        .admin__control-select {
+            min-width: 6rem;
+        }
+    }
+    .data-grid-filters {
+        td {
+            padding: 1rem;
+            border-bottom: 1px solid #D6D6D6;
+        }
+        select,
+        input[type="text"]{
+            width: 100%;
+            padding: .2rem .4rem;
+            height: 2.8rem;
+            min-width: 5rem;
+            font-size: 1.3rem;
+        }
+        .admin__control-text {
+            width: 100%;
+        }
+        select {
+            padding: .2rem 1.8rem .2rem .3rem;
+            background-position+: ~'calc(100% - 5px)' -37px;
+            background-size+: auto;
+            background-position+: 100%;
+            background-size+: 18px 100%;
+            background-position+: ~'calc(100% - 18px)' 0;
+            background-size+: 1px 100%;
+            height: 2.8rem;
+            &:focus {
+                background-position+: ~'calc(100% - 5px)' 11px;
+                background-position+: 100%;
+                background-position+: ~'calc(100% - 18px)' 0;
+            }
+        }
+        td {
+            .hasDatepicker {
+                + .ui-datepicker-trigger {
+                    height: 2.8rem;
+                    margin-left: -3.2rem;
+                    width: 2.8rem;
+                    &:after {
+                        line-height: 28px;
+                    }
+                }
+            }
+        }
+    }
+    .range-line {
+        position: relative;
+        + .range-line {
+            margin-top: .5rem;
+        }
+    }
+    .col-qty {
+        .admin__control-text {
+            &:extend(.abs-control-qty all);
+        }
+    }
+    .field-row {
+        display: inline-block;
+    }
+}
+
+.mass-select-info {
+    &:before {
+        content: "(";
+    }
+    &:after {
+        content:")";
+    }
+    &._empty {
+        display: none;
+    }
+}
+
+.mass-select-wrap {
+    position: absolute;
+    top: 100%;
+    margin-top: 3.3rem;
+    margin-left: 1.1rem;
+    select {
+        position:absolute;
+        top: 0;
+        left: 0;
+        opacity: 0.01;
+        width: 22px;
+        height: 22px;
+        cursor: pointer;
+        z-index: 2;
+
+        + label {
+            &:extend(.abs-action-default);
+            z-index: 1;
+            width: 16px;
+            height: 16px;
+            line-height: 16px;
+            padding: 0;
+
+            &:before {
+                &:extend(.admin__control-checkbox + label:before);
+                position:absolute;
+                left: 0;
+                top: 0;
+            }
+            &:after {
+                &:extend(.action-multiselect-wrap .action-multiselect-toggle:after);
+                top: 40% !important;
+            }
+        }
+        &:focus {
+            + label {
+                &:after {
+                    &:extend(.action-multiselect-wrap .action-multiselect-toggle._active:after);
+                }
+            }
+        }
+        &._checked {
+            + label {
+                &:before {
+                    &:extend(.admin__control-checkbox:checked + label:before);
+                }
+            }
+            &._indeterminate {
+                + label {
+                    &:before {
+                        content: '-';
+                        font-size: 2rem;
+                        line-height: 0.7rem;
+                    }
+                }
+            }
+        }
+        &._disabled {
+            display: none;
+            + label {
+                opacity: .6;
+                cursor: not-allowed;
+            }
+        }
+    }
+}
+
+.admin__data-grid-toolbar {
+    *,
+    *:before,
+    *:after {
+        box-sizing: border-box;
+    }
+    .admin__data-grid-header-row {
+        &:extend(.abs-cleafix);
+        .action-select-multiselect {
+            height: 38px;
+            left: -1rem;
+            min-width: 0;
+            opacity: .01;
+            top: -1.2rem;
+            width: 52px;
+        }
+        > div + div {
+            margin-left: @temp_gutter;
+        }
+        button {
+            vertical-align: top;
+        }
+    }
+    .admin__filter-actions {
+        float: left;
+    }
+    .admin__data-grid-export {
+        float: right;
+        .admin__control-select {
+            margin-right: @action__outer-indent;
+        }
+    }
+    .admin__grid-massaction {
+        float: left;
+        .admin__control-select {
+            margin-right: @action__outer-indent;
+        }
+        + .admin__control-text {
+            float: left;
+        }
+        .form-inline {
+            display: inline;
+            .admin__field-label {
+                width: auto;
+                float: none;
+                padding-right: 1rem;
+                padding-left: 2rem;
+            }
+        }
+        .admin__grid-massaction-form {
+            .admin__control-select {
+                ~ button {
+                    display: none;
+                }
+                &._selected {
+                    ~ button {
+                        display: inline-block;
+                    }
+                }
+
+            }
+        }
+        .admin__control-select-placeholder {
+            color:  @color-darkie-gray;
+            font-weight: @font-weight__bold;
+        }
+    }
+    .admin__data-grid-pager-wrap {
+        float: right;
+    }
+    .admin__data-grid-header-row {
+        &._massaction {
+            position: relative;
+            z-index: 1;
+        }
+    }
+}
+
+.admin__grid-control {
+    .admin__grid-control {
+        display: none;
+    }
+}
+
+.ui-dialog {
+    .admin__data-grid-header-row._massaction,
+    .mass-select-wrap select,
+    .mass-select-wrap,
+    .admin__grid-massaction {
+        z-index: 2000;
+    }
+    .admin__data-grid-wrap {
+        z-index: 1999;
+    }
+}
+
+.data-grid {
+    td.col-action {
+        a + a {
+            &:before {
+                content: "";
+                display: block;
+            }
+        }
+    }
+}
+
+
+//
+//  Popups
+//  _____________________________________________
+
+.attribute-popup {
+    background-color: @color-white;
+    #edit_form {
+        padding-left: 1.8rem;
+        padding-right: 1.8rem;
+    }
+}
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_checkbox-radio.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/controls/_checkbox-radio.less
similarity index 100%
rename from app/design/adminhtml/Magento/backend/web/css/source/forms/_checkbox-radio.less
rename to app/design/adminhtml/Magento/backend/web/css/source/forms/controls/_checkbox-radio.less
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_control-table.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_control-table.less
new file mode 100644
index 0000000000000..90eb06efb93b1
--- /dev/null
+++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_control-table.less
@@ -0,0 +1,98 @@
+// /**
+//  * Copyright © 2015 Magento. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+//
+//  Variables
+//  ---------------------------------------------
+
+@control-table-cell__background-color: @color-white-dark-smoke;
+@control-table-cell__border-color: @color-white;
+@control-table-cell__padding-vertical: 1.3rem;
+
+//
+
+.admin__control-table-wrapper {
+    max-width: 100%;
+    overflow-x: auto;
+    overflow-y: hidden;
+}
+
+.admin__control-table {
+    width: 100%;
+    thead {
+        background-color: transparent;
+    }
+    tbody {
+        td {
+            vertical-align: middle;
+        }
+    }
+    tfoot {
+        th {
+            padding-bottom: @control-table-cell__padding-vertical;
+        }
+    }
+    tr {
+        &:last-child {
+            th,
+            td {
+                border-bottom: none;
+            }
+        }
+    }
+    td,
+    th {
+        background-color: @control-table-cell__background-color;
+        border: 0;
+        border-bottom: 1px solid @control-table-cell__border-color;
+        padding: @control-table-cell__padding-vertical 2.5rem @control-table-cell__padding-vertical 0;
+        text-align: left;
+        vertical-align: top;
+        &:first-child {
+            padding-left: 1.5rem;
+        }
+    }
+    th {
+        border: 0;
+        vertical-align: bottom;
+        color: @color-very-dark-gray-black;
+        font-size: @font-size__base;
+        font-weight: @font-weight__semibold;
+        padding-bottom: 0;
+        &._required {
+            span {
+                &:after {
+                    color: @field-label__required__color;
+                    content: '*';
+                }
+            }
+        }
+    }
+    //  Actions column
+    .control-table-actions-th {
+        white-space: nowrap;
+    }
+    .control-table-actions-cell {
+        padding-top: 1.8rem;
+        text-align: center;
+        width: 1%;
+    }
+    //  Draggable column
+    .col-draggable {
+        padding-top: 2.2rem;
+        width: 1%;
+    }
+    //  Actions
+    .action-delete {
+        .action-icon();
+        &:before {
+            &:extend(.abs-icon all);
+            content: @icon-delete__content;
+        }
+        > span {
+            display: none;
+        }
+    }
+}
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_tooltip.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_field-tooltips.less
similarity index 100%
rename from app/design/adminhtml/Magento/backend/web/css/source/forms/_tooltip.less
rename to app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_field-tooltips.less
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/variables/_actions.less b/app/design/adminhtml/Magento/backend/web/css/source/variables/_actions.less
index 6cb821a11a68f..356dc736f9fa3 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/variables/_actions.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/variables/_actions.less
@@ -18,5 +18,7 @@
 @action__hover__background-color: @color-blue-clear-sky;
 @action__hover__border-color: darken(@action__border-color, 15%);
 
+@action__outer-indent: .7rem;
+
 //  Actions menu
 @action-menu__hover__background-color: @color-gray89;
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/variables/_colors.less b/app/design/adminhtml/Magento/backend/web/css/source/variables/_colors.less
index 80492cbd3cd37..b1851c3dae1a8 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/variables/_colors.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/variables/_colors.less
@@ -64,5 +64,6 @@
 //  ---------------------------------------------
 
 @primary__color: @color-phoenix;
+@success__color: @color-green-apple;
 @text__color: @color-brown-darkie;
 @border__color: @color-gray89;
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/variables/_structure.less b/app/design/adminhtml/Magento/backend/web/css/source/variables/_structure.less
index 65feb808800fd..521d53cbe3e4c 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/variables/_structure.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/variables/_structure.less
@@ -46,6 +46,7 @@
 
 // z-index 5
 @field-tooltip__z-index: @z-index-5;
+@action-select__z-index: @z-index-5;
 @admin__page-nav-tooltip__z-index: @field-tooltip__z-index;
 
 // z-index 7
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/variables/_typography.less b/app/design/adminhtml/Magento/backend/web/css/source/variables/_typography.less
index 95422456d853c..85fdad960613b 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/variables/_typography.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/variables/_typography.less
@@ -20,7 +20,7 @@
 @font-size__tiny: 1.1rem;
 @font-size__xs: 1rem;
 
-@line-height__base: 1.4;
+@line-height__base: 1.36;
 @line-height__s: 1.2;
 
 //  Links
diff --git a/app/design/adminhtml/Magento/backend/web/css/styles-old.less b/app/design/adminhtml/Magento/backend/web/css/styles-old.less
index 77fb1698576b0..06bdf16535aa9 100644
--- a/app/design/adminhtml/Magento/backend/web/css/styles-old.less
+++ b/app/design/adminhtml/Magento/backend/web/css/styles-old.less
@@ -751,7 +751,6 @@ input.no-display,
 
 
     fieldset {
-        border: 1px solid #ccc;
         padding: 20px;
     }
 
@@ -1151,7 +1150,7 @@ input.no-display,
         background: #fff;
         border: 0;
         margin: 0;
-        padding: 5px 18px 38px;
+        padding: 5px 0 38px;
         position: relative;
     }
 
@@ -1172,7 +1171,9 @@ input.no-display,
 
     .fieldset-wrapper > .fieldset-wrapper-title .title,
     .fieldset > .legend span {
-        .style10();
+        color: #303030;
+        font-size: 1.7rem;
+        font-weight: 600;
         padding: 7px 0 10px;
         display: inline-block;
     }
@@ -1180,57 +1181,19 @@ input.no-display,
     //
     //  Collapsable fieldset-wrapper
     //  --------------------------------------
-    .collapsable-wrapper {
-        padding-bottom: 2px;
-        > .fieldset-wrapper-title {
-            border-bottom: 1px solid #cac3b4;
-            margin-bottom: 0;
-            > .title {
-                position: relative;
-                padding-left: 22px;
-                cursor: pointer;
-                float: left;
-                &:before {
-                    position: absolute;
-                    left: 0;
-                    top: 11px;
-                    font-family: 'MUI-Icons';
-                    font-size: 16px;
-                    font-style: normal;
-                    speak: none;
-                    font-weight: normal;
-                    -webkit-font-smoothing: antialiased;
-                    content: '\e02a'; // arrow right icon
-                    color: #b2b0ad;
-                }
-                &:hover:before {
-                    color: #7e7e7e;
-                }
-            }
-        }
-        &.opened {
-            padding-bottom: 18px;
-            > .fieldset-wrapper-title {
-                //border-bottom: 1px solid #ededed;
-                margin-bottom: 18px;
-                > .title:before {
-                    content: '\e02c'; // arrow down icon
-                }
-            }
-        }
-    }
 
     // Fieldset styles in another fieldset
     .fieldset .fieldset-wrapper,
     .fieldset-wrapper .fieldset-wrapper {
         border: 1px solid #cac3b4;
         border-radius: 2px;
+        margin-bottom: 5px;
         padding: 0;
     }
 
     .fieldset .fieldset-wrapper .fieldset-wrapper-title,
     .fieldset-wrapper .fieldset-wrapper .fieldset-wrapper-title {
-        background:#f7f3eb;
+        background: #f7f3eb;
         padding: 0 18px;
         border: 0;
     }
@@ -1290,12 +1253,19 @@ input.no-display,
     }
 
     // Sortable fieldsets
+
+    .ui-sortable {
+        margin-bottom: 15px; // should be the same as .sortable-wrapper
+    }
+
     .ui-sortable .entry-edit .fieldset-wrapper-title,
     #product_options_container_top .fieldset-wrapper-title {
         padding-left: 30px;
     }
 
-    .ui-sortable .entry-edit .fieldset-wrapper-title > .title {
+    #super_config-wrapper,
+    #grouped-wrapper {
+        border-bottom: 0;
     }
 
     .fieldset-wrapper-title > .actions,
@@ -1983,21 +1953,6 @@ input.no-display,
     .backup-dialog {
         margin-top: inherit !important;
     }
-//
-//  .side-col {
-//      box-sizing: border-box;
-//      padding-bottom: 20px;
-//      padding-right: 10px;
-//      position: relative;
-//      width: 25%;
-//  }
-//
-//  .main-col {
-//      position: relative;
-//      width: 75%;
-//      padding: 0 20px 20px;
-//      box-sizing: border-box;
-//  }
 
     .col-left {
         float: left;
@@ -2026,63 +1981,13 @@ input.no-display,
             min-width: 730px;
             width: 80%;
         }
-//      .main-col {
-//          padding-right: 0;
-//          padding-left: 0;
-//          float: right;
-//      }
-//      .side-col {
-//          float: left;
-//      }
-    }
-
-//  .col-2-right-layout {
-//      .side-col {
-//          float: right;
-//      }
-//      .main-col {
-//          float: left;
-//      }
-//  }
+    }
 
     .col-2-left-layout .main-col,
     .col-2-right-layout .main-col {
         min-width: 730px;
     }
 
-    //
-    //  Horizontal Tabs
-    //  --------------------------------------
-
-    .ui-tabs {
-        clear: both;
-        margin-bottom: 0;
-    }
-    .tabs-horiz {
-        list-style: none;
-        margin: 0;
-        padding: 3px 0 0;
-    }
-
-    .tabs-horiz > li {
-        float: left;
-        margin: 0 5px 0 0;
-    }
-
-    .tabs-horiz .ui-tabs-anchor {
-        position: relative;
-        display: block;
-        text-decoration: none;
-        .style7();
-        background: #e0dacf;
-        padding: 11px 15px 13px;
-        border-radius: 2px 2px 0 0;
-    }
-
-    .tabs-horiz > .ui-state-active .ui-tabs-anchor {
-        background: #fff;
-    }
-
     //
     //  Switcher
     //  --------------------------------------
@@ -2469,6 +2374,10 @@ input.no-display,
         top: -50px;
     }
 
+    #front_fieldset-wrapper {
+        border-bottom: 0;
+    }
+
     .attribute-popup {
         background: none;
     }
@@ -2503,7 +2412,7 @@ input.no-display,
         border-top: none;
     }
 
-    .attribute-popup .fieldset-wrapper:not(.collapsable-wrapper) .fieldset-wrapper-title {
+    .attribute-popup .fieldset-wrapper:not(.admin__collapsible-block) .fieldset-wrapper-title {
         border-bottom: none;
     }
 
@@ -2520,13 +2429,20 @@ input.no-display,
         width: 35%;
     }
 
-    .attribute-popup .collapsable-wrapper,
-    #manage-titles-wrapper .fieldset-wrapper-title {
-        margin-bottom: 0;
-        padding-bottom: 0;
+    .attribute-popup .admin__collapsible-block-wrapper,
+    #manage-titles-wrapper {
+        .fieldset-wrapper-title {
+            margin-bottom: 0;
+            padding-bottom: 0;
+        }
+        .col-store-view {
+            .input-text {
+                width: 100%;
+            }
+        }
     }
 
-    .attribute-popup .collapsable-wrapper .fieldset-wrapper-title > .title:before {
+    .attribute-popup .admin__collapsible-block-wrapper .fieldset-wrapper-title > .title:before {
         color: #797269;
         font-size: 14px;
         top: 9px;
@@ -2569,8 +2485,13 @@ input.no-display,
         display: none;
     }
 
-    #manage-options-panel > .data-table {
-        clear: both;
+    #manage-options-panel {
+        .admin__control-table {
+            clear: both;
+        }
+        .input-text {
+            width: 100%;
+        }
     }
 
     // Custom grids view
@@ -2693,12 +2614,12 @@ input.no-display,
         clear: both;
     }
 
-    .customer-information .data-table,
+    .customer-information .admin__table-secondary,
     .customer-information address {
         width: 48.5%;
     }
 
-    .customer-information .data-table {
+    .customer-information .admin__table-secondary {
         float: left;
         width: 48.5%;
     }
@@ -4015,480 +3936,6 @@ input.no-display,
         border: 1px solid red !important;
     }
 
-    //
-    //  Accordion
-    //  ------------------------
-
-    .accordion {
-        margin: 0 0 8px;
-        padding: 0;
-    }
-
-    .accordion > dt,
-    .accordion > dd.open,
-    .accordion .collapseable,
-    .section-config.active > .collapseable + input + fieldset,
-    .accordion .collapseable.open + input + fieldset {
-        background: #fff;
-        padding: 5px 18px 2px;
-        position: relative;
-    }
-
-    .accordion > dt + dd {
-        display: none;
-    }
-
-    .section-config > .config {
-        &.collapseable {
-            display: none;
-        }
-    }
-
-    .accordion > dt.open,
-    .section-config.active > .collapseable,
-    .accordion .collapseable.open {
-        margin: 0;
-        border-bottom: 0;
-        border-radius: 5px 5px 0 0;
-    }
-    .section-config.active > .collapseable + input + fieldset,
-    .accordion > dt + dd.open,
-    .accordion .collapseable.open + input + fieldset {
-        padding: 25px 18px 18px;
-        display: block;
-        margin-left: 0;
-        border-top: 0;
-        border-radius: 0 0 5px 5px;
-    }
-
-    .section-config > .collapseable > a,
-    .accordion > dt a,
-    .accordion .collapseable > a {
-        .style10();
-        display: block;
-        padding: 7px 0 10px 22px;
-        text-decoration: none;
-        position: relative;
-        cursor: pointer;
-        border-bottom: 1px solid #cac3b4;
-    }
-
-    .section-config > .collapseable > a i,
-    .accordion > dt a i,
-    .accordion .collapseable > a i {
-        .style31();
-    }
-
-    .section-config > .collapseable > a:before,
-    .accordion > dt a:before,
-    .accordion .collapseable > a:before {
-        position: absolute;
-        left: 0;
-        top: 11px;
-        font-family: 'MUI-Icons';
-        font-style: normal;
-        speak: none;
-        font-size: 16px;
-        font-weight: normal;
-        -webkit-font-smoothing: antialiased;
-        content: '\e02a'; // arrow right icon
-        color: #b2b0ad;
-    }
-
-    .section-config.active > .collapseable > a:before,
-    .accordion > dt.open a:before,
-    .accordion .collapseable.open a:before {
-        content: '\e02c'; // arrow down icon
-    }
-    .section-config > .collapseable > a:hover:before,
-    .accordion > dt a:hover:before,
-    .accordion .collapseable > a:hover:before {
-        color: #7e7e7e;
-    }
-
-    // PayPal connected
-
-    .section-config.complex .section-config.with-button {
-        padding:20px 15px;
-        margin:0 -30px 0 -15px;
-        border-bottom:1px solid #eae6e0;
-    }
-
-    .section-config.complex tr:last-child .section-config.with-button {
-        border-bottom:0;
-    }
-
-    .section-config.complex .section-config.with-button > .entry-edit-head {
-        padding: 0 0 0 25px;
-        border:0;
-    }
-
-    .section-config.complex .section-config.with-button.enabled > .entry-edit-head:before {
-        content: "\e01e";
-        color:#fff;
-        background: #65940a;
-        font-family: "MUI-Icons";
-        font-weight: normal;
-        padding:3px;
-        font-size: 10px;
-        width:10px;
-        height:10px;
-        line-height: 10px;
-        overflow: hidden;
-        border-radius: 8px;
-        display: block;
-        float:left;
-        margin-left:-25px;
-        margin-top:0;
-    }
-
-    .section-config.complex .section-config.with-button > .config {
-        margin:10px -10px;
-        border:1px solid #d1d0ce;
-        border-radius: 0;
-        padding:5px 0;
-    }
-    .section-config.complex .section-config.with-button > .config > table > tbody > tr > td {
-        padding:0;
-    }
-
-    .section-config.complex .section-config.with-button > .config > table > tbody > tr > td > .section-config > .entry-edit-head {
-        border:0;
-        border-radius: 0;
-        margin-bottom:0;
-        padding:5px 10px 2px;
-        border-bottom:1px solid #d1d0ce;
-        background: transparent;
-    }
-    .section-config.complex .section-config.with-button > .config > table > tbody > tr > td > .section-config > .entry-edit-head > a {
-        padding-left: 22px;
-    }
-    .section-config.complex .section-config.with-button > .config > table > tbody > tr > td > .section-config > .entry-edit-head > a:before {
-        left: 0;
-    }
-    .section-config.complex .section-config.with-button > .config > table > tbody > tr:last-child > td > .section-config > .entry-edit-head {
-        border:0;
-    }
-    .section-config.complex .section-config.with-button > .config > table > tbody > tr > td > .section-config > .entry-edit-head a {
-        border-bottom:0;
-    }
-
-    .section-config.complex .section-config.with-button > .config > table > tbody > tr > td > .section-config > .config {
-        border:0;
-        border-bottom:1px solid #d1d0ce;
-        border-radius: 0;
-        margin:0;
-        padding-bottom:50px;
-    }
-    .section-config.complex .section-config.with-button > .config > table > tbody > tr:last-child > td > .section-config > .config {
-        border-bottom:0;
-    }
-
-    .section-config .config h4 {
-        padding-left:25%;
-        font-size: 18px;
-    }
-
-    .section-config .config td.label label.enabled:before {
-        content: "\e01e";
-        color:#fff;
-        background: #65940a;
-        font-family: "MUI-Icons";
-        font-weight: normal;
-        padding:3px;
-        font-size: 10px;
-        width:10px;
-        height:10px;
-        line-height: 10px;
-        overflow: hidden;
-        border-radius: 8px;
-        display: block;
-        float:left;
-        margin-right:5px;
-    }
-
-    .section-config.complex .section-config.with-button > .config:before {
-        content:'';
-        height: 9px;
-        width: 20px;
-        overflow: hidden;
-        display: block;
-        position: absolute;
-        bottom: 100%;
-        left: 50%;
-        z-index: 2;
-        margin-left: -10px;
-        background: url(../images/subconfig-bg.png) no-repeat 0 0;
-    }
-
-    .section-config.config-advanced {
-        padding:30px 0 0;
-    }
-    .section-config.config-advanced > .entry-edit-head {
-        border:0;
-        padding: 0 0 0 25%;
-    }
-    .section-config.config-advanced > .entry-edit-head a {
-        border:0 !important;
-    }
-    .section-config.config-advanced > .config {
-        padding-left:0!important;
-        padding-right:0!important;
-        border:0!important;
-        border-radius: 0!important;
-    }
-
-    .section-config.config-advanced > .entry-edit-head a {
-        margin-left:-22px;
-    }
-
-
-    .section-config.with-button .config-heading strong {
-        display: block;
-        .style28();
-        margin-bottom:5px;
-    }
-
-    .section-config.with-button .config-heading .button-container {
-        margin:15px 0 0;
-    }
-    .section-config.with-button .button-container {
-        line-height: 28px;
-    }
-    .section-config.with-button .button-container a {
-        margin-left:20px;
-    }
-
-    .section-config.with-button .action-configure span {
-        display: block;
-        position: relative;
-        text-align: center;
-    }
-    .section-config.with-button .action-configure .state-opened {
-        visibility: hidden;
-        height:0;
-        overflow: hidden;
-    }
-    .section-config.with-button .action-configure.open .state-opened {
-        visibility: visible;
-        height:auto;
-        overflow: auto;
-    }
-    .section-config.with-button .action-configure.open .state-closed {
-        visibility: hidden;
-        height:0;
-        overflow: hidden;
-    }
-
-    .accordion > dt + dd {
-        display: none;
-    }
-
-    .accordion > dt + .open:empty {
-        background: #fff url(../mui/images/ajax-loader-big.gif) no-repeat center;
-        height: 100px;
-    }
-
-    // TODO: arrange configuration tables
-    .accordion .collapseable.disabled {
-        background: #f1f1f1;
-    }
-
-    .accordion .collapseable.disabled > a {
-        cursor: not-allowed;
-    }
-
-    .accordion .collapseable.disabled > a:before {
-        content: '';
-    }
-
-    .accordion .config {
-        border: 0;
-    }
-
-    .accordion .config {
-        .comment a,
-        .link-more {
-            .style3();
-        }
-    }
-
-    .accordion .config legend {
-        display: none;
-    }
-
-    .accordion .config table {
-        width: 100%;
-    }
-
-    .accordion .config .label {
-        float: none;
-        width: 33%;
-        padding-right: 30px;
-        text-align: right;
-        font-size: 14px;
-        font-weight: 600;
-        color: #303030;
-    }
-
-    .accordion .config .value .label {
-        padding: 6px 5px 0 15px;
-        vertical-align: top;
-        width: auto;
-    }
-
-    .accordion .config .value .label:first-child {
-        padding-left: 0;
-    }
-
-    .accordion .config .label label {
-        padding-top: 7px;
-    }
-
-    .accordion .config td {
-        background: none;
-        border: 0;
-        padding: 22px 15px 0 0;
-        vertical-align: top;
-    }
-
-    .accordion .paypal-selection-simplified {
-        padding-left: 30px;
-    }
-
-    .accordion .paypal-selection input[type="checkbox"] {
-        margin: -4px 7px 0 0;
-    }
-
-    .accordion .config input[type="text"],
-    .accordion .config input[type="password"],
-    .accordion .config select,
-    .accordion .config textarea {
-        width: 100%;
-    }
-
-    .accordion .config input.input-file {
-        margin-top: 4px;
-    }
-
-    .accordion .config select.select-date {
-        width: 27%;
-    }
-
-    .accordion .config .value {
-        width: 44%;
-        padding-right: 40px;
-        .checkboxes {
-            list-style: none;
-            padding: 0;
-            margin: -3px 0 0;
-
-            li {
-                margin: 7px 0;
-            }
-
-            input,
-            label {
-                vertical-align: middle;
-            }
-
-            label {
-                margin-left: 5px;
-            }
-        }
-    }
-
-    .accordion .config .value.with-tooltip {
-        padding-top:5px;
-    }
-    .accordion .config .value.with-tooltip .tooltip {
-        position: relative;
-        top:0;
-        left:0;
-        right:0;
-        bottom:0;
-        float:right;
-        margin: 6px -28px 0 0;
-    }
-    .accordion .config .value.with-tooltip .tooltip-content {
-        padding: 18px;
-        margin: 0 -17px 10px 0;
-        right: 0;
-        bottom: 100%;
-        width: 239px;
-        max-width: 239px;
-        font-size: 13px;
-        line-height: 1.4;
-        background: #31302b;
-        background: rgba(49, 48, 43, .8);
-        border-radius: 5px;
-    }
-    .accordion .config .value.with-tooltip .tooltip-content:before {
-        content: '';
-        position: absolute;
-        width: 0;
-        height: 0;
-        top: auto;
-        bottom:-5px;
-        left:auto;
-        right: 20px;
-        border-left: 5px solid transparent;
-        border-right: 5px solid transparent;
-        border-top: 5px solid #31302b;
-        border-bottom:0;
-        opacity: .8;
-    }
-
-    .accordion .config .value.with-tooltip .help {
-        position: relative;
-        width:auto;
-        margin:0;
-    }
-
-    .accordion .config .scope-label {
-        color: #999;
-        font-size: 12px;
-        letter-spacing: .05em;
-        padding: 31px 15px 0 0;
-    }
-
-    .accordion .config .note {
-        color: #303030;
-        font-size: 12px;
-        margin: 5px 0;
-    }
-
-    .accordion .config .note a {
-        .style22();
-    }
-
-    .accordion .config .system-tooltip-box {
-        position: absolute;
-    }
-
-    .accordion .paypal-selection {
-        margin: 10px;
-        width: 98%;
-    }
-
-    .accordion .paypal-selection th {
-        padding: 6px 10px 7px;
-    }
-
-    .accordion .paypal-selection {
-        border-bottom: 2px solid #c0bbaf;
-    }
-
-    .accordion .paypal-payment-notice {
-        margin: 10px;
-    }
-
-    .accordion .custom-options {
-        border: 1px solid #999;
-        padding: 0 10px;
-        margin: 0 0 20px;
-    }
-
     //
     //  Sales
     //  --------------------------------------
@@ -4872,6 +4319,7 @@ input.no-display,
 .adminhtml-system-config-edit {
     .admin__scope-old {
         .payflow-settings-notice {
+            margin-top: 2rem;
             padding: 10px;
             .important-label {
                 .style32();
@@ -5362,15 +4810,6 @@ input.no-display,
     }
 }
 
-.adminhtml-rma-edit {
-    .admin__scope-old {
-        .col-product,
-        .col-sku {
-            &:extend(.col-70-max all);
-        }
-    }
-}
-
 
 //
 //  Products
@@ -5799,7 +5238,7 @@ input.no-display,
 .adminhtml-export-index {
     .admin__scope-old {
         .grid-actions,
-        .grid {
+        .data-grid {
             &:extend(.side-paddings-0);
         }
         .col-label,
@@ -5809,7 +5248,7 @@ input.no-display,
         .col-code {
             &:extend(.ellipsis all);
         }
-        .grid {
+        .data-grid {
             td {
                 vertical-align: middle;
             }
@@ -5817,15 +5256,18 @@ input.no-display,
                 margin: 0 10px 0 5px;
                 width: 37%;
             }
-            .input-text-range-date {
+            .hasDatepicker{
                 margin: 0 5px;
                 width: 32%;
             }
+            .admin__control-support-text {
+                margin-right: .5rem;
+            }
         }
-        .ui-datepicker-trigger {
-            display: inline-block;
-            margin: -3px 10px 0 0;
-            vertical-align: middle;
+        .data-grid-checkbox-cell {
+            padding-right: 1rem;
+            padding-left: 1rem;
+            text-align: center;
         }
     }
 }
@@ -5926,65 +5368,6 @@ input.no-display,
         padding-left: 0;
         padding-right: 0;
     }
-    .accordion {
-        margin: 0 0 8px;
-        padding: 0;
-        > dt {
-            background: #fff;
-            padding: 5px 18px 2px;
-            position: relative;
-            + dd {
-                display: none;
-                &.open {
-                    padding: 25px 18px 18px;
-                    display: block;
-                    margin-left: 0;
-                    border-top: 0;
-                    border-radius: 0 0 5px 5px;
-                }
-            }
-            &.open {
-                margin: 0;
-                border-bottom: 0;
-                border-radius: 5px 5px 0 0;
-                a {
-                    &:before {
-                        content: '\e02c'; // arrow down icon
-                    }
-                }
-            }
-            a {
-                .style10();
-                display: block;
-                padding: 7px 0 10px 22px;
-                text-decoration: none;
-                position: relative;
-                cursor: pointer;
-                border-bottom: 1px solid #cac3b4;
-                i {
-                    .style31();
-                }
-                &:before {
-                    position: absolute;
-                    left: 0;
-                    top: 11px;
-                    font-family: 'MUI-Icons';
-                    font-style: normal;
-                    speak: none;
-                    font-size: 16px;
-                    font-weight: normal;
-                    -webkit-font-smoothing: antialiased;
-                    content: '\e02a'; // arrow right icon
-                    color: #b2b0ad;
-                }
-                &:hover {
-                    &:before {
-                        color: #7e7e7e;
-                    }
-                }
-            }
-        }
-    }
 }
 
 // ==|== print styles =======================================================
diff --git a/app/design/adminhtml/Magento/backend/web/mui/styles/table.less b/app/design/adminhtml/Magento/backend/web/mui/styles/table.less
index 574b9f0754306..3c8e2938e2b1f 100644
--- a/app/design/adminhtml/Magento/backend/web/mui/styles/table.less
+++ b/app/design/adminhtml/Magento/backend/web/mui/styles/table.less
@@ -4,9 +4,10 @@
 //  */
 
 //
-//    Tables
-// --------------------------------------
-table {
+//  Tables
+//  --------------------------------------
+
+table:not(.data-grid .admin__control-table) {
     > caption {
         margin-bottom: 5px;
     }
@@ -281,7 +282,6 @@ td.col-updated_at,
 td.col-customer_since,
 td.col-session_start_time,
 td.col-time,
-td.col-sku,
 td.col-type {
     &:extend(.nowrap all);
 }
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_minicart.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_minicart.less
index 486f123262140..535a47ff7f9ee 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_minicart.less
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_minicart.less
@@ -228,6 +228,19 @@
         .price {
             font-weight: @font-weight__bold;
         }
+        .price-including-tax,
+        .price-excluding-tax {
+            margin: @indent__xs 0;
+        }
+        .weee[data-label] {
+            .font-size(11);
+            .label {
+                &:extend(.abs-no-display all);
+            }
+        }
+        .details-qty {
+            margin-top: @indent__s;
+        }
     }
     .product.options {
         .tooltip.toggle {
diff --git a/app/design/frontend/Magento/blank/Magento_Theme/web/css/source/module/_collapsible_navigation.less b/app/design/frontend/Magento/blank/Magento_Theme/web/css/source/module/_collapsible_navigation.less
index e816173e91ab3..f3ce324df0335 100644
--- a/app/design/frontend/Magento/blank/Magento_Theme/web/css/source/module/_collapsible_navigation.less
+++ b/app/design/frontend/Magento/blank/Magento_Theme/web/css/source/module/_collapsible_navigation.less
@@ -3,28 +3,34 @@
 //  * See COPYING.txt for license details.
 //  */
 
+//
+//  Variables
+//  ---------------------------------------------
+
 @collapsible-nav-background: @sidebar__background-color;
-@collapsible-nav-item-hover: @color-gray91;
 @collapsible-nav-color: false;
-@collapsible-nav-current-color: false;
-@collapsible-nav-current-font-weight: @font-weight__semibold;
 @collapsible-nav-current-border: 3px solid transparent;
 @collapsible-nav-current-border-color: @color-orange-red1;
+@collapsible-nav-current-color: false;
+@collapsible-nav-current-font-weight: @font-weight__semibold;
+@collapsible-nav-item-hover: @color-gray91;
 
+//
 
 //
-//    Common
-//--------------------------------------
+//  Common
+//  ---------------------------------------------
 
 & when (@media-common = true) {
 
 //
 //    Collapsible navigation
-//--------------------------------------
+//  ---------------------------------------------
+
 .block-collapsible-nav {
     .content {
-        padding: 15px 0;
         .css(background, @collapsible-nav-background);
+        padding: 15px 0;
     }
     .item {
         margin: 3px 0 0;
@@ -32,11 +38,11 @@
             margin-top: 0;
         }
         a,
-        strong {
-            display: block;
-            padding: 5px 18px 5px 15px;
+        > strong {
             border-left: 3px solid transparent;
             .css(color, @collapsible-nav-color);
+            display: block;
+            padding: 5px 18px 5px 15px;
         }
         a {
             text-decoration: none;
@@ -47,14 +53,13 @@
         &.current {
             a,
             strong {
-                .css(color, @collapsible-nav-current-color);
                 .css(border-color, @collapsible-nav-current-border-color);
+                .css(color, @collapsible-nav-current-color);
                 .css(font-weight, @collapsible-nav-current-font-weight);
             }
             a {
                 .css(border-color, @collapsible-nav-current-border-color);
             }
-
         }
     }
 }
@@ -62,8 +67,9 @@
 }
 
 //
-//    Desktop
-//--------------------------------------
+//  Desktop
+//  ---------------------------------------------
+
 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
     .block-collapsible-nav {
         .title {
@@ -73,13 +79,14 @@
 }
 
 //
-//    Mobile
-//--------------------------------------
+//  Mobile
+//  ---------------------------------------------
+
 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
     .block-collapsible-nav {
+        left: 0;
         position: absolute;
         top: -21px;
-        left: 0;
         width: 100%;
         z-index: 5;
         .title {
diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_minicart.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_minicart.less
index 365f03d8f28a5..ddeb77db7fdfd 100644
--- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_minicart.less
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_minicart.less
@@ -236,6 +236,19 @@
         .price {
             font-weight: @font-weight__bold;
         }
+        .price-including-tax,
+        .price-excluding-tax {
+            margin: @indent__xs 0;
+        }
+        .weee[data-label] {
+            .font-size(11);
+            .label {
+                &:extend(.abs-no-display all);
+            }
+        }
+        .details-qty {
+            margin-top: @indent__s;
+        }
     }
     .product {
         .toggle {
diff --git a/app/design/frontend/Magento/luma/Magento_Theme/layout/default.xml b/app/design/frontend/Magento/luma/Magento_Theme/layout/default.xml
index a999d2fbf3c6c..41178b9cd8dc6 100644
--- a/app/design/frontend/Magento/luma/Magento_Theme/layout/default.xml
+++ b/app/design/frontend/Magento/luma/Magento_Theme/layout/default.xml
@@ -14,6 +14,12 @@
                 </arguments>
             </block>
         </referenceContainer>
+        <referenceBlock name="logo">
+            <arguments>
+                <argument name="logo_img_width" xsi:type="number">148</argument>
+                <argument name="logo_img_height" xsi:type="number">43</argument>
+            </arguments>
+        </referenceBlock>
         <referenceContainer name="footer">
             <block class="Magento\Store\Block\Switcher" name="store_switcher" as="store_switcher" after="footer_links" template="switch/stores.phtml"/>
         </referenceContainer>
diff --git a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/module/_collapsible_navigation.less b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/module/_collapsible_navigation.less
index 54b37411c7494..8001529dc0263 100644
--- a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/module/_collapsible_navigation.less
+++ b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/module/_collapsible_navigation.less
@@ -3,27 +3,34 @@
 //  * See COPYING.txt for license details.
 //  */
 
+//
+//  Variables
+//  ---------------------------------------------
+
 @collapsible-nav-background: @sidebar__background-color;
-@collapsible-nav-item-hover: @color-gray91;
 @collapsible-nav-color: @color-gray34;
-@collapsible-nav-current-color: @color-black;
-@collapsible-nav-current-font-weight: @font-weight__semibold;
 @collapsible-nav-current-border: 3px solid transparent;
 @collapsible-nav-current-border-color: @color-orange-red1;
+@collapsible-nav-current-color: @color-black;
+@collapsible-nav-current-font-weight: @font-weight__semibold;
+@collapsible-nav-item-hover: @color-gray91;
+
+//
 
 //
-//    Common
-//--------------------------------------
+//  Common
+//  ---------------------------------------------
 
 & when (@media-common = true) {
 
 //
-//    Collapsible navigation
-//--------------------------------------
+//  Collapsible navigation
+//  ---------------------------------------------
+
 .block-collapsible-nav {
     .content {
-        padding: 15px 0;
         .css(background, @collapsible-nav-background);
+        padding: 15px 0;
     }
     .item {
         margin: 3px 0 0;
@@ -31,11 +38,11 @@
             margin-top: 0;
         }
         a,
-        strong {
-            display: block;
-            padding: 5px 18px 5px 15px;
+        > strong {
             border-left: 3px solid transparent;
             .css(color, @collapsible-nav-color);
+            display: block;
+            padding: 5px 18px 5px 15px;
         }
         a {
             text-decoration: none;
@@ -45,15 +52,14 @@
         }
         &.current {
             a,
-            strong {
-                .css(color, @collapsible-nav-current-color);
+            > strong {
                 .css(border-color, @collapsible-nav-current-border-color);
+                .css(color, @collapsible-nav-current-color);
                 .css(font-weight, @collapsible-nav-current-font-weight);
             }
             a {
                 .css(border-color, @collapsible-nav-current-border-color);
             }
-
         }
     }
 }
@@ -61,8 +67,9 @@
 }
 
 //
-//    Desktop
-//--------------------------------------
+//  Desktop
+//  ---------------------------------------------
+
 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
     .block-collapsible-nav {
         .title {
@@ -72,13 +79,14 @@
 }
 
 //
-//    Mobile
-//--------------------------------------
+//  Mobile
+//  ---------------------------------------------
+
 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
     .block-collapsible-nav {
+        left: 0;
         position: absolute;
         top: -21px;
-        left: 0;
         width: 100%;
         z-index: 5;
         .title {
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Grid.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Grid.php
index 40d04bc0fd76f..01b45c71f953f 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Grid.php
@@ -88,7 +88,7 @@ abstract class Grid extends Block
      *
      * @var string
      */
-    protected $massactionAction = '#massaction-select';
+    protected $massactionAction = '[data-menu="grid-mass-select"]';
 
     /**
      * Massaction 'Submit' button
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/AttributeForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/AttributeForm.php
index 2f83b72385835..d80a7e7545894 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/AttributeForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/AttributeForm.php
@@ -24,7 +24,7 @@ class AttributeForm extends FormTabs
      *
      * @var string
      */
-    protected $closedToggle = '//*[contains(@class,"collapsable-wrapper") and not(contains(@class,"opened"))]//strong';
+    protected $closedToggle = '.admin__collapsible-block-wrapper:not(.opened) [data-toggle="collapse"]';
 
     /**
      * Properties tab selector.
@@ -87,7 +87,7 @@ public function getData(FixtureInterface $fixture = null, SimpleElement $element
      */
     protected function expandAllToggles()
     {
-        $closedToggles = $this->_rootElement->getElements($this->closedToggle, Locator::SELECTOR_XPATH);
+        $closedToggles = $this->_rootElement->getElements($this->closedToggle);
         foreach ($closedToggles as $toggle) {
             $toggle->click();
         }
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Page/Adminhtml/CmsBlockIndex.xml b/dev/tests/functional/tests/app/Magento/Cms/Test/Page/Adminhtml/CmsBlockIndex.xml
index 7f0434e5c6573..061442f63a80e 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Page/Adminhtml/CmsBlockIndex.xml
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Page/Adminhtml/CmsBlockIndex.xml
@@ -9,6 +9,6 @@
     <page name="CmsBlockIndex" area="Adminhtml" mca="cms/block/index" module="Magento_Cms">
         <block name="messagesBlock" class="Magento\Backend\Test\Block\Messages" locator=".messages .message" strategy="css selector" />
         <block name="gridPageActions" class="Magento\Backend\Test\Block\GridPageActions" locator=".page-main-actions" strategy="css selector" />
-        <block name="cmsBlockGrid" class="Magento\Cms\Test\Block\Adminhtml\Block\CmsGrid" locator=".admin__data-grid-wrap" strategy="css selector" />
+        <block name="cmsBlockGrid" class="Magento\Cms\Test\Block\Adminhtml\Block\CmsGrid" locator=".admin__data-grid-outer-wrap" strategy="css selector" />
     </page>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Page/Adminhtml/CmsPageIndex.xml b/dev/tests/functional/tests/app/Magento/Cms/Test/Page/Adminhtml/CmsPageIndex.xml
index 44247cb0b2157..4672b7a44134d 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Page/Adminhtml/CmsPageIndex.xml
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Page/Adminhtml/CmsPageIndex.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
     <page name="CmsPageIndex" area="Adminhtml" mca="cms/page/index" module="Magento_Cms">
         <block name="pageActionsBlock" class="Magento\Backend\Test\Block\GridPageActions" locator=".page-main-actions" strategy="css selector" />
-        <block name="cmsPageGridBlock" class="Magento\Cms\Test\Block\Adminhtml\Page\Grid" locator=".admin__data-grid-wrap" strategy="css selector" />
+        <block name="cmsPageGridBlock" class="Magento\Cms\Test\Block\Adminhtml\Page\Grid" locator=".admin__data-grid-outer-wrap" strategy="css selector" />
         <block name="messagesBlock" class="Magento\Backend\Test\Block\Messages" locator=".messages .message" strategy="css selector" />
     </page>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute.php
index a86c1eb0631c3..9008800f6dd2e 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute.php
@@ -104,7 +104,7 @@ class Attribute extends Form
      *
      * @var string
      */
-    protected $attributeTitle = '.title > span';
+    protected $attributeTitle = '[data-toggle="collapse"]';
 
     /**
      * Selector for attribute content
diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Block/Adminhtml/System/Currency/Rate/CurrencyRateForm.php b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Block/Adminhtml/System/Currency/Rate/CurrencyRateForm.php
index d5d1c887a484c..dd274d5fc172f 100644
--- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Block/Adminhtml/System/Currency/Rate/CurrencyRateForm.php
+++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Block/Adminhtml/System/Currency/Rate/CurrencyRateForm.php
@@ -16,7 +16,42 @@
 class CurrencyRateForm extends Form
 {
     /**
-     * Fill currency rate form.
+     * Locator value for "Messages" block.
+     *
+     * @var string
+     */
+    protected $message = '#messages';
+
+    /**
+     * Locator value for "Import" button.
+     *
+     * @var string
+     */
+    protected $importButton = '[data-ui-id$="import-button"]';
+
+    /**
+     * Click on the "Import" button.
+     *
+     * @throws \Exception
+     * @return void
+     */
+    public function clickImportButton()
+    {
+        $this->_rootElement->find($this->importButton)->click();
+
+        //Wait message
+        $browser = $this->browser;
+        $selector = $this->message;
+        $browser->waitUntil(
+            function () use ($browser, $selector) {
+                $message = $browser->find($selector);
+                return $message->isVisible() ? true : null;
+            }
+        );
+    }
+
+    /**
+     * Fill "Currency Rates" form.
      *
      * @param FixtureInterface $fixture
      * @param SimpleElement|null $element
diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Block/Adminhtml/System/Currency/Rate/GridPageActions.php b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Block/Adminhtml/System/Currency/Rate/GridPageActions.php
deleted file mode 100644
index ee7d3fcc64116..0000000000000
--- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Block/Adminhtml/System/Currency/Rate/GridPageActions.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * Copyright © 2015 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\CurrencySymbol\Test\Block\Adminhtml\System\Currency\Rate;
-
-use Magento\Backend\Test\Block\PageActions;
-
-/**
- * Grid page actions on the SystemCurrencyIndex page.
- */
-class GridPageActions extends PageActions
-{
-    /**
-     * Import button locator.
-     *
-     * @var string
-     */
-    protected $importButton = '[data-ui-id$="import-button"]';
-
-    /**
-     * Message block css selector.
-     *
-     * @var string
-     */
-    protected $message = '#messages';
-
-    /**
-     * Click Import button.
-     *
-     * @throws \Exception
-     * @return void
-     */
-    public function clickImportButton()
-    {
-        $this->_rootElement->find($this->importButton)->click();
-
-        //Wait message
-        $browser = $this->browser;
-        $selector = $this->message;
-        $browser->waitUntil(
-            function () use ($browser, $selector) {
-                $message = $browser->find($selector);
-                return $message->isVisible() ? true : null;
-            }
-        );
-    }
-}
diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Block/Adminhtml/System/CurrencySymbolForm.php b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Block/Adminhtml/System/CurrencySymbolForm.php
index 020ae28779832..2f758e545f482 100644
--- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Block/Adminhtml/System/CurrencySymbolForm.php
+++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Block/Adminhtml/System/CurrencySymbolForm.php
@@ -22,7 +22,7 @@ class CurrencySymbolForm extends Form
      *
      * @var string
      */
-    protected $currencyRow = '//tr[td/label[@for="custom_currency_symbol%s"]]';
+    protected $currencyRow = '//div[input[@id="custom_currency_symbol%s"]]';
 
     /**
      * Fill the root form
diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Page/Adminhtml/SystemCurrencyIndex.xml b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Page/Adminhtml/SystemCurrencyIndex.xml
index efcc314043ecb..800e5342f6232 100644
--- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Page/Adminhtml/SystemCurrencyIndex.xml
+++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Page/Adminhtml/SystemCurrencyIndex.xml
@@ -7,9 +7,8 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
     <page name="SystemCurrencyIndex" area="Adminhtml" mca="admin/system_currency/index" module="Magento_CurrencySymbol">
-        <block name="gridPageActions" class="Magento\CurrencySymbol\Test\Block\Adminhtml\System\Currency\Rate\GridPageActions" locator=".grid-actions" strategy="css selector"/>
         <block name="formPageActions" class="Magento\CurrencySymbol\Test\Block\Adminhtml\System\Currency\Rate\FormPageActions" locator=".page-main-actions" strategy="css selector"/>
-        <block name="currencyRateForm" class="Magento\CurrencySymbol\Test\Block\Adminhtml\System\Currency\Rate\CurrencyRateForm" locator="#rate-form" strategy="css selector"/>
+        <block name="currencyRateForm" class="Magento\CurrencySymbol\Test\Block\Adminhtml\System\Currency\Rate\CurrencyRateForm" locator="#container" strategy="css selector"/>
         <block name="messagesBlock" class="Magento\Backend\Test\Block\Messages" locator="#messages" strategy="css selector"/>
     </page>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/AbstractCurrencySymbolEntityTest.php b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/AbstractCurrencySymbolEntityTest.php
index 157b6dae2e1a1..5be6ff8e8e5da 100644
--- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/AbstractCurrencySymbolEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/AbstractCurrencySymbolEntityTest.php
@@ -79,7 +79,7 @@ protected function importCurrencyRate($configData)
 
         // Import Exchange Rates for currencies
         $this->currencyIndex->open();
-        $this->currencyIndex->getGridPageActions()->clickImportButton();
+        $this->currencyIndex->getCurrencyRateForm()->clickImportButton();
         if ($this->currencyIndex->getMessagesBlock()->isVisibleMessage('warning')) {
             throw new \Exception($this->currencyIndex->getMessagesBlock()->getWarningMessages());
         }
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/Bestsellers.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/Bestsellers.xml
index 8dc602074b43b..7f7eedb651962 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/Bestsellers.xml
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/Bestsellers.xml
@@ -10,6 +10,6 @@
     <block name="messagesBlock" class="Magento\Backend\Test\Block\Messages" locator="#messages .messages" strategy="css selector"/>
     <block name="actionsBlock" class="Magento\Reports\Test\Block\Adminhtml\Viewed\Action" locator=".page-main-actions" strategy="css selector"/>
     <block name="filterBlock" class="Magento\Reports\Test\Block\Adminhtml\Product\Viewed\Filter" locator="#filter_form" strategy="css selector"/>
-    <block name="gridBlock" class="Magento\Reports\Test\Block\Adminhtml\Product\Viewed\ProductGrid" locator=".grid" strategy="css selector"/>
+    <block name="gridBlock" class="Magento\Reports\Test\Block\Adminhtml\Product\Viewed\ProductGrid" locator=".data-grid" strategy="css selector"/>
   </page>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/ProductReportView.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/ProductReportView.xml
index 6b09e1eea717d..c51b3b5f61d3c 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/ProductReportView.xml
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/ProductReportView.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
   <page name="ProductReportView" area="Adminhtml" mca="reports/report_product/viewed/" module="Magento_Reports">
     <block name="actionsBlock" class="Magento\Reports\Test\Block\Adminhtml\Viewed\Action" locator=".page-main-actions" strategy="css selector"/>
-    <block name="gridBlock" class="Magento\Reports\Test\Block\Adminhtml\Review\Products\Viewed\ProductGrid" locator=".grid" strategy="css selector"/>
+    <block name="gridBlock" class="Magento\Reports\Test\Block\Adminhtml\Review\Products\Viewed\ProductGrid" locator=".data-grid" strategy="css selector"/>
     <block name="filterBlock" class="Magento\Sales\Test\Block\Adminhtml\Report\Filter\Form" locator="#filter_form" strategy="css selector"/>
     <block name="messagesBlock" class="Magento\Backend\Test\Block\Messages" locator="#messages .messages" strategy="css selector"/>
   </page>
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/RefundsReport.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/RefundsReport.xml
index d9178313fb69b..ef3d8424e1909 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/RefundsReport.xml
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/RefundsReport.xml
@@ -10,6 +10,6 @@
     <block name="messagesBlock" class="Magento\Backend\Test\Block\Messages" locator="#messages .messages" strategy="css selector"/>
     <block name="filterBlock" class="Magento\Sales\Test\Block\Adminhtml\Report\Filter\Form" locator="#filter_form" strategy="css selector"/>
     <block name="actionBlock" class="Magento\Reports\Test\Block\Adminhtml\Viewed\Action" locator=".page-main-actions" strategy="css selector"/>
-    <block name="gridBlock" class="Magento\Reports\Test\Block\Adminhtml\Sales\Refunded\FilterGrid" locator=".grid" strategy="css selector"/>
+    <block name="gridBlock" class="Magento\Reports\Test\Block\Adminhtml\Sales\Refunded\FilterGrid" locator=".data-grid" strategy="css selector"/>
   </page>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/SalesInvoiceReport.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/SalesInvoiceReport.xml
index 80d2d491cf977..245a21f9aaec0 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/SalesInvoiceReport.xml
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/SalesInvoiceReport.xml
@@ -10,6 +10,6 @@
     <block name="messagesBlock" class="Magento\Backend\Test\Block\Messages" locator="#messages .messages" strategy="css selector"/>
     <block name="filterForm" class="Magento\Sales\Test\Block\Adminhtml\Report\Filter\Form" locator="#filter_form" strategy="css selector"/>
     <block name="actionBlock" class="Magento\Reports\Test\Block\Adminhtml\Viewed\Action" locator=".page-main-actions" strategy="css selector"/>
-    <block name="gridBlock" class="Magento\Reports\Test\Block\Adminhtml\Sales\Invoiced\Grid" locator=".grid" strategy="css selector"/>
+    <block name="gridBlock" class="Magento\Reports\Test\Block\Adminhtml\Sales\Invoiced\Grid" locator=".data-grid" strategy="css selector"/>
   </page>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/SalesReport.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/SalesReport.xml
index 5ca316b71b414..63f26114a2546 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/SalesReport.xml
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/SalesReport.xml
@@ -10,6 +10,6 @@
     <block name="messagesBlock" class="Magento\Backend\Test\Block\Messages" locator="#messages .messages" strategy="css selector"/>
     <block name="filterBlock" class="Magento\Sales\Test\Block\Adminhtml\Report\Filter\Form" locator="#filter_form" strategy="css selector"/>
     <block name="actionBlock" class="Magento\Reports\Test\Block\Adminhtml\Viewed\Action" locator=".page-main-actions" strategy="css selector"/>
-    <block name="gridBlock" class="Magento\Reports\Test\Block\Adminhtml\Sales\Orders\Viewed\FilterGrid" locator=".grid" strategy="css selector"/>
+    <block name="gridBlock" class="Magento\Reports\Test\Block\Adminhtml\Sales\Orders\Viewed\FilterGrid" locator=".data-grid" strategy="css selector"/>
   </page>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/SalesTaxReport.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/SalesTaxReport.xml
index 39eb397bf1a4d..04b999e099978 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/SalesTaxReport.xml
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/SalesTaxReport.xml
@@ -9,6 +9,6 @@
   <page name="SalesTaxReport" area="Adminhtml" mca="reports/report_sales/tax" module="Magento_Reports">
     <block name="filterBlock" class="Magento\Reports\Test\Block\Adminhtml\Sales\TaxRule\Filter" locator="#filter_form" strategy="css selector"/>
     <block name="actionBlock" class="Magento\Reports\Test\Block\Adminhtml\Sales\TaxRule\Action" locator=".page-main-actions" strategy="css selector"/>
-    <block name="gridBlock" class="Magento\Reports\Test\Block\Adminhtml\Sales\TaxRule\Grid" locator=".grid" strategy="css selector"/>
+    <block name="gridBlock" class="Magento\Reports\Test\Block\Adminhtml\Sales\TaxRule\Grid" locator=".data-grid" strategy="css selector"/>
   </page>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create.php
index b2030524e5eec..782298c972060 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create.php
@@ -85,7 +85,7 @@ class Create extends Block
      *
      * @var string
      */
-    protected $updateItems = '#order-items_grid button[onclick="order.itemsUpdate()"]';
+    protected $updateItems = '[onclick="order.itemsUpdate()"]';
 
     /**
      * 'Add Selected Product(s) to Order' button.
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Store.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Store.php
index d1ca2a6925a1e..f37068a27706e 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Store.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Store.php
@@ -25,6 +25,13 @@ class Store extends Block
      */
     protected $templateBlock = './ancestor::body';
 
+    /**
+     * Locator value for specified Store control.
+     *
+     * @var string
+     */
+    protected $store = '//label[contains(., "%s")]/preceding-sibling::*';
+
     /**
      * Get backend abstract block
      *
@@ -48,7 +55,7 @@ public function selectStoreView(StoreFixture $fixture = null)
             return;
         }
         $storeName = $fixture == null ? 'Default Store View' : $fixture->getName();
-        $selector = '//label[text()="' . $storeName . '"]/preceding-sibling::*';
+        $selector = sprintf($this->store, $storeName);
         $this->_rootElement->find($selector, Locator::SELECTOR_XPATH, 'checkbox')->setValue('Yes');
         $this->getTemplateBlock()->waitLoader();
     }
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Grid.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Grid.php
index 8923aa8d311fb..c6754087307d1 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Grid.php
@@ -49,7 +49,7 @@ class Grid extends GridInterface
      *
      * @var string
      */
-    protected $firstRowSelector = '//tr[./td[contains(@class, "col-name")]][1]';
+    protected $firstRowSelector = '//tbody/tr[./td[contains(@class, "col-name")]][1]';
 
     /**
      * Check if specific row exists in grid
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Adminhtml/Customer/Edit/Tab/Wishlist/Grid.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Adminhtml/Customer/Edit/Tab/Wishlist/Grid.php
index fd2a372a44473..db52e68e51d0d 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Adminhtml/Customer/Edit/Tab/Wishlist/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Adminhtml/Customer/Edit/Tab/Wishlist/Grid.php
@@ -104,7 +104,7 @@ protected function getRow(array $filter, $isSearchable = true, $isStrict = true)
         if ($isSearchable) {
             $this->search($filter);
         }
-        $location = '//div[@class="grid"]//tr[';
+        $location = '//tr[';
         $rowTemplate = 'td[contains(.,normalize-space("%s"))]';
         $rows = [];
         foreach ($filter as $value) {
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/CartTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/CartTest.php
index f7160adb6c3af..f4887bb251ad4 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/CartTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/CartTest.php
@@ -81,7 +81,10 @@ public function testGetGridParentHtml()
             ->disableOriginalConstructor()
             ->getMock();
         $this->_block->setCollection($mockCollection);
-        $this->assertContains("<div class=\"grid-actions\">", $this->_block->getGridParentHtml());
+        $this->assertContains(
+            "<div class=\"admin__data-grid-header admin__data-grid-toolbar\"",
+            $this->_block->getGridParentHtml()
+        );
     }
 
     public function testGetRowUrl()
@@ -94,8 +97,8 @@ public function testGetRowUrl()
     public function testGetHtml()
     {
         $html = $this->_block->toHtml();
-        $this->assertContains("<div id=\"customer_cart_grid\">", $html);
-        $this->assertContains("<div class=\"grid-actions\">", $html);
+        $this->assertContains("<div id=\"customer_cart_grid\"", $html);
+        $this->assertContains("<div class=\"admin__data-grid-header admin__data-grid-toolbar\"", $html);
         $this->assertContains("customer_cart_gridJsObject = new varienGrid('customer_cart_grid',", $html);
         $this->assertContains(
             "backend/customer/cart_product_composite_cart/configure/customer_id/" . self::CUSTOMER_ID_VALUE,
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/CartsTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/CartsTest.php
index 2f66f52ff06ad..5bbdca87782a2 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/CartsTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/CartsTest.php
@@ -56,8 +56,11 @@ public function testGetHtml()
         );
 
         $html = $this->_block->toHtml();
-        $this->assertContains("<div id=\"customer_cart_grid1\">", $html);
-        $this->assertContains("<div class=\"grid-actions\">", $html);
+        $this->assertContains("<div id=\"customer_cart_grid1\"", $html);
+        $this->assertRegExp(
+            '/<div class=".*admin__data-grid-toolbar"/',
+            $html
+        );
         $this->assertContains("customer_cart_grid1JsObject = new varienGrid('customer_cart_grid1',", $html);
         $this->assertContains("backend/customer/cart_product_composite_cart/configure/website_id/1", $html);
     }
@@ -76,8 +79,11 @@ public function testGetHtmlNoCustomer()
         );
 
         $html = $this->_block->toHtml();
-        $this->assertContains("<div id=\"customer_cart_grid\">", $html);
-        $this->assertContains("<div class=\"grid-actions\">", $html);
+        $this->assertContains("<div id=\"customer_cart_grid\"", $html);
+        $this->assertRegExp(
+            '/<div class=".*admin__data-grid-toolbar"/',
+            $html
+        );
         $this->assertContains("customer_cart_gridJsObject = new varienGrid('customer_cart_grid',", $html);
         $this->assertContains("backend/customer/cart_product_composite_cart/configure/key/", $html);
     }
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php
index da3a723a0db75..a52fef8b40a43 100755
--- a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php
@@ -543,7 +543,7 @@ public function testCartAction()
         $this->getRequest()->setParam('id', 1)->setParam('website_id', 1)->setPostValue('delete', 1);
         $this->dispatch('backend/customer/index/cart');
         $body = $this->getResponse()->getBody();
-        $this->assertContains('<div id="customer_cart_grid1">', $body);
+        $this->assertContains('<div id="customer_cart_grid1"', $body);
     }
 
     /**
@@ -554,7 +554,7 @@ public function testProductReviewsAction()
         $this->getRequest()->setParam('id', 1);
         $this->dispatch('backend/customer/index/productReviews');
         $body = $this->getResponse()->getBody();
-        $this->assertContains('<div id="reviwGrid">', $body);
+        $this->assertContains('<div id="reviwGrid"', $body);
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/Magento/ModuleA/view/adminhtml/product/product.css b/dev/tests/integration/testsuite/Magento/Framework/View/_files/Magento/ModuleA/view/adminhtml/product/product.css
index 88aa062ced50c..c7310b1e87937 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/View/_files/Magento/ModuleA/view/adminhtml/product/product.css
+++ b/dev/tests/integration/testsuite/Magento/Framework/View/_files/Magento/ModuleA/view/adminhtml/product/product.css
@@ -493,10 +493,6 @@
     width: 43%;
 }
 
-#configurable-attributes-container {
-    margin-bottom: 23px;
-}
-
 #configurable-attributes-container .col-name {
     width: 65%;
 }
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreateTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreateTest.php
index 0a35f0488948b..9514e649404e0 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreateTest.php
@@ -33,8 +33,8 @@ public function testLoadBlockActionData()
         $this->getRequest()->setParam('json', 1);
         $this->dispatch('backend/sales/order_create/loadBlock');
         $html = $this->getResponse()->getBody();
-        $this->assertContains('<div id=\"sales_order_create_search_grid\">', $html);
-        $this->assertContains('<div id=\"order-billing_method_form\">', $html);
+        $this->assertContains('<div id=\"sales_order_create_search_grid\"', $html);
+        $this->assertContains('<div id=\"order-billing_method_form\"', $html);
         $this->assertContains('id=\"shipping-method-overlay\"', $html);
         $this->assertContains('id=\"coupons:code\"', $html);
     }
@@ -57,8 +57,8 @@ public function loadBlockActionsDataProvider()
             'shipping_method' => ['shipping_method', 'id=\"shipping-method-overlay\"'],
             'billing_method' => ['billing_method', '<div id=\"order-billing_method_form\">'],
             'newsletter' => ['newsletter', 'name=\"newsletter:subscribe\"'],
-            'search' => ['search', '<div id=\"sales_order_create_search_grid\">'],
-            'search_grid' => ['search', '<div id=\"sales_order_create_search_grid\">']
+            'search' => ['search', '<div id=\"sales_order_create_search_grid\"'],
+            'search_grid' => ['search', '<div id=\"sales_order_create_search_grid\"']
         ];
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/OrderTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/OrderTest.php
index afe9624ba2fb1..bb770aca97b95 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/OrderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/OrderTest.php
@@ -13,7 +13,7 @@ class OrderTest extends \Magento\Backend\Utility\Controller
     public function testIndexAction()
     {
         $this->dispatch('backend/sales/order/index');
-        $this->assertContains('Total 0 records found', $this->getResponse()->getBody());
+        $this->assertContains('No records found.', $this->getResponse()->getBody());
     }
 
     /**
@@ -22,7 +22,10 @@ public function testIndexAction()
     public function testIndexActionWithOrder()
     {
         $this->dispatch('backend/sales/order/index');
-        $this->assertContains('Total 1 records found', $this->getResponse()->getBody());
+        $this->assertRegExp(
+            '/<span.*id="sales_order_grid-total-count".*>\s*1\s*<\/span>\s*records found.\s*/',
+            $this->getResponse()->getBody()
+        );
     }
 
     /**
diff --git a/dev/tools/grunt/configs/banner.js b/dev/tools/grunt/configs/banner.js
deleted file mode 100644
index df195f673c0bb..0000000000000
--- a/dev/tools/grunt/configs/banner.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Copyright © 2015 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-'use strict';
-
-module.exports = {
-    firstLine: 'Copyright © <%= grunt.template.today("yyyy") %> Magento. All rights reserved.',
-    secondLine: 'See COPYING.txt for license details.',
-
-    css: function () {
-        return '/**\n * ' + this.firstLine + '\n * ' + this.secondLine + '\n */\n';
-    },
-
-    less: function () {
-        return '// /**\n//  * ' + this.firstLine + '\n//  * ' + this.secondLine + '\n//  */\n';
-    },
-
-    html: function () {
-        return '<!--\n/**\n * ' + this.firstLine + '\n * ' + this.secondLine + '\n */\n-->\n';
-    }
-};
diff --git a/dev/tools/grunt/configs/usebanner.js b/dev/tools/grunt/configs/usebanner.js
index 699e33a66766d..fb952f050c2b9 100644
--- a/dev/tools/grunt/configs/usebanner.js
+++ b/dev/tools/grunt/configs/usebanner.js
@@ -5,7 +5,22 @@
 
 'use strict';
 
-var banner = require('./banner');
+var banner = {
+    firstLine: 'Copyright © 2015 Magento. All rights reserved.',
+    secondLine: 'See COPYING.txt for license details.',
+
+    css: function () {
+        return '/**\n * ' + this.firstLine + '\n * ' + this.secondLine + '\n */\n';
+    },
+
+    less: function () {
+        return '// /**\n//  * ' + this.firstLine + '\n//  * ' + this.secondLine + '\n//  */\n';
+    },
+
+    html: function () {
+        return '<!--\n/**\n * ' + this.firstLine + '\n * ' + this.secondLine + '\n */\n-->\n';
+    }
+};
 
 module.exports = {
     options: {
diff --git a/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/Oyejorge.php b/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/Oyejorge.php
index e490aa616ba34..c91e1721686ac 100644
--- a/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/Oyejorge.php
+++ b/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/Oyejorge.php
@@ -12,16 +12,25 @@
  */
 class Oyejorge implements \Magento\Framework\Css\PreProcessor\AdapterInterface
 {
+    /**
+     * @var \Psr\Log\LoggerInterface
+     */
+    protected $logger;
+
     /**
      * @var \Magento\Framework\App\State
      */
     protected $appState;
 
     /**
-     * @param \Magento\Framework\App\State $appState
+     * @param \Psr\Log\LoggerInterface $logger
+     * @param State $appState
      */
-    public function __construct(State $appState)
-    {
+    public function __construct(
+        \Psr\Log\LoggerInterface $logger,
+        State $appState
+    ) {
+        $this->logger = $logger;
         $this->appState = $appState;
     }
 
@@ -32,8 +41,14 @@ public function __construct(State $appState)
     public function process($sourceFilePath)
     {
         $options = ['relativeUrls' => false, 'compress' => $this->appState->getMode() !== State::MODE_DEVELOPER];
-        $parser = new \Less_Parser($options);
-        $parser->parseFile($sourceFilePath, '');
-        return $parser->getCss();
+        try {
+            $parser = new \Less_Parser($options);
+            $parser->parseFile($sourceFilePath, '');
+            return $parser->getCss();
+        } catch (\Exception $e) {
+            $messagePrefix = 'CSS compilation from LESS ';
+            $this->logger->critical($messagePrefix . $e->getMessage());
+            return $messagePrefix . $e->getMessage();
+        }
     }
 }
diff --git a/lib/web/mage/adminhtml/grid.js b/lib/web/mage/adminhtml/grid.js
index 62ede73c5c2fc..684f8358df001 100644
--- a/lib/web/mage/adminhtml/grid.js
+++ b/lib/web/mage/adminhtml/grid.js
@@ -63,7 +63,7 @@ varienGrid.prototype = {
             }
         }
         if (this.sortVar && this.dirVar) {
-            var columns = $$('#' + this.containerId + this.tableSufix + ' thead a');
+            var columns = $$('#' + this.containerId + this.tableSufix + ' thead [data-sort]');
 
             for (var col = 0; col < columns.length; col++) {
                 Event.observe(columns[col], 'click', this.thLinkOnClick);
@@ -107,10 +107,10 @@ varienGrid.prototype = {
 
         Element.addClassName(element, 'on-mouse');
 
-        if (!Element.hasClassName('pointer')
+        if (!Element.hasClassName('_clickable')
             && (this.rowClickCallback !== openGridRow || element.title)) {
             if (element.title) {
-                Element.addClassName(element, 'pointer');
+                Element.addClassName(element, '_clickable');
             }
         }
     },
@@ -135,11 +135,11 @@ varienGrid.prototype = {
 
     },
     doSort:function (event) {
-        var element = Event.findElement(event, 'a');
+        var element = Event.findElement(event, 'th');
 
-        if (element.name && element.title) {
-            this.addVarToUrl(this.sortVar, element.name);
-            this.addVarToUrl(this.dirVar, element.title);
+        if (element.readAttribute('data-sort') && element.readAttribute('data-direction')) {
+            this.addVarToUrl(this.sortVar, element.readAttribute('data-sort'));
+            this.addVarToUrl(this.dirVar, element.readAttribute('data-direction'));
             this.reload(this.url);
         }
         Event.stop(event);
@@ -267,7 +267,7 @@ varienGrid.prototype = {
         }
     },
     bindFilterFields : function(){
-        var filters = $$('#'+this.containerId+' .filter input', '#'+this.containerId+' .filter select');
+        var filters = $$('#'+this.containerId+' [data-role="filter-form"] input', '#'+this.containerId+' [data-role="filter-form"] select');
         for (var i=0; i<filters.length; i++) {
             Event.observe(filters[i],'keypress',this.filterKeyPress.bind(this));
         }
@@ -304,7 +304,7 @@ varienGrid.prototype = {
         }
     },
     doFilter:function (callback) {
-        var filters = $$('#' + this.containerId + ' .filter input', '#' + this.containerId + ' .filter select');
+        var filters = $$('#' + this.containerId + ' [data-role="filter-form"] input', '#' + this.containerId + ' [data-role="filter-form"] select');
         var elements = [];
         for (var i in filters) {
             if (filters[i].value && filters[i].value.length) elements.push(filters[i]);
@@ -404,6 +404,7 @@ varienGridMassaction.prototype = {
     },
     initMassactionElements: function() {
         this.container      = $(this.containerId);
+        this.multiselect    = $(this.containerId + '-mass-select');
         this.count          = $(this.containerId + '-count');
         this.formHiddens    = $(this.containerId + '-form-hiddens');
         this.formAdditional = $(this.containerId + '-form-additional');
@@ -412,6 +413,7 @@ varienGridMassaction.prototype = {
         jQuery(this.form).mage('validation');
         this.select.observe('change', this.onSelectChange.bindAsEventListener(this));
         this.lastChecked    = { left: false, top: false, checkbox: false };
+        this.select.addClassName(this.select.value ? '_selected' : '');
         this.initMassSelect();
     },
     prepareForm: function() {
@@ -428,7 +430,7 @@ varienGridMassaction.prototype = {
             form.setAttribute('method', 'post');
             form.setAttribute('action', '');
             form.id = this.containerId + '-form';
-            formPlace = formElement.parentNode.parentNode;
+            formPlace = formElement.parentNode;
             formPlace.parentNode.appendChild(form);
             form.appendChild(formPlace);
         }
@@ -513,8 +515,10 @@ varienGridMassaction.prototype = {
         var item = this.getSelectedItem();
         if(item) {
             this.formAdditional.update($(this.containerId + '-item-' + item.id + '-block').innerHTML);
+            evt.target.addClassName('_selected')
         } else {
             this.formAdditional.update('');
+            evt.target.removeClassName('_selected')
         }
         jQuery(this.form).data('validator').resetForm();
     },
@@ -523,7 +527,7 @@ varienGridMassaction.prototype = {
             return false;
         }
         checkbox = false;
-        Event.findElement(evt, 'tr').select('.massaction-checkbox').each(function(element){
+        Event.findElement(evt, 'tr').select('[data-role="select-row"]').each(function(element){
             if(element.isMassactionCheckbox) {
                 checkbox = element;
             }
@@ -580,7 +584,7 @@ varienGridMassaction.prototype = {
     getCheckboxes: function() {
         var result = [];
         this.grid.rows.each(function(row){
-            var checkboxes = row.select('.massaction-checkbox');
+            var checkboxes = row.select('[data-role="select-row"]');
             checkboxes.each(function(checkbox){
                 result.push(checkbox);
             });
@@ -606,7 +610,24 @@ varienGridMassaction.prototype = {
         this.updateCount();
     },
     updateCount: function() {
-        this.count.update(varienStringArray.count(this.checkedString));
+        var checkboxesTotal = varienStringArray.count((this.useSelectAll ? this.getGridIds() : this.getCheckboxesValuesAsString())),
+            checkboxesChecked = varienStringArray.count(this.checkedString);
+        jQuery('[data-role="counter"]' ,this.count).html(checkboxesChecked);
+        if (!checkboxesTotal) {
+            this.multiselect.addClassName('_disabled');
+        } else {
+            this.multiselect.removeClassName('_disabled');
+        }
+        if (checkboxesChecked == checkboxesTotal && checkboxesTotal != 0) {
+            this.count.removeClassName('_empty');
+            this.multiselect.addClassName('_checked').removeClassName('_indeterminate');
+        } else if (checkboxesChecked == 0) {
+            this.count.addClassName('_empty');
+            this.multiselect.removeClassName('_checked').removeClassName('_indeterminate');
+        } else {
+            this.count.removeClassName('_empty');
+            this.multiselect.addClassName('_checked').addClassName('_indeterminate');
+        }
         if(!this.grid.reloadParams) {
             this.grid.reloadParams = {};
         }
@@ -675,7 +696,7 @@ varienGridMassaction.prototype = {
         return eval(strValue);
     },
     initMassSelect: function() {
-        $$('input[class~="massaction-checkbox"]').each(
+        $$('input[data-role="select-row"]').each(
             function(element) {
                 element.observe('click', this.massSelect.bind(this));
             }.bind(this)
diff --git a/package.json b/package.json
index 69657eb7702c6..55e65759502a1 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "Magento2",
   "author": "Magento, an eBay Inc. company",
   "description": "Magento2 node modules dependencies for local development",
-  "version": "0.42.0-beta1",
+  "version": "0.74.0-beta7",
   "repository": {
     "type": "git",
     "url": "https://github.com/magento/magento2.git"
@@ -11,7 +11,7 @@
   "devDependencies": {
     "grunt": "^0.4.5",
     "grunt-autoprefixer": "^2.0.0",
-    "grunt-banner": "^0.3.1",
+    "grunt-banner": "^0.4.0",
     "grunt-contrib-clean": "^0.6.0",
     "grunt-contrib-connect": "^0.9.0",
     "grunt-contrib-cssmin": "^0.10.0",