diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Price.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Price.php
index 8164f1a4e3d08..df8e260986e4b 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Price.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Price.php
@@ -66,7 +66,7 @@ public function getHtml()
                 'From'
             ) . '" value="' . $this->getEscapedValue(
                 'from'
-            ) . '" class="input-text no-changes"  ' . $this->getUiId(
+            ) . '" class="input-text admin__control-text no-changes"  ' . $this->getUiId(
                 'filter',
                 $this->_getHtmlName(),
                 'from'
@@ -81,7 +81,7 @@ public function getHtml()
                 'To'
             ) . '" value="' . $this->getEscapedValue(
                 'to'
-            ) . '" class="input-text no-changes" ' . $this->getUiId(
+            ) . '" class="input-text admin__control-text no-changes" ' . $this->getUiId(
                 'filter',
                 $this->_getHtmlName(),
                 'to'
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Range.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Range.php
index 38455e7bd7caa..0d0ea1e411572 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Range.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Range.php
@@ -28,7 +28,7 @@ public function getHtml()
                 'From'
             ) . '" value="' . $this->getEscapedValue(
                 'from'
-            ) . '" class="input-text no-changes" ' . $this->getUiId(
+            ) . '" class="input-text admin__control-text no-changes" ' . $this->getUiId(
                 'filter',
                 $this->_getHtmlName(),
                 'from'
@@ -43,7 +43,7 @@ public function getHtml()
                 'To'
             ) . '" value="' . $this->getEscapedValue(
                 'to'
-            ) . '" class="input-text no-changes" ' . $this->getUiId(
+            ) . '" class="input-text admin__control-text no-changes" ' . $this->getUiId(
                 'filter',
                 $this->_getHtmlName(),
                 'to'
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 1a87e74881a30..c06fb05c9a4e0 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="no-changes">';
+        ) . 'class="admin__control-select no-changes">';
         $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 ab455c9ec4a50..f1b6d1a98dba0 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
@@ -23,7 +23,7 @@ public function getHtml()
             $this->_getHtmlId() .
             '" value="' .
             $this->getEscapedValue() .
-            '" class="input-text no-changes"' .
+            '" class="input-text admin__control-text no-changes"' .
             $this->getUiId(
                 'filter',
                 $this->_getHtmlName()
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Theme.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Theme.php
index 948e7f757163a..2e0087ad7f8d7 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Theme.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Theme.php
@@ -44,7 +44,7 @@ public function getHtml()
             array_unshift($options, ['value' => '', 'label' => '']);
         }
         $html = sprintf(
-            '<select name="%s" id="%s" class="no-changes" %s>%s</select>',
+            '<select name="%s" id="%s" class="admin__control-select no-changes" %s>%s</select>',
             $this->_getHtmlName(),
             $this->_getHtmlId(),
             $this->getUiId('filter', $this->_getHtmlName()),
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 3695d9df3eec3..bca3b3038445b 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
@@ -113,8 +113,11 @@ protected function _getCheckboxHtml($value, $checked)
         $html .= 'value="' . $this->escapeHtml($value) . '" ';
         $html .= 'class="' .
             ($this->getColumn()->getInlineCss() ? $this->getColumn()->getInlineCss() : 'checkbox') .
+            ' admin__control-checkbox' .
             '"';
         $html .= $checked . $this->getDisabled() . '/>';
+        $html .= '<label></label>';
+        /* ToDo UI: add class="admin__field-label" after some refactoring _fields.less */
         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 f87b7ee84a1a4..78d3d2677e94c 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml
@@ -14,7 +14,7 @@ $numColumns = sizeof($block->getColumns());
 <?php if ($block->getCollection()): ?>
 <div class="dashboard-item-content">
     <?php if ($block->getCollection()->getSize()>0): ?>
-        <table class="table dashboard-data" id="<?php echo $block->getId() ?>_table">
+        <table class="table-info dashboard-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): ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form.phtml
index ce11f847b4b0a..c2637c6682a3c 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form.phtml
@@ -9,6 +9,8 @@
 /** @var $block \Magento\Backend\Block\Widget\Form */
 ?>
 <?php /* @todo replace .form-inline with better class name */?>
+<?php /* ToDo UI: check if we need this wrapper in the process of global forms refactoring */ ?>
+
 <div class="entry-edit form-inline">
     <?php echo $block->getFormHtml();?>
 </div>
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 59dfc9db6b35d..88470e31c7d16 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
@@ -22,7 +22,7 @@ if (!isset($advancedLabel)) {
     $advancedLabel = __('Additional Settings');
 }
 
-$cssClass = ($isField) ? 'field ' . $element->getClass() : 'fieldset ' . $element->getClass();
+$cssClass = ($isField) ? 'field ' . $element->getClass() : 'fieldset admin__fieldset ' . $element->getClass();
 
 if ($isField) {
     $count = $element->getCountBasicChildren();
@@ -41,13 +41,13 @@ if ($isField) {
     <div class="fieldset-wrapper <?php echo($isCollapsable) ? 'collapsable-wrapper ' : ''; ?>"
         id="<?php echo $containerId ? $containerId : $id . '-wrapper';?>"
         data-role="<?php echo $id ?>-wrapper">
-        <div class="fieldset-wrapper-title">
+        <div class="fieldset-wrapper-title admin__fieldset-wrapper-title">
             <strong class="title"<?php echo($isCollapsable) ? ' data-toggle="collapse" data-target="#' . $id . '-content"' : ''; ?>>
                 <span><?php echo $element->getLegend() ?></span>
             </strong>
             <?php echo $titleActions; ?>
         </div>
-        <div class="fieldset-wrapper-content<?php echo($isCollapsable) ? ' collapse' : ''; ?>"
+        <div class="fieldset-wrapper-content admin__fieldset-wrapper-content<?php echo($isCollapsable) ? ' collapse' : ''; ?>"
             id="<?php echo $id ?>-content"
             data-role="<?php echo $id ?>-content">
 <?php endif; ?>
@@ -69,7 +69,7 @@ if ($isField) {
     </div>
 
 
-    <?php echo($isField) ? '<div class="control">' : ''; ?>
+    <?php echo($isField) ? '<div class="control admin__field-control">' : ''; ?>
 
     <?php if ($element->hasHtmlContent() && !$isField): ?>
         <?php echo $element->getHtmlContent(); ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset/element.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset/element.phtml
index 0919e2e7773cc..a9600c1aae00a 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset/element.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset/element.phtml
@@ -11,13 +11,13 @@
 /* @var $block \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Element */
 $element = $block->getElement();
 $note = $element->getNote() ? '<div class="note" id="' . $element->getId() . '-note">' . $element->getNote() . '</div>' : '';
-$elementBeforeLabel = $element->getExtType() == 'checkbox' || $element->getExtType() == 'radio';
+$elementBeforeLabel = $element->getExtType() == 'checkbox admin__control-checkbox' || $element->getExtType() == 'radio admin__control-radio';
 $addOn = $element->getBeforeElementHtml() || $element->getAfterElementHtml();
 $fieldId = ($element->getHtmlContainerId()) ? ' id="' . $element->getHtmlContainerId() . '"' : '';
-$fieldClass = "field field-{$element->getId()} {$element->getCssClass()}";
+$fieldClass = "admin__field field field-{$element->getId()} {$element->getCssClass()}";
 $fieldClass .= ($elementBeforeLabel) ? ' choice' : '';
 $fieldClass .= ($addOn) ? ' with-addon' : '';
-$fieldClass .= ($element->getRequired()) ? ' required' : '';
+$fieldClass .= ($element->getRequired()) ? ' required _required' : '';
 $fieldClass .= ($note) ? ' with-note' : '';
 $fieldClass .= (!$element->getLabelHtml()) ? ' no-label' : '';
 
@@ -36,8 +36,8 @@ $fieldAttributes = $fieldId . ' class="' . $fieldClass . '" '
             <?php echo $note ?>
         <?php else: ?>
             <?php echo $element->getLabelHtml() ?>
-            <div class="control">
-                <?php echo($addOn) ? '<div class="addon">' . $element->getElementHtml() . '</div>' : $element->getElementHtml(); ?>
+            <div class="admin__field-control control">
+                <?php echo($addOn) ? '<div class="admin__field admin__field-option">' . $element->getElementHtml() . '</div>' : $element->getElementHtml(); ?>
                 <?php echo $note ?>
             </div>
         <?php endif; ?>
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 f020f39cee126..ce39df8da943b 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
@@ -55,7 +55,7 @@ $numColumns = sizeof($block->getColumns());
                             <?php echo __('View') ?>
                             <select name="<?php echo $block->getVarNameLimit() ?>"
                                     onchange="<?php echo $block->getJsObjectName() ?>.loadByElement(this)" <?php echo $block->getUiId('per-page') ?>
-                                    class="select">
+                                    class="select admin__control-select">
                                 <option value="20"<?php if ($block->getCollection()->getPageSize() == 20): ?>
                                     selected="selected"<?php endif; ?>>20
                                 </option>
@@ -108,11 +108,11 @@ $numColumns = sizeof($block->getColumns());
                             <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-previous disabled"><span><?php echo __('Previous page') ?></span></span>
+                            <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 page"
+                               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">
@@ -123,7 +123,7 @@ $numColumns = sizeof($block->getColumns());
                             <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-next disabled"><span><?php echo __('Next page') ?></span></span>
+                            <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') ?>
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 fc733f71a023a..c8f1b79cf2cca 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
@@ -42,7 +42,7 @@ $numColumns = sizeof($block->getColumns());
                     <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">
+                            class="select admin__control-select">
                         <?php foreach ($block->getExportTypes() as $_type): ?>
                             <option value="<?php echo $_type->getUrl() ?>"><?php echo $_type->getLabel() ?></option>
                         <?php endforeach; ?>
@@ -63,7 +63,8 @@ $numColumns = sizeof($block->getColumns());
                     <label class="view-pages">
                         <?php echo __('View') ?>
                         <select name="<?php echo $block->getVarNameLimit() ?>"
-                                onchange="<?php echo $block->getJsObjectName() ?>.loadByElement(this)" class="select">
+                                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>
@@ -199,11 +200,11 @@ $numColumns = sizeof($block->getColumns());
                     <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-previous disabled"><span><?php echo __('Previous page') ?></span></span>
+                    <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 page"
+                       class="input-text admin__control-text page"
                        onkeypress="<?php echo $block->getJsObjectName() ?>.inputPage(event, '<?php echo $_lastPage ?>')"/>
 
                 <span class="pages-total">
@@ -214,7 +215,7 @@ $numColumns = sizeof($block->getColumns());
                     <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-next disabled"><span><?php echo __('Next page') ?></span></span>
+                    <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') ?>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/bundle.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/bundle.phtml
index 86d170187b0af..73d5d50ee6574 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/bundle.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/bundle.phtml
@@ -11,15 +11,13 @@
 <?php /* @var $block \Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Bundle */ ?>
 <?php $options = $block->decorateArray($block->getOptions()); ?>
 <?php if (count($options)): ?>
-<fieldset id="catalog_product_composite_configure_fields_bundle" class="fieldset bundle<?php echo $block->getIsLastFieldset() ? ' last-fieldset' : '' ?>">
-    <legend class="legend"><span><?php echo __('Bundle Items') ?></span></legend><br />
-    <div class="fields options">
-        <?php foreach ($options as $option) : ?>
-            <?php if ($option->getSelections()) : ?>
-                <?php echo $block->getOptionHtml($option); ?>
-            <?php endif; ?>
-        <?php endforeach; ?>
-    </div>
+<fieldset id="catalog_product_composite_configure_fields_bundle" class="fieldset admin__fieldset composite-bundle <?php echo $block->getIsLastFieldset() ? ' last-fieldset' : '' ?>">
+    <legend class="legend admin__legend"><span><?php echo __('Bundle Items') ?></span></legend><br />
+    <?php foreach ($options as $option) : ?>
+        <?php if ($option->getSelections()) : ?>
+            <?php echo $block->getOptionHtml($option); ?>
+        <?php endif; ?>
+    <?php endforeach; ?>
 </fieldset>
 
 <script>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/checkbox.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/checkbox.phtml
index 930efcfb1c1aa..ecc896b655639 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/checkbox.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/checkbox.phtml
@@ -11,43 +11,53 @@
 <?php $_option = $block->getOption(); ?>
 <?php $_selections = $_option->getSelections(); ?>
 <?php $_skipSaleableCheck = $this->helper('Magento\Catalog\Helper\Product')->getSkipSaleableCheck(); ?>
-<div class="field options<?php if ($_option->getRequired()) {
-    echo ' required' ?>">
-    <label class="label"><span><?php echo $block->escapeHtml($_option->getTitle()) ?></span></label>
-    <div class="control">
-        <div class="nested<?php if ($_option->getDecoratedIsLast()):?> last<?php endif;
-} ?>">
-        <?php if (count($_selections) == 1 && $_option->getRequired()): ?>
-            <?php echo $block->getSelectionQtyTitlePrice($_selections[0]) ?>
-            <input type="hidden" name="bundle_option[<?php echo $_option->getId() ?>]"
-                   value="<?php echo $_selections[0]->getSelectionId() ?>"
-                   price="<?php echo $block->getSelectionPrice($_selections[0]) ?>" />
-        <?php else:?>
-            <?php foreach ($_selections as $_selection): ?>
-            <div class="field choice">
-                <input
-                    class="change-container-classname checkbox bundle-option-<?php echo $_option->getId() ?> <?php if ($_option->getRequired()) {
-    echo 'validate-one-required-by-name' ?>"
-                    id="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>"
-                    type="checkbox"
-                    name="bundle_option[<?php echo $_option->getId() ?>][<?php echo $_selection ?>]"<?php if ($block->isSelected($_selection)) {
-    echo ' checked="checked"' ?><?php if (!$_selection->isSaleable() && !$_skipSaleableCheck) {
-    echo ' disabled="disabled"' ?>
-                    value="<?php echo $_selection->getSelectionId() ?>"
-                    onclick="ProductConfigure.bundleControl.changeSelection(this)"
-                    price="<?php echo $block->getSelectionPrice($_selection) ?>" />
-                <label class="label"
-                       for="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>"><span><?php echo $block->getSelectionQtyTitlePrice($_selection) ?></span></label>
-                    <?php if ($_option->getRequired()): ?>
-                        <?php echo $block->setValidationContainer('bundle-option-' . $_option->getId() . '-' . $_selection->getSelectionId(), 'bundle-option-' . $_option->getId() . '-container') ?>
-                    <?php endif;
-}
-}
-} ?>
-                </div>
-            <?php endforeach; ?>
-            <div id="bundle-option-<?php echo $_option->getId() ?>-container"></div>
-        <?php endif; ?>
+
+<div class="field admin__field options<?php if ($_option->getRequired()) echo ' required _required' ?>">
+    <label class="label admin__field-label">
+        <span><?php echo $block->escapeHtml($_option->getTitle()) ?></span>
+    </label>
+
+    <div class="control admin__field-control">
+        <div class="nested <?php if ($_option->getDecoratedIsLast()):?> last<?php endif;?>">
+
+            <?php if (count($_selections) == 1 && $_option->getRequired()): ?>
+                <?php echo $block->getSelectionQtyTitlePrice($_selections[0]) ?>
+                <input type="hidden"
+                       name="bundle_option[<?php echo $_option->getId() ?>]"
+                       value="<?php echo $_selections[0]->getSelectionId() ?>"
+                       price="<?php echo $block->getSelectionPrice($_selections[0]) ?>" />
+            <?php else:?>
+
+                <?php foreach ($_selections as $_selection): ?>
+                    <div class="field choice admin__field admin__field-option">
+                        <input
+                            class="change-container-classname admin__control-checkbox checkbox bundle-option-<?php echo $_option->getId() ?> <?php if ($_option->getRequired()) echo 'validate-one-required-by-name' ?>"
+                            id="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>"
+                            type="checkbox"
+                            name="bundle_option[<?php echo $_option->getId() ?>]"
+                            <?php if ($block->isSelected($_selection)):?>
+                                <?php echo ' checked="checked"'; ?>
+                            <?php endif;?>
+                            <?php if (!$_selection->isSaleable() && !$_skipSaleableCheck):?>
+                                <?php echo ' disabled="disabled"'; ?>
+                            <?php endif;?>
+                            value="<?php echo $_selection->getSelectionId() ?>"
+                            onclick="ProductConfigure.bundleControl.changeSelection(this)"
+                            price="<?php echo $block->getSelectionPrice($_selection) ?>" />
+
+                        <label class="admin__field-label"
+                               for="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>">
+                            <span><?php echo $block->getSelectionQtyTitlePrice($_selection) ?></span>
+                        </label>
+
+                        <?php if ($_option->getRequired()): ?>
+                            <?php echo $block->setValidationContainer('bundle-option-' . $_option->getId() . '-' . $_selection->getSelectionId(), 'bundle-option-' . $_option->getId() . '-container') ?>
+                        <?php endif;?>
+                    </div>
+                <?php endforeach; ?>
+
+                <div id="bundle-option-<?php echo $_option->getId() ?>-container"></div>
+            <?php endif; ?>
         </div>
     </div>
 </div>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/multi.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/multi.phtml
index 03922735e0c8e..9f49261b63773 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/multi.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/multi.phtml
@@ -11,9 +11,9 @@
 <?php $_option = $block->getOption(); ?>
 <?php $_selections = $_option->getSelections(); ?>
 <?php $_skipSaleableCheck = $this->helper('Magento\Catalog\Helper\Product')->getSkipSaleableCheck(); ?>
-<div class="field<?php if ($_option->getRequired()) echo ' required' ?><?php if ($_option->getDecoratedIsLast()):?> last<?php endif; ?>">
-    <label class="label"><span><?php echo $block->escapeHtml($_option->getTitle()) ?></span></label>
-    <div class="control">
+<div class="field admin__field <?php if ($_option->getRequired()) echo ' required' ?><?php if ($_option->getDecoratedIsLast()):?> last<?php endif; ?>">
+    <label class="label admin__field-label"><span><?php echo $block->escapeHtml($_option->getTitle()) ?></span></label>
+    <div class="control admin__field-control">
         <?php if (count($_selections) == 1 && $_option->getRequired()): ?>
             <?php echo $block->getSelectionQtyTitlePrice($_selections[0]) ?>
             <input type="hidden" name="bundle_option[<?php echo $_option->getId() ?>]"
@@ -22,7 +22,7 @@
         <?php else: ?>
             <select multiple="multiple" size="5" id="bundle-option-<?php echo $_option->getId() ?>"
                     name="bundle_option[<?php echo $_option->getId() ?>]"
-                    class="bundle-option-<?php echo $_option->getId() ?><?php if ($_option->getRequired()) echo ' required-entry' ?> multiselect change-container-classname"
+                    class="admin__control-multiselect bundle-option-<?php echo $_option->getId() ?><?php if ($_option->getRequired()) echo ' required-entry' ?> multiselect change-container-classname"
                     onchange="ProductConfigure.bundleControl.changeSelection(this)">
             <?php if(!$_option->getRequired()): ?>
                 <option value=""><?php echo __('None') ?></option>
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 f9fb5cd872ea0..297bf38a39c99 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
@@ -14,20 +14,21 @@
 <?php $_skipSaleableCheck = $this->helper('Magento\Catalog\Helper\Product')->getSkipSaleableCheck(); ?>
 <?php list($_defaultQty, $_canChangeQty) = $block->getDefaultValues(); ?>
 
-<div class="field options<?php if ($_option->getRequired()) echo ' required' ?>">
-    <label class="label"><span><?php echo $block->escapeHtml($_option->getTitle()) ?></span></label>
-    <div class="control">
+<div class="field admin__field options<?php if ($_option->getRequired()) echo ' required' ?>">
+    <label class="label admin__field-label"><span><?php echo $block->escapeHtml($_option->getTitle()) ?></span></label>
+    <div class="control admin__field-control">
         <div class="nested<?php if ($_option->getDecoratedIsLast()):?> last<?php endif; ?>">
         <?php if ($block->showSingle()): ?>
             <?php echo $block->getSelectionTitlePrice($_selections[0]) ?>
-            <input type="hidden" name="bundle_option[<?php echo $_option->getId() ?>]"
+            <input type="hidden"
+                   name="bundle_option[<?php echo $_option->getId() ?>]"
                    value="<?php echo $_selections[0]->getSelectionId() ?>"
                    price="<?php echo $block->getSelectionPrice($_selections[0]) ?>" />
         <?php else:?>
             <?php if (!$_option->getRequired()): ?>
-                <div class="field choice">
+                <div class="field choice admin__field admin__field-option">
                     <input type="radio"
-                           class="radio"
+                           class="radio admin__control-radio"
                            id="bundle-option-<?php echo $_option->getId() ?>"
                            name="bundle_option[<?php echo $_option->getId() ?>]"<?php echo ($_default && $_default->isSalable()) ? '' : ' checked="checked" ' ?>
                            value=""
@@ -36,10 +37,11 @@
                            for="bundle-option-<?php echo $_option->getId() ?>"><span><?php echo __('None') ?></span></label>
                 </div>
             <?php endif; ?>
+
             <?php foreach ($_selections as $_selection): ?>
-                <div class="field choice">
+                <div class="field choice admin__field admin__field-option">
                     <input type="radio"
-                           class="radio<?php echo $_option->getRequired() ? ' validate-one-required-by-name' : '' ?> change-container-classname"
+                           class="radio admin__control-radio <?php echo $_option->getRequired() ? ' validate-one-required-by-name' : '' ?> change-container-classname"
                            id="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>"
                            name="bundle_option[<?php echo $_option->getId() ?>]"
                            <?php if ($block->isSelected($_selection)) echo ' checked="checked"' ?><?php if (!$_selection->isSaleable() && !$_skipSaleableCheck) echo ' disabled="disabled"' ?>
@@ -56,12 +58,13 @@
             <?php endforeach; ?>
             <div id="bundle-option-<?php echo $_option->getId() ?>-container"></div>
         <?php endif; ?>
-            <div class="field qty">
-                <label class="label"
+            <div class="field admin__field qty">
+                <label class="label admin__field-label"
                        for="bundle-option-<?php echo $_option->getId() ?>-qty-input"><span><?php echo __('Qty:') ?></span></label>
-                <div class="control"><input <?php if (!$_canChangeQty) echo ' disabled="disabled"' ?>
+                <div class="control admin__field-control"><input <?php if (!$_canChangeQty) echo ' disabled="disabled"' ?>
                         id="bundle-option-<?php echo $_option->getId() ?>-qty-input"
-                        class="input-text qty<?php if (!$_canChangeQty) echo ' qty-disabled' ?>" type="text"
+                        class="input-text admin__control-text qty<?php if (!$_canChangeQty) echo ' qty-disabled' ?>"
+                        type="text"
                         name="bundle_option_qty[<?php echo $_option->getId() ?>]" value="<?php echo $_defaultQty ?>" />
                 </div>
             </div>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/select.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/select.phtml
index 93a08e8b7cd88..9605342dff7b4 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/select.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/select.phtml
@@ -14,9 +14,9 @@
 <?php $_skipSaleableCheck = $this->helper('Magento\Catalog\Helper\Product')->getSkipSaleableCheck(); ?>
 <?php list($_defaultQty, $_canChangeQty) = $block->getDefaultValues(); ?>
 
-<div class="field option<?php if ($_option->getDecoratedIsLast()):?> last<?php endif; ?><?php if ($_option->getRequired()) echo ' required' ?>">
-    <label class="label"><span><?php echo $block->escapeHtml($_option->getTitle()) ?></span></label>
-    <div class="control">
+<div class="field admin__field option<?php if ($_option->getDecoratedIsLast()):?> last<?php endif; ?><?php if ($_option->getRequired()) echo ' required _required' ?>">
+    <label class="label admin__field-label"><span><?php echo $block->escapeHtml($_option->getTitle()) ?></span></label>
+    <div class="control admin__field-control">
         <?php if ($block->showSingle()): ?>
             <?php echo $block->getSelectionTitlePrice($_selections[0]) ?>
             <input type="hidden" name="bundle_option[<?php echo $_option->getId() ?>]"
@@ -25,7 +25,7 @@
         <?php else:?>
             <select id="bundle-option-<?php echo $_option->getId() ?>"
                     name="bundle_option[<?php echo $_option->getId() ?>]"
-                    class="bundle-option-<?php echo $_option->getId() ?><?php if ($_option->getRequired()) echo ' required-entry' ?> select change-container-classname"
+                    class="bundle-option-<?php echo $_option->getId() ?><?php if ($_option->getRequired()) echo ' required-entry' ?> select admin__control-select change-container-classname"
                     onchange="ProductConfigure.bundleControl.changeSelection(this)">
                 <option value=""><?php echo __('Choose a selection...') ?></option>
                 <?php foreach ($_selections as $_selection): ?>
@@ -38,13 +38,13 @@
         <?php endif; ?>
 
         <div class="nested">
-            <div class="field qty">
-                <label class="label"
+            <div class="field admin__field qty">
+                <label class="label admin__field-label"
                        for="bundle-option-<?php echo $_option->getId() ?>-qty-input"><span><?php echo __('Qty:') ?></span></label>
-                <div class="control">
+                <div class="control admin__field-control">
                     <input <?php if (!$_canChangeQty) echo ' disabled="disabled"' ?>
                         id="bundle-option-<?php echo $_option->getId() ?>-qty-input"
-                        class="input-text qty<?php if (!$_canChangeQty) echo ' qty-disabled' ?>" type="text"
+                        class="input-text admin__control-text qty<?php if (!$_canChangeQty) echo ' qty-disabled' ?>" type="text"
                         name="bundle_option_qty[<?php echo $_option->getId() ?>]" value="<?php echo $_defaultQty ?>" />
                 </div>
             </div>
diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Date.php b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Date.php
index 18c10874a1d24..fceda10388d54 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Date.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Date.php
@@ -189,7 +189,7 @@ protected function _getHtmlSelect($name, $value = null)
         )->setId(
             'options_' . $this->getOption()->getId() . '_' . $name
         )->setClass(
-            'product-custom-option datetime-picker' . $require
+            'product-custom-option admin__control-select datetime-picker' . $require
         )->setExtraParams()->setName(
             'options[' . $option->getId() . '][' . $name . ']'
         );
diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php
index f6d056298b390..0a8f2c6a6f641 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php
@@ -38,13 +38,16 @@ public function getValuesHtml()
             $select = $this->getLayout()->createBlock(
                 'Magento\Framework\View\Element\Html\Select'
             )->setData(
-                ['id' => 'select_' . $_option->getId(), 'class' => $require . ' product-custom-option']
+                [
+                    'id' => 'select_' . $_option->getId(),
+                    'class' => $require . ' product-custom-option admin__control-select'
+                ]
             );
             if ($_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_DROP_DOWN) {
                 $select->setName('options[' . $_option->getid() . ']')->addOption('', __('-- Please Select --'));
             } else {
                 $select->setName('options[' . $_option->getid() . ']');
-                $select->setClass('multiselect' . $require . ' product-custom-option');
+                $select->setClass('multiselect admin__control-multiselect' . $require . ' product-custom-option');
             }
             foreach ($_option->getValues() as $_value) {
                 $priceStr = $this->_formatPrice(
@@ -84,9 +87,9 @@ public function getValuesHtml()
             switch ($_option->getType()) {
                 case \Magento\Catalog\Model\Product\Option::OPTION_TYPE_RADIO:
                     $type = 'radio';
-                    $class = 'radio';
+                    $class = 'radio admin__control-radio';
                     if (!$_option->getIsRequire()) {
-                        $selectHtml .= '<div class="field choice"><input type="radio" id="options_' .
+                        $selectHtml .= '<div class="field admin__field choice"><input type="radio" id="options_' .
                             $_option->getId() .
                             '" class="' .
                             $class .
@@ -102,7 +105,7 @@ public function getValuesHtml()
                     break;
                 case \Magento\Catalog\Model\Product\Option::OPTION_TYPE_CHECKBOX:
                     $type = 'checkbox';
-                    $class = 'checkbox';
+                    $class = 'checkbox admin__control-checkbox';
                     $arraySign = '[]';
                     break;
             }
@@ -124,7 +127,7 @@ public function getValuesHtml()
                     $checked = $configValue == $htmlValue ? 'checked' : '';
                 }
 
-                $selectHtml .= '<div class="field choice ' .
+                $selectHtml .= '<div class="field choice admin__field admin__field-option' .
                     $require .
                     '">' .
                     '<input type="' .
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options.phtml
index a365783bfb168..d5250a51abe7c 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options.phtml
@@ -14,8 +14,10 @@
 
 <?php echo $block->getChildHtml('options_js') ?>
 
-<fieldset id="product_composite_configure_fields_options" class="fieldset <?php echo $block->getIsLastFieldset() ? 'last-fieldset' : '' ?>">
-    <legend class="legend"><span><?php echo __('Custom Options') ?></span></legend>
+<fieldset id="product_composite_configure_fields_options" class="fieldset admin__fieldset <?php echo $block->getIsLastFieldset() ? 'last-fieldset' : '' ?>">
+    <legend class="legend admin__legend">
+        <span><?php echo __('Custom Options') ?></span>
+    </legend><br>
     <?php foreach ($options as $option): ?>
         <?php echo $block->getOptionHtml($option); ?>
     <?php endforeach;?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/date.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/date.phtml
index 71a7919aed364..40fe6a37f8e85 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/date.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/date.phtml
@@ -10,12 +10,12 @@
 <?php /* @var $block \Magento\Catalog\Block\Product\View\Options\Type\Date */ ?>
 <?php $_option = $block->getOption(); ?>
 <?php $_optionId = $_option->getId(); ?>
-<div class="field<?php if ($_option->getIsRequire()) echo ' required' ?>">
-  <label class="label">
+<div class="admin__field field<?php if ($_option->getIsRequire()) echo ' required _required' ?>">
+  <label class="label admin__field-label">
       <?php echo  $block->escapeHtml($_option->getTitle()) ?>
       <?php echo $block->getFormatedPrice() ?>
   </label>
-  <div class="control">
+  <div class="admin__field-control control">
 
   <?php if ($_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_DATE_TIME
       || $_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_DATE): ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/default.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/default.phtml
index 43b1a0087c140..c0c807cba0b98 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/default.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/default.phtml
@@ -6,6 +6,10 @@
 ?>
 <?php /* @var $block \Magento\Catalog\Block\Adminhtml\Product\Composite\Fieldset\Options */ ?>
 <?php $option = $block->getOption(); ?>
-<div class="field">
-    <label class="label"><?php echo $block->escapeHtml($option->getTitle()) ?></label>
+<div class="admin__field field">
+    <label class="admin__field-label label">
+        <span>
+            <?php echo $block->escapeHtml($option->getTitle()) ?>
+        </span>
+    </label>
 </div>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/file.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/file.phtml
index 7f10c3e22aad6..9f2fbc3cdd2ba 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/file.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/file.phtml
@@ -61,12 +61,12 @@ require(['prototype'], function(){
 });
 </script>
 
-<div class="field<?php if ($_option->getIsRequire()) echo ' required' ?>">
-    <label class="label">
+<div class="admin__field <?php if ($_option->getIsRequire()) echo ' required _required' ?>">
+    <label class="admin__field-label label">
         <?php echo  $block->escapeHtml($_option->getTitle()) ?>
         <?php echo $block->getFormatedPrice() ?>
     </label>
-    <div class="control">
+    <div class="admin__field-control control">
         <?php if ($_fileExists): ?>
             <span class="<?php echo $_fileNamed ?>"><?php echo $_fileInfo->getTitle(); ?></span>
             <a href="javascript:void(0)" class="label" onclick="opFile<?php echo $_rand; ?>.toggleFileChange($(this).next('.input-box'))">
@@ -78,16 +78,26 @@ require(['prototype'], function(){
             <?php endif; ?>
         <?php endif; ?>
         <div class="input-box" <?php echo $_fileExists ? 'style="display:none"' : '' ?>>
+            <!-- ToDo UI: add appropriate file class when z-index issue in ui dialog will be resolved  -->
             <input type="file" name="<?php echo $_fileName; ?>" class="product-custom-option<?php echo $_option->getIsRequire() ? ' required-entry' : '' ?>" price="<?php echo $block->getCurrencyPrice($_option->getPrice(true)) ?>" <?php echo $_fileExists ? 'disabled="disabled"' : '' ?>/>
             <input type="hidden" name="<?php echo $_fieldNameAction; ?>" value="<?php echo $_fieldValueAction; ?>" />
+
             <?php if ($_option->getFileExtension()): ?>
-            <p class="no-margin"><?php echo __('Allowed file extensions to upload')?>: <strong><?php echo $_option->getFileExtension() ?></strong></p>
+                <div class="admin__field-note">
+                    <span><?php echo __('Allowed file extensions to upload')?>: <strong><?php echo $_option->getFileExtension() ?></strong></span>
+                </div>
             <?php endif; ?>
+
             <?php if ($_option->getImageSizeX() > 0): ?>
-            <p class="no-margin"><?php echo __('Maximum image width')?>: <strong><?php echo $_option->getImageSizeX() ?> <?php echo __('px.')?></strong></p>
+                <div class="admin__field-note">
+                    <span><?php echo __('Maximum image width')?>: <strong><?php echo $_option->getImageSizeX() ?> <?php echo __('px.')?></strong></span>
+                </div>
             <?php endif; ?>
+
             <?php if ($_option->getImageSizeY() > 0): ?>
-            <p class="no-margin"><?php echo __('Maximum image height')?>: <strong><?php echo $_option->getImageSizeY() ?> <?php echo __('px.')?></strong></p>
+                <div class="admin__field-note">
+                    <span><?php echo __('Maximum image height')?>: <strong><?php echo $_option->getImageSizeY() ?> <?php echo __('px.')?></strong></span>
+                </div>
             <?php endif; ?>
         </div>
     </div>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/select.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/select.phtml
index 353c6879a420e..aced0e6a83071 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/select.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/select.phtml
@@ -9,14 +9,16 @@
 ?>
 <?php /* @var $block \Magento\Catalog\Block\Product\View\Options\Type\Select */ ?>
 <?php $_option = $block->getOption(); ?>
-<div class="field<?php if ($_option->getIsRequire()) echo ' required' ?>">
-	<label class="label"><?php echo  $block->escapeHtml($_option->getTitle()) ?></label>
-	<div class="control">
+<div class="admin__field field<?php if ($_option->getIsRequire()) echo ' required _required' ?>">
+    <label class="label admin__field-label">
+        <span><?php echo  $block->escapeHtml($_option->getTitle()) ?></span>
+    </label>
+    <div class="control admin__field-control">
         <?php echo $block->getValuesHtml() ?>
         <?php if ($_option->getIsRequire()): ?>
             <?php if ($_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_RADIO || $_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_CHECKBOX): ?>
                 <span id="options-<?php echo $_option->getId() ?>-container"></span>
             <?php endif; ?>
         <?php endif;?>
-	</div>
+    </div>
 </div>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/text.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/text.phtml
index 51b92468dd307..190c4d6dd69d4 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/text.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/text.phtml
@@ -9,23 +9,20 @@
 ?>
 <?php /* @var $block \Magento\Catalog\Block\Product\View\Options\Type\Text */ ?>
 <?php $_option = $block->getOption(); ?>
-<div class="field<?php if ($_option->getIsRequire()) {
-    echo ' required' ?>">
-    <label class="label">
+<div class="field admin__field<?php if ($_option->getIsRequire()) echo ' required _required' ?>">
+    <label class="admin__field-label label">
         <?php echo  $block->escapeHtml($_option->getTitle()) ?>
         <?php echo $block->getFormatedPrice() ?>
     </label>
-    <div class="control">
-        <div class="input-box">
+    <div class="control admin__field-control">
         <?php if ($_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_FIELD): ?>
-            <input type="text" id="options_<?php echo $_option->getId() ?>_text" class="input-text<?php echo $_option->getIsRequire() ? ' required-entry' : '' ?> <?php echo $_option->getMaxCharacters() ? ' validate-length maximum-length-' . $_option->getMaxCharacters() : '' ?> product-custom-option" name="options[<?php echo $_option->getId() ?>]" value="<?php echo $block->escapeHtml($block->getDefaultValue()) ?>" price="<?php echo $block->getCurrencyPrice($_option->getPrice(true)) ?>" />
+            <input type="text" id="options_<?php echo $_option->getId() ?>_text" class="input-text admin__control-text <?php echo $_option->getIsRequire() ? ' required-entry' : '' ?> <?php echo $_option->getMaxCharacters() ? ' validate-length maximum-length-' . $_option->getMaxCharacters() : '' ?> product-custom-option" name="options[<?php echo $_option->getId() ?>]" value="<?php echo $block->escapeHtml($block->getDefaultValue()) ?>" price="<?php echo $block->getCurrencyPrice($_option->getPrice(true)) ?>" />
         <?php elseif ($_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_AREA): ?>
-            <textarea id="options_<?php echo $_option->getId() ?>_text" class="<?php echo $_option->getIsRequire() ? ' required-entry' : '' ?> <?php echo $_option->getMaxCharacters() ? ' validate-length maximum-length-' . $_option->getMaxCharacters() : '' ?> product-custom-option" name="options[<?php echo $_option->getId() ?>]" rows="5" cols="25" price="<?php echo $block->getCurrencyPrice($_option->getPrice(true)) ?>"><?php echo $block->escapeHtml($block->getDefaultValue()) ?></textarea>
-        <?php endif;
-} ?>
+            <textarea id="options_<?php echo $_option->getId() ?>_text" class="admin__control-textarea <?php echo $_option->getIsRequire() ? ' required-entry' : '' ?> <?php echo $_option->getMaxCharacters() ? ' validate-length maximum-length-' . $_option->getMaxCharacters() : '' ?> product-custom-option" name="options[<?php echo $_option->getId() ?>]" rows="5" cols="25" price="<?php echo $block->getCurrencyPrice($_option->getPrice(true)) ?>"><?php echo $block->escapeHtml($block->getDefaultValue()) ?></textarea>
+        <?php endif;?>
+
         <?php if ($_option->getMaxCharacters()): ?>
             <p class="note"><?php echo __('Maximum number of characters:')?> <strong><?php echo $_option->getMaxCharacters() ?></strong></p>
         <?php endif; ?>
-        </div>
     </div>
 </div>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/qty.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/qty.phtml
index e73c33560258b..1f398b405d55f 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/qty.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/qty.phtml
@@ -10,11 +10,12 @@
 
 <?php /* @var $block \Magento\Catalog\Block\Adminhtml\Product\Composite\Fieldset\Qty */ ?>
 
-<fieldset id="product_composite_configure_fields_qty" class="fieldset <?php echo $block->getIsLastFieldset() ? 'last-fieldset' : '' ?>">
-    <div class="field">
-        <label class="label"><?php echo __('Quantity') ?></label>
-        <div class="control">
-        	<input id="product_composite_configure_input_qty" class="input-text" type="text" name="qty" value="<?php echo $block->getQtyValue() * 1 ?>">
+<fieldset id="product_composite_configure_fields_qty"
+          class="fieldset product-composite-qty-block admin__fieldset <?php echo $block->getIsLastFieldset() ? 'last-fieldset' : '' ?>">
+    <div class="field admin__field">
+        <label class="label admin__field-label"><span><?php echo __('Quantity') ?></span></label>
+        <div class="control admin__field-control">
+            <input id="product_composite_configure_input_qty" class="input-text admin__control-text qty" type="text" name="qty" value="<?php echo $block->getQtyValue() * 1 ?>">
         </div>
     </div>
 </fieldset>
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/product/product.css b/app/code/Magento/Catalog/view/adminhtml/web/product/product.css
index 0ae2dbe3db001..fb2348a0fd81d 100644
--- a/app/code/Magento/Catalog/view/adminhtml/web/product/product.css
+++ b/app/code/Magento/Catalog/view/adminhtml/web/product/product.css
@@ -401,11 +401,6 @@
     padding-top: 3px;
 }
 
-.admin__scope-old .field-weight .choice input {
-    margin-right: 5px;
-    vertical-align: bottom;
-}
-
 .admin__scope-old .field-price .addon > input {
     width: 99px;
     float: left;
diff --git a/app/code/Magento/Centinel/view/adminhtml/templates/order/create/abstract.phtml b/app/code/Magento/Centinel/view/adminhtml/templates/order/create/abstract.phtml
index 7ebc48041243a..802e8c8759f97 100644
--- a/app/code/Magento/Centinel/view/adminhtml/templates/order/create/abstract.phtml
+++ b/app/code/Magento/Centinel/view/adminhtml/templates/order/create/abstract.phtml
@@ -5,11 +5,10 @@
  */
 ?>
 
-<div class="fieldset-wrapper">
-    <div class="fieldset-wrapper-title">
-        <span class="title"><?php echo $block->getHeaderText() ?></span>
-        <div class="actions"><?php echo $block->getButtonsHtml() ?></div>
-    </div>
-
+<div class="admin__fieldset-wrapper-title">
+    <span class="title"><?php echo $block->getHeaderText() ?></span>
+    <div class="actions"><?php echo $block->getButtonsHtml() ?></div>
+</div>
+<div class="admin__fieldset-wrapper-content">
     <?php echo $block->getChildHtml('', true) ?>
 </div>
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/composite/fieldset/configurable.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/composite/fieldset/configurable.phtml
index 577bd6a2d60b8..48fbaa7bc66ef 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/composite/fieldset/configurable.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/composite/fieldset/configurable.phtml
@@ -13,18 +13,20 @@
 <?php $_attributes = $block->decorateArray($block->getAllowAttributes()); ?>
 <?php $_skipSaleableCheck = $this->helper('Magento\Catalog\Helper\Product')->getSkipSaleableCheck(); ?>
 <?php if (($_product->isSaleable() || $_skipSaleableCheck) && count($_attributes)):?>
-<fieldset id="catalog_product_composite_configure_fields_configurable" class="fieldset">
-    <legend class="legend"><span><?php echo __('Associated Products') ?></span></legend>
+<fieldset id="catalog_product_composite_configure_fields_configurable" class="fieldset admin__fieldset">
+    <legend class="legend admin__legend"><span><?php echo __('Associated Products') ?></span></legend>
     <div class="product-options">
-        <div class="field required">
-        <?php foreach ($_attributes as $_attribute): ?>
-            <label class="label"><?php echo $_attribute->getLabel() ?></label>
-            <div class="control<?php if ($_attribute->getDecoratedIsLast()):?> last<?php endif; ?>">
-                <select name="super_attribute[<?php echo $_attribute->getAttributeId() ?>]" id="attribute<?php echo $_attribute->getAttributeId() ?>" class="required-entry super-attribute-select">
-                    <option><?php echo __('Choose an Option...') ?></option>
-                </select>
-            </div>
-        <?php endforeach; ?>
+        <div class="field admin__field _required required">
+            <?php foreach ($_attributes as $_attribute): ?>
+                <label class="label admin__field-label"><?php echo $_attribute->getLabel() ?></label>
+                <div class="control admin__field-control <?php if ($_attribute->getDecoratedIsLast()):?> last<?php endif; ?>">
+                    <select name="super_attribute[<?php echo $_attribute->getAttributeId() ?>]"
+                            id="attribute<?php echo $_attribute->getAttributeId() ?>"
+                            class="admin__control-select required-entry super-attribute-select">
+                        <option><?php echo __('Choose an Option...') ?></option>
+                    </select>
+                </div>
+            <?php endforeach; ?>
         </div>
     </div>
 </fieldset>
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 ac26944f6758f..4af99352c7abc 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/product/product.css
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/product/product.css
@@ -241,25 +241,3 @@
 #allow_open_amount {
     margin-top: 8px;
 }
-
-.mage-new-category-dialog .ui-dialog-content .fieldset {
-    padding: 0;
-    margin: 0;
-}
-
-.mage-new-category-dialog .ui-dialog-content .label {
-    width: 25%;
-}
-
-.mage-new-category-dialog .ui-dialog-content .control {
-    width: 75%;
-}
-
-.mage-new-category-dialog .ui-dialog-buttonset {
-    text-align: left;
-}
-
-.mage-new-category-dialog .ui-dialog-buttonset .action-create {
-    margin: 0 0 0 25%;
-    vertical-align: middle;
-}
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Renderer/Region.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Renderer/Region.php
index d56e6a1532523..be760c935c073 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Renderer/Region.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Renderer/Region.php
@@ -48,10 +48,10 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele
 
         $regionId = $element->getForm()->getElement('region_id')->getValue();
 
-        $html = '<div class="field field-state required">';
-        $element->setClass('input-text');
+        $html = '<div class="field field-state required admin__field _required">';
+        $element->setClass('input-text admin__control-text');
         $element->setRequired(true);
-        $html .= $element->getLabelHtml() . '<div class="control">';
+        $html .= $element->getLabelHtml() . '<div class="control admin__field-control">';
         $html .= $element->getElementHtml();
 
         $selectName = str_replace('region', 'region_id', $element->getName());
@@ -60,7 +60,7 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele
             $selectId .
             '" name="' .
             $selectName .
-            '" class="select required-entry" style="display:none">';
+            '" class="select required-entry admin__control-select" style="display:none">';
         $html .= '<option value="">' . __('Please select') . '</option>';
         $html .= '</select>';
 
diff --git a/app/code/Magento/Customer/view/adminhtml/templates/sales/order/create/address/form/renderer/vat.phtml b/app/code/Magento/Customer/view/adminhtml/templates/sales/order/create/address/form/renderer/vat.phtml
index cfaa1853fc2da..e25b244605606 100644
--- a/app/code/Magento/Customer/view/adminhtml/templates/sales/order/create/address/form/renderer/vat.phtml
+++ b/app/code/Magento/Customer/view/adminhtml/templates/sales/order/create/address/form/renderer/vat.phtml
@@ -14,15 +14,15 @@ $_class = $_element->getFieldsetHtmlClass();
 $_validateButton = $block->getValidateButton();
 ?>
 <?php if (!$_element->getNoDisplay()): ?>
-<div class="field field-vat-number">
+<div class="admin__field field-vat-number">
     <?php if ($_element->getType() == 'hidden'): ?>
     <div class="hidden"><?php echo $_element->getElementHtml(); ?></div>
     <?php else: ?>
     <?php echo $_element->getLabelHtml(); ?>
-    <div class="control <?php echo $_element->hasValueClass() ? $_element->getValueClass() : 'value'; ?><?php echo $_class ? " {$_class}-value" : ''; ?>">
+    <div class="admin__field-control <?php echo $_element->hasValueClass() ? $_element->getValueClass() : 'value'; ?><?php echo $_class ? " {$_class}-value" : ''; ?>">
         <?php echo $_element->getElementHtml(); ?>
         <?php if ($_note): ?>
-            <div class="note<?php echo $_class ? " {$_class}-note" : ''; ?>" id="note_<?php echo $_element->getId(); ?>">
+            <div class="admin__field-note<?php echo $_class ? " {$_class}-note" : ''; ?>" id="note_<?php echo $_element->getId(); ?>">
                 <span><?php echo $_note; ?></span>
             </div>
         <?php endif; ?>
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/product/composite/fieldset/downloadable.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/product/composite/fieldset/downloadable.phtml
index 629eb0116f10f..eb21eecacccf5 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/product/composite/fieldset/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/product/composite/fieldset/downloadable.phtml
@@ -12,28 +12,33 @@
 <?php $_skipSaleableCheck = $this->helper('Magento\Catalog\Helper\Product')->getSkipSaleableCheck(); ?>
 <?php if (($block->getProduct()->isSaleable() || $_skipSaleableCheck) && $block->hasLinks()):?>
 
-<fieldset id="catalog_product_composite_configure_fields_downloadable" class="fieldset downloadable information<?php echo $block->getIsLastFieldset() ? ' last-fieldset' : '' ?>">
-    <legend class="legend"><span><?php echo __('Downloadable Information') ?></span></legend><br />
+<fieldset id="catalog_product_composite_configure_fields_downloadable"
+          class="fieldset admin__fieldset downloadable information<?php echo $block->getIsLastFieldset() ? ' last-fieldset' : '' ?>">
+    <legend class="legend admin__legend"><span><?php echo __('Downloadable Information') ?></span></legend><br />
     <?php $_links = $block->getLinks(); ?>
     <?php $_isRequired = $block->getLinkSelectionRequired(); ?>
-    <div class="field link<?php if ($_isRequired) echo ' required' ?>">
-        <label class="label"><span><?php echo $block->getLinksTitle() ?></span></label>
-        <div class="control" id="downloadable-links-list">
+    <div class="field admin__field link<?php if ($_isRequired) echo ' required _required' ?>">
+        <label class="label admin__field-label"><span><?php echo $block->getLinksTitle() ?></span></label>
+        <div class="control admin__field-control" id="downloadable-links-list">
             <?php foreach ($_links as $_link): ?>
-                <div class="nested">
+                <div class="nested admin__field-option">
                 <?php if ($_linksPurchasedSeparately): ?>
-                    <input type="checkbox" class="checkbox<?php if ($_isRequired):?> validate-one-required-by-name<?php endif; ?> product downloadable link" name="links[]" id="links_<?php echo $_link->getId() ?>" value="<?php echo $_link->getId(); ?>" <?php echo $block->getLinkCheckedValue($_link); ?> price="<?php echo $block->getCurrencyPrice($_link->getPrice()); ?>"/>
+                    <input type="checkbox"
+                           class="admin__control-checkbox checkbox<?php if ($_isRequired):?> validate-one-required-by-name<?php endif; ?> product downloadable link"
+                           name="links[]" id="links_<?php echo $_link->getId() ?>"
+                           value="<?php echo $_link->getId(); ?>" <?php echo $block->getLinkCheckedValue($_link); ?>
+                           price="<?php echo $block->getCurrencyPrice($_link->getPrice()); ?>"/>
                     <?php endif; ?>
                     <label for="links_<?php echo $_link->getId() ?>" class="label">
-                    <?php echo $block->escapeHtml($_link->getTitle()) ?>
-                    <?php if ($_link->getSampleFile() || $_link->getSampleUrl()): ?>
-                        &nbsp;(<a href="<?php echo $block->getLinkSampleUrl($_link) ?>" <?php echo $block->getIsOpenInNewWindow()?'onclick="this.target=\'_blank\'"':''; ?>><?php echo __('sample') ?></a>)
-                    <?php endif; ?>
-                    <?php if ($_linksPurchasedSeparately): ?>
-                    <?php echo $block->getFormattedLinkPrice($_link); ?>
-                        <br />
-                        <?php echo $block->getLinkPrice($_link); ?>
-                    <?php endif; ?>
+                        <?php echo $block->escapeHtml($_link->getTitle()) ?>
+                        <?php if ($_link->getSampleFile() || $_link->getSampleUrl()): ?>
+                            &nbsp;(<a href="<?php echo $block->getLinkSampleUrl($_link) ?>" <?php echo $block->getIsOpenInNewWindow()?'onclick="this.target=\'_blank\'"':''; ?>><?php echo __('sample') ?></a>)
+                        <?php endif; ?>
+                        <?php if ($_linksPurchasedSeparately): ?>
+                        <?php echo $block->getFormattedLinkPrice($_link); ?>
+                            <br />
+                            <?php echo $block->getLinkPrice($_link); ?>
+                        <?php endif; ?>
                     </label>
                 <?php if ($_isRequired): ?>
                     <script>
diff --git a/app/code/Magento/GiftMessage/view/adminhtml/templates/giftoptionsform.phtml b/app/code/Magento/GiftMessage/view/adminhtml/templates/giftoptionsform.phtml
index d39c143a2990a..f2b059b2ba5d6 100644
--- a/app/code/Magento/GiftMessage/view/adminhtml/templates/giftoptionsform.phtml
+++ b/app/code/Magento/GiftMessage/view/adminhtml/templates/giftoptionsform.phtml
@@ -9,23 +9,32 @@
 ?>
 
 <?php if ($block->canDisplayGiftmessageForm()): ?>
-<div id="gift_options_giftmessage" class="giftcard-form giftcard-send-form fieldset">
-    <div class="field">
-        <label for="current_item_giftmessage_sender"><?php echo __('From'); ?></label>
-        <div class="control">
-            <input type="text" class="input-text" name="current_item_giftmessage_sender" id="current_item_giftmessage_sender" />
+<div id="gift_options_giftmessage" class="giftcard-form giftcard-send-form fieldset admin__fieldset">
+    <div class="field admin__field">
+        <label class="admin__field-label" for="current_item_giftmessage_sender"><?php echo __('From'); ?></label>
+        <div class="control admin__field-control">
+            <input type="text" class="input-text admin__control-text"
+                   name="current_item_giftmessage_sender"
+                   id="current_item_giftmessage_sender" />
         </div>
     </div>
-    <div class="field">
-        <label for="current_item_giftmessage_recipient"><?php echo __('To'); ?></label>
-        <div class="control">
-            <input type="text" class="input-text" name="current_item_giftmessage_recipient" id="current_item_giftmessage_recipient" />
+    <div class="field admin__field">
+        <label class="admin__field-label" for="current_item_giftmessage_recipient"><?php echo __('To'); ?></label>
+        <div class="control admin__field-control">
+            <input type="text"
+                   class="input-text admin__control-text"
+                   name="current_item_giftmessage_recipient"
+                   id="current_item_giftmessage_recipient" />
         </div>
     </div>
-    <div class="field">
-        <label for="current_item_giftmessage_message"><?php echo __('Message'); ?></label>
-        <div class="control">
-            <textarea class="textarea" cols="15" rows="2" name="current_item_giftmessage_message" id="current_item_giftmessage_message"></textarea>
+    <div class="field admin__field">
+        <label class="admin__field-label" for="current_item_giftmessage_message"><?php echo __('Message'); ?></label>
+        <div class="control admin__field-control">
+            <textarea class="textarea admin__control-textarea"
+                      cols="15"
+                      rows="2"
+                      name="current_item_giftmessage_message"
+                      id="current_item_giftmessage_message"></textarea>
         </div>
     </div>
 </div>
diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/templates/catalog/product/composite/fieldset/grouped.phtml b/app/code/Magento/GroupedProduct/view/adminhtml/templates/catalog/product/composite/fieldset/grouped.phtml
index fa174c796d2d4..0a09bcdf7488f 100644
--- a/app/code/Magento/GroupedProduct/view/adminhtml/templates/catalog/product/composite/fieldset/grouped.phtml
+++ b/app/code/Magento/GroupedProduct/view/adminhtml/templates/catalog/product/composite/fieldset/grouped.phtml
@@ -20,7 +20,7 @@
         <?php if ((!$_product->isAvailable() && !$_skipSaleableCheck) || !$_hasAssociatedProducts): ?>
             <p class="availability out-of-stock"><?php echo __('Availability:') ?> <span><?php echo __('Out of stock') ?></span></p>
         <?php endif; ?>
-        <table class="data-table grouped-items-table" id="super-product-table">
+        <table class="data-table table-info grouped-items-table" id="super-product-table">
             <thead>
                 <tr class="headings">
                     <th class="col-id"><?php echo __('ID') ?></th>
@@ -52,7 +52,13 @@
                     <?php if ($_product->isSaleable() || $_skipSaleableCheck): ?>
                     <td class="col-qty">
                     <?php if ($_item->isSaleable() || $_skipSaleableCheck) : ?>
-                        <input type="text" name="super_group[<?php echo $_item->getId() ?>]" id="super_group[<?php echo $_item->getId() ?>]" maxlength="12" value="<?php echo $_item->getQty()*1 ?>" title="<?php echo __('Qty') ?>" class="input-text qty" />
+                        <input type="text"
+                               name="super_group[<?php echo $_item->getId() ?>]"
+                               id="super_group[<?php echo $_item->getId() ?>]"
+                               maxlength="12"
+                               value="<?php echo $_item->getQty()*1 ?>"
+                               title="<?php echo __('Qty') ?>"
+                               class="input-text admin__control-text qty" />
                         <input type="hidden" value="1" price="<?php echo $block->getCurrencyPrice($_item->getPrice()) ?>" qtyId="super_group[<?php echo $_item->getId() ?>]" />
                     <?php else: ?>
                         <p class="availability out-of-stock"><span><?php echo __('Out of stock') ?></span></p>
diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/checkmo.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/checkmo.phtml
index 57305a3bd345c..9b69a59bd09de 100644
--- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/checkmo.phtml
+++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/checkmo.phtml
@@ -7,14 +7,14 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<fieldset class="fieldset payment method" id="payment_form_<?php echo $block->getMethodCode() ?>" style="display:none">
+<fieldset class="admin__fieldset payment-method" id="payment_form_<?php echo $block->getMethodCode() ?>" style="display:none">
     <?php if ($block->getMethod()->getPayableTo()): ?>
         <?php echo __('<label class="label"><span>Make Check payable to:</span></label> %1', $block->escapeHtml($block->getMethod()->getPayableTo())) ?>
     <?php endif; ?>
     <?php if ($block->getMethod()->getMailingAddress()): ?>
-        <div class="field field-check">
-            <label class="label"><span><?php echo __('Send Check to:') ?></span></label>
-            <div class="control checkmo-mailing-address">
+        <div class="admin__field">
+            <label class="admin__field-label"><span><?php echo __('Send Check to:') ?></span></label>
+            <div class="admin__field-control checkmo-mailing-address">
                 <?php echo nl2br($block->escapeHtml($block->getMethod()->getMailingAddress())) ?>
             </div>
         </div>
diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/purchaseorder.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/purchaseorder.phtml
index 5aaac9a25c8c0..f77ab6e1bec5c 100644
--- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/purchaseorder.phtml
+++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/purchaseorder.phtml
@@ -7,11 +7,13 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<fieldset class="fieldset payment method" id="payment_form_<?php echo $block->getMethodCode() ?>" style="display:none">
-    <div class="field field-number required">
-        <label for="po_number" class="label"><span><?php echo __('Purchase Order Number') ?></span></label>
-        <div class="control">
-            <input type="text" id="po_number" name="payment[po_number]" title="<?php echo __("Purchase Order Number") ?>" class="required-entry input-text" value="<?php echo $block->getInfoData('po_number') ?>"/>
+<fieldset class="admin__fieldset payment-method" id="payment_form_<?php echo $block->getMethodCode() ?>" style="display: none">
+    <div class="admin__field _required">
+        <label for="po_number" class="admin__field-label"><span><?php echo __('Purchase Order Number') ?></span></label>
+        <div class="admin__field-control">
+            <input type="text" id="po_number" name="payment[po_number]"
+                   title="<?php echo __("Purchase Order Number") ?>" class="required-entry admin__control-text"
+                   value="<?php echo $block->getInfoData('po_number') ?>"/>
         </div>
     </div>
 </fieldset>
diff --git a/app/code/Magento/Payment/view/adminhtml/templates/form/cc.phtml b/app/code/Magento/Payment/view/adminhtml/templates/form/cc.phtml
index b8495b7f60fa6..edb72d3ce144e 100644
--- a/app/code/Magento/Payment/view/adminhtml/templates/form/cc.phtml
+++ b/app/code/Magento/Payment/view/adminhtml/templates/form/cc.phtml
@@ -8,11 +8,11 @@
 
 ?>
 <?php $_code = $block->getMethodCode() ?>
-<fieldset class="fieldset payment method" id="payment_form_<?php echo $_code ?>" style="display:none">
-    <div class="field field-type required">
-        <label class="label" for="<?php echo $_code ?>_cc_type"><span><?php echo __('Credit Card Type') ?></span></label>
-        <div class="control">
-            <select id="<?php echo $_code ?>_cc_type" name="payment[cc_type]" class="required-entry validate-cc-type-select">
+<fieldset class="admin__fieldset payment-method" id="payment_form_<?php echo $_code ?>" style="display:none">
+    <div class="field-type admin__field _required">
+        <label class="admin__field-label" for="<?php echo $_code ?>_cc_type"><span><?php echo __('Credit Card Type') ?></span></label>
+        <div class="admin__field-control">
+            <select id="<?php echo $_code ?>_cc_type" name="payment[cc_type]" class="required-entry validate-cc-type-select admin__control-select">
                 <?php $_ccType = $block->getInfoData('cc_type') ?>
                 <option value=""></option>
                 <?php foreach ($block->getCcAvailableTypes() as $_typeCode => $_typeName): ?>
@@ -21,59 +21,75 @@
             </select>
         </div>
     </div>
-    <div class="field field-number required">
-        <label  class="label" for="<?php echo $_code ?>_cc_number"><span><?php echo __('Credit Card Number') ?></span></label>
-        <div class="control">
-            <input type="text" id="<?php echo $_code ?>_cc_number" name="payment[cc_number]" title="<?php echo __('Credit Card Number') ?>" class="input-text validate-cc-number" value="<?php echo $block->getInfoData('cc_number')?>"/>
+    <div class="field-number admin__field _required">
+        <label class="admin__field-label" for="<?php echo $_code ?>_cc_number"><span><?php echo __('Credit Card Number') ?></span></label>
+        <div class="admin__field-control">
+            <input type="text" id="<?php echo $_code ?>_cc_number" name="payment[cc_number]"
+                   title="<?php echo __('Credit Card Number') ?>" class="admin__control-text validate-cc-number"
+                   value="<?php echo $block->getInfoData('cc_number') ?>"/>
         </div>
     </div>
-    <div class="field field-date required">
-        <label class="label" for="<?php echo $_code ?>_expiration"><span><?php echo __('Expiration Date') ?></span></label>
-        <div class="control">
-            <select id="<?php echo $_code ?>_expiration" style="width:140px;" name="payment[cc_exp_month]" class="validate-cc-exp required-entry">
+    <div class="field-date admin__field _required">
+        <label class="admin__field-label"
+               for="<?php echo $_code ?>_expiration"><span><?php echo __('Expiration Date') ?></span></label>
+        <div class="admin__field-control">
+            <select id="<?php echo $_code ?>_expiration" name="payment[cc_exp_month]"
+                    class="admin__control-select admin__control-select-month validate-cc-exp required-entry">
                 <?php $_ccExpMonth = $block->getInfoData('cc_exp_month') ?>
                 <?php foreach ($block->getCcMonths() as $k => $v): ?>
-                    <option value="<?php echo $k ?>" <?php if ($k == $_ccExpMonth): ?>selected="selected"<?php endif ?>><?php echo $v ?></option>
+                    <option value="<?php echo $k ?>"
+                            <?php if ($k == $_ccExpMonth): ?>selected="selected"<?php endif ?>><?php echo $v ?></option>
                 <?php endforeach ?>
             </select>
             <?php $_ccExpYear = $block->getInfoData('cc_exp_year') ?>
-            <select id="<?php echo $_code ?>_expiration_yr" style="width:103px;" name="payment[cc_exp_year]" class="required-entry">
+            <select id="<?php echo $_code ?>_expiration_yr" name="payment[cc_exp_year]"
+                    class="admin__control-select admin__control-select-year required-entry">
                 <?php foreach ($block->getCcYears() as $k => $v): ?>
-                    <option value="<?php echo $k ? $k : '' ?>" <?php if ($k == $_ccExpYear): ?>selected="selected"<?php endif ?>><?php echo $v ?></option>
+                    <option value="<?php echo $k ? $k : '' ?>"
+                            <?php if ($k == $_ccExpYear): ?>selected="selected"<?php endif ?>><?php echo $v ?></option>
                 <?php endforeach ?>
             </select>
         </div>
     </div>
 
     <?php if ($block->hasVerification()): ?>
-        <div class="field field-number required">
-            <label class="label" for="<?php echo $_code ?>_cc_cid"><span><?php echo __('Card Verification Number') ?></span></label>
-            <div class="control">
-                <input type="text" title="<?php echo __('Card Verification Number') ?>" class="required-entry input-text validate-cc-cvn" id="<?php echo $_code ?>_cc_cid" name="payment[cc_cid]" style="width:3em;" value="<?php echo $block->getInfoData('cc_cid')?>"/>
+        <div class="field-number required admin__field _required">
+            <label class="admin__field-label"
+                   for="<?php echo $_code ?>_cc_cid"><span><?php echo __('Card Verification Number') ?></span></label>
+            <div class="admin__field-control">
+                <input type="text" title="<?php echo __('Card Verification Number') ?>"
+                       class="required-entry validate-cc-cvn admin__control-cvn admin__control-text"
+                       id="<?php echo $_code ?>_cc_cid"
+                       name="payment[cc_cid]" value="<?php echo $block->getInfoData('cc_cid') ?>"/>
             </div>
         </div>
     <?php endif; ?>
 
     <?php if ($block->hasSsCardType()): ?>
         <div id="<?php echo $_code ?>_cc_type_ss_div">
-            <div class="field field-type required">
-                <label class="label" for="<?php echo $_code ?>_cc_issue"><span><?php echo __('Switch/Solo/Maestro Only') ?></span></label>
+            <div class="field-type required admin__field _required">
+                <label class="admin__field-label"
+                       for="<?php echo $_code ?>_cc_issue"><span><?php echo __('Switch/Solo/Maestro Only') ?></span></label>
             </div>
-            <div class="field field-issue">
-                <label class="label" for="<?php echo $_code ?>_cc_issue"><span><?php echo __('Issue Number') ?>:</span></label>
-                <div class="control">
-                    <input type="text" title="<?php echo __('Issue Number') ?>" class="input-text validate-cc-ukss cvv" id="<?php echo $_code ?>_cc_issue" name="payment[cc_ss_issue]" value="" />
+            <div class="admin__field field-issue">
+                <label class="admin__field-label"
+                       for="<?php echo $_code ?>_cc_issue"><span><?php echo __('Issue Number') ?></span></label>
+
+                <div class="admin__field-control">
+                    <input type="text" title="<?php echo __('Issue Number') ?>"
+                           class="validate-cc-ukss cvv admin__control-cvv admin__control-text"
+                           id="<?php echo $_code ?>_cc_issue" name="payment[cc_ss_issue]" value=""/>
                 </div>
             </div>
             <div class="field field-date">
-                <label class="label" for="<?php echo $_code ?>_start_month"><span><?php echo __('Start Date') ?>:</span></label>
-                <div class="control">
-                    <select id="<?php echo $_code ?>_start_month" name="payment[cc_ss_start_month]" class="validate-cc-ukss month">
+                <label class="admin__field-label" for="<?php echo $_code ?>_start_month"><span><?php echo __('Start Date') ?></span></label>
+                <div class="admin__field-control">
+                    <select id="<?php echo $_code ?>_start_month" name="payment[cc_ss_start_month]" class="validate-cc-ukss admin__control-select admin__control-select-month">
                         <?php foreach ($block->getCcMonths() as $k => $v): ?>
                             <option value="<?php echo $k ? $k : '' ?>"<?php if ($k == $block->getInfoData('cc_ss_start_month')): ?> selected="selected"<?php endif ?>><?php echo $v ?></option>
                         <?php endforeach ?>
                     </select>
-                    <select id="<?php echo $_code ?>_start_year" name="payment[cc_ss_start_year]" class="validate-cc-ukss year">
+                    <select id="<?php echo $_code ?>_start_year" name="payment[cc_ss_start_year]" class="validate-cc-ukss admin__control-select admin__control-select-year">
                         <?php foreach ($block->getSsStartYears() as $k => $v): ?>
                             <option value="<?php echo $k ? $k : '' ?>"<?php if ($k == $block->getInfoData('cc_ss_start_year')): ?> selected="selected"<?php endif ?>><?php echo $v ?></option>
                         <?php endforeach ?>
@@ -100,7 +116,7 @@ require(['jquery', 'prototype'], function(jQuery){
     //]]>
 
 });
-</script>
+            </script>
         </div>
     <?php endif; ?>
 </fieldset>
diff --git a/app/code/Magento/Quote/Model/Quote.php b/app/code/Magento/Quote/Model/Quote.php
index 5daefcfe5f7f6..1d663cfd5d942 100644
--- a/app/code/Magento/Quote/Model/Quote.php
+++ b/app/code/Magento/Quote/Model/Quote.php
@@ -27,7 +27,6 @@
  *  sales_quote_delete_after
  *
  * @method Quote setStoreId(int $value)
- * @method Quote setIsVirtual(int $value)
  * @method int getIsMultiShipping()
  * @method Quote setIsMultiShipping(int $value)
  * @method float getStoreToBaseRate()
@@ -556,6 +555,14 @@ public function setIsActive($isActive)
         return $this->setData(self::KEY_IS_ACTIVE, $isActive);
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function setIsVirtual($isVirtual)
+    {
+        return $this->setData(self::KEY_IS_VIRTUAL, $isVirtual);
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -772,6 +779,9 @@ public function beforeSave()
             $this->setCustomerId($this->_customer->getId());
         }
 
+        //mark quote if it has virtual products only
+        $this->setIsVirtual($this->getIsVirtual());
+
         parent::beforeSave();
     }
 
diff --git a/app/code/Magento/Quote/Test/Unit/Model/QuoteTest.php b/app/code/Magento/Quote/Test/Unit/Model/QuoteTest.php
index 8aab4a28cb4b2..98c15827761b5 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/QuoteTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/QuoteTest.php
@@ -10,6 +10,7 @@
 
 use Magento\Quote\Model\Quote\Address;
 use Magento\Store\Model\ScopeInterface;
+use Magento\Quote\Api\Data\CartInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
@@ -1040,4 +1041,94 @@ public function testAddItem()
 
         $this->quote->addItem($item);
     }
+
+    /**
+     * @param array $productTypes
+     * @param int $expected
+     * @dataProvider dataProviderForTestBeforeSaveIsVirtualQuote
+     */
+    public function testBeforeSaveIsVirtualQuote(array $productTypes, $expected)
+    {
+        $storeId = 1;
+        $currencyMock = $this->getMockBuilder('Magento\Directory\Model\Currency')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $currencyMock->expects($this->any())
+            ->method('getCode')
+            ->will($this->returnValue('test_code'));
+        $currencyMock->expects($this->any())
+            ->method('getRate')
+            ->will($this->returnValue('test_rate'));
+        $storeMock = $this->getMockBuilder('Magento\Store\Model\Store')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $storeMock->expects($this->once())
+            ->method('getBaseCurrency')
+            ->will($this->returnValue($currencyMock));
+        $storeMock->expects($this->once())
+            ->method('getCurrentCurrency')
+            ->will($this->returnValue($currencyMock));
+
+        $this->storeManagerMock->expects($this->any())
+            ->method('getStore')
+            ->with($storeId)
+            ->will($this->returnValue($storeMock));
+        $this->quote->setStoreId($storeId);
+
+        $collectionMock = $this->getMock(
+            'Magento\Quote\Model\Resource\Quote\Item\Collection',
+            [],
+            [],
+            '',
+            false
+        );
+        $items = [];
+        foreach ($productTypes as $type) {
+            $productMock = $this->getMock('\Magento\Catalog\Model\Product', [], [], '', false);;
+            $productMock->expects($this->any())->method('getIsVirtual')->willReturn($type);
+
+            $itemMock = $this->getMock(
+                'Magento\Quote\Model\Quote\Item',
+                ['isDeleted', 'getParentItemId', 'getProduct'],
+                [],
+                '',
+                false
+            );
+            $itemMock->expects($this->any())
+                ->method('isDeleted')
+                ->willReturn(false);
+            $itemMock->expects($this->any())
+                ->method('getParentItemId')
+                ->willReturn(false);
+            $itemMock->expects($this->any())
+                ->method('getProduct')
+                ->willReturn($productMock);
+            $items[] = $itemMock;
+        }
+        $iterator = new \ArrayIterator($items);
+        $collectionMock->expects($this->any())
+            ->method('getIterator')
+            ->will($this->returnValue($iterator));
+        $this->quoteItemCollectionFactoryMock->expects($this->once())
+            ->method('create')
+            ->will($this->returnValue($collectionMock));
+
+        $this->quote->beforeSave();
+        $this->assertEquals($expected, $this->quote->getDataByKey(CartInterface::KEY_IS_VIRTUAL));
+    }
+
+
+    /**
+     * @return array
+     */
+    public function dataProviderForTestBeforeSaveIsVirtualQuote()
+    {
+        return [
+            [[true], 1],
+            [[true, true], 1],
+            [[false], 0],
+            [[true, false], 0],
+            [[false, false], 0]
+        ];
+    }
 }
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Customer.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Customer.php
index 15f41844176a8..3bdf948e426dc 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Customer.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Customer.php
@@ -30,7 +30,7 @@ protected function _construct()
      */
     public function getHeaderText()
     {
-        return __('Please select a customer.');
+        return __('Please select a customer');
     }
 
     /**
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
index 480d8900659d6..8652c6bea59f8 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
@@ -147,7 +147,7 @@ protected function _addAdditionalFormElementData(AbstractElement $element)
         switch ($element->getId()) {
             case 'email':
                 $element->setRequired(0);
-                $element->setClass('validate-email');
+                $element->setClass('validate-email admin__control-text');
                 break;
         }
         return $this;
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Giftmessage/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Giftmessage/Form.php
index a5398a55d946d..d573a445ad19e 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Giftmessage/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Giftmessage/Form.php
@@ -253,7 +253,11 @@ protected function _prepareVisibleFields(Fieldset $fieldset)
         $fieldset->addField(
             'message',
             'textarea',
-            ['name' => $this->_getFieldName('message'), 'label' => __('Message'), 'rows' => '5', 'cols' => '20']
+            [
+                'name' => $this->_getFieldName('message'),
+                'label' => __('Message'),
+                'class' => 'admin__control-textarea'
+            ]
         );
         return $this;
     }
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search.php
index cf3225dcb8eec..63a57255919c0 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search.php
@@ -30,7 +30,7 @@ protected function _construct()
      */
     public function getHeaderText()
     {
-        return __('Please select products.');
+        return __('Please select products');
     }
 
     /**
@@ -43,7 +43,7 @@ public function getButtonsHtml()
         $addButtonData = [
             'label' => __('Add Selected Product(s) to Order'),
             'onclick' => 'order.productGridAddSelected()',
-            'class' => 'action-add',
+            'class' => 'action-add action-secondary',
         ];
         return $this->getLayout()->createBlock(
             'Magento\Backend\Block\Widget\Button'
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid.php
index ba80805bb2213..2f93c40d0b384 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid.php
@@ -204,7 +204,6 @@ protected function _prepareColumns()
                 'type' => 'checkbox',
                 'name' => 'in_products',
                 'values' => $this->_getSelectedProducts(),
-                'align' => 'center',
                 'index' => 'entity_id',
                 'sortable' => false
             ]
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/Renderer/Qty.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/Renderer/Qty.php
index 9c1e2230f6d24..3b1bdcb40eac6 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/Renderer/Qty.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/Renderer/Qty.php
@@ -72,7 +72,7 @@ public function render(\Magento\Framework\Object $row)
         $html = '<input type="text" ';
         $html .= 'name="' . $this->getColumn()->getId() . '" ';
         $html .= 'value="' . $qty . '" ' . $disabled;
-        $html .= 'class="input-text ' . $this->getColumn()->getInlineCss() . $addClass . '" />';
+        $html .= 'class="input-text admin__control-text ' . $this->getColumn()->getInlineCss() . $addClass . '" />';
         return $html;
     }
 }
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar.php
index f65a70f4d564b..cb0ea9ae012b7 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar.php
@@ -26,6 +26,7 @@ protected function _prepareLayout()
                 [
                     'label' => __('Update Changes'),
                     'onclick' => 'order.sidebarApplyChanges()',
+                    'class' => 'action-secondary',
                     'before_html' => '<div class="actions">',
                     'after_html' => '</div>',
                 ]
diff --git a/app/code/Magento/Sales/Model/AdminOrder/Create.php b/app/code/Magento/Sales/Model/AdminOrder/Create.php
index 7141a1bed3a26..a661297a73aef 100644
--- a/app/code/Magento/Sales/Model/AdminOrder/Create.php
+++ b/app/code/Magento/Sales/Model/AdminOrder/Create.php
@@ -1882,11 +1882,11 @@ protected function _validate()
     {
         $customerId = $this->getSession()->getCustomerId();
         if (is_null($customerId)) {
-            throw new \Magento\Framework\Exception\LocalizedException(__('Please select a customer.'));
+            throw new \Magento\Framework\Exception\LocalizedException(__('Please select a customer'));
         }
 
         if (!$this->getSession()->getStore()->getId()) {
-            throw new \Magento\Framework\Exception\LocalizedException(__('Please select a store.'));
+            throw new \Magento\Framework\Exception\LocalizedException(__('Please select a store'));
         }
         $items = $this->getQuote()->getAllItems();
 
diff --git a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/Search/Grid/Renderer/QtyTest.php b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/Search/Grid/Renderer/QtyTest.php
index 3689ad080a099..8ef8674d942f4 100644
--- a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/Search/Grid/Renderer/QtyTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/Search/Grid/Renderer/QtyTest.php
@@ -37,7 +37,7 @@ protected function setUp()
     public function testRender()
     {
         $expected = '<input type="text" name="id_name" value="" disabled="disabled" ' .
-            'class="input-text inline_css input-inactive" />';
+            'class="input-text admin__control-text inline_css input-inactive" />';
         $this->typeConfigMock->expects(
             $this->any()
         )->method(
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_index.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_index.xml
index 06ed8294a5895..edb3ca36ad888 100644
--- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_index.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_index.xml
@@ -12,6 +12,8 @@
     </head>
     <update handle="sales_order_create_item_price"/>
     <body>
+        <referenceContainer name="admin.scope.col.wrap" htmlClass="admin__old" /> <!-- ToDo UI: remove this wrapper with old styles removal. The class name "admin__old" is for tests only, we shouldn't use it in any way -->
+
         <referenceBlock name="page.title">
             <action method="setTitleId">
                 <argument translate="true" name="id" xsi:type="string">order-header</argument>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/address/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/address/form.phtml
index 4c678d854c911..863c6d69b1d29 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/address/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/address/form.phtml
@@ -13,8 +13,8 @@
     </div>
 </div>
 
-<fieldset class="fieldset">
-    <legend class="legend">
+<fieldset class="fieldset admin__fieldset-wrapper">
+    <legend class="legend admin__legend">
         <span><?php echo $block->getHeaderText() ?></span>
     </legend>
     <br>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/abstract.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/abstract.phtml
index a9972cc6ca086..956ca1eedf569 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/abstract.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/abstract.phtml
@@ -8,9 +8,11 @@
 
 ?>
 
-<div class="fieldset-wrapper-title">
-	<span class="title"><?php echo $block->getHeaderText() ?></span>
-	<div class="actions"><?php echo $block->getButtonsHtml() ?></div>
+<div class="admin__fieldset-wrapper-title">
+    <strong><?php echo $block->getHeaderText() ?></strong>
+    <?php if($block->getButtonsHtml()): ?>
+        <div class="actions"><?php echo $block->getButtonsHtml() ?></div>
+    <?php endif; ?>
 </div>
 
 <?php echo $block->getChildHtml('', true) ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml
index 4b640152b2a15..54990665e4e09 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml
@@ -9,23 +9,30 @@
 ?>
 <?php if ($block->hasMethods()): ?>
 <div id="order-billing_method_form">
-    <dl class="payment-methods">
+    <dl class="admin__payment-methods">
     <?php
         $_methods       = $block->getMethods();
         $_methodsCount  = count($_methods);
         $_counter = 0;
     ?>
     <?php foreach ($_methods as $_method): $_code = $_method->getCode(); $_counter++; ?>
-        <dt>
+        <dt class="admin__field-option">
         <?php if ($_methodsCount > 1): ?>
-            <input id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" type="radio" name="payment[method]" title="<?php echo $block->escapeHtml($_method->getTitle()) ?>" onclick="payment.switchMethod('<?php echo $_code ?>')"<?php if ($block->getSelectedMethodCode() == $_code): ?> checked="checked"<?php endif; ?> <?php if ($_counter == $_methodsCount) : ?>class="validate-one-required-by-name"<?php endif;?>/>
+            <input id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" type="radio" name="payment[method]"
+                   title="<?php echo $block->escapeHtml($_method->getTitle()) ?>"
+                   onclick="payment.switchMethod('<?php echo $_code ?>')"<?php if ($block->getSelectedMethodCode() == $_code): ?> checked="checked"<?php endif; ?>
+                   class="admin__control-radio<?php if ($_counter == $_methodsCount) : ?> validate-one-required-by-name<?php endif; ?>"/>
         <?php else :?>
-            <span class="no-display"><input id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" type="radio" name="payment[method]" checked="checked" /></span>
+            <span class="no-display">
+                <input id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" type="radio"
+                       name="payment[method]" class="admin__control-radio"
+                       checked="checked"/>
+            </span>
         <?php endif;?>
 
-            <label for="p_method_<?php echo $_code ?>"><?php echo $block->escapeHtml($_method->getTitle()) ?></label>
+            <label class="admin__field-label" for="p_method_<?php echo $_code ?>"><?php echo $block->escapeHtml($_method->getTitle()) ?></label>
         </dt>
-        <dd>
+        <dd class="admin__payment-method-wapper">
             <?php echo $block->getChildHtml('payment.method.' . $_code) ?>
         </dd>
     <?php endforeach; ?>
@@ -37,5 +44,5 @@
     });
 </script>
 <?php else: ?>
-    <div><?php echo __('No Payment Methods') ?></div>
+    <div class="admin__message-empty"><?php echo __('No Payment Methods') ?></div>
 <?php endif; ?>
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 fda6073ecea27..bd3da1a28327e 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
@@ -7,11 +7,17 @@
 // @codingStandardsIgnoreFile
 
  ?>
-<!--<h4 class="icon-head fieldset-legend <?php echo $block->getHeaderCssClass() ?>"><?php echo $block->getHeaderText() ?></h4>-->
-<label for="order-comment"><?php echo __('Order Comments') ?></label><br />
-<textarea style="width:98%; height:8em;" id="order-comment" name="order[comment][customer_note]" rows="2" cols="15"><?php echo $block->getCommentNote() ?></textarea>
+
+<?php /* <h4 class="icon-head fieldset-legend <?php echo $block->getHeaderCssClass() ?>"><?php echo $block->getHeaderText() ?></h4> */ ?>
+<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>
+    </div>
+</div>
 <script>
-	require(["Magento_Sales/order/create/form"], function(){
-		order.commentFieldsBind('order-comment')
-	});
+    require(["Magento_Sales/order/create/form"], function(){
+        order.commentFieldsBind('order-comment')
+    });
 </script>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/coupons/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/coupons/form.phtml
index d21c3c50f1329..74511acdd3e81 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/coupons/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/coupons/form.phtml
@@ -13,23 +13,26 @@
  *
  */
 ?>
-<div class="box-left">
-    <h4><?php echo __('Apply Coupon Code') ?></h4>
-    <fieldset>
-        <div class="content">
-            <input type="text" class="input-text" id="coupons:code" value="" name="coupon_code" />
-            <?php echo $block->getButtonHtml(__('Apply'), 'order.applyCoupon($F(\'coupons:code\'))') ?>
-            <?php if ($block->getCouponCode()): ?>
-            <p><strong><?php echo $block->escapeHtml($block->getCouponCode()) ?></strong> [<a href="#" onclick="order.applyCoupon(''); return false;" title="<?php echo __('Remove Coupon Code') ?>"><?php echo __('Remove') ?></a>]</p>
-            <?php endif; ?>
-            <script>
+
+<div class="admin__field field-apply-coupon-code">
+    <label class="admin__field-label"><span><?php echo __('Apply Coupon Code') ?></span></label>
+    <div class="admin__field-control">
+        <input type="text" class="admin__control-text" id="coupons:code" value="" name="coupon_code" />
+        <?php echo $block->getButtonHtml(__('Apply'), 'order.applyCoupon($F(\'coupons:code\'))') ?>
+        <?php if ($block->getCouponCode()): ?>
+        <p class="added-coupon-code">
+            <span><?php echo $block->escapeHtml($block->getCouponCode()) ?></span>
+            <a href="#" onclick="order.applyCoupon(''); return false;" title="<?php echo __('Remove Coupon Code') ?>"
+               class="action-remove"><span><?php echo __('Remove') ?></span></a>
+        </p>
+        <?php endif; ?>
+        <script>
             require(["Magento_Sales/order/create/form"], function(){
 
                 order.overlay('shipping-method-overlay', <?php if ($block->getQuote()->isVirtual()): ?>false<?php else: ?>true<?php endif; ?>);
                 order.overlay('address-shipping-overlay', <?php if ($block->getQuote()->isVirtual()): ?>false<?php else: ?>true<?php endif; ?>);
 
             });
-</script>
-        </div>
-    </fieldset>
+        </script>
+    </div>
 </div>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/data.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/data.phtml
index 6bd52066538ee..d166ab4edac32 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/data.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/data.phtml
@@ -13,71 +13,106 @@
         order.setCurrencySymbol('<?php echo $block->getCurrencySymbol($block->getCurrentCurrencyCode()) ?>')
     });
 </script>
-    <?php if ($block->getCustomerId()): ?>
-    <div class="order-sidebar">
-        <div class="store-switcher order-currency">
-            <label for="currency_switcher"><?php echo __('Order Currency:') ?></label>
-            <select id="currency_switcher" name="order[currency]" onchange="order.setCurrencyId(this.value); order.setCurrencySymbol(this.options[this.selectedIndex].getAttribute('symbol'));">
-                <?php foreach ($block->getAvailableCurrencies() as $_code): ?>
-                    <option value="<?php echo $_code ?>"<?php if ($_code == $block->getCurrentCurrencyCode()): ?> selected="selected"<?php endif; ?> symbol="<?php echo $block->getCurrencySymbol($_code) ?>">
-                        <?php echo $block->getCurrencyName($_code) ?>
-                    </option>
-                <?php endforeach; ?>
-            </select>
-        </div>
-        <div class="customer-current-activity" id="order-sidebar">
-            <?php echo $block->getChildHtml('sidebar') ?>
-        </div>
-    </div>
-    <?php endif; ?>
     <div class="order-details<?php if ($block->getCustomerId()): ?> order-details-existing-customer<?php endif; ?>">
         <div class="order-details-inner">
-            <div id="order-additional_area" style="display:none" class="fieldset-wrapper order-additional-area"><?php echo $block->getChildHtml('additional_area') ?></div>
-            <div id="order-search" style="display:none" class="fieldset-wrapper order-search-items"><?php echo $block->getChildHtml('search') ?></div>
-            <div id="order-items" class="order-items fieldset-wrapper" data-mage-init='{"loader": {}}'><?php echo $block->getChildHtml('items') ?></div>
+            <div id="order-additional_area" style="display: none" class="admin__fieldset-wrapper order-additional-area">
+                <?php echo $block->getChildHtml('additional_area') ?>
+            </div>
+
+            <div id="order-search" style="display: none" class="admin__fieldset-wrapper order-search-items">
+                <?php echo $block->getChildHtml('search') ?>
+            </div>
+
+            <div id="order-items" class="admin__fieldset-wrapper order-items" data-mage-init='{"loader": {}}'>
+                <?php echo $block->getChildHtml('items') ?>
+            </div>
+
             <div id="order-errors" class="order-errors"><?php echo $block->getChildHtml('errors') ?></div>
-            <div id="order-form_account" class="order-account-information fieldset-wrapper"><?php echo $block->getChildHtml('form_account') ?></div>
 
-            <div id="order-addresses" class="order-addresses">
-                <div id="order-billing_address" class="order-billing-address"><?php echo $block->getChildHtml('billing_address') ?></div>
-                <div id="order-shipping_address" class="order-shipping-address"><?php echo $block->getChildHtml('shipping_address') ?></div>
+            <div id="order-form_account" class="admin__fieldset-wrapper order-account-information">
+                <?php echo $block->getChildHtml('form_account') ?>
             </div>
 
-            <div id="order-methods" class="order-methods">
-                <div class="order-billing-method">
-                    <div class="fieldset-wrapper" id="order-billing_method">
-                        <?php echo $block->getChildHtml('billing_method') ?>
+            <div id="order-addresses" class="admin__fieldset-wrapper order-addresses">
+                <div class="admin__fieldset-wrapper-title">
+                    <strong class="title"><?php echo __('Address Information') ?></strong>
+                </div>
+                <div class="admin__fieldset-wrapper-content">
+                    <div id="order-billing_address" class="order-billing-address">
+                        <?php echo $block->getChildHtml('billing_address') ?>
+                    </div>
+                    <div id="order-shipping_address" class="order-shipping-address">
+                        <?php echo $block->getChildHtml('shipping_address') ?>
                     </div>
                 </div>
-                <div class="order-shipping-method">
-                    <div class="fieldset-wrapper" id="order-shipping_method">
+            </div>
+
+            <div id="order-methods" class="admin__fieldset-wrapper order-methods">
+                <div class="admin__fieldset-wrapper-title">
+                    <strong class="title"><?php echo __('Payment & Shipping Information') ?></strong>
+                </div>
+                <div class="admin__fieldset-wrapper-content">
+                    <div id="order-billing_method" class="order-billing-method">
+                        <?php echo $block->getChildHtml('billing_method') ?>
+                    </div>
+                    <div id="order-shipping_method" class="order-shipping-method">
                         <?php echo $block->getChildHtml('shipping_method') ?>
                     </div>
                 </div>
             </div>
 
             <?php if ($block->getChildBlock('card_validation')): ?>
-                <div class="order-card-validation" id="order-card_validation">
+                <div id="order-card_validation" class="admin__fieldset-wrapper order-card-validation">
                     <?php echo $block->getChildHtml('card_validation') ?>
                 </div>
             <?php endif; ?>
 
             <?php echo $block->getChildHtml('gift_options') ?>
 
-            <div class="order-summary">
-                <div class="order-history">
-                    <fieldset class="fieldset" id="order-comment">
-                         <legend class="legend"><span><?php echo __('Order History') ?></span></legend>
-                        <?php echo $block->getChildHtml('comment') ?>
-                    </fieldset>
+            <div class="admin__fieldset-wrapper order-summary">
+                <div class="admin__fieldset-wrapper-title">
+                    <strong class="title"><?php echo __('Order Total') ?></strong>
                 </div>
-                <div class="order-totals">
-                    <fieldset id="order-totals" class="order-totals-content fieldset">
-                        <?php echo $block->getChildHtml('totals') ?>
-                    </fieldset>
+                <div class="admin__fieldset-wrapper-content">
+                    <div class="order-history">
+                        <fieldset class="admin__fieldset" id="order-comment">
+                            <legend class="admin__legend"><span><?php echo __('Order History') ?></span></legend>
+                            <br>
+                            <?php echo $block->getChildHtml('comment') ?>
+                        </fieldset>
+                    </div>
+                    <div class="order-totals">
+                        <fieldset id="order-totals" class="order-totals-content admin__fieldset">
+                            <?php echo $block->getChildHtml('totals') ?>
+                        </fieldset>
+                    </div>
                 </div>
             </div>
 
         </div>
     </div>
+
+    <?php if ($block->getCustomerId()): ?>
+        <div class="order-sidebar">
+            <div class="store-switcher order-currency">
+                <label class="admin__field-label" for="currency_switcher">
+                    <?php echo __('Order Currency:') ?>
+                </label>
+                <select id="currency_switcher"
+                        class="admin__control-select"
+                        name="order[currency]"
+                        onchange="order.setCurrencyId(this.value); order.setCurrencySymbol(this.options[this.selectedIndex].getAttribute('symbol'));">
+                    <?php foreach ($block->getAvailableCurrencies() as $_code): ?>
+                        <option value="<?php echo $_code ?>"<?php if ($_code == $block->getCurrentCurrencyCode()): ?> selected="selected"<?php endif; ?> symbol="<?php echo $block->getCurrencySymbol($_code) ?>">
+                            <?php echo $block->getCurrencyName($_code) ?>
+                        </option>
+                    <?php endforeach; ?>
+                </select>
+            </div>
+            <div class="customer-current-activity" id="order-sidebar">
+                <?php echo $block->getChildHtml('sidebar') ?>
+            </div>
+        </div>
+    <?php endif; ?>
+
 </div>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/account.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/account.phtml
index 255c3b83940f4..23f4f8379ceaf 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/account.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/account.phtml
@@ -4,15 +4,18 @@
  * See COPYING.txt for license details.
  */
  ?>
-<div class="fieldset-wrapper-title <?php echo $block->getHeaderCssClass() ?>">
-	<span class="title"><?php echo $block->getHeaderText() ?></span>
-	<div class="actions"></div>
+
+<div class="admin__fieldset-wrapper-title <?php echo $block->getHeaderCssClass() ?>">
+    <span class="title"><?php echo $block->getHeaderText() ?></span>
+    <div class="actions"></div>
 </div>
-<div class="form-inline" id="customer_account_fieds">
+
+<div id="customer_account_fieds" class="admin__fieldset-wrapper-content">
     <?php echo $block->getForm()->getHtml() ?>
 </div>
+
 <script>
-	require(["prototype", "Magento_Sales/order/create/form"], function(){
-		order.accountFieldsBind($('customer_account_fieds'));
-	});
+    require(["prototype", "Magento_Sales/order/create/form"], function(){
+        order.accountFieldsBind($('customer_account_fieds'));
+    });
 </script>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml
index abab97a13d08b..7db94eab68f48 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml
@@ -20,7 +20,7 @@ if ($block->getIsShipping()):
         order.setAddresses(<?php echo $block->getAddressCollectionJson() ?>);
 
     });
-</script>
+    </script>
     <?php
 else:
     $_fieldsContainerId = 'order-billing_address_fields';
@@ -30,50 +30,66 @@ else:
         require(["Magento_Sales/order/create/form"], function(){
             order.billingAddressContainer = '<?php echo $_fieldsContainerId ?>';
         });
-</script>
+    </script>
     <?php
 endif; ?>
 
-<fieldset class="fieldset">
-    <legend class="legend <?php echo $block->getHeaderCssClass() ?>"><span><?php echo $block->getHeaderText() ?></span></legend>
-    <div id = "<?php echo $_addressChoiceContainerId ?>" class="field order-choose-address">
-        <label class="label"><?php echo __('Select from existing customer addresses:') ?></label>
-        <?php $_id = $block->getForm()->getHtmlIdPrefix() . 'customer_address_id' ?>
-        <div class="control">
-            <select id="<?php echo $_id ?>"  name="<?php echo $block->getForm()->getHtmlNamePrefix()?>[customer_address_id]" style="width:97.5%;" onchange="order.selectAddress(this, '<?php echo $_fieldsContainerId ?>')">
-                <option value=""><?php echo __('Add New Address') ?></option>
-                <?php foreach ($block->getAddressCollection() as $_address): ?>
-                <?php //if($block->getAddressAsString($_address)!=$block->getAddressAsString($block->getAddress())): ?>
-                <option value="<?php echo $_address->getId() ?>"<?php if ($_address->getId() == $block->getAddressId()): ?> selected="selected"<?php endif; ?>>
-                    <?php echo $block->getAddressAsString($_address) ?>
-                </option>
-                <?php //endif; ?>
-                <?php endforeach; ?>
-            </select>
-            <p>
-            <?php if ($block->getIsShipping()): ?>
-                <input type="checkbox" id="order-shipping_same_as_billing" name="shipping_same_as_billing" onclick="order.setShippingAsBilling(this.checked)" <?php if ($block->getIsAsBilling()): ?>checked<?php endif; ?>/>
-                <label for="order-shipping_same_as_billing" class="no-float">
-                    <?php echo __('Same As Billing Address') ?>
-                </label>
-            <?php else: ?>
-                &nbsp;
-            <?php endif; ?>
-            </p>
-        </div>
-    </div>
+<fieldset class="admin__fieldset">
+    <legend class="admin__legend <?php echo $block->getHeaderCssClass() ?>">
+        <span><?php echo $block->getHeaderText() ?></span>
+    </legend><br>
 
-    <div class="order-address" id="<?php echo $_fieldsContainerId ?>">
-        <div class="content">
-            <?php echo $block->getForm()->toHtml() ?>
+    <fieldset id="<?php echo $_addressChoiceContainerId ?>" class="admin__fieldset order-choose-address">
+    <?php if ($block->getIsShipping()): ?>
+        <div class="admin__field admin__field-option">
+            <input type="checkbox" id="order-shipping_same_as_billing" name="shipping_same_as_billing"
+                   onclick="order.setShippingAsBilling(this.checked)" class="admin__control-checkbox"
+                   <?php if ($block->getIsAsBilling()): ?>checked<?php endif; ?> />
+            <label for="order-shipping_same_as_billing" class="admin__field-label">
+                <?php echo __('Same As Billing Address') ?>
+            </label>
         </div>
-        <div class="order-save-in-address-book">
-            <input name="<?php echo $block->getForm()->getHtmlNamePrefix()?>[save_in_address_book]" type="checkbox" id="<?php echo $block->getForm()->getHtmlIdPrefix()?>save_in_address_book" value="1" <?php if (!$block->getDontSaveInAddressBook() && $block->getAddress()->getSaveInAddressBook()):?> checked="checked"<?php endif;?>/>
-            <label for="<?php echo $block->getForm()->getHtmlIdPrefix()?>save_in_address_book"><?php echo __('Save in address book') ?></label>
+    <?php endif; ?>
+        <div class="admin__field">
+            <label class="admin__field-label"><?php echo __('Select from existing customer addresses:') ?></label>
+            <?php $_id = $block->getForm()->getHtmlIdPrefix() . 'customer_address_id' ?>
+            <div class="admin__field-control">
+                <select id="<?php echo $_id ?>"
+                        name="<?php echo $block->getForm()->getHtmlNamePrefix() ?>[customer_address_id]"
+                        style="width: 97.5%;" onchange="order.selectAddress(this, '<?php echo $_fieldsContainerId ?>')"
+                        class="admin__control-select">
+                    <option value=""><?php echo __('Add New Address') ?></option>
+                    <?php foreach ($block->getAddressCollection() as $_address): ?>
+                        <?php //if($block->getAddressAsString($_address)!=$block->getAddressAsString($block->getAddress())): ?>
+                        <option
+                            value="<?php echo $_address->getId() ?>"<?php if ($_address->getId() == $block->getAddressId()): ?> selected="selected"<?php endif; ?>>
+                            <?php echo $block->getAddressAsString($_address) ?>
+                        </option>
+                        <?php //endif; ?>
+                    <?php endforeach; ?>
+                </select>
+            </div>
+        </div>
+    </fieldset>
+
+    <div class="order-address admin__fieldset" id="<?php echo $_fieldsContainerId ?>">
+        <?php echo $block->getForm()->toHtml() ?>
+
+        <div class="admin__field admin__field-option order-save-in-address-book">
+            <input name="<?php echo $block->getForm()->getHtmlNamePrefix() ?>[save_in_address_book]" type="checkbox"
+                   id="<?php echo $block->getForm()->getHtmlIdPrefix() ?>save_in_address_book"
+                   value="1"
+                   <?php if (!$block->getDontSaveInAddressBook() && $block->getAddress()->getSaveInAddressBook()): ?> checked="checked"<?php endif; ?>
+                   class="admin__control-checkbox"/>
+            <label for="<?php echo $block->getForm()->getHtmlIdPrefix() ?>save_in_address_book"
+                   class="admin__field-label"><?php echo __('Save in address book') ?></label>
         </div>
     </div>
     <?php $hideElement = 'address-' . ($block->getIsShipping() ? 'shipping' : 'billing') . '-overlay'; ?>
-    <div style="display:none;" id="<?php echo $hideElement ?>" class="overlay"><span><?php echo __('You don\'t need to select a shipping address.') ?></span></div>
+    <div style="display: none;" id="<?php echo $hideElement ?>" class="order-methods-overlay">
+        <span><?php echo __('You don\'t need to select a shipping address.') ?></span>
+    </div>
+
     <script>
         require(["Magento_Sales/order/create/form"], function(){
                 order.bindAddressFields('<?php echo $_fieldsContainerId ?>');
@@ -81,7 +97,6 @@ endif; ?>
                 <?php if ($block->getIsShipping() && $block->getIsAsBilling()): ?>
                 order.disableShippingAddress(true);
                 <?php endif; ?>
-
         });
-</script>
+    </script>
 </fieldset>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/giftmessage.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/giftmessage.phtml
index 846caa0fd3951..f06c41f3340a2 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/giftmessage.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/giftmessage.phtml
@@ -9,18 +9,16 @@
 ?>
 <?php if ($this->helper('Magento\GiftMessage\Helper\Message')->isMessagesAllowed('main', $block->getQuote(), $block->getStoreId())): ?>
 <?php $_items = $block->getItems(); ?>
-<div id="order-giftmessage" class="giftmessage-order-create box-left">
-    <fieldset>
-        <legend><?php echo __('Gift Message for the Entire Order') ?></legend>
-        <br />
+<div id="order-giftmessage" class="giftmessage-order-create">
+    <fieldset class="admin__fieldset">
+        <legend class="admin__legend"><span><?php echo __('Gift Message for the Entire Order') ?></span></legend>
+        <br>
         <?php if ($this->helper('Magento\GiftMessage\Helper\Message')->isMessagesAllowed('main', $block->getQuote(), $block->getStoreId())): ?>
-            <div class="giftmessage-entire-order">
-                <p><?php echo __('If you don\'t want to leave a gift message for the entire order, leave this box blank.') ?></p>
-                <?php echo $block->getFormHtml($block->getQuote(), 'main') ?>
-            </div>
+            <p><?php echo __('If you don\'t want to leave a gift message for the entire order, leave this box blank.') ?></p>
+            <?php echo $block->getFormHtml($block->getQuote(), 'main') ?>
         <?php endif; ?>
     </fieldset>
-    <script>
+<script>
 require(['Magento_Sales/order/create/form'], function(){
 
     order.giftmessageFieldsBind('order-giftmessage');
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items.phtml
index b7f98bb2143f0..e2b9bd096a03c 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items.phtml
@@ -8,8 +8,8 @@
 
 ?>
 
-<div class="fieldset-wrapper-title">
-    <span class="title"><?php echo $block->getHeaderText() ?></span>
+<div class="admin__fieldset-wrapper-title">
+    <strong class="title"><?php echo $block->getHeaderText() ?></strong>
     <div class="actions">
         <?php echo $block->getButtonsHtml() ?>
     </div>
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 80cf6765da7a5..d6c4a2dd5a591 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
@@ -16,7 +16,7 @@
 <?php $_items = $block->getItems() ?>
 <?php if (empty($_items)): ?>
     <div class="grid" id="order-items_grid">
-        <table cellspacing="0" class="data-table order-tables">
+        <table class="data-table table-info order-tables">
             <thead>
                 <tr class="headings">
                     <th class="col-product"><span><?php echo __('Product') ?></span></th>
@@ -44,10 +44,10 @@
             <?php echo $block->getButtonHtml(__('Update Items and Qty\'s'), 'order.itemsUpdate()'); ?>
         </div>
     <?php endif; ?>
-        <table cellspacing="0" class="data-table order-tables">
+        <table class="data-table table-info order-tables">
             <thead>
                 <tr class="headings">
-                    <th class="col-product" colspan="2"><span><?php echo __('Product') ?></span></th>
+                    <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>
@@ -58,7 +58,7 @@
             </thead>
             <tfoot>
                 <tr>
-                    <td class="col-total" colspan="2"><?php echo __('Total %1 product(s)', count($_items)) ?></td>
+                    <td class="col-total"><?php echo __('Total %1 product(s)', count($_items)) ?></td>
                     <td colspan="2" class="col-subtotal"><?php echo __('Subtotal:') ?></td>
                     <td class="col-price"><strong><?php echo $block->formatPrice($block->getSubtotal()) ?></strong></td>
                     <td class="col-price"><strong><?php echo $block->formatPrice($block->getDiscountAmount()) ?></strong></td>
@@ -79,9 +79,9 @@
                                 <strong><?php echo __('SKU') ?>:</strong>
                                 <?php echo implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))); ?>
                             </div>
-                        </td>
-                        <td class="col-configure">
-                            <?php echo $block->getConfigureButtonHtml($_item) ?>
+                            <div class="product-configure-block">
+                                <?php echo $block->getConfigureButtonHtml($_item) ?>
+                            </div>
                         </td>
                         <td class="col-price">
 
@@ -95,27 +95,51 @@
                             </div>
                             <?php endif; ?>
                             <?php if ($block->canApplyCustomPrice($_item)): ?>
-                            <div class="nobr">
-                            <input type="checkbox" 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>
-                            </div>
+                                <div class="custom-price-block">
+                                    <input type="checkbox"
+                                           class="admin__control-checkbox"
+                                           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>
+                                </div>
                             <?php endif; ?>
-                            <input id="item_custom_price_<?php echo $_item->getId() ?>" name="item[<?php echo $_item->getId() ?>][custom_price]" value="<?php echo sprintf("%.2f", $block->getOriginalEditablePrice($_item))?>"<?php if (!$_isCustomPrice): ?> style="display:none" disabled="disabled"<?php endif; ?> class="input-text item-price"/>
+                            <input id="item_custom_price_<?php echo $_item->getId() ?>"
+                                   name="item[<?php echo $_item->getId() ?>][custom_price]"
+                                   value="<?php echo sprintf("%.2f", $block->getOriginalEditablePrice($_item))?>"
+                                   <?php if (!$_isCustomPrice): ?>
+                                   style="display:none"
+                                   disabled="disabled"
+                                   <?php endif; ?>
+                                   class="input-text item-price admin__control-text"/>
+                        </td>
+                        <td class="col-qty">
+                            <input name="item[<?php echo $_item->getId() ?>][qty]"
+                                   class="input-text item-qty admin__control-text"
+                                   value="<?php echo $_item->getQty()*1 ?>"
+                                   maxlength="12" />
                         </td>
-                        <td class="col-qty"><input name="item[<?php echo $_item->getId() ?>][qty]" class="input-text item-qty" value="<?php echo $_item->getQty()*1 ?>" maxlength="12" /></td>
                         <td class="col-subtotal col-price">
                             <?php echo $block->getItemRowTotalHtml($_item); ?>
                         </td>
                         <td class="col-discount col-price">
-                            <?php echo $block->formatPrice(-$_item->getTotalDiscountAmount()) ?><br />
-                            <input id="item_use_discount_<?php echo $_item->getId() ?>" name="item[<?php echo $_item->getId() ?>][use_discount]"<?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>
+                            <?php echo $block->formatPrice(-$_item->getTotalDiscountAmount()) ?>
+                            <div class="discount-price-block">
+                                <input id="item_use_discount_<?php echo $_item->getId() ?>"
+                                       class="admin__control-checkbox"
+                                       name="item[<?php echo $_item->getId() ?>][use_discount]"
+                                       <?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>
+                            </div>
+
                         </td>
                         <td class="col-price col-row-subtotal">
                             <?php echo $block->getItemRowTotalWithDiscountHtml($_item); ?>
                         </td>
                         <td class="col-actions last">
-                            <select name="item[<?php echo $_item->getId() ?>][action]" style="width:100px;">
+                            <select class="admin__control-select" name="item[<?php echo $_item->getId() ?>][action]">
                                 <option value=""></option>
                                 <option value="remove"><?php echo __('Remove') ?></option>
                                 <?php if ($block->getCustomerId() && $block->getMoveToCustomerStorage()): ?>
@@ -136,34 +160,50 @@
                             </select>
                         </td>
                     </tr>
-                    <tr>
-                        <td colspan="100">
-                            <?php foreach ($_item->getMessage(false) as $message):
-                                if (empty($message)) {
-                                    continue;
-                                }
-                                ?>
-                                <div class="message <?php if ($_item->getHasError()): ?>error<?php else: ?>notice<?php endif; ?>">
-                                    <?php echo $block->escapeHtml($message); ?>
-                                </div>
-                            <?php endforeach; ?>
-                        </td>
-                    </tr>
+
+                    <?php $hasMessageError = false; ?>
+                    <?php foreach ($_item->getMessage(false) as $messageError):?>
+                        <?php if (!empty($messageError)) {
+                            $hasMessageError = true;
+                        }
+                        ?>
+                    <?php endforeach; ?>
+
+                    <?php if ($hasMessageError):?>
+                        <tr class="col-messages-error">
+                            <td colspan="100"> <!-- ToDo UI: remove the 100 -->
+                                <?php foreach ($_item->getMessage(false) as $message):
+                                    if (empty($message)) {
+                                        continue;
+                                    }
+                                    ?>
+                                    <div class="message <?php if ($_item->getHasError()): ?>message-error<?php else: ?>message-notice<?php endif; ?>">
+                                        <?php echo $block->escapeHtml($message); ?>
+                                    </div>
+                                <?php endforeach; ?>
+                            </td>
+                        </tr>
+                    <?php endif;?>
+
                     <?php echo $block->getItemExtraInfo($_item)->toHtml(); ?>
                 </tbody>
                 <?php endforeach; ?>
         </table>
         <p><small><?php echo $block->getInclExclTaxMessage(); ?></small></p>
-        <p><?php echo $block->getButtonHtml(__('Update Items and Qty\'s'), 'order.itemsUpdate()'); ?></p>
     </div>
-    <div class="order-coupons" id="order-coupons"><?php echo $block->getChildHtml();?></div>
+
+    <div class="order-discounts">
+        <?php echo $block->getButtonHtml(__('Update Items and Qty\'s'), 'order.itemsUpdate()', 'action-secondary'); ?>
+        <div id="order-coupons" class="order-coupons"><?php echo $block->getChildHtml();?></div>
+    </div>
+
     <script>
-require([
-    'Magento_Sales/order/create/form'
-], function(){
-    order.itemsOnchangeBind()
-});
-</script>
+        require([
+            'Magento_Sales/order/create/form'
+        ], function(){
+            order.itemsOnchangeBind()
+        });
+    </script>
 </div>
 
 <?php if ($block->isGiftMessagesAvailable()) : ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/shipping/method/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/shipping/method/form.phtml
index 5265ef94e56b2..7ccbfbb6bd3ec 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/shipping/method/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/shipping/method/form.phtml
@@ -11,61 +11,69 @@
 <?php $_shippingRateGroups = $block->getShippingRates(); ?>
 <?php if ($_shippingRateGroups): ?>
     <div id="order-shipping-method-choose" style="display:none">
-    <dl class="shipment-methods">
-    <?php foreach ($_shippingRateGroups as $code => $_rates): ?>
-        <dt><strong><?php echo $block->escapeHtml($block->getCarrierName($code)) ?></strong></dt>
-        <dd>
-            <ul>
-            <?php foreach ($_rates as $_rate): ?>
-                <?php $_radioProperty = 'name="order[shipping_method]" type="radio" onclick="order.setShippingMethod(this.value)"' ?>
-                <?php $_code = $_rate->getCode() ?>
-                <li>
-                   <?php if ($_rate->getErrorMessage()): ?>
-                       <div class="messages">
-                           <div class="message message-error error">
-                               <div><?php echo $block->escapeHtml($_rate->getErrorMessage()) ?></div>
+        <dl class="admin__order-shipment-methods">
+        <?php foreach ($_shippingRateGroups as $code => $_rates): ?>
+            <dt class="admin__order-shipment-methods-title"><?php echo $block->escapeHtml($block->getCarrierName($code)) ?></dt>
+            <dd class="admin__order-shipment-methods-options">
+                <ul class="admin__order-shipment-methods-options-list">
+                <?php foreach ($_rates as $_rate): ?>
+                    <?php $_radioProperty = 'name="order[shipping_method]" type="radio" onclick="order.setShippingMethod(this.value)"' ?>
+                    <?php $_code = $_rate->getCode() ?>
+                    <li class="admin__field-option">
+                       <?php if ($_rate->getErrorMessage()): ?>
+                           <div class="messages">
+                               <div class="message message-error error">
+                                   <div><?php echo $block->escapeHtml($_rate->getErrorMessage()) ?></div>
+                               </div>
                            </div>
-                       </div>
-                   <?php else: ?>
-                        <?php $_checked = $block->isMethodActive($_code) ? 'checked="checked"' : '' ?>
-                        <input <?php echo $_radioProperty ?> value="<?php echo $_code ?>" id="s_method_<?php echo $_code ?>" <?php echo $_checked ?>/>
-                        <label class="normal" for="s_method_<?php echo $_code ?>">
-                            <?php echo $block->escapeHtml($_rate->getMethodTitle() ? $_rate->getMethodTitle() : $_rate->getMethodDescription()) ?> -
-                            <strong>
-                                <?php $_excl = $block->getShippingPrice($_rate->getPrice(), $this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()); ?>
-                                <?php $_incl = $block->getShippingPrice($_rate->getPrice(), true); ?>
+                       <?php else: ?>
+                            <?php $_checked = $block->isMethodActive($_code) ? 'checked="checked"' : '' ?>
+                            <input <?php echo $_radioProperty ?> value="<?php echo $_code ?>"
+                                                                 id="s_method_<?php echo $_code ?>" <?php echo $_checked ?>
+                                                                 class="admin__control-radio"/>
+                            <label class="admin__field-label" for="s_method_<?php echo $_code ?>">
+                                <?php echo $block->escapeHtml($_rate->getMethodTitle() ? $_rate->getMethodTitle() : $_rate->getMethodDescription()) ?> -
+                                <strong>
+                                    <?php $_excl = $block->getShippingPrice($_rate->getPrice(), $this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()); ?>
+                                    <?php $_incl = $block->getShippingPrice($_rate->getPrice(), true); ?>
 
-                                <?php echo $_excl; ?>
-                                <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
-                                    (<?php echo __('Incl. Tax'); ?> <?php echo $_incl; ?>)
-                                <?php endif; ?>
-                            </strong>
-                        </label>
-                   <?php endif ?>
-                </li>
-            <?php endforeach; ?>
-            </ul>
-        </dd>
-    <?php endforeach; ?>
-    </dl>
+                                    <?php echo $_excl; ?>
+                                    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
+                                        (<?php echo __('Incl. Tax'); ?> <?php echo $_incl; ?>)
+                                    <?php endif; ?>
+                                </strong>
+                            </label>
+                       <?php endif ?>
+                    </li>
+                <?php endforeach; ?>
+                </ul>
+            </dd>
+        <?php endforeach; ?>
+        </dl>
     </div>
     <?php if ($_rate = $block->getActiveMethodRate()): ?>
         <div id="order-shipping-method-info">
-            <strong><?php echo $block->escapeHtml($block->getCarrierName($_rate->getCarrier())) ?></strong><br/>
-            <?php echo $block->escapeHtml($_rate->getMethodTitle() ? $_rate->getMethodTitle() : $_rate->getMethodDescription()) ?> -
-            <strong>
-                <?php $_excl = $block->getShippingPrice($_rate->getPrice(), $this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()); ?>
-                <?php $_incl = $block->getShippingPrice($_rate->getPrice(), true); ?>
+            <dl class="admin__order-shipment-methods">
+                <dt class="admin__order-shipment-methods-title">
+                    <?php echo $block->escapeHtml($block->getCarrierName($_rate->getCarrier())) ?>
+                </dt>
+                <dd class="admin__order-shipment-methods-options">
+                    <?php echo $block->escapeHtml($_rate->getMethodTitle() ? $_rate->getMethodTitle() : $_rate->getMethodDescription()) ?> -
+                    <strong>
+                        <?php $_excl = $block->getShippingPrice($_rate->getPrice(), $this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()); ?>
+                        <?php $_incl = $block->getShippingPrice($_rate->getPrice(), true); ?>
 
-                <?php echo $_excl; ?>
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
-                    (<?php echo __('Incl. Tax'); ?> <?php echo $_incl; ?>)
-                <?php endif; ?>
-            </strong>
-            <!--input type="text" class="input-text" style="width:70px"/-->
-            <br/>
-            <a href="#" onclick="$('order-shipping-method-info').hide();$('order-shipping-method-choose').show();return false">
-                <?php echo __('Click to change shipping method') ?>
+                        <?php echo $_excl; ?>
+                        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
+                            (<?php echo __('Incl. Tax'); ?> <?php echo $_incl; ?>)
+                        <?php endif; ?>
+                    </strong>
+                </dd>
+            </dl>
+            <a href="#"
+               onclick="$('order-shipping-method-info').hide();$('order-shipping-method-choose').show();return false"
+               class="action-default">
+                <span><?php echo __('Click to change shipping method') ?></span>
             </a>
         </div>
     <?php else: ?>
@@ -76,16 +84,20 @@ require(['prototype'], function(){
 </script>
     <?php endif; ?>
 <?php elseif ($block->getIsRateRequest()): ?>
-    <strong><?php echo __('Sorry, no quotes are available for this order.') ?></strong>
+    <div class="order-shipping-method-summary">
+        <strong class="order-shipping-method-not-available"><?php echo __('Sorry, no quotes are available for this order.') ?></strong>
+    </div>
 <?php else: ?>
-    <div id="order-shipping-method-summary">
-        <a href="#" onclick="order.loadShippingRates();return false">
-            <?php echo __('Get shipping methods and rates') ?>
+    <div id="order-shipping-method-summary" class="order-shipping-method-summary">
+        <a href="#" onclick="order.loadShippingRates();return false" class="action-default">
+            <span><?php echo __('Get shipping methods and rates') ?></span>
         </a>
         <input type="hidden" name="order[has_shipping]" value="" class="required-entry" />
     </div>
 <?php endif; ?>
-<div style="display:none;" id="shipping-method-overlay" class="overlay"><span><?php echo __('You don\'t need to select a shipping method.') ?></span></div>
+<div style="display: none;" id="shipping-method-overlay" class="order-methods-overlay">
+    <span><?php echo __('You don\'t need to select a shipping method.') ?></span>
+</div>
 <script>
     require(["Magento_Sales/order/create/form"], function(){
 
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar.phtml
index d3ff40c5de6cf..b3be7262a555d 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar.phtml
@@ -9,13 +9,13 @@
 /** @var $block \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar */
 ?>
 <div class="customer-current-activity-inner">
-    <h4><?php echo __('Customer\'s Activities') ?></h4>
+    <h4 class="customer-activity-title"><?php echo __('Customer\'s Activities') ?></h4>
     <div class="create-order-sidebar-container">
     <?php echo $block->getChildHtml('top_button'); ?>
     <?php foreach ($block->getLayout()->getChildBlocks($block->getNameInLayout()) as $_alias => $_child): ?>
         <?php if ($_alias != 'top_button' && $_alias != 'bottom_button'): ?>
             <?php if ($block->canDisplay($_child)): ?>
-                <div id="order-sidebar_<?php echo $_alias ?>">
+                <div class="order-sidebar-block" id="order-sidebar_<?php echo $_alias ?>">
                     <?php echo $block->getChildHtml($_alias) ?>
                 </div>
             <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml
index fe28d891e44fc..c3eaf03a4c255 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml
@@ -10,68 +10,105 @@
 <?php /* @var $block \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\AbstractSidebar */ ?>
 <div class="create-order-sidebar-block" id="sidebar_data_<?php echo $block->getDataId() ?>">
     <div class="head">
-        <a href="#" class="action-refresh" title="<?php echo __('Refresh') ?>" onclick="order.loadArea('sidebar_<?php echo $block->getDataId() ?>', 'sidebar_data_<?php echo $block->getDataId() ?>');return false;">Refresh</a>
-        <h5><?php echo $block->getHeaderText() ?> <span class="normal">(<?php echo $block->getItemCount() ?>)</span></h5>
+        <a href="#" class="action-refresh"
+           title="<?php echo $block->escapeHtml(__('Refresh')); ?>"
+           onclick="order.loadArea('sidebar_<?php echo $block->getDataId() ?>', 'sidebar_data_<?php echo $block->getDataId() ?>');return false;">
+            <span><?php echo __('Refresh'); ?></span>
+        </a>
+        <h5 class="create-order-sidebar-label">
+            <?php echo $block->getHeaderText() ?>
+            <span class="normal">(<?php echo $block->getItemCount() ?>)</span>
+        </h5>
     </div>
     <div class="content">
         <div class="auto-scroll">
         <?php if ($block->getItemCount()): ?>
-        <table class="data-table" cellspacing="0">
-            <col />
-            <?php if ($block->canDisplayItemQty()): ?>
-            <col width="20" />
-            <?php endif; ?>
-            <?php if ($block->canDisplayPrice()): ?>
-            <col width="60" />
-            <?php endif; ?>
-            <?php if ($block->canRemoveItems()): ?>
-            <col width="16" />
-            <?php endif; ?>
-            <col width="16" />
+        <table class="table-info">
             <thead>
                 <tr>
-                    <th><?php echo __('Item') ?></th>
+                    <th class="col-item"><?php echo __('Item') ?></th>
+
                     <?php if ($block->canDisplayItemQty()): ?>
-                    <th class="a-center"><?php echo __('Qty') ?></th>
+                        <th class="col-qty"><?php echo __('Qty') ?></th>
                     <?php endif; ?>
+
                     <?php if ($block->canDisplayPrice()): ?>
-                    <th><?php echo __('Price') ?></th>
+                        <th class="col-price"><?php echo __('Price') ?></th>
                     <?php endif; ?>
+
                     <?php if ($block->canRemoveItems()): ?>
-                    <th class="a-center">
-                        <span class="icon icon-remove"><?php echo __('Remove') ?></span>
-                    </th>
+                        <th class="col-remove">
+                            <span title="<?php echo $block->escapeHtml(__('Remove')); ?>"
+                                  class="icon icon-remove">
+                                <span><?php echo __('Remove') ?></span>
+                            </span>
+                        </th>
                     <?php endif; ?>
-                    <th class="a-center">
-                        <span class="icon icon-add"><?php echo __('Add To Order') ?></span>
+
+                    <th class="col-add">
+                        <span title="<?php echo $block->escapeHtml(__('Add To Order')); ?>"
+                              class="icon icon-add">
+                            <span><?php echo __('Add To Order') ?></span>
+                        </span>
                     </th>
                 </tr>
             </thead>
+
             <tbody>
                 <?php foreach ($block->getItems() as $_item): ?>
-                <tr>
-                    <td><?php echo $block->escapeHtml($_item->getName()) ?></td>
-                    <?php if ($block->canDisplayItemQty()): ?>
-                    <td class="a-center">
-                        <?php echo $block->getItemQty($_item); ?>
-                    </td>
-                    <?php endif; ?>
-                    <?php if ($block->canDisplayPrice()): ?>
-                    <td><?php echo $block->convertPrice($_item->getPrice()) ?></td>
-                    <?php endif; ?>
-                    <?php if ($block->canRemoveItems()): ?>
-                    <td class="a-center"><input type="checkbox" name="sidebar[remove][<?php echo $block->getItemId($_item) ?>]" value="<?php echo $block->getDataId() ?>" title="<?php echo __('Remove') ?>"/></td>
-                    <?php endif; ?>
-                    <td class="a-center">
-                        <?php if ($block->isConfigurationRequired($_item->getTypeId()) && $block->getDataId() == 'wishlist'): ?>
-                            <a href="#" onclick="order.sidebarConfigureProduct('<?php echo 'sidebar_wishlist' ?>', <?php echo $block->getProductId($_item) ?>, <?php echo $block->getItemId($_item) ?>); return false;"><img src="<?php echo $block->getViewFileUrl('images/grouped_to_order_icon.png') ?>" class="v-middle" alt="<?php echo __('Configure and Add to Order') ?>" title="<?php echo __('Configure and Add to Order') ?>" width="16" height="16"/></a>
-                        <?php elseif ($block->isConfigurationRequired($_item->getTypeId())): ?>
-                            <a href="#" onclick="order.sidebarConfigureProduct('<?php echo 'sidebar' ?>', <?php echo $block->getProductId($_item) ?>); return false;"><img src="<?php echo $block->getViewFileUrl('images/grouped_to_order_icon.png') ?>" class="v-middle" alt="<?php echo __('Configure and Add to Order') ?>" title="<?php echo __('Configure and Add to Order') ?>" width="16" height="16"/></a>
-                        <?php else: ?>
-                            <input type="checkbox" name="sidebar[<?php echo $block->getSidebarStorageAction() ?>][<?php echo $block->getIdentifierId($_item) ?>]" value="<?php echo $block->canDisplayItemQty() ? $_item->getQty()*1 : 1 ?>" title="<?php echo __('Add To Order') ?>"/>
+                    <tr>
+                        <td class="col-item"><?php echo $block->escapeHtml($_item->getName()) ?></td>
+
+                        <?php if ($block->canDisplayItemQty()): ?>
+                            <td class="col-qty">
+                                <?php echo $block->getItemQty($_item); ?>
+                            </td>
                         <?php endif; ?>
-                    </td>
-                </tr>
+
+                        <?php if ($block->canDisplayPrice()): ?>
+                            <td class="col-price"><?php echo $block->convertPrice($_item->getPrice()) ?></td>
+                        <?php endif; ?>
+
+                        <?php if ($block->canRemoveItems()): ?>
+                            <td class="col-remove">
+                                <div class="admin__field-option">
+                                    <input type="checkbox"
+                                           class="admin__control-checkbox"
+                                           name="sidebar[remove][<?php echo $block->getItemId($_item) ?>]"
+                                           value="<?php echo $block->getDataId() ?>"
+                                           title="<?php echo $block->escapeHtml(__('Remove')); ?>" />
+                                    <label class="admin__field-label"></label>
+                                </div>
+                            </td>
+                        <?php endif; ?>
+
+                        <td class="col-add">
+                            <div class="admin__field-option">
+                                <?php if ($block->isConfigurationRequired($_item->getTypeId()) && $block->getDataId() == 'wishlist'): ?>
+                                    <a href="#"
+                                       class="icon icon-configure"
+                                       title="<?php echo $block->escapeHtml(__('Configure and Add to Order')); ?>"
+                                       onclick="order.sidebarConfigureProduct('<?php echo 'sidebar_wishlist' ?>', <?php echo $block->getProductId($_item) ?>, <?php echo $block->getItemId($_item) ?>); return false;">
+                                        <span><?php echo __('Configure and Add to Order') ?></span>
+                                    </a>
+                                <?php elseif ($block->isConfigurationRequired($_item->getTypeId())): ?>
+                                    <a href="#"
+                                       class="icon icon-configure"
+                                       title="<?php echo $block->escapeHtml(__('Configure and Add to Order')); ?>"
+                                       onclick="order.sidebarConfigureProduct('<?php echo 'sidebar' ?>', <?php echo $block->getProductId($_item) ?>); return false;">
+                                        <span><?php echo __('Configure and Add to Order') ?></span>
+                                    </a>
+                                <?php else: ?>
+                                    <input type="checkbox"
+                                           class="admin__control-checkbox"
+                                           name="sidebar[<?php echo $block->getSidebarStorageAction() ?>][<?php echo $block->getIdentifierId($_item) ?>]"
+                                           value="<?php echo $block->canDisplayItemQty() ? $_item->getQty()*1 : 1 ?>"
+                                           title="<?php echo $block->escapeHtml(__('Add To Order')); ?>"/>
+                                    <label class="admin__field-label"></label>
+                                <?php endif; ?>
+                            </div>
+                        </td>
+                    </tr>
                 <?php endforeach; ?>
             </tbody>
         </table>
@@ -80,7 +117,7 @@
         <?php endif ?>
         </div>
         <?php if ($block->getItemCount() && $block->canRemoveItems()): ?>
-        <?php echo $block->getChildHtml('empty_customer_cart_button'); ?>
+            <?php echo $block->getChildHtml('empty_customer_cart_button'); ?>
         <?php endif; ?>
     </div>
 </div>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/store/select.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/store/select.phtml
index 700a32215d613..86a81649ffe1e 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/store/select.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/store/select.phtml
@@ -9,46 +9,55 @@
 ?>
 <?php /* @var $block \Magento\Sales\Block\Adminhtml\Order\Create\Store\Select */ ?>
 <div class="store-scope form-inline">
-    <div class="tree-store-scope">
-    <?php $showHelpHint = 0; ?>
-    <?php foreach ($block->getWebsiteCollection() as $_website): ?>
-        <?php $showWebsite = false; ?>
-        <?php foreach ($block->getGroupCollection($_website) as $_group): ?>
-            <?php $showGroup = false; ?>
-            <?php foreach ($block->getStoreCollection($_group) as $_store): ?>
-                <?php if ($showWebsite == false): ?>
-                    <?php $showWebsite = true; ?>
-                    <div class="field field-website_label">
-                        <label class="label" for=""><span><?php echo $block->escapeHtml($_website->getName()) ?></span></label>
-                        <div class="control"></div>
-                        <?php if ($showHelpHint == 0):
-                            echo $block->getHintHtml();
-                            $showHelpHint = 1;
-                        endif; ?>
-                    </div>
-                <?php endif; ?>
-                <?php if ($showGroup == false): ?>
-                    <?php $showGroup = true; ?>
-                    <div class="field field-group_label">
-                        <label class="label" for=""><span><?php echo $block->escapeHtml($_group->getName()) ?></span></label>
-                        <div class="control"></div>
-                    </div>
-                <?php endif; ?>
-                <div class="field field-store_label">
-                     <label class="label" for=""><span><?php echo $block->escapeHtml($_group->getName()) ?></span></label>
-                    <div class="control">
-                        <div class="nested">
-                            <div class="field choice">
-                                <input type="radio" id="store_<?php echo $_store->getId() ?>" class="radio" onclick="order.setStoreId('<?php echo $_store->getId() ?>')"/>
-                                <label for="store_<?php echo $_store->getId() ?>"><?php echo $block->escapeHtml($_store->getName()) ?></label>
+    <div class="admin__fieldset tree-store-scope">
+        <?php $showHelpHint = 0; ?>
+        <?php foreach ($block->getWebsiteCollection() as $_website): ?>
+            <?php $showWebsite = false; ?>
+            <?php foreach ($block->getGroupCollection($_website) as $_group): ?>
+                <?php $showGroup = false; ?>
+                <?php foreach ($block->getStoreCollection($_group) as $_store): ?>
+                    <?php if ($showWebsite == false): ?>
+                        <?php $showWebsite = true; ?>
+                        <div class="admin__field field-website_label">
+                            <label class="admin__field-label" for="">
+                                <span><?php echo $block->escapeHtml($_website->getName()) ?></span>
+                            </label>
+                            <div class="admin__field-control">
+                                <div class="admin__field admin__field-option">
+                                    <?php if ($showHelpHint == 0):
+                                        echo $block->getHintHtml();
+                                        $showHelpHint = 1;
+                                    endif; ?>
+                                </div>
+                            </div>
+                        </div>
+                    <?php endif; ?>
+
+                    <?php if ($showGroup == false): ?>
+                        <?php $showGroup = true; ?>
+                        <div class="admin__field field-group_label">
+                            <label class="admin__field-label" for=""><span><?php echo $block->escapeHtml($_group->getName()) ?></span></label>
+                            <div class="admin__field-control"></div>
+                        </div>
+                    <?php endif; ?>
+
+                    <div class="admin__field field-store_label">
+                        <label class="admin__field-label" for=""><span><?php echo $block->escapeHtml($_group->getName()) ?></span></label>
+                        <div class="admin__field-control">
+                            <div class="nested">
+                                <div class="admin__field admin__field-option">
+                                    <input type="radio" id="store_<?php echo $_store->getId() ?>" class="admin__control-radio" onclick="order.setStoreId('<?php echo $_store->getId() ?>')"/>
+                                    <label class="admin__field-label" for="store_<?php echo $_store->getId() ?>">
+                                        <?php echo $block->escapeHtml($_store->getName()) ?>
+                                    </label>
+                                </div>
                             </div>
                         </div>
                     </div>
-                </div>
+                <?php endforeach; ?>
+                <?php if ($showGroup): ?>
+                <?php endif; ?>
             <?php endforeach; ?>
-            <?php if ($showGroup): ?>
-            <?php endif; ?>
         <?php endforeach; ?>
-    <?php endforeach; ?>
     </div>
 </div>
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 1ad9afba28cf0..a309c817ee92f 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
@@ -7,26 +7,33 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<legend class="legend"><span><?php echo __('Order Totals') ?></span></legend>
-<table class="data-table" cellspacing="0">
+<legend class="admin__legend"><span><?php echo __('Order Totals') ?></span></legend>
+<br>
+
+<table class="admin__table-secondary data-table" cellspacing="0">
     <tbody>
         <?php echo $block->renderTotals(); ?>
         <?php echo $block->renderTotals('footer'); ?>
     </tbody>
 </table>
-<div class="divider"></div>
-<div class="order-totals-bottom">
-    <div class="field choice field-append-comments">
-        <input type="checkbox" id="notify_customer" name="order[comment][customer_note_notify]" value="1"<?php if ($block->getNoteNotify()): ?> checked="checked"<?php endif; ?>/>
-        <label for="notify_customer" class="normal"><?php echo __('Append Comments') ?></label>
+
+<div class="order-totals-actions">
+    <div class="admin__field admin__field-option field-append-comments">
+        <input type="checkbox" id="notify_customer" name="order[comment][customer_note_notify]"
+               value="1"<?php if ($block->getNoteNotify()): ?> checked="checked"<?php endif; ?>
+               class="admin__control-checkbox"/>
+        <label for="notify_customer" class="admin__field-label"><?php echo __('Append Comments') ?></label>
     </div>
     <?php if ($block->canSendNewOrderConfirmationEmail()): ?>
-    <div class="field choice field-email-order-confirmation">
-        <input type="checkbox" id="send_confirmation" name="order[send_confirmation]" value="1" checked="checked"/>
-        <label for="send_confirmation" class="normal"><?php echo __('Email Order Confirmation') ?></label>
+    <div class="admin__field admin__field-option field-email-order-confirmation">
+        <input type="checkbox" id="send_confirmation" name="order[send_confirmation]" value="1" checked="checked"
+               class="admin__control-checkbox"/>
+        <label for="send_confirmation" class="admin__field-label"><?php echo __('Email Order Confirmation') ?></label>
     </div>
     <?php endif; ?>
-    <div class="actions"><?php echo $block->getButtonHtml(__('Submit Order'), 'order.submit()', 'save primary'); ?></div>
+    <div class="actions">
+        <?php echo $block->getButtonHtml(__('Submit Order'), 'order.submit()', 'save primary'); ?>
+    </div>
 </div>
 
 <script>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/default.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/default.phtml
index d1db039e303b9..94a4867b28739 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/default.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/default.phtml
@@ -8,12 +8,12 @@
 
 ?>
 <tr class="<?php echo $block->getTotal()->getCode(); ?> row-totals">
-    <td style="<?php echo $block->getTotal()->getStyle() ?>" class="a-right" colspan="<?php echo $block->getColspan(); ?>">
+    <td style="<?php echo $block->getTotal()->getStyle() ?>" class="admin__total-mark" colspan="<?php echo $block->getColspan(); ?>">
         <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()): ?><strong><?php endif; ?>
             <?php echo $block->escapeHtml($block->getTotal()->getTitle()); ?>
         <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()): ?></strong><?php endif; ?>
     </td>
-    <td style="<?php echo $block->getTotal()->getStyle() ?>" class="a-right">
+    <td style="<?php echo $block->getTotal()->getStyle() ?>" class="admin__total-amount">
         <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()): ?><strong><?php endif; ?>
             <?php echo $block->formatPrice($block->getTotal()->getValue()) ?>
         <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()): ?></strong><?php endif; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/grandtotal.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/grandtotal.phtml
index ff8f6fd2d84be..076b419c5036f 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/grandtotal.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/grandtotal.phtml
@@ -13,28 +13,28 @@
 ?>
 <?php if ($block->includeTax() && $block->getTotalExclTax() >= 0):?>
 <tr class="row-totals">
-    <td style="<?php echo $block->getStyle() ?>" class="a-right" colspan="<?php echo $block->getColspan(); ?>">
+    <td style="<?php echo $block->getStyle() ?>" class="admin__total-mark" colspan="<?php echo $block->getColspan(); ?>">
         <strong><?php echo __('Grand Total Excl. Tax')?></strong>
     </td>
-    <td style="<?php echo $block->getStyle() ?>" class="a-right">
+    <td style="<?php echo $block->getStyle() ?>" class="admin__total-amount">
         <strong><?php echo $block->formatPrice($block->getTotalExclTax()) ?></strong>
     </td>
 </tr>
 <?php echo $block->renderTotals('taxes', $block->getColspan()); ?>
 <tr class="row-totals">
-    <td style="<?php echo $block->getStyle() ?>" class="a-right" colspan="<?php echo $block->getColspan(); ?>">
+    <td style="<?php echo $block->getStyle() ?>" class="admin__total-mark" colspan="<?php echo $block->getColspan(); ?>">
         <strong><?php echo __('Grand Total Incl. Tax')?></strong>
     </td>
-    <td style="<?php echo $block->getStyle() ?>" class="a-right">
+    <td style="<?php echo $block->getStyle() ?>" class="admin__total-amount">
         <strong><?php echo $block->formatPrice($block->getTotal()->getValue()) ?></strong>
     </td>
 </tr>
 <?php else:?>
 <tr class="row-totals">
-    <td style="<?php echo $block->getStyle() ?>" class="a-right" colspan="<?php echo $block->getColspan(); ?>">
+    <td style="<?php echo $block->getStyle() ?>" class="admin__total-mark" colspan="<?php echo $block->getColspan(); ?>">
         <strong><?php echo $block->getTotal()->getTitle() ?></strong>
     </td>
-    <td style="<?php echo $block->getStyle() ?>" class="a-right">
+    <td style="<?php echo $block->getStyle() ?>" class="admin__total-amount">
         <strong><?php echo $block->formatPrice($block->getTotal()->getValue()) ?></strong>
     </td>
 </tr>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/shipping.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/shipping.phtml
index 20e3b2235dc26..0e4e6834a5ac7 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/shipping.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/shipping.phtml
@@ -13,36 +13,36 @@
 ?>
 <?php if ($block->displayBoth()):?>
 <tr class="row-totals">
-    <td style="<?php echo $block->getStyle() ?>" class="a-right" colspan="<?php echo $block->getColspan(); ?>">
+    <td style="<?php echo $block->getStyle() ?>" class="admin__total-mark" colspan="<?php echo $block->getColspan(); ?>">
         <?php echo $block->getExcludeTaxLabel() ?>
     </td>
-    <td style="<?php echo $block->getStyle() ?>" class="a-right">
+    <td style="<?php echo $block->getStyle() ?>" class="admin__total-amount">
         <?php echo $block->formatPrice($block->getShippingExcludeTax()) ?>
     </td>
 </tr>
 <tr class="row-totals">
-    <td style="<?php echo $block->getStyle() ?>" class="a-right" colspan="<?php echo $block->getColspan(); ?>">
+    <td style="<?php echo $block->getStyle() ?>" class="admin__total-mark" colspan="<?php echo $block->getColspan(); ?>">
         <?php echo $block->getIncludeTaxLabel() ?>
     </td>
-    <td style="<?php echo $block->getStyle() ?>" class="a-right">
+    <td style="<?php echo $block->getStyle() ?>" class="admin__total-amount">
         <?php echo $block->formatPrice($block->getShippingIncludeTax()) ?>
     </td>
 </tr>
 <?php elseif ($block->displayIncludeTax()) : ?>
 <tr>
-    <td style="<?php echo $block->getStyle() ?>" class="a-right" colspan="<?php echo $block->getColspan(); ?>">
+    <td style="<?php echo $block->getStyle() ?>" class="admin__total-mark" colspan="<?php echo $block->getColspan(); ?>">
         <?php echo $block->getTotal()->getTitle() ?>
     </td>
-    <td style="<?php echo $block->getStyle() ?>" class="a-right">
+    <td style="<?php echo $block->getStyle() ?>" class="admin__total-amount">
         <?php echo $block->formatPrice($block->getShippingIncludeTax()) ?>
     </td>
 </tr>
 <?php else:?>
 <tr class="row-totals">
-    <td style="<?php echo $block->getStyle() ?>" class="a-right" colspan="<?php echo $block->getColspan(); ?>">
+    <td style="<?php echo $block->getStyle() ?>" class="admin__total-mark" colspan="<?php echo $block->getColspan(); ?>">
         <?php echo $block->escapeHtml($block->getTotal()->getTitle()) ?>
     </td>
-    <td style="<?php echo $block->getStyle() ?>" class="a-right">
+    <td style="<?php echo $block->getStyle() ?>" class="admin__total-amount">
         <?php echo $block->formatPrice($block->getShippingExcludeTax()) ?>
     </td>
 </tr>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/subtotal.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/subtotal.phtml
index 800480b568e40..aa933a7adf2cb 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/subtotal.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/subtotal.phtml
@@ -13,27 +13,27 @@
 ?>
 <?php if ($block->displayBoth()):?>
 <tr class="row-totals">
-    <td style="<?php echo $block->getStyle() ?>" class="a-right" colspan="<?php echo $block->getColspan(); ?>">
+    <td style="<?php echo $block->getStyle() ?>" class="admin__total-mark" colspan="<?php echo $block->getColspan(); ?>">
         <?php echo __('Subtotal (Excl. Tax)') ?>
     </td>
-    <td style="<?php echo $block->getStyle() ?>" class="a-right">
+    <td style="<?php echo $block->getStyle() ?>" class="admin__total-amount">
         <?php echo $block->formatPrice($block->getTotal()->getValueExclTax()) ?>
     </td>
 </tr>
 <tr class="row-totals">
-    <td style="<?php echo $block->getStyle() ?>" class="a-right" colspan="<?php echo $block->getColspan(); ?>">
+    <td style="<?php echo $block->getStyle() ?>" class="admin__total-mark" colspan="<?php echo $block->getColspan(); ?>">
         <?php echo __('Subtotal (Incl. Tax)') ?>
     </td>
-    <td style="<?php echo $block->getStyle() ?>" class="a-right">
+    <td style="<?php echo $block->getStyle() ?>" class="admin__total-amount">
         <?php echo $block->formatPrice($block->getTotal()->getValueInclTax()) ?>
     </td>
 </tr>
 <?php else : ?>
 <tr class="row-totals">
-    <td style="<?php echo $block->getStyle() ?>" class="a-right" colspan="<?php echo $block->getColspan(); ?>">
+    <td style="<?php echo $block->getStyle() ?>" class="admin__total-mark" colspan="<?php echo $block->getColspan(); ?>">
         <?php echo $block->getTotal()->getTitle() ?>
     </td>
-    <td style="<?php echo $block->getStyle() ?>" class="a-right">
+    <td style="<?php echo $block->getStyle() ?>" class="admin__total-amount">
         <?php echo $block->formatPrice($block->getTotal()->getValue()) ?>
     </td>
 </tr>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/tax.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/tax.phtml
index 5bf58c7c6de26..094021903235f 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/tax.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/tax.phtml
@@ -21,7 +21,7 @@
 
                 <?php foreach ($rates as $rate): ?>
                 <tr class="summary-details-<?php echo $taxIter; ?> summary-details<?php if ($isTop): echo ' summary-details-first'; endif; ?>" style="display:none;">
-                    <td class="a-right" style="<?php echo $block->getTotal()->getStyle() ?>" colspan="<?php echo $block->getColspan(); ?>">
+                    <td class="admin__total-mark" style="<?php echo $block->getTotal()->getStyle() ?>" colspan="<?php echo $block->getColspan(); ?>">
                         <?php echo $block->escapeHtml($rate['title']); ?>
                         <?php if (!is_null($rate['percent'])): ?>
                             (<?php echo (float)$rate['percent']; ?>%)
@@ -29,7 +29,7 @@
                         <br />
                     </td>
                     <?php if ($isFirst): ?>
-                        <td style="<?php echo $block->getTotal()->getStyle() ?>" class="a-right" rowspan="<?php echo count($rates); ?>">
+                        <td style="<?php echo $block->getTotal()->getStyle() ?>" class="admin__total-amount" rowspan="<?php echo count($rates); ?>">
                             <?php echo $block->formatPrice($amount); ?>
                         </td>
                     <?php endif; ?>
@@ -41,12 +41,12 @@
 <?php endif;?>
 <?php $class = "{$block->getTotal()->getCode()} " . ($this->helper('Magento\Tax\Helper\Data')->displayFullSummary() ? 'summary-total' : ''); ?>
 <tr<?php if ($this->helper('Magento\Tax\Helper\Data')->displayFullSummary()): ?> onclick="expandDetails(this, '.summary-details-<?php echo $taxIter;?>')"<?php endif; ?> class="<?php echo $class;?> row-totals">
-    <td style="<?php echo $block->getTotal()->getStyle() ?>" class="a-right" colspan="<?php echo $block->getColspan(); ?>">
+    <td style="<?php echo $block->getTotal()->getStyle() ?>" class="admin__total-mark" colspan="<?php echo $block->getColspan(); ?>">
         <?php if ($this->helper('Magento\Tax\Helper\Data')->displayFullSummary()): ?>
             <div class="summary-collapse"><?php echo $block->getTotal()->getTitle() ?></div>
         <?php else: ?>
             <?php echo $block->getTotal()->getTitle() ?>
         <?php endif;?>
     </td>
-    <td style="<?php echo $block->getTotal()->getStyle() ?>" class="a-right"><?php echo $block->formatPrice($block->getTotal()->getValue()) ?></td>
+    <td style="<?php echo $block->getTotal()->getStyle() ?>" class="admin__total-amount"><?php echo $block->formatPrice($block->getTotal()->getValue()) ?></td>
 </tr>
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 71b0687c04384..c09ee04d9435d 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
@@ -86,8 +86,8 @@
         <div class="fieldset-wrapper">
             <div class="fieldset-wrapper-title"><span class="title"><?php echo __('Refund Totals') ?></span></div>
             <?php echo $block->getChildHtml('creditmemo_totals') ?>
-            <div class="order-totals-bottom">
-                <div  class="field choice field-append-comments">
+            <div class="order-totals-actions">
+                <div class="field choice field-append-comments">
                     <input id="notify_customer" name="creditmemo[comment_customer_notify]" value="1" type="checkbox" />
                     <label for="notify_customer"><span><?php echo __('Append Comments') ?></span></label>
                 </div>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/giftoptions.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/giftoptions.phtml
index d0cc6e3fa2fa7..c837566257032 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/giftoptions.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/giftoptions.phtml
@@ -8,8 +8,8 @@
 
 ?>
 <?php if ($block->getChildHtml()): ?>
-<div class="fieldset-wrapper order-gift-options clearfix">
-    <div class="fieldset-wrapper-title"><span class="title"><?php echo __('Gift Options') ?></span></div>
+<div class="admin__fieldset-wrapper order-gift-options">
+    <div class="admin__fieldset-wrapper-title"><strong class="title"><?php echo __('Gift Options') ?></strong></div>
     <?php echo $block->getChildHtml() ?>
 </div>
 <?php endif ?>
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 169be0530afe0..118eca6417298 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
@@ -78,7 +78,7 @@
             <div class="fieldset-wrapper-title">
                 <span class="title"><?php echo __('Invoice Totals') ?></span>
             </div>
-            <div class="order-totals-bottom">
+            <div class="order-totals-actions">
                 <?php echo $block->getChildHtml('invoice_totals') ?>
                 <?php if ($block->isCaptureAllowed()): ?>
                 <?php if ($block->canCapture()):?>
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 9d44791a0fc5f..2dd825764ac91 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
@@ -8,7 +8,7 @@
 
 ?>
 <div class="grid">
-    <table cellspacing="0" class="data order-tables">
+    <table class="data order-tables">
         <thead>
             <tr class="headings">
                 <th class="col-product"><span><?php echo __('Product') ?></span></th>
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 75f93842f96d9..06b1e692a036a 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals.phtml
@@ -15,7 +15,7 @@
     <?php echo $block->getChildHtml('footer'); ?>
 </table>
 <?php endif;*/ ?>
-<table cellspacing="0" class="data-table order-subtotal">
+<table class="data-table table-info order-subtotal">
     <?php $_totals = $block->getTotals('footer')?>
     <?php if ($_totals):?>
     <tfoot>
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 820d695cc3645..a7d7d1552fcb7 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
@@ -12,8 +12,8 @@
 <div id="<?php echo $block->getHtmlId() ?>" class="box-left giftmessage-whole-order-container">
     <form class="entry-edit form-inline" id="<?php echo $block->getFieldId('form') ?>" action="<?php echo $block->getSaveUrl() ?>">
         <fieldset>
-            <legend class="legend"><span><?php echo __('Gift Message for the Entire Order'); ?></span></legend>
-            <br />
+            <legend class="admin__legend"><span><?php echo __('Gift Message for the Entire Order'); ?></span></legend>
+            <br>
 
             <input type="hidden" id="<?php echo $block->getFieldId('type'); ?>" name="<?php echo $block->getFieldName('type'); ?>" value="order" />
 
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 1ab29b8edab24..62900a6f6bb0b 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
@@ -44,7 +44,7 @@ $orderStoreDate = $block->formatDate(
                     <?php endif; ?>
                 </span>
             </div>
-            <table cellspacing="0" class="data-table">
+            <table class="data-table table-info">
                 <tr>
                     <th><?php echo __('Order Date') ?></th>
                     <td><?php echo $orderAdminDate ?></td>
@@ -111,12 +111,12 @@ $orderStoreDate = $block->formatDate(
 
     <div class="order-account-information">
         <?php /* Account Information */?>
-        <div class="fieldset-wrapper">
-            <div class="fieldset-wrapper-title">
+        <div class="admin__fieldset-wrapper">
+            <div class="admin__fieldset-wrapper-title">
                 <div class="actions"><?php echo $block->getAccountEditLink()?></div>
-                <span class="title"><?php echo __('Account Information') ?></span>
+                <strong class="title"><?php echo __('Account Information') ?></strong>
             </div>
-            <table cellspacing="0" class="data-table">
+            <table class="data-table table-info">
                 <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 cef1757cca65c..cb1c7006dd751 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
@@ -10,7 +10,7 @@
 <?php $_order = $block->getOrder() ?>
 <div class="grid">
   <div class="hor-scroll">
-    <table cellspacing="0" class="data-table">
+    <table class="data-table table-info">
         <thead>
             <tr class="headings">
                 <th class="col-product"><span><?php echo __('Product') ?></span></th>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/transactions/detail.phtml b/app/code/Magento/Sales/view/adminhtml/templates/transactions/detail.phtml
index e2edf06262dcb..701a7c73a192f 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/transactions/detail.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/transactions/detail.phtml
@@ -13,7 +13,7 @@
         <span class="title"><?php echo __('Transaction Data'); ?></span>
     </div>
     <div id="log_details_fieldset" class="log-details">
-        <table cellspacing="0" class="log-info data-table">
+        <table class="log-info data-table table-info">
             <tbody>
             <tr>
                 <th><?php echo __('Transaction ID'); ?></th>
diff --git a/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js b/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js
index 2ba401a017ebe..029a93e92456b 100644
--- a/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js
+++ b/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js
@@ -1290,7 +1290,7 @@ ControlButton.prototype = {
     initialize: function(label){
         this._label = label;
         this._node = new Element('button', {
-            'class': 'scalable action-add',
+            'class': 'action-secondary action-add',
             'type':  'button'
         });
     },
diff --git a/app/code/Magento/Sales/view/frontend/templates/guest/form.phtml b/app/code/Magento/Sales/view/frontend/templates/guest/form.phtml
index 7d1374a007bbc..89089385f0ebf 100644
--- a/app/code/Magento/Sales/view/frontend/templates/guest/form.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/guest/form.phtml
@@ -10,8 +10,8 @@
 <form class="form form-orders-search" id="oar-widget-orders-and-returns-form" data-mage-init='{"ordersReturns":{}, "validation":{}}' action="<?php echo $block->getActionUrl() ?>"
       method="post" name="guest_post">
     <fieldset class="fieldset">
-        <legend class="legend"><span><?php echo __('Order Information') ?></span></legend>
-        <br/>
+        <legend class="admin__legend"><span><?php echo __('Order Information') ?></span></legend>
+        <br>
 
         <div class="field id required">
             <label class="label" for="oar-order-id"><span><?php echo __('Order ID') ?></span></label>
diff --git a/app/code/Magento/Ui/view/base/web/templates/pagination.html b/app/code/Magento/Ui/view/base/web/templates/pagination.html
index 00f1c58b45b8c..9046c0f4a1c4b 100644
--- a/app/code/Magento/Ui/view/base/web/templates/pagination.html
+++ b/app/code/Magento/Ui/view/base/web/templates/pagination.html
@@ -24,7 +24,7 @@
     <input data-bind="value: current, event: {change: onPageChange}" type="text" class="input-text page" />
     <span class="pages-total">
         of
-        <span data-bind="text: pages" style="vertical-align: top;"></span>
+        <span data-bind="text: pages"></span>
     </span>
     <span data-bind="css: { disabled: isLast() }, click: next" class="action-next">
         <span>Next page</span>
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/layout/default.xml b/app/design/adminhtml/Magento/backend/Magento_Backend/layout/default.xml
index 254c75d0eb680..977f917eb142c 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/layout/default.xml
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/layout/default.xml
@@ -7,7 +7,6 @@
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
     <head>
-        <css src="mui/mui_legacy.css"/>
         <css src="css/styles-old.css"/>
         <css src="css/styles.css"/>
     </head>
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/layout/styles.xml b/app/design/adminhtml/Magento/backend/Magento_Backend/layout/styles.xml
index c9656e9f2858b..561ada3af36cf 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/layout/styles.xml
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/layout/styles.xml
@@ -7,7 +7,6 @@
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
     <head>
-        <remove src="mui/mui_legacy.css"/>
         <remove src="css/styles-old.css"/>
         <remove src="jquery/farbtastic/css/farbtastic.css"/>
 
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less
index c64513ee36887..0101fe2439257 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less
@@ -166,7 +166,7 @@
             text-decoration: none;
             text-transform: uppercase;
             transition: background-color .1s linear;
-            word-break: break-all;
+            word-wrap: break-word;
             z-index: @menu__z-index;
             &:focus {
                 box-shadow: none;
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 f97ba9ca38830..09319136bec92 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
@@ -23,7 +23,7 @@
 @admin__page-nav-item__hover__background-color: darken(@admin__page-nav__background-color, 5%);
 
 @admin__page-nav-link__color: @color-very-dark-gray-black;
-@admin__page-nav-link__padding: 2rem 4rem 2rem 1rem;
+@admin__page-nav-link__padding: @indent__base 4rem @indent__base 1rem;
 @admin__page-nav-link__hover__color: @color-very-dark-gray-black;
 @admin__page-nav-link__changed__color: @color-very-dark-gray;
 
@@ -197,7 +197,7 @@
     margin: 0 0 -1px;
     padding: @admin__page-nav-link__padding;
     transition: @admin__page-nav-transition;
-    word-break: break-all;
+    word-wrap: break-word;
 
     &._changed {
         .admin__page-nav-item-message {
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/pages/_dashboard.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/pages/_dashboard.less
index 1d9ddf540b3b4..8155f8e461eab 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/pages/_dashboard.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/pages/_dashboard.less
@@ -27,7 +27,7 @@
             padding-left: 0;
         }
     }
-    &.table {
+    &.table-info {
         th {
             border-top: 0;
         }
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 b74ebc2e62a57..7ba168e1ab233 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
@@ -14,7 +14,6 @@
 @login-box__shadow: 0 5px 30px 0 rgba(0, 0, 0, 1);
 @login-page__background-color: @color-very-dark-grayish-orange;
 
-
 //
 //  Admin user auth pages layout
 //  ---------------------------------------------
diff --git a/app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module.less
new file mode 100644
index 0000000000000..bfdae677b798e
--- /dev/null
+++ b/app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module.less
@@ -0,0 +1,12 @@
+// /**
+//  * Copyright © 2015 Magento. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+.product-composite-configure-inner {
+    .admin__control-text {
+        &.qty {
+            &:extend(.abs-control-qty all);
+        }
+    }
+}
diff --git a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/_module.less
new file mode 100644
index 0000000000000..910cec4be04df
--- /dev/null
+++ b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/_module.less
@@ -0,0 +1,12 @@
+// /**
+//  * Copyright © 2015 Magento. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+//
+//  Pages
+//  _____________________________________________
+
+@import 'module/_order-create.less';
+@import 'module/_order-create-sidebar.less';
+@import 'module/_order-create-table.less';
diff --git a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order-create-sidebar.less b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order-create-sidebar.less
new file mode 100644
index 0000000000000..6bdd17f7f4d18
--- /dev/null
+++ b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order-create-sidebar.less
@@ -0,0 +1,164 @@
+// /**
+//  * Copyright © 2015 Magento. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+//
+//  Variables
+//  ---------------------------------------------
+
+@order-create-sidebar__font-size: 1.5rem;
+@order-create-sidebar__font-size-xs: 1.1rem;
+@order-create-sidebar__color: @color-very-dark-gray;
+@order-create-sidebar__margin: 2.4rem;
+@order-create-sidebar__padding: @indent__base;
+@order-create-sidebar__margin-small: .5rem;
+@order-create-sidebar__margin-m: 1rem;
+@order-create-sidebar__margin-reqular: 1.7rem;
+@order-create-sidebar__border-color: @border__color;
+
+@order-create-sidebar-scroll__height: 24rem;
+
+//
+
+//
+//  Order Sidebar
+//  ---------------------------------------------
+
+.order-sidebar {
+    &:extend(.admin__page-nav);
+    color: @order-create-sidebar__color;
+    padding: 3rem @order-create-sidebar__padding;
+
+    .order-currency {
+        float: none;
+        font-size: @font-size__base;
+        margin: 0 0 @order-create-sidebar__margin;
+        .admin__field-label {
+            display: block;
+            text-align: left;
+        }
+    }
+    .customer-activity-title {
+        border-bottom: 1px solid @order-create-sidebar__border-color;
+        font-size: 1.9rem;
+        font-weight: @font-weight__bold;
+        margin: 0 0 @order-create-sidebar__margin;
+        padding: 0 0 @order-create-sidebar__margin;
+    }
+    .admin__control-select {
+        margin: 0 0 @order-create-sidebar__margin-small;
+        width: 100%;
+    }
+    .order-sidebar-block {
+        border-bottom: 1px solid @order-create-sidebar__border-color;
+        margin: 0 0 @order-create-sidebar__margin;
+        padding: 0 0 @order-create-sidebar__margin;
+    }
+    .table-info {
+        color: @order-create-sidebar__color;
+        width: 100%;
+        th,
+        td {
+            &:first-child {
+                padding-left: @order-create-sidebar__padding;
+            }
+        }
+        .icon {
+            &:extend(.abs-icon all);
+            display: inline-block;
+            font-size: @order-create-sidebar__font-size + 0.1rem;
+            text-decoration: none;
+            vertical-align: middle;
+            &:after {
+                color: @order-create-sidebar__color;
+            }
+            &.icon-remove {
+                margin-left: -3px;
+                &:after {
+                    content: @order-create-icon-remove__content;
+                }
+            }
+            &.icon-add {
+                &:after {
+                    content: @order-create-icon-add__content;
+                }
+            }
+            &.icon-configure {
+                &:after {
+                    content: @order-create-icon-configure__content;
+                }
+                &:hover {
+                    &:after {
+                        color: @order-create-icon-plus__hover__color;
+                    }
+                }
+            }
+            > span {
+                .extend__visually-hidden();
+            }
+        }
+        .col-add {
+            text-align: right;
+            .icon-configure,
+            .icon-add {
+                margin-right: @order-create-sidebar__margin-m;
+            }
+        }
+    }
+    .action-refresh {
+        &:extend(.abs-icon all);
+        display: table-cell;
+        font-size: @order-create-icon-refresh__font-size;
+        padding-right: @order-create-sidebar__margin-m;
+        vertical-align: middle;
+        &:after {
+            color: @order-create-icon-refresh__color;
+            content: @order-create-icon-refresh__content;
+        }
+        &:hover {
+            &:after {
+                color: @order-create-icon-refresh__hover__color;
+            }
+            text-decoration: none;
+        }
+        > span {
+            .extend__visually-hidden();
+        }
+    }
+    .create-order-sidebar-block {
+        .head {
+            margin: 0 0 @order-create-sidebar__margin;
+        }
+        .auto-scroll {
+            margin: 0 -@order-create-sidebar__padding @order-create-sidebar__margin-small;
+            max-height: @order-create-sidebar-scroll__height;
+            overflow: auto;
+            position: relative;
+            + .action-default {
+                margin-top: @order-create-sidebar__margin-reqular;
+            }
+            .no-items {
+                padding-left: @order-create-sidebar__padding;
+            }
+        }
+        .admin__field-option {
+            padding-top: 0;
+        }
+    }
+    .create-order-sidebar-label {
+        display: table-cell;
+        font-size: @order-create-sidebar__font-size;
+        font-weight: @font-weight__regular;
+        margin: 0;
+        vertical-align: middle;
+        + .admin__control-select {
+            margin-top: @order-create-sidebar__margin-reqular;
+        }
+    }
+    .actions {
+        .action-secondary {
+            width: 100%;
+        }
+    }
+}
diff --git a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order-create-table.less b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order-create-table.less
new file mode 100644
index 0000000000000..a9594b130c1e8
--- /dev/null
+++ b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order-create-table.less
@@ -0,0 +1,174 @@
+// /**
+//  * Copyright © 2015 Magento. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+//
+//  Variables
+//  ---------------------------------------------
+
+@order-create-table__border-color: @table-td__border-color;
+@order-create-sku__background: @admin__page-nav__background-color;
+@order-create-sku__padding: @indent__base;
+@order-create-sku-table__border-color: @color-white;
+
+//
+
+//
+//  Table
+//  ---------------------------------------------
+
+.order-tables {
+    margin: 0 0 @order-create-sidebar__margin-reqular;
+    width: 100%;
+    th {
+        border-top: 0;
+        font-size: 1.3rem;
+    }
+    td {
+        border-bottom: none;
+        padding-top: @order-create-sidebar__padding;
+    }
+    tbody {
+        tr {
+            &:last-child {
+                td {
+                    border-bottom: 1px solid @order-create-table__border-color;
+                }
+            }
+            &.border {
+                td {
+                    padding-top: 0;
+                }
+            }
+        }
+    }
+    .col-qty {
+        .admin__control-text {
+            &:extend(.abs-control-qty all);
+        }
+    }
+    .col-actions {
+        .admin__control-select {
+            width: 13rem;
+        }
+    }
+    .price {
+        display: inline-block;
+        margin: 0 0 @order-create-sidebar__margin-small;
+    }
+    .custom-price-block {
+        font-size: @order-create-sidebar__font-size-xs;
+        margin: 0 0 @order-create-sidebar__margin-small;
+        + .admin__control-text {
+            &:extend(.abs-control-price);
+        }
+    }
+    .discount-price-block {
+        font-size: @order-create-sidebar__font-size-xs;
+    }
+    .product-configure-block {
+        margin: 1rem 0 0;
+        .disabled {
+            display: none;
+        }
+    }
+}
+
+.order-search-items {
+    .grid {
+        .action-configure {
+            float: right;
+        }
+        .col-id,
+        .col-price,
+        .col-in_products {
+            width: 10rem;
+        }
+    }
+}
+
+//
+//  Add by SKU
+//  ---------------------------------------------
+
+.add-by-sku-wrapper {
+    .add-by-sku {
+        background: @order-create-sku__background;
+        clear: both;
+        margin: 0 0 @indent__base;
+        padding: @order-create-sku__padding;
+    }
+    .table-info {
+        color: @order-create-sidebar__color;
+    }
+    .admin__field-note {
+        margin: 1.4rem 0;
+    }
+    .table-info {
+        th {
+            border-top: none;
+        }
+        th,
+        td {
+            border-bottom-color: @order-create-sku-table__border-color;
+            &:first-child {
+                padding-left: 0;
+            }
+        }
+    }
+    .action-reset,
+    .action-delete {
+        &:extend(.abs-action-reset all);
+        &:extend(.abs-icon all);
+        display: inline-block;
+        font-size: @order-create-sidebar__font-size + 0.1rem;
+        margin-left: 1.2rem;
+        padding-top: @order-create-sidebar__margin-small + 0.2rem;
+        vertical-align: middle;
+        &:after {
+            color: @order-create-sidebar__color;
+            content: @order-create-icon-remove__content;
+        }
+        &:hover {
+            &:after {
+                color: @order-create-icon-plus__hover__color;
+            }
+        }
+        > span {
+            &:extend(.abs-visually-hidden all);
+        }
+    }
+    .action-reset {
+        margin-top: -.4rem;
+        opacity: .5;
+        padding-top: 0;
+        &:after {
+            content: @order-create-icon-reset__content;
+        }
+        &:hover {
+            opacity: 1;
+        }
+    }
+    .col-qty {
+        .admin__control-text {
+            &:extend(.abs-control-qty all);
+        }
+    }
+}
+
+//
+//  Product configure popup
+//  ---------------------------------------------
+
+.product-configure-popup {
+    .weee {
+        .price-wrapper {
+            display: block;
+            font-size: 1.3rem;
+            &:before {
+                content: attr(data-label) ": ";
+            }
+        }
+    }
+}
diff --git a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order-create.less b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order-create.less
new file mode 100644
index 0000000000000..5ff4e9228ffd8
--- /dev/null
+++ b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order-create.less
@@ -0,0 +1,416 @@
+// /**
+//  * Copyright © 2015 Magento. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+//
+//  Variables
+//  ---------------------------------------------
+
+@order-create-icon-refresh__font-size: 2rem;
+@order-create-icon-refresh__color: @color-gray83;
+@order-create-icon-refresh__hover__color: darken(@color-gray83, 10%);
+
+@order-create-icon-add__content: @icon-arrow-right__content;
+@order-create-icon-configure__content: @icon-systems__content;
+@order-create-icon-remove__content: @icon-delete__content;
+@order-create-icon-reset__content: @icon-remove-small__content;
+@order-create-icon-refresh__content: @icon-refresh__content;
+@order-create-icon-plus__content: @icon-plus__content;
+@order-create-icon-plus__hover__color: @color-very-dark-gray-black2;
+
+//
+
+//
+//  Layout
+//  ---------------------------------------------
+
+.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
+    .order-details {
+        float: right;
+        #mix-grid .width(9,12);
+        margin-left: 0;
+    }
+    .order-sidebar {
+        #mix-grid .column(3,12);
+        margin-left: 0;
+    }
+
+    .order-billing-address,
+    .order-billing-method,
+    .order-history {
+        float: left;
+        #mix-grid .width(6,12);
+    }
+
+    .order-shipping-address,
+    .order-shipping-method,
+    .order-totals {
+        float: right;
+        #mix-grid .width(6,12);
+    }
+}
+
+//
+//  Select Store Scope
+//  ---------------------------------------------
+
+.tree-store-scope {
+    max-width: 50rem;
+
+    .admin__field {
+        margin: 0 0 1rem;
+    }
+}
+
+//
+//  Order discounts
+//  ---------------------------------------------
+
+.order-discounts {
+    &:extend(.abs-clearfix all);
+    margin-top: @indent__base;
+    .action-secondary {
+        float: right;
+        margin-top: 2.1rem;
+    }
+    .order-coupons {
+        float: left;
+    }
+    .admin__field {
+        display: inline-block;
+        margin: 0 3.5rem 0 0;
+        vertical-align: top;
+
+        .admin__field-control {
+            padding-right: 32px;
+            position: relative;
+        }
+
+        .action-default {
+            &:extend(.abs-action-reset all);
+            top: 7px;
+            position: absolute;
+            right: 0;
+            > span {
+                .extend__visually-hidden();
+            }
+
+            &:before {
+                &:extend(.abs-icon all);
+                content: @order-create-icon-add__content;
+            }
+
+            &:hover {
+                color: @order-create-icon-plus__hover__color;
+            }
+        }
+        p {
+            margin: @indent__s 0 0;
+        }
+    }
+    .action-remove {
+        color: @color-brownie;
+        margin-left: @indent__xs;
+        &:hover {
+            color: @order-create-icon-plus__hover__color;
+            text-decoration: none;
+        }
+        > span {
+            .extend__visually-hidden();
+        }
+        &:before {
+            &:extend(.abs-icon all);
+            content: @order-create-icon-remove__content;
+        }
+    }
+}
+
+//
+//  Order Account Information
+//  ---------------------------------------------
+
+.order-account-information {
+    .admin__fieldset {
+        &:extend(.abs-clearfix all);
+    }
+    .admin__field {
+        margin-bottom: 0;
+    }
+    .field-group_id {
+        float: left;
+    }
+    .field-email {
+        margin-top: 0;
+        overflow: hidden;
+    }
+}
+
+//
+//  Order Address Information
+//  ---------------------------------------------
+
+.order-details {
+    .order-search-items {
+        .col-qty {
+            .admin__control-text {
+                &:extend(.abs-control-qty);
+            }
+        }
+    }
+
+    .admin__fieldset-wrapper:not(:last-child) {
+        margin-bottom: 5rem;
+    }
+
+    .admin__fieldset-wrapper-content {
+        &:extend(.abs-clearfix all);
+    }
+
+    .admin__fieldset-wrapper-title {
+        &:extend(.abs-clearfix all);
+        border-bottom: 1px solid @color-gray80;
+        margin-bottom: @order-create-sidebar__margin-reqular;
+        padding-bottom: @indent__xs;
+        .actions {
+            float: right;
+            margin-bottom: @order-create-sidebar__margin-reqular;
+            margin-top: -@indent__xs;
+        }
+        .action-secondary {
+            margin-left: @indent__base;
+        }
+        .title {
+            margin: 0;
+        }
+    }
+
+    .admin__legend {
+        &:extend(.abs-fieldset-legend all);
+    }
+
+    .admin__field {
+        &:extend(.abs-field-rows all);
+    }
+
+    .admin__field-option {
+        .admin__field-label {
+            display: block;
+            width: auto;
+        }
+    }
+}
+
+.field-vat-number {
+    .action-default {
+        &:extend(.action-tertiary all);
+        font-weight: @font-weight__regular;
+        margin-top: @indent__s;
+        padding: 0;
+    }
+}
+
+//
+//  Order Payment & Shipping Information
+//  ---------------------------------------------
+
+.order-methods {
+    .admin__field {
+        &:extend(.abs-field-rows all);
+    }
+    .admin__fieldset-wrapper-content {
+        .admin__fieldset-wrapper-title {
+            &:extend(.abs-fieldset-legend all);
+            border-bottom: 0;
+            margin-bottom: 1.5rem;
+            padding: 0;
+            strong {
+                font-weight: @font-weight__semibold;
+            }
+        }
+    }
+}
+
+.admin__payment-method-wapper {
+    margin: 0;
+    .admin__fieldset {
+        padding: 1.5rem 0 @indent__base @field-control-option-label__padding-left;
+    }
+    .admin__field {
+        &:last-child {
+            margin-bottom: 0;
+        }
+    }
+}
+
+.admin__order-shipment-methods-title {
+    font-weight: @font-weight__bold;
+    margin: 0 0 @indent__xs;
+}
+
+.admin__order-shipment-methods-options {
+    margin: 0 0 @indent__base;
+}
+
+.admin__order-shipment-methods-options-list {
+    list-style: none;
+    margin: 0;
+}
+
+.order-shipping-method-summary {
+    padding-top: @field-option__padding-top;
+}
+
+.order-shipping-method,
+.order-billing-method {
+    position: relative;
+}
+
+.order-shipping-method-summary,
+.order-shipping-method {
+    .action-default {
+        &:extend(.action-tertiary all);
+        font-weight: @font-weight__regular;
+        padding: 0;
+    }
+}
+
+.order-methods-overlay {
+    background: rgba(255, 255, 255, .5);
+    bottom: 0;
+    left: 0;
+    position: absolute;
+    right: 0;
+    top: 0;
+    span {
+        background: @color-white;
+        display: block;
+        font-weight: @font-weight__bold;
+        left: 0;
+        position: absolute;
+        top: 48px;
+    }
+    .order-shipping-address & {
+        span {
+            top: 27px;
+        }
+    }
+}
+
+//
+//  Order Errors
+//  ---------------------------------------------
+
+.order-errors {
+    .col-qty {
+        .admin__control-text {
+            &:extend(.abs-control-qty all);
+        }
+    }
+}
+
+//
+//  Gift options
+//  ---------------------------------------------
+
+.order-gift-options {
+    &:extend(.abs-clearfix all);
+    .card-price-box {
+        display: none;
+        &._active {
+            display: block;
+        }
+    }
+
+    .price-box {
+        .price {
+            font-weight: @font-weight__bold;
+        }
+    }
+
+    > .giftmessage-order-create {
+        float: left;
+        #mix-grid .width(6, 12);
+    }
+}
+
+.giftmessage-order-create {
+    .field-sender {
+        margin-top: 1.4rem;
+    }
+    .admin__field { // ToDo UI: remove when /app/code/Magento/Backend/view/adminhtml/templates/widget/form.phtml refactored (the wrapping div removed)
+        margin-bottom: 3rem;
+        position: relative;
+        + .admin__field {
+            margin-top: 1.5rem;
+        }
+    }
+}
+
+//
+//  Totals
+//  ---------------------------------------------
+
+.admin__table-secondary {
+    width: 100%;
+    td {
+        padding: .7rem @indent__s;
+    }
+    tr:nth-child(2n+1) td {
+        background-color: @color-white-fog2;
+    }
+    .admin__total-amount {
+        text-align: right;
+    }
+    tr:last-child td {
+        border-bottom: 1px solid @color-gray80;
+        padding-bottom: @indent__s;
+    }
+}
+
+.order-totals-actions {
+    margin-top: @indent__s;
+    .actions {
+        margin-top: @indent__l;
+        text-align: right;
+    }
+    .action-default {
+        &:extend(.abs-action-l all);
+    }
+}
+
+//  ToDo UI: review the collapsible block
+//.order-subtotal {
+//    .summary-collapse {
+//        cursor: pointer;
+//        display: inline-block;
+//        &:before {
+//            @iconsize: 16px;
+//
+//            background: #f2ebde;
+//            border: 1px solid #ada89e;
+//            border-radius: 2px;
+//            color: #816063;
+//            content: '+';
+//            display: inline-block;
+//            font-size: @iconsize;
+//            -webkit-font-smoothing: antialiased;
+//            font-style: normal;
+//            font-weight: normal;
+//            height: @iconsize;
+//            line-height: @iconsize;
+//            margin-right: 7px;
+//            overflow: hidden;
+//            speak: none;
+//            text-indent: 0;
+//            vertical-align: top;
+//            width: @iconsize;
+//        }
+//        &:hover:before {
+//            background: #cac3b4;
+//        }
+//    }
+//    &.show-details .summary-collapse:before {
+//        content: '\e03a';
+//    }
+//}
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 906c538fc04f7..a70fc496ce35d 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/_components.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/_components.less
@@ -11,3 +11,6 @@
 @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/_extends.less b/app/design/adminhtml/Magento/backend/web/css/source/_extends.less
index 80094085bd6aa..26099b295ea07 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/_extends.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/_extends.less
@@ -47,6 +47,15 @@
     &:extend(.abs-visually-hidden all);
 }
 
+//  Revert visually hidden
+.abs-visually-hidden-reset {
+    .visually-hidden-reset();
+}
+
+.extend__visually-hidden-reset() {
+    &:extend(.abs-visually-hidden-reset all);
+}
+
 //  Clearfix
 .abs-clearfix {
     .clearfix();
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 11e8b27d45714..bf591fe9921f7 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/_tables.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/_tables.less
@@ -7,48 +7,44 @@
 //  Variables
 //  _____________________________________________
 
-@base-table-color: @color-very-dark-gray-black;
-@base-table-border-th-color: @color-gray89;
-@base-table-border-td-color: @color-gray89;
-@base-table-background-tfoot: @color-white-fog;
+@table__color: @color-very-dark-gray-black;
+@table__border-color: @color-gray89;
+
+@table-th__border-color: @table__border-color;
+
+@table-td__border-color: @table__border-color;
+
+@table-tfoot__background-color: @color-white-fog;
+
+@table-info__font-size: 1.3rem;
+@table-info__padding-vertical: 1rem;
+@table-info__padding-horizontal: 1.5rem;
 
 //
 //  Tables
 //  _____________________________________________
 
-table.table {
-    color: @base-table-color;
-    > caption {
-        margin-bottom: .5rem;
-    }
-    tfoot {
-        background: @base-table-background-tfoot;
-        th,
-        td {
-            text-align: left;
-        }
+//
+//  Utilities
+//  ---------------------------------------------
+
+.table-info {
+    font-size: @table-info__font-size;
+    th,
+    td {
+        padding: @table-info__padding-vertical @table-info__padding-horizontal;
+        text-align: left;
     }
     th {
-        background: transparent;
-        border-bottom: .1rem solid @base-table-border-th-color;
-        border-top: .1rem solid @base-table-border-th-color;
+        border-bottom: 1px solid @table-th__border-color;
+        border-top: 1px solid @table-th__border-color;
         font-weight: @font-weight__bold;
-        padding: 1rem 1.5rem;
-        text-align: left;
     }
     td {
-        border-bottom: .1rem solid @base-table-border-td-color;
-        padding: 1rem 1.5rem;
+        border-bottom: 1px solid @table-td__border-color;
         vertical-align: top;
     }
     tbody {
-        td {
-            &:first-child {
-                input[type='checkbox'] {
-                    margin: 0;
-                }
-            }
-        }
         tr {
             &:last-child {
                 td {
@@ -57,9 +53,17 @@ table.table {
             }
         }
     }
-    th {
-        &.required {
-            &:extend(.validation-symbol all);
-        }
+    tfoot {
+        background: @table-tfoot__background-color;
+    }
+}
+
+//
+
+table {
+    background-color: transparent;
+    color: @table__color;
+    > caption {
+        margin-bottom: .5em;
     }
 }
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
new file mode 100644
index 0000000000000..7098e076357d1
--- /dev/null
+++ b/app/design/adminhtml/Magento/backend/web/css/source/components/_data-grid-temp.less
@@ -0,0 +1,315 @@
+// /**
+//  * 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 {
+    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;
+                        }
+                    }
+                }
+            }
+            //  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/_messages.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_messages.less
index ca1ba9e890277..493a38a1f5bb1 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/components/_messages.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/components/_messages.less
@@ -41,7 +41,11 @@
 //  ---------------------------------------------
 
 .messages {
-    margin: 0 0 2rem;
+    .message {
+        &:last-child {
+            margin: 0 0 2rem;
+        }
+    }
 }
 
 .message {
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 414d670182ee3..abac708dc0eb5 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
@@ -317,6 +317,24 @@
     }
 }
 
+.ui-dialog {
+    .admin__fieldset {
+        > .admin__legend {
+            float: none;
+            font-size: 1.8rem;
+            margin: 0 0 2rem 34%;
+            width: auto;
+        }
+    }
+    .gift_options-popup {
+        .admin__fieldset {
+            > .admin__legend {
+                margin-left: 0;
+            }
+        }
+    }
+}
+
 .ui-widget-overlay {
     background: @popup-overlay__background-color;
     bottom: 0;
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_tooltip-temp.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_tooltip-temp.less
index a084345880534..94e7125551a0a 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/components/_tooltip-temp.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/components/_tooltip-temp.less
@@ -9,70 +9,70 @@
 
 //  ToDo UI: Consist old styles, should be changed with new design
 
-.tooltip {
-    display: inline-block;
-    margin-left: 5px;
-    .help span,
-    .help a {
-        position: relative;
-        z-index: 2;
-        width: 22px;
-        height: 22px;
-        display: inline-block;
-        vertical-align: middle;
-        cursor: pointer;
-        &:before {
-            content: "?";
-            font-weight: 500;
-            font-size: 18px;
-            display: inline-block;
-            overflow: hidden;
-            height: 22px;
-            border-radius: 11px;
-            line-height: 22px;
-            width: 22px;
-            text-align: center;
-            color: #ffffff;
-            background-color: #514943;
-        }
-        span {
-            .visually-hidden();
-        }
-    }
-    //  TODO Tooltips
-    .tooltip-content {
-        display: none;
-        position: absolute;
-        max-width: 200px;
-        margin-top: 10px;
-        margin-left: -19px;
-        padding: 4px 8px;
-        border-radius: 3px;
-        background: #000;
-        background: rgba(49, 48, 43, .8);
-        color: #fff;
-        text-shadow: none;
-        z-index: 20;
-        &:before {
-            content: '';
-            position: absolute;
-            width: 0;
-            height: 0;
-            top: -5px;
-            left: 20px;
-            border-left: 5px solid transparent;
-            border-right: 5px solid transparent;
-            border-bottom: 5px solid #000;
-            opacity: .8;
-        }
-        &.loading {
-            position: absolute;
-            &:before {
-                border-bottom-color: rgba(0, 0, 0, .3);
-            }
-        }
-    }
-    &:hover > .tooltip-content {
-        display: block;
-    }
-}
+//.tooltip {
+//    display: inline-block;
+//    margin-left: 5px;
+//    .help span,
+//    .help a {
+//        position: relative;
+//        z-index: 2;
+//        width: 22px;
+//        height: 22px;
+//        display: inline-block;
+//        vertical-align: middle;
+//        cursor: pointer;
+//        &:before {
+//            content: "?";
+//            font-weight: 500;
+//            font-size: 18px;
+//            display: inline-block;
+//            overflow: hidden;
+//            height: 22px;
+//            border-radius: 11px;
+//            line-height: 22px;
+//            width: 22px;
+//            text-align: center;
+//            color: #ffffff;
+//            background-color: #514943;
+//        }
+//        span {
+//            .visually-hidden();
+//        }
+//    }
+//    //  TODO Tooltips
+//    .tooltip-content {
+//        display: none;
+//        position: absolute;
+//        max-width: 200px;
+//        margin-top: 10px;
+//        margin-left: -19px;
+//        padding: 4px 8px;
+//        border-radius: 3px;
+//        background: #000;
+//        background: rgba(49, 48, 43, .8);
+//        color: #fff;
+//        text-shadow: none;
+//        z-index: 20;
+//        &:before {
+//            content: '';
+//            position: absolute;
+//            width: 0;
+//            height: 0;
+//            top: -5px;
+//            left: 20px;
+//            border-left: 5px solid transparent;
+//            border-right: 5px solid transparent;
+//            border-bottom: 5px solid #000;
+//            opacity: .8;
+//        }
+//        &.loading {
+//            position: absolute;
+//            &:before {
+//                border-bottom-color: rgba(0, 0, 0, .3);
+//            }
+//        }
+//    }
+//    &:hover > .tooltip-content {
+//        display: block;
+//    }
+//}
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 ed51b9110dc72..6d6619c82ef5d 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
@@ -16,6 +16,7 @@
 @field-control__font-size: 1.4rem;
 @field-control__height: 3.3rem;
 @field-control-addon__color: @color-gray52;
+@field-control-option-label__padding-left: 26px;
 
 //  States
 @field-control__disabled__background-color: @color-lighter-gray;
@@ -40,7 +41,6 @@
     font-weight: @font-weight__regular;
     height: @field-control__height;
     max-width: 100%;
-    min-width: 10rem;
     padding: 0 1rem;
     transition: border-color .1s ease-in;
 }
@@ -55,18 +55,18 @@
     background-color: @field-control__disabled__background-color;
     border-color: @field-control__border-color;
     color: @field-control__color;
-    opacity: .5;
+    opacity: @disabled__opacity;
     cursor: not-allowed;
 }
 
-// Input text styles
+//  Input text styles
 .admin__control-text {
     .extend__form-control-styles();
     line-height: @field-control__height;
     width: 100%;
 }
 
-// Select styles
+//  Select styles
 .admin__control-select {
     .extend__form-control-styles();
     .css(appearance, none, 1);
@@ -104,18 +104,23 @@
     }
 }
 
+// ToDo UI: add month and date styles
+//.admin__control-select-month {width:140px;}
+//.admin__control-select-year {width:103px;}
+//.admin__control-cvn {width:3em;}
+
 option:empty {
     display: none;
 }
 
-// Multiple select
+//  Multiple select
 .admin__control-multiselect {
     .extend__form-control-styles();
     height: auto;
     padding: .6rem 1rem;
 }
 
-// File uploader
+//  File uploader
 .admin__control-file-wrapper {
     display: inline-block;
     padding: .5rem 1rem;
@@ -148,18 +153,20 @@ option:empty {
     width: auto;
 }
 
-// Textarea
+//  Textarea
 .admin__control-textarea {
     .extend__form-control-styles();
     height: 8.48rem;
     line-height: 1.18;
     padding-top: .8rem;
+    resize: vertical;
     width: 100%;
 }
 
-// Checkboxes and radios
+//  Checkboxes and radios
 .admin__control-radio,
 .admin__control-checkbox {
+    cursor: pointer;
     margin: .3rem 0 0;
     opacity: 0.01; // hack for successful selenium tests
     overflow: hidden;
@@ -168,10 +175,10 @@ option:empty {
     + label {
         cursor: pointer;
         display: inline-block;
-        padding-left: 26px;
+        padding-left: @field-control-option-label__padding-left;
 
         &:before {
-            background: none;
+            background: @field-control__background-color;
             border-radius: .2rem;
             border: 1px solid @field-control__border-color;
             color: transparent;
@@ -203,7 +210,7 @@ option:empty {
                 border-color: @field-control__border-color;
             }
             color: @field-control__color;
-            opacity: .5;
+            opacity: @disabled__opacity;
         }
     }
 }
@@ -236,7 +243,7 @@ option:empty {
     }
 }
 
-// Control with additional prefix or suffix label
+//  Control with additional prefix or suffix label
 .admin__control-addon {
     .vendor-prefix-display(inline-flex);
     .vendor-prefix-flex-direction(row);
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 f6679928d0171..699c2ba354eeb 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
@@ -43,12 +43,12 @@
     }
     &:not(.admin__field-option) {
         > .admin__field-label {
-            text-align: left;
-            width: auto;
             display: block;
             line-height: @field-label__font-size;
             margin-bottom: 1rem - round(( @field-label__line-height - 1 ) * @field-label__font-size / 2 , 2); // Try to Calculate margin offset considering line-height;
             margin-top: 0rem - round(( @field-label__line-height - 1 ) * @field-label__font-size / 2, 2);
+            text-align: left;
+            width: auto;
             &:before {
                 display: none;
             }
@@ -67,3 +67,19 @@
         }
     }
 }
+
+.abs-control-qty {
+    min-width: 0;
+    width: 5.4rem;
+}
+
+.abs-control-price {
+    min-width: 0;
+    width: 10rem;
+}
+
+.abs-fieldset-legend {
+    font-size: 1.8rem;
+    font-weight: @font-weight__semibold;
+    margin-bottom: @indent__l;
+}
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 59165529f481d..f5ae9614e8a91 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
@@ -17,6 +17,8 @@
 @field-note__font-size: @font-size__s;
 @field-scope__color: @color-dark-gray;
 
+@field-option__padding-top: .8rem;
+
 @field-error-control__border-color: @color-tomato-brick;
 @field-error-message__background-color: @color-lazy-sun;
 @field-error-message__border-color: @color-apricot;
@@ -26,7 +28,7 @@
 //  Form Fields
 //  _____________________________________________
 
-// Fieldset
+//  Fieldset
 .admin__fieldset {
     border: 0;
     margin: 0;
@@ -52,7 +54,7 @@
     }
 }
 
-// Label
+//  Label
 .admin__field-label {
     color: @field-label__color;
     margin: 0;
@@ -69,7 +71,7 @@
         line-height: 3.2rem;
         padding: 0;
         white-space: nowrap;
-        word-break: break-all;
+        word-wrap: break-word;
 
         &:before {
             content: '.';
@@ -107,7 +109,7 @@
     }
 }
 
-// Field
+//  Field
 .admin__field {
     margin-bottom: 0;
 
@@ -130,10 +132,6 @@
     .admin__fieldset > & {
         margin-bottom: 3rem;
         position: relative;
-        z-index: 1;
-        &:hover {
-            z-index: 2;
-        }
     }
 
     &[data-config-scope] {
@@ -166,7 +164,13 @@
     }
 }
 
-// Field error message
+.admin__field-control {
+    & + & {
+        margin-top: 1.5rem;
+    }
+}
+
+//  Field error message
 .admin__field-error {
     background: @field-error-message__background-color;
     border: 1px solid @field-error-message__border-color;
@@ -180,7 +184,7 @@
     padding: .8rem 1rem .9rem;
 }
 
-// Field notice message
+//  Field notice message
 .admin__field-note {
     color: @field-note__color;
     font-size: @field-note__font-size;
@@ -188,9 +192,9 @@
     padding: 0;
 }
 
-// Field containing checkbox or radio
+//  Field containing checkbox or radio
 .admin__field-option {
-    padding-top: 8px;
+    padding-top: @field-option__padding-top;
 
     .admin__field-label {
         text-align: left;
@@ -218,6 +222,11 @@
     }
 }
 
+//  Field containing a value
+.admin__field-value {
+    padding-top: @field-option__padding-top;
+}
+
 //
 //  Field containing multiple fields
 //  _____________________________________________
@@ -237,7 +246,7 @@
     }
 }
 
-// In rows
+//  In rows
 .admin__control-fields {
     .admin__field-label ~ .admin__field-control {
         width: 100%;
@@ -249,7 +258,7 @@
     }
 }
 
-// In line
+//  In line
 [class*='admin__control-grouped'] {
     box-sizing: border-box;
     display: table;
@@ -271,3 +280,20 @@
         }
     }
 }
+
+//
+//  Form legend
+//  _____________________________________________
+
+.admin__legend {
+    //  ToDo UI: add form legend styles. Check if they doon't conflict with create order page form legend styles
+    float: left;
+    position: static;
+    width: 100%;
+    & + br {
+        display: block;
+        height: 0;
+        overflow: hidden;
+        clear: left;
+    }
+}
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 93c09e6a81c7f..53a728106a5af 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,11 +39,21 @@
 //  _____________________________________________
 
 .admin__fieldset-wrapper-title {
+    .extend__clearfix();
+    border-bottom: 1px solid @color-gray80;
     margin-bottom: 30px;
     padding: 14px 0 16px;
-    strong {
+    strong,
+    .title {
         &:extend(h2);
     }
+    .title {
+        float: left;
+        margin: .7rem 0 0;
+    }
+    .actions {
+        float: right;
+    }
 }
 
 // @todo ui Move to other place - will be done in upcoming task "Address Tabs":
@@ -185,7 +195,7 @@
 .admin__field-control > [class*='admin__control-'].mage-error {
     border-color: @field-error-control__border-color;
 }
-.admin__field-control label.mage-error {
+label.mage-error {
     &:extend(.admin__field-error);
 }
 
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 13f9dbc30e0d6..fa70769896ebb 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
@@ -27,4 +27,4 @@
 @link__hover__color: @color-blue-pure;
 
 //  Disabled
-@disabled__opacity: .7;
+@disabled__opacity: .5;
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 a00d8cbb543d1..f6b0cff9e7c8d 100644
--- a/app/design/adminhtml/Magento/backend/web/css/styles-old.less
+++ b/app/design/adminhtml/Magento/backend/web/css/styles-old.less
@@ -12,12 +12,320 @@
 @import "../mui/styles/vars.less";
 @import (reference) "../mui/styles/abstract.less"; // Import some abstract
 
+// DO NOT REMOVE! Can be dangerous (need for Product Creation)
+.collapse.in,
+.no-js .collapse {
+    height: auto !important;
+    overflow: visible;
+}
+.hidden {
+    display: none;
+    visibility: hidden;
+}
+input.no-display,
+.no-display {
+    display: none;
+}
+.invisible {
+    visibility: hidden;
+}
+//  DO NOT REMOVE! Can be dangerous (need for Product Creation)
+
 .admin__scope-old {
     box-sizing: content-box;
 
     @import "../mui/styles/base.less";
     @import "../mui/styles/table.less"; // Import table styles
 
+    .field {
+        position: relative;
+        box-sizing: border-box;
+        margin: 0 0 12px 0;
+    }
+
+    .field > .label {
+        margin: 0 0 6px;
+    }
+
+    // TODO: remove after all templates refactoring
+    span.required {
+        display: none;
+    }
+
+    .field.required > .label {
+        &:not(.admin__field-label) {
+            :after {
+                content: '*';
+                color: red;
+                margin-left: 3px;
+            }
+        }
+    }
+
+    //
+    //  Control with added before and after content
+    //  ---------------------------------------------
+
+    .addon {
+        padding: 0;
+        display: table;
+        width: 100%;
+    }
+
+    .addon textarea,
+    .addon select,
+    .addon input {
+        width: 100%;
+        border-radius: 0;
+        box-shadow: none;
+        margin: 0;
+    }
+
+    .addon select {
+        width: auto;
+    }
+
+    .addon select + .addafter {
+        border: none;
+    }
+
+    .ie .addon textarea,
+    .ie .addon select {
+        display:inline-block;
+    }
+
+    .addon textarea:first-child,
+    .addon select:first-child,
+    .addon input[type=text]:first-child,
+    .addon .addbefore:first-child {
+        border-radius: 0;
+    }
+
+    .addon textarea:last-child,
+    .addon select:last-child,
+    .addon input[type=text]:last-child,
+    .addon .addafter:last-child {
+        border-radius: 0;
+    }
+
+    .addon .addbefore,
+    .addon .addafter {
+        background: #f5f5f5;
+        background-image: -ms-linear-gradient(top, #ffffff, #e6e6e6);
+        background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
+        background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
+        background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
+        background-image: linear-gradient(top, #ffffff, #e6e6e6);
+        background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
+        background-repeat: repeat-x;
+        vertical-align: middle;
+        width: 1px;
+        color: #666;
+        font-size: 11px;
+        font-weight: bold;
+        height: 0;
+        white-space: nowrap;
+        display: inline-block;
+        display: table-cell;
+        padding: 4px;
+        border: solid #ccc;
+        border-width: 1px 0 1px 1px;
+    }
+
+//    .addon {direction: rtl; }
+//    .addon > * {direction: ltr; }
+
+    .addon *:focus ~ .addafter {
+
+    }
+
+    .addon .addafter {
+        border-width: 1px 1px 1px 0;
+    }
+
+    .choice .addafter,
+    .choice .addbefore {
+        display: inline;
+    }
+
+    //  Addon left aligned
+    .field-price .addon {
+        direction: rtl;
+    }
+
+    .field-price .addon > * {
+        direction: ltr;
+    }
+
+    .field-price .addon .addafter {
+        border-width: 1px 0 1px 1px;
+        border-radius: 1px 0 0 1px;
+    }
+
+    //
+    //  Form actions
+    //  ---------------------------------------------
+
+    .form-actions {
+        padding: 10px;
+        margin: 10px 0;
+    }
+
+    //
+    //  Default view for fields: Labels are above the controls
+    //  ---------------------------------------------
+
+    .form-inline .label,
+    .form-inline .control {
+        margin: 0;
+        float: left;
+        width: 55%;
+        box-sizing: border-box;
+    }
+
+    .form-inline .label {
+        width: 45%;
+        text-align: right;
+        padding: 5px 15px 0 0;
+    }
+
+    .form-inline .choice {
+        position: relative;
+        z-index: 1;
+    }
+
+    .form-inline .choice .control {
+        position: absolute;
+        margin-top: 4px;
+        width: auto;
+        left: 45%;
+    }
+
+    .form-inline .choice .tooltip {
+        margin-left: 20px;
+        position: relative;
+        z-index: 1;
+        margin-top: 7px;
+    }
+
+    .form-inline .with-tooltip:not(.choice) {
+        padding-top: 20px;
+    }
+
+    .control .control-value {
+        display: inline-block;
+        padding: 6px 0 0;
+        vertical-align: top;
+    }
+
+    .control .control-value.special {
+        font-weight: bold;
+    }
+
+    //
+    //  Field with multiple fields
+    //  ---------------------------------------------
+
+    // TODO: rename 'fields-group' class. Propose - 'group'
+
+    [class^="fields-group-"] .field {
+        vertical-align: top;
+        margin: 0;
+        display: inline-block;
+    }
+
+    [class^="fields-group-"] .field .label {
+        width: auto;
+        float: none;
+        text-align: left;
+        padding-right: 0;
+    }
+
+    [class^="fields-group-"] .choice .label {
+        display: inline;
+    }
+
+    [class^="fields-group-"] .field .control {
+        float: none;
+        width: auto;
+        margin-left: 0;
+    }
+
+    @media screen and (max-width: 960px) {
+        [class^="fields-group-"] .field {
+            width: 100% !important;
+            margin-bottom: 20px !important;
+        }
+    }
+
+    [class^="fields-group-"] {
+        letter-spacing: -0.31em; // webkit
+        word-spacing: -0.43em; // IE < 8 && gecko
+    }
+
+    [class^="fields-group-"] > * {
+        letter-spacing: normal;
+        word-spacing: normal;
+    }
+
+    //
+    //  Form field with nested controls inside
+    //  ---------------------------------------------
+
+    .nested {
+        padding: 6px 0 0;
+    }
+
+    .nested .choice .label,
+    .nested .choice .control {
+        float: none;
+        width: auto;
+        position: static;
+        left: auto;
+        text-align: left;
+        display: inline;
+        padding: 0;
+    }
+
+    .nested .field {
+        width: auto;
+        padding: 0;
+        margin: 5px 0;
+        display: block;
+    }
+
+    .nested .field:first-child {
+        margin-top: 0;
+    }
+
+    .nested .field:last-child {
+        margin-bottom: 0;
+    }
+
+    //
+    //  Clearfix
+    //  ---------------------------------------------
+
+    .buttons-set:before,
+    .buttons-set:after,
+    .form-inline .field:before,
+    .form-inline .field:after,
+    .form-actions:before,
+    .form-actions:after,
+    .clearfix:before,
+    .clearfix:after {
+        content: "";
+        display: table;
+    }
+
+    .buttons-set:after,
+    .form-inline .field:after,
+    .form-actions:after,
+    .clearfix:after {
+        clear: both;
+    }
+
+
     //
     //  Reset 'button view' for actions
     //  --------------------------------------
@@ -624,11 +932,11 @@
     input[readonly],
     select[readonly],
     textarea[readonly] {
+        background-color: #e9e9e9;
+        border-color: #adadad;
+        color: #303030;
+        opacity: .5;
         cursor: not-allowed;
-        background-color: #fff;
-        border-color: #eee;
-        box-shadow: none;
-        color: #999;
     }
 
     select[disabled] option[selected] {
@@ -671,9 +979,16 @@
         width: 20%;
         padding-top: 8px;
         padding-right: 30px;
+        &.admin__field-label {
+            padding-top: 0;
+            padding-right: 30px;
+            width: 20%;
+            margin-left: 0;
+        }
     }
 
     .form-inline .label ~ .control {
+        margin: 0;
         width: 60%;
     }
 
@@ -1064,7 +1379,7 @@
         line-height: 3.2rem;
         padding: 0 30px 0 0;
         white-space: nowrap;
-        word-break: break-all;
+        word-wrap: break-word;
         &:before {
             content: '.';
             margin-left: -7px;
@@ -2300,7 +2615,6 @@
         margin: 0 0 5px;
     }
 
-
     .data-table .fpt-item-container {
         td {
             vertical-align: top;
@@ -2320,8 +2634,6 @@
     .page-create-order:after,
     .order-addresses:before,
     .order-addresses:after,
-    .order-methods:before,
-    .order-methods:after,
     .order-summary:before,
     .order-summary:after,
     .order-methods:before,
@@ -2339,7 +2651,6 @@
     .tabs-horiz:after,
     .page-create-order:after,
     .order-addresses:after,
-    .order-methods:after,
     .order-summary:after,
     .order-methods:after,
     .grid-actions:after,
@@ -2714,11 +3025,6 @@
         .style3();
     }
 
-    .order-sidebar {
-        float: left;
-        width: 22%;
-    }
-
     .customer-current-activity-inner {
         padding: 18px;
     }
@@ -2743,18 +3049,6 @@
         float: right;
     }
 
-    .order-billing-address,
-    .order-billing-method {
-        float: left;
-        width: 49.5%;
-    }
-
-    .order-shipping-address,
-    .order-shipping-method {
-        float: right;
-        width: 49%;
-    }
-
     #order-data .order-account-information {
         float: none;
         width: auto;
@@ -2792,6 +3086,20 @@
         margin: 0 0 8px;
     }
 
+    .order-account-information {
+        .admin__fieldset-wrapper-title {
+            margin: 0 0 18px;
+            padding: 12px 0 14px;
+            .title {
+                margin: 0;
+            }
+        }
+    }
+
+    .order-gift-options {
+        padding: 0 18px;
+    }
+
     .order-coupons .box-left,
     .order-gift-options .box-left {
         float: left;
@@ -2828,11 +3136,6 @@
             margin-left: 10px;
         }
 
-        .giftmessage-entire-order textarea {
-            height: 6em;
-            width: 100%;
-        }
-
         .giftmessage-whole-order-container {
             textarea {
                 height: 6em;
@@ -2874,54 +3177,6 @@
     //  Sales -> Create Order
     // --------------------------------------
 
-    .summary-total {
-        .summary-collapse {
-            cursor: pointer;
-            display: inline-block;
-            &:before {
-                @iconsize: 16px;
-                content: "\e02d";
-                color: #816063;
-                background: #f2ebde;
-                display: inline-block;
-                text-indent: 0;
-                font-size: @iconsize;
-                width:@iconsize;
-                height:@iconsize;
-                line-height: @iconsize;
-                overflow: hidden;
-                font-family: 'MUI-Icons';
-                border:1px solid #ada89e;
-                font-style: normal;
-                vertical-align: top;
-                margin-right:7px;
-                font-weight: normal;
-                speak: none;
-                -webkit-font-smoothing: antialiased;
-                border-radius: 2px;
-            }
-            &:hover:before {
-                background: #cac3b4;
-            }
-        }
-        &.show-details .summary-collapse:before {
-            content: "\e03a";
-        }
-    }
-
-    tr.row-totals:nth-child(even) + tr.summary-details ~ tr.summary-total:not(.show-details):nth-child(even) td,
-    tr.row-totals:nth-child(even) + tr.summary-details ~ tr.summary-total:not(.show-details):nth-child(even) ~ tr.row-totals:nth-child(even) td,
-    tr.row-totals:nth-child(odd) + tr.summary-details ~ tr.summary-total:not(.show-details):nth-child(odd) ~ tr.row-totals:nth-child(even) td {
-        background:  #fbfaf6;
-    }
-
-    tr.row-totals:nth-child(odd) + tr.summary-details ~ tr.summary-total:not(.show-details):nth-child(odd) ~ tr.row-totals:nth-child(odd) td,
-    tr.row-totals:nth-child(even) + tr.summary-details ~ tr.summary-total:not(.show-details):nth-child(even) ~ tr.row-totals:nth-child(odd) td,
-    tr.row-totals:nth-child(odd) + tr.summary-details ~ tr.summary-total:not(.show-details):nth-child(odd) td {
-        background: #fff;
-    }
-
-
     #order-data .page-actions {
         padding-top: 0;
     }
@@ -4875,25 +5130,6 @@
     width: 100%;
 }
 
-[class*="-order-"] .admin__scope-old .order-billing-address .actions,
-[class*="-order-"] .admin__scope-old .order-shipping-address .actions {
-    margin: 17px 0;
-}
-
-[class*="-order-"] .admin__scope-old .order-billing-address .control + label,
-[class*="-order-"] .admin__scope-old .order-shipping-address .control + label {
-    margin: 17px 0 0;
-}
-
-.sales-order-create-index #order-message .admin__scope-old .messages .message,
-.sales-order-edit-index #order-message .admin__scope-old .messages .message {
-    margin: 0 0 60px;
-}
-
-.sales-order-create-index .admin__scope-old .order-items.fieldset-wrapper,
-.sales-order-create-index .admin__scope-old .order-search-items.fieldset-wrapper,
-.sales-order-create-index .admin__scope-old .order-additional-area.fieldset-wrapper,
-.sales-order-create-index .admin__scope-old .order-errors,
 .checkout-index-index .checkout-errors {
     .fieldset-wrapper-title {
         border-bottom: 0;
@@ -4906,86 +5142,6 @@
     }
 }
 
-[class*="-order-"] .admin__scope-old {
-    .fieldset-wrapper-title {
-        .actions {
-            float: right;
-            padding: 0;
-            a:link,
-            a:visited,
-            a:hover,
-            a:active {
-                color: #a29c94;
-            }
-        }
-    }
-    .order-customer-selector .fieldset-wrapper-title .actions {
-        padding-top: 8px;
-    }
-    .order-details .fieldset-wrapper-title .actions {
-        padding-bottom: 15px;
-    }
-}
-
-.sales-order-create-index {
-    .admin__scope-old {
-        // Configure product popup
-        .ui-dialog {
-            // Virtual and downloadable product
-            .downloadable.information .link {
-                .label {
-                    margin-left: 0;
-                }
-                .nested {
-                    margin-left: 8px;
-                }
-            }
-            // Bundle product
-            .fieldset.bundle {
-                .nested {
-                    padding-left: 6px;
-                    .field {
-                        margin: 0 0 5px;
-                    }
-                    .label {
-                        font-size: 13px;
-                        margin: 0;
-                    }
-                    .qty .control {
-                        display: inline-block;
-                        margin: 0 0 0 10px;
-                        width: 60px;
-                    }
-                }
-            }
-        }
-        .order-billing-method {
-            .payment-methods {
-                .fieldset {
-                    padding: 0;
-                    margin: 0;
-                    .field {
-                        margin: 0 0 12px 0;
-                    }
-                }
-            }
-        }
-        .grid .action-configure {
-            float: right;
-            &.disabled {
-                cursor: default;
-                opacity: .5;
-                &:hover {
-                    text-decoration: none;
-                }
-            }
-        }
-        .order-items.fieldset-wrapper {
-            .clearfix();
-        }
-    }
-}
-
 [class^=" sales-"] {
     .admin__scope-old {
         tr.headings {
@@ -5889,3 +6045,68 @@
         }
     }
 }
+
+// ==|== print styles =======================================================
+//   Print styles.
+//   Inlined to avoid required HTTP connection: h5bp.com/r
+//   ==========================================================================
+
+@media print {
+    * {
+        background: transparent !important;
+        color: black !important;
+        box-shadow: none !important;
+        text-shadow: none !important;
+        filter: none !important;
+        -ms-filter: none !important;
+    }
+
+    // Black prints faster: h5bp.com/s
+    a, a:visited {
+        text-decoration: underline;
+    }
+
+    a[href]:after {
+        content: " (" attr(href) ")";
+    }
+
+    abbr[title]:after {
+        content: " (" attr(title) ")";
+    }
+
+    .ir a:after, a[href^="javascript:"]:after, a[href^="#"]:after {
+        content: "";
+    }
+
+    // Don't show links for images, or javascript/internal links
+    pre, blockquote {
+        border: 1px solid #999;
+        page-break-inside: avoid;
+    }
+
+    thead {
+        display: table-header-group;
+    }
+
+    // h5bp.com/t
+    tr, img {
+        page-break-inside: avoid;
+    }
+
+    img {
+        max-width: 100% !important;
+    }
+
+    @page {
+        margin: 0.5cm;
+    }
+
+    p, h2, h3 {
+        orphans: 3;
+        widows: 3;
+    }
+
+    h2, h3 {
+        page-break-after: avoid;
+    }
+}
diff --git a/app/design/adminhtml/Magento/backend/web/css/styles.less b/app/design/adminhtml/Magento/backend/web/css/styles.less
index a53fca54f3078..8b9bd439e270c 100644
--- a/app/design/adminhtml/Magento/backend/web/css/styles.less
+++ b/app/design/adminhtml/Magento/backend/web/css/styles.less
@@ -41,7 +41,6 @@
 
 // ToDo UI: Temporary. Should be changed
 @import 'source/components/_calendar-temp.less';
-@import 'source/components/_tooltip-temp.less';
 
 //
 //  Media queries collector
diff --git a/app/design/adminhtml/Magento/backend/web/mui/mui_legacy.css b/app/design/adminhtml/Magento/backend/web/mui/mui_legacy.css
deleted file mode 100644
index b6b8818b3bccc..0000000000000
--- a/app/design/adminhtml/Magento/backend/web/mui/mui_legacy.css
+++ /dev/null
@@ -1,1939 +0,0 @@
-/**
- * Copyright © 2015 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-/* ==========================================================================
-   base.css (begin)
-   ========================================================================== */
-
-/*
-    Buttons group
--------------------------------------- */
-
-.buttons-group {
-    position: relative;
-    display: inline-block;
-}
-
-.buttons-group:before,
-.buttons-group:after {
-    display: table;
-    content: "";
-}
-
-.buttons-group:after {
-    clear: both;
-}
-
-.buttons-group > button,
-.buttons-group > .button {
-    position: relative;
-    float: left;
-    margin-left: -1px;
-    border-radius: 0;
-}
-
-.buttons-group > button:first-child,
-.buttons-group > .button:first-child {
-    margin-left: 0;
-    border-bottom-left-radius: 4px;
-    border-top-left-radius: 4px;
-}
-
-.buttons-group > button:last-child,
-.buttons-group > .button:last-child,
-.buttons-group > [data-toggle="dropdown"] {
-    border-top-right-radius: 4px;
-    border-bottom-right-radius: 4px;
-}
-
-.buttons-group-vertical > .button {
-    float: none;
-    display: block;
-    margin-left: 0;
-    margin-top: -1px;
-}
-
-.buttons-group-vertical > input[type=button],
-.buttons-group-vertical > input[type=submit],
-.buttons-group-vertical > input[type=reset],
-.buttons-group-vertical > button {
-    width: 100%;
-}
-
-.buttons-group-vertical > .button:first-child {
-    margin-top: 0;
-    border-radius: 4px 4px 0 0;
-}
-
-.buttons-group-vertical > .button:last-child {
-    border-radius: 0 0 4px 4px;
-}
-
-/*
-    Forms
--------------------------------------- */
-
-fieldset {
-    border: 1px solid #ccc;
-    padding: 20px;
-}
-
-legend {
-    padding: 0 10px;
-    margin: 0 -10px;
-}
-
-fieldset legend + br {
-    display: none;
-}
-
-label {
-    display: inline-block;
-}
-
-label > input[type="radio"],
-label > input[type="checkbox"] {
-    margin: -3px 3px 0 0;
-    vertical-align: middle;
-}
-
-select {
-    padding: 4px;
-    margin: 0 0 8px;
-}
-
-select[multiple],
-select[size] {
-    height: auto;
-}
-
-input[type="radio"],
-input[type="checkbox"] {
-    margin: 3px 0;
-    line-height: normal;
-}
-
-input[disabled],
-select[disabled],
-textarea[disabled],
-input[readonly],
-select[readonly],
-textarea[readonly] {
-    cursor: not-allowed;
-}
-
-/*
-    Blockquotes
--------------------------------------- */
-blockquote {
-    border-left: 2px solid #ccc;
-    padding-left: 5px;
-}
-
-blockquote small:before {
-    content: '\2014 \00A0';
-}
-/* ==========================================================================
-   base.css (end)
-   ========================================================================== */
-
-
-/* ==========================================================================
-   elements.css (begin)
-   ========================================================================== */
-.tipsy {
-    position: absolute;
-    left: 0;
-    top: 0;
-    display: none;
-    padding: 5px;
-    font-size: 12px;
-    z-index: 998;
-}
-
-.tipsy-inner {
-    padding: 5px 8px 4px;
-    background-color: #000;
-    color: #fff;
-    max-width: 150px;
-    border-radius: 3px;
-}
-
-.tipsy-arrow {
-    position: absolute;
-    width: 0;
-    height: 0;
-    border-left: 5px solid transparent;
-    border-right: 5px solid transparent;
-    border-bottom: 5px solid #000;
-}
-
-.tipsy-s .tipsy-arrow {
-    top: 0;
-    left: 50%;
-    margin-left: -4px;
-}
-
-.tipsy-se .tipsy-arrow {
-    top: 0;
-    left: 10px;
-}
-
-.tipsy-sw .tipsy-arrow {
-    top: 0;
-    right: 10px;
-}
-
-.tipsy-n .tipsy-arrow,
-.tipsy-ne .tipsy-arrow,
-.tipsy-nw .tipsy-arrow {
-    bottom: 0;
-    border-left: 5px solid transparent;
-    border-right: 5px solid transparent;
-    border-top: 5px solid #000;
-    border-bottom: none;
-}
-
-.tipsy-n .tipsy-arrow {
-    left: 50%;
-    margin-left: -4px;
-}
-
-.tipsy-ne .tipsy-arrow {
-    left: 10px;
-}
-
-.tipsy-nw .tipsy-arrow {
-    right: 10px;
-}
-
-.tipsy-w .tipsy-arrow,
-.tipsy-e .tipsy-arrow {
-    top: 50%;
-    margin-top: -4px;
-    border-top: 5px solid transparent;
-    border-bottom: 5px solid transparent;
-}
-
-.tipsy-w .tipsy-arrow {
-    right: 0;
-    border-right: none;
-    border-left: 5px solid #000;
-}
-
-.tipsy-e .tipsy-arrow {
-    left: 0;
-    border-right: 5px solid #000;
-    border-left: none;
-}
-
-/*
-    Pagination
--------------------------------------- */
-.pagination {
-    margin: 18px 0;
-    text-align: center;
-    font-size: 11px;
-    line-height: 26px;
-}
-
-.pagination-left {
-    text-align: left;
-}
-
-.pagination-right {
-    text-align: right;
-}
-
-.pagination ul {
-    display: inline-block;
-    margin: 0;
-    padding: 0;
-}
-
-.pagination li {
-    display: inline;
-    line-height: 18px;
-}
-
-.pagination li a,
-.pagination li span {
-    margin: 0 5px;
-}
-
-.pagination .current span {
-    color: #000;
-}
-
-.pagination .current .button {
-    color: #fff;
-}
-
-.pagination .amount {
-    display: inline;
-    margin: 0 15px 0 0;
-}
-
-.pagination .limiter,
-.pagination label {
-    display: inline;
-}
-
-.pagination .limiter {
-    margin: 0 0 0 15px;
-}
-
-.pagination select {
-    width: auto;
-    margin-right: 5px;
-}
-
-.pagination-alt .amount {
-    float: left;
-}
-
-.pagination-alt .limiter {
-    float: right;
-}
-
-.pagination li .pagination-previous,
-.pagination li .pagination-next {
-    display: inline-block;
-    width: 8px;
-    height: 12px;
-    text-indent: -9999px;
-    text-align: left;
-    vertical-align: middle;
-    background: url(images/pagination-arrows-bg.png) no-repeat 0 0;
-}
-
-.pagination li .pagination-previous:hover {
-    background-position: 0 -13px;
-}
-
-.pagination li.disabled .pagination-previous {
-    background-position: 0 -26px;
-}
-
-.pagination li .pagination-next {
-    background-position: -10px 0;
-}
-
-.pagination li .pagination-next:hover {
-    background-position: -10px -13px;
-}
-
-.pagination li.disabled .pagination-next {
-    background-position: -10px -26px;
-}
-
-/*
-    Breadcrumbs
--------------------------------------- */
-.breadcrumbs {
-    margin: 18px 0;
-}
-
-.breadcrumbs ul {
-    margin: 0;
-    padding: 0;
-}
-
-.breadcrumbs li {
-    display: inline-block;
-}
-
-.breadcrumbs li:after {
-    content: "/";
-    margin: 0 4px;
-}
-
-.breadcrumbs .current:after {
-    content: "";
-}
-
-/*
-    Tags
--------------------------------------- */
-.tags {
-    margin: 18px 0;
-    padding: 0;
-}
-
-.tags li {
-    display: inline-block;
-    margin: 0 10px 5px 0;
-    white-space: nowrap;
-    list-style: none;
-}
-
-/* =============================================================================
-   Tabels
-   ========================================================================== */
-
-/* Striped table */
-
-.table-striped tbody tr td:nth-child(odd),
-.table-striped tbody tr th:nth-child(odd) {
-    background: #f5f5f5;
-}
-
-.table-striped tbody tr td:nth-child(even),
-.table-striped tbody tr th:nth-child(even) {
-    background: #fff;
-}
-
-.table-striped tbody tr:hover td,
-.table-striped tbody tr:hover th {
-    background-color: #fff9e4;
-}
-
-.table-light th,
-.table-light td {
-    border-width: 1px 0 0 0;
-}
-
-.table-light caption + thead tr:first-child th,
-.table-light caption + thead tr:first-child td,
-.table-light colgroup + thead tr:first-child th,
-.table-light colgroup + thead tr:first-child td,
-.table-light thead:first-child tr:first-child th,
-.table-light thead:first-child tr:first-child td {
-    border-top: 0;
-}
-
-.table-light tbody tr:nth-child(odd) td,
-.table-light tbody tr:nth-child(odd) th,
-.table-light tbody tr:nth-child(even) td,
-.table-light tbody tr:nth-child(even) th,
-.table-light tfoot tr:nth-child(odd) td,
-.table-light tfoot tr:nth-child(odd) th,
-.table-light tfoot tr:nth-child(even) td,
-.table-light tfoot tr:nth-child(even) th,
-.table-light thead tr:nth-child(odd) td,
-.table-light thead tr:nth-child(odd) th,
-.table-light thead tr:nth-child(even) td,
-.table-light thead tr:nth-child(even) th,
-.table-light tfoot {
-    background: none;
-}
-
-.table-light tbody tr:hover td,
-.table-light tbody tr:hover th {
-    background-color: #fff9e4;
-}
-
-.table-full-width {
-    width: 100%;
-}
-
-/*
-    Star rating
--------------------------------------- */
-.rating-box {
-    width: 70px;
-    height: 13px;
-    font-size: 0;
-    line-height: 0;
-    background: url(images/rating-bg.png) 0 0 repeat-x;
-    overflow: hidden;
-}
-
-.rating-box  .rating {
-    height: 13px;
-    background: url(images/rating-bg.png) 0 -13px repeat-x;
-}
-
-/*
-    Navigation
--------------------------------------- */
-.nav {
-    background: #e6e6e6;
-}
-
-.menu {
-    margin: 0;
-    padding: 0;
-}
-
-/* All Levels */
-.menu li:hover,
-.menu li.hovered {
-    z-index: 990 !important;
-}
-
-.menu li.parent {
-    position: relative;
-    z-index: 1;
-}
-
-.menu li a {
-    font-size: 14px;
-    font-weight: bold;
-    color: #000;
-    text-decoration: none;
-}
-
-.menu li a span {
-    cursor: pointer;
-    text-transform: uppercase;
-}
-
-/* 1st Level (Top Level) */
-.level-top > li {
-    float: left;
-    margin: 0;
-    display: inline;
-    position: relative;
-    z-index: 1;
-}
-
-.level-top > li > a {
-    float: left;
-    font-size: 14px;
-    height: 36px;
-    line-height: 36px;
-    padding: 0 15px;
-    border: 1px solid transparent;
-}
-
-.level-top > .parent > a span:after {
-    content: " ▼";
-}
-
-.level-top > li > a:hover,
-.level-top > li:hover > a,
-.level-top > li.hovered > a {
-    background: #fff;
-    border-color: #a6a6a6;
-}
-
-.level-top > .parent > a:hover,
-.level-top > .parent:hover > a,
-.level-top > .parent.hovered > a {
-    border-color: #a6a6a6;
-    border-bottom-color: transparent;
-    position: relative;
-    z-index: 99999;
-}
-
-/* 2nd Level */
-.menu ul {
-    margin: 0;
-    position: absolute;
-    min-width: 100%;
-    top: 36px;
-    left: -10000px;
-    background: #fff;
-    padding: 0;
-    border: 1px solid #a6a6a6;
-}
-
-.menu ul li {
-    float: none;
-    height: auto;
-    display: block;
-    margin: 0;
-}
-
-.menu ul .parent > a span:after {
-    content: " ►"
-}
-
-.menu ul li a {
-    display: block;
-    padding: 8px 12px;
-    line-height: 1.2;
-}
-
-.menu ul li a:hover {
-    background: #e6e6e6;
-}
-
-/* 3rd+ Level */
-.menu ul ul {
-    top: 0;
-}
-
-/* Show Menu */
-.menu li:hover > ul,
-.menu li.hovered > ul {
-    left: 0;
-    z-index: 991;
-}
-
-.menu li:hover > ul > li:hover > ul,
-.menu li.hovered > ul > li.hovered > ul {
-    left: -2px;
-    margin-left: 100%;
-}
-
-/* Vertical navigation */
-.nav-vertical .menu  li {
-    float: none;
-    display: block;
-}
-
-.nav-vertical .menu li a {
-    float: none;
-    display: block;
-    height: auto;
-    line-height: 1.2;
-    padding: 10px;
-}
-
-.nav-vertical .menu li:hover > ul,
-.nav-vertical .menu li.hovered > ul {
-    left: -1px;
-    top: 0;
-    margin-left: 100%;
-}
-
-.nav-vertical .level-top > .parent > a span:after {
-    content: " ►";
-}
-
-.nav-vertical .level-top > .parent > a:hover,
-.nav-vertical .level-top > .parent:hover > a,
-.nav-vertical .level-top > .parent.hovered > a {
-    border-color: #a6a6a6;
-}
-
-/*  Tree navigation */
-.nav-tree {
-    background: none;
-    box-shadow: none;
-}
-
-.nav-tree ul li {
-    margin: 10px 0;
-}
-
-.nav-tree .level-top > li {
-    display: block;
-    float: none;
-    border: none;
-}
-
-.nav-tree .menu ul {
-    position: static;
-    left: 0;
-    background: none;
-    box-shadow: none;
-    margin: 0 0 0 20px;
-    border: none;
-}
-
-.nav-tree .menu li:hover > ul > li:hover > ul,
-.nav-tree .menu li:hover > ul {
-    left: 0;
-    top: 0;
-    margin-left: 20px;
-}
-
-.nav-tree .menu li a {
-    float: none;
-    border: none;
-    font-weight: normal;
-}
-
-.nav-tree .menu li a:link,
-.nav-tree .menu li a:visited {
-    height: auto;
-    line-height: 1.2;
-    padding: 0;
-    display: inline;
-    text-decoration: underline;
-}
-
-.nav-tree .menu li a:hover,
-.nav-tree .menu li a:active {
-    text-decoration: none;
-    background: none;
-    box-shadow: none;
-}
-
-.nav-tree .menu li a span {
-    text-transform: none;
-}
-
-.nav-tree .menu ul .parent > a span:after,
-.nav-tree .level-top > .parent > a span:after {
-    content: "";
-}
-
-/*  Inline navigation */
-.nav-inline {
-    background: none;
-    box-shadow: none;
-    position: relative;
-}
-
-.nav-inline ul {
-    display: inline;
-}
-
-.nav-inline .menu ul {
-    border: none;
-    top: 16px;
-    padding: 10px 0;
-}
-
-.nav-inline ul li {
-    display: inline;
-    border: none;
-}
-
-.nav-inline .menu li.parent {
-    position: static;
-}
-
-.nav-inline .menu li:hover > ul > li:hover > ul {
-    left: 0;
-    top: 25px;
-    margin-left: 0;
-}
-
-.nav-inline  ul li:after {
-    content: '|';
-    margin: 0 5px;
-}
-
-.nav-inline  ul  li:last-child:after {
-    content: '';
-}
-
-.nav-inline .menu li a {
-    border: none;
-    font-weight: normal;
-}
-
-.nav-inline .menu li a:link,
-.nav-inline .menu li a:visited {
-    padding: 0;
-    line-height: 1.2;
-    height: auto;
-    display: inline;
-    text-decoration: underline;
-}
-
-.nav-inline .menu li a:hover,
-.nav-inline .menu li a:active {
-    text-decoration: none;
-    background: none;
-    box-shadow: none;
-}
-
-.nav-inline .menu li a span {
-    text-transform: none;
-}
-
-.nav-inline .menu ul .parent > a span:after,
-.nav-inline .level-top > .parent > a span:after {
-    content: " ▼";
-}
-
-/*
-    Loaders
--------------------------------------- */
-.loading {
-    position: relative;
-}
-
-.loading:after {
-    content: '';
-    position: absolute;
-    width: 24px;
-    height: 24px;
-    top: 50%;
-    left: 50%;
-    margin: -12px 0 0 -12px;
-    background: #fff url(images/ajax-loader.gif) no-repeat center;
-}
-
-.loading-message {
-    position: absolute;
-    left: 0;
-    right: 0;
-    top: 50%;
-    text-align: center;
-    z-index: 2;
-}
-
-.button.loading {
-    padding-right: 25px;
-}
-
-.button.loading:after {
-    left: auto;
-    right: 6px;
-}
-
-table.loading:after {
-    right: -1px;
-}
-
-/* loader with svg */
-.loading-svg {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    background-image: url(images/ajax-loader.svg);
-    background-size: contain;
-    width: 36px;
-    height: 36px;
-    margin: -18px 0 0 -18px;
-    opacity: .7;
-    -webkit-animation: rotate 1.5s infinite steps(12);
-    -moz-animation: rotate 1.5s infinite steps(12);
-    animation: rotate 1.5s infinite steps(12);
-}
-
-@-moz-keyframes rotate {
-    0% {
-        -moz-transform: rotate(0deg);
-    }
-    100% {
-        -moz-transform: rotate(360deg);
-    }
-}
-
-@-webkit-keyframes "rotate" {
-    0% {
-        -webkit-transform: rotate(0deg);
-    }
-    100% {
-        -webkit-transform: rotate(360deg);
-    }
-}
-
-/* loader inner */
-.loading-inner {
-    background: url(images/ajax-loader.gif) no-repeat center;
-}
-
-/* loader sizes */
-.loading-small:after {
-    background-image: url(images/ajax-loader-small.gif);
-    width: 16px;
-    height: 16px;
-    margin: -8px 0 0 -8px;
-}
-
-.loading-big:after {
-    background-image: url(images/ajax-loader-big.gif);
-    width: 64px;
-    height: 64px;
-    margin: -32px 0 0 -32px;
-}
-
-/* laoder locker */
-.loading-blocker {
-    -webkit-touch-callout: none;
-    -webkit-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
-}
-
-.loading-blocker:after {
-    width: auto;
-    height: auto;
-    margin: 0;
-    left: 0;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    background-color: rgba(255, 255, 255, .65);
-}
-
-/* css3 only loader */
-.loading-arrow {
-    width: 30px;
-    height: 30px;
-    position: absolute;
-    left: 50%;
-    top: 50%;
-    margin: -15px 0 0 -15px;
-    text-align: center;
-    font: 32px/1 Arial, Verdana, sans-serif;
-    color: #AE4444;
-    text-shadow: 0 0 5px #A5E0FC;
-    -moz-animation: spin .8s infinite linear;
-    -webkit-animation: spin .8s infinite linear;
-    animation: spin .8s infinite linear;
-}
-
-.loading-arrow:before {
-    content: '↻';
-}
-
-@-moz-document url-prefix() {
-    .loading-arrow:after {
-        font-size:36px;
-        position: absolute;
-        left:-1px;
-        top:-5px;
-    }
-}
-@-moz-keyframes spin {
-    0% {
-        -moz-transform: rotate(0deg);
-    }
-    100% {
-        -moz-transform: rotate(360deg);
-    }
-}
-
-@-webkit-keyframes spin {
-    0% {
-        -webkit-transform: rotate(0deg);
-    }
-    100% {
-        -webkit-transform: rotate(360deg);
-    }
-}
-
-/*
-    Tabs
--------------------------------------- */
-.tabs-nav {
-    margin: 0;
-    list-style: none;
-    border-bottom: 1px solid #ccc;
-    padding: 0;
-}
-
-.tabs-nav > li > a {
-    display: block;
-}
-
-.tabs-nav > li > a:hover {
-    text-decoration: none;
-}
-
-.tabs-nav > li {
-    float: left;
-    margin-bottom: -1px;
-    margin-right: -1px;
-    background: #eaeaea;
-    background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2VhZWFlYSIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNkZmRmZGYiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
-    background: -moz-linear-gradient(top, #eaeaea 0%, #dfdfdf 100%);
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #eaeaea), color-stop(100%, #dfdfdf));
-    background: -webkit-linear-gradient(top, #eaeaea 0%, #dfdfdf 100%);
-    background: -o-linear-gradient(top, #eaeaea 0%, #dfdfdf 100%);
-    background: -ms-linear-gradient(top, #eaeaea 0%, #dfdfdf 100%);
-    background: linear-gradient(to bottom, #eaeaea 0%, #dfdfdf 100%);
-}
-
-.tabs-nav > li:hover {
-    background: #dfdfdf;
-    background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2RmZGZkZiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNlYWVhZWEiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
-    background: -moz-linear-gradient(top, #dfdfdf 0%, #eaeaea 100%);
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #dfdfdf), color-stop(100%, #eaeaea));
-    background: -webkit-linear-gradient(top, #dfdfdf 0%, #eaeaea 100%);
-    background: -o-linear-gradient(top, #dfdfdf 0%, #eaeaea 100%);
-    background: -ms-linear-gradient(top, #dfdfdf 0%, #eaeaea 100%);
-    background: linear-gradient(to bottom, #dfdfdf 0%, #eaeaea 100%);
-}
-
-.tabs-nav > li > a {
-    padding: 8px 12px;
-    line-height: 18px;
-    border: 1px solid #ccc;
-    text-decoration: none;
-    color: #666;
-}
-
-.tabs-nav > .active > a,
-.tabs-nav > .active > a:hover {
-    color: #555;
-    cursor: default;
-    background-color: #fff;
-    border-bottom-color: #fff;
-}
-
-.tab-content {
-    overflow: auto;
-    border: solid #ccc;
-    border-width: 0 1px 1px;
-}
-
-.tabs-below > .tabs-nav,
-.tabs-right > .tabs-nav,
-.tabs-left > .tabs-nav {
-    border-bottom: 0;
-}
-
-.tab-content > .tab-pane {
-    display: none;
-    padding: 20px 13px;
-}
-
-.tab-content > .active {
-    display: block;
-    background: #fff;
-}
-
-.tabs-below > .tabs-nav {
-    border-top: 1px solid #ccc;
-}
-
-.tabs-below > .tabs-nav > li {
-    margin-top: -1px;
-    margin-bottom: 0;
-}
-
-.tabs-below > .tabs-nav > li.active > a {
-    border: 1px solid #ccc;
-    border-top-color: transparent;
-}
-
-.tabs-below > .tab-content {
-    border-width: 1px 1px 0;
-}
-
-.tabs-left > .tabs-nav > li,
-.tabs-right > .tabs-nav > li {
-    float: none;
-}
-
-.tabs-left > .tabs-nav > li > a,
-.tabs-right > .tabs-nav > li > a {
-    min-width: 74px;
-    margin-right: 0;
-}
-
-.tabs-left > .tabs-nav {
-    float: left;
-    margin-right: -1px;
-    border-right: 1px solid #ccc;
-}
-
-.tabs-left > .tab-content,
-.tabs-right > .tab-content {
-    border-width: 1px;
-}
-
-.tabs-left > .tabs-nav .active > a,
-.tabs-left > .tabs-nav .active > a:hover {
-    border-color: #ccc transparent #ccc #ccc;
-}
-
-.tabs-right > .tabs-nav {
-    float: right;
-    margin-left: -1px;
-}
-
-.tabs-right > .tabs-nav .active > a,
-.tabs-right > .tabs-nav .active > a:hover {
-    border-color: #ccc #ccc #ccc transparent;
-}
-
-.accordion {
-    margin-bottom: 18px;
-}
-
-.accordion-group {
-    margin: 0 0 5px;
-    border: 1px solid #ccc;
-}
-
-.accordion-heading {
-    border-bottom: 0;
-    background: #eaeaea;
-    background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2VhZWFlYSIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNkZmRmZGYiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
-    background: -moz-linear-gradient(top, #eaeaea 0%, #dfdfdf 100%);
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #eaeaea), color-stop(100%, #dfdfdf));
-    background: -webkit-linear-gradient(top, #eaeaea 0%, #dfdfdf 100%);
-    background: -o-linear-gradient(top, #eaeaea 0%, #dfdfdf 100%);
-    background: -ms-linear-gradient(top, #eaeaea 0%, #dfdfdf 100%);
-    background: linear-gradient(to bottom, #eaeaea 0%, #dfdfdf 100%);
-}
-
-.accordion-heading .accordion-toggle {
-    display: block;
-    padding: 8px 15px;
-    cursor: pointer;
-    color: #555;
-    text-decoration: none;
-}
-
-.accordion-inner {
-    padding: 9px 15px;
-    border-top: 1px solid #ccc;
-}
-
-.collapse {
-    position: relative;
-    height: 0;
-    overflow: hidden;
-    -webkit-transition: height 0.35s ease;
-    -moz-transition: height 0.35s ease;
-    -ms-transition: height 0.35s ease;
-    -o-transition: height 0.35s ease;
-    transition: height 0.35s ease;
-}
-
-.collapse.in,
-.no-js .collapse {
-    height: auto !important;
-    overflow: visible;
-}
-
-.no-js .tabs-nav > li,
-.no-js .tabs-left > .tabs-nav,
-.no-js .tabs-right > .tabs-nav {
-    float: none;
-}
-
-.no-js .tabs-left > .tabs-nav,
-.no-js .tabs-nav > li {
-    margin-right: 0;
-}
-
-.no-js .tabs-right > .tabs-nav {
-    margin-left: 0;
-}
-
-.no-js .tabs-right > .tabs-nav > .active > a {
-    border-left-color: #ccc;
-}
-
-.no-js .tabs-left .tabs-nav {
-    border-right: 1px solid #ccc;
-}
-
-.no-js .tabs-left .tabs-nav > li > a {
-    border-right: 0;
-}
-
-.no-js .tab-content > .tab-pane {
-    display: block;
-    border-bottom: 1px solid #ccc;
-}
-
-.no-js .tab-content > .tab-pane:last-child {
-    border-bottom: none;
-}
-
-.no-js .tab-content > .active {
-    background: #fff;
-}
-
-.no-js .tabs-below > .tabs-nav > li.active > a {
-    border-top: 1px solid #ccc;
-}
-
-/*
-    Clears
--------------------------------------- */
-.tabs:before,
-.tabs:after,
-.tabs-nav:before,
-.tabs-nav:after {
-    display: table;
-    content: "";
-}
-
-.tabs-nav:after,
-.tabs:after {
-    clear: both;
-}
-
-/* ==========================================================================
-   elements.css (end)
-   ========================================================================== */
-
-
-/* ==========================================================================
-   form.css (begin)
-   ========================================================================== */
-/*
-    Forms
--------------------------------------- */
-.form {
-}
-
-/*
-    Fieldset
--------------------------------------- */
-.fieldset {
-    margin: 20px 0;
-    letter-spacing: -0.31em; /* webkit */
-    word-spacing: -0.43em; /* IE < 8 && gecko */
-}
-
-.fieldset > * {
-    letter-spacing: normal;
-    word-spacing: normal;
-}
-
-/*
-    Legend
--------------------------------------- */
-.legend {
-}
-
-/*
-    Label
--------------------------------------- */
-.label {
-    margin: 0;
-    vertical-align: middle;
-}
-
-/*
-    Control
--------------------------------------- */
-.control input {
-    vertical-align: middle;
-    margin: 0;
-}
-
-.control select,
-.control textarea {
-    margin: 0;
-}
-
-/*
-    Field
--------------------------------------- */
-.field {
-    position: relative;
-    box-sizing: border-box;
-    margin: 0 0 12px 0;
-}
-
-.field > .label {
-    margin: 0 0 6px;
-}
-
-.field > .control {
-}
-
-/* TODO: remove after all templates refactoring */
-span.required {
-    display: none;
-}
-
-.field.required > .label:after {
-    content: '*';
-    color: red;
-    margin-left: 3px;
-}
-
-.field.alternative {
-}
-
-/*
-    Radios and Checkboxes
--------------------------------------- */
-/* TODO: rename 'choice' class */
-.choice .control {
-    display: inline-block;
-    vertical-align: top;
-}
-
-.choice > .label span:after {
-    content: '';
-    margin: 0;
-}
-
-.choice > .control {
-    width: auto;
-}
-
-/* TODO: rename or remove 'extra' class */
-.extra {
-    margin: 5px 0 0;
-}
-
-/*
-    Control with added before and after content
--------------------------------------- */
-.with-addon {
-}
-
-.addon {
-    padding: 0;
-    display: table;
-    width: 100%;
-}
-
-.addon textarea,
-.addon select,
-.addon input {
-    width: 100%;
-    border-radius: 0;
-    box-shadow: none;
-    margin: 0;
-}
-
-.addon select {
-    width: auto;
-}
-
-.addon select + .addafter {
-    border: none;
-}
-
-.ie .addon textarea,
-.ie .addon select {
-    display:inline-block;
-}
-
-.addon textarea:first-child,
-.addon select:first-child,
-.addon input[type=text]:first-child,
-.addon .addbefore:first-child {
-    border-radius: 0;
-}
-
-.addon textarea:last-child,
-.addon select:last-child,
-.addon input[type=text]:last-child,
-.addon .addafter:last-child {
-    border-radius: 0;
-}
-
-.addon .addbefore,
-.addon .addafter {
-    background: #f5f5f5;
-    background-image: -ms-linear-gradient(top, #ffffff, #e6e6e6);
-    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
-    background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
-    background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
-    background-image: linear-gradient(top, #ffffff, #e6e6e6);
-    background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
-    background-repeat: repeat-x;
-    vertical-align: middle;
-    width: 1px;
-    color: #666;
-    font-size: 11px;
-    font-weight: bold;
-    height: 0;
-    white-space: nowrap;
-    display: inline-block;
-    display: table-cell;
-    padding: 4px;
-    border: solid #ccc;
-    border-width: 1px 0 1px 1px;
-}
-
-/*.addon {direction: rtl; }
-.addon > * {direction: ltr; }*/
-
-.addon *:focus ~ .addafter {
-
-}
-
-.addon .addafter {
-    border-width: 1px 1px 1px 0;
-}
-
-.choice .addafter,
-.choice .addbefore {
-    display: inline;
-}
-
-/* Addon left aligned */
-.field-price .addon {
-    direction: rtl;
-}
-
-.field-price .addon > * {
-    direction: ltr;
-}
-
-.field-price .addon .addafter {
-    border-width: 1px 0 1px 1px;
-    border-radius: 1px 0 0 1px;
-}
-
-
-/*
-    Form tooltip
--------------------------------------- */
-.with-tooltip.choice {
-    padding-right: 20px;
-}
-
-.with-tooltip.choice,
-.with-tooltip > .control {
-    position: relative;
-    z-index: 1;
-}
-
-.with-tooltip.choice:hover,
-.with-tooltip:hover > .control {
-    z-index: 998;
-}
-
-.with-tooltip:not(.choice) .tooltip {
-    position: absolute;
-    left: 100%;
-    top: 3px;
-    vertical-align: middle;
-    margin: 4px 0 0 3px;
-}
-
-.with-tooltip:not(.choice) .tooltip .help {
-    width: 12px;
-    overflow: hidden;
-}
-
-/*
-    Form actions
--------------------------------------- */
-.form-actions {
-    padding: 10px;
-    margin: 10px 0;
-}
-
-/*
-    Default view for fields: Labels are above the controls
--------------------------------------- */
-.form-inline .label,
-.form-inline .control {
-    margin: 0;
-    float: left;
-    width: 55%;
-    -moz-box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box;
-}
-
-.form-inline .label {
-    width: 45%;
-    text-align: right;
-    padding: 5px 15px 0 0;
-}
-
-.form-inline .choice {
-    position: relative;
-    z-index: 1;
-}
-
-.form-inline .choice .control {
-    position: absolute;
-    margin-top: 4px;
-    width: auto;
-    left: 45%;
-}
-
-.form-inline .choice .tooltip {
-    margin-left: 20px;
-    position: relative;
-    z-index: 1;
-    margin-top: 7px;
-}
-
-.form-inline .with-tooltip:not(.choice) {
-    padding-top: 20px;
-}
-
-.control .control-value {
-    display: inline-block;
-    padding: 6px 0 0;
-    vertical-align: top;
-}
-
-.control .control-value.special {
-    font-weight: bold;
-}
-
-/*
-    Field with multiple fields
--------------------------------------- */
-/* TODO: rename 'fields-group' class. Propose - 'group' */
-
-[class^="fields-group-"] .field {
-    vertical-align: top;
-    margin: 0;
-    display: inline-block;
-}
-
-[class^="fields-group-"] .field .label {
-    width: auto;
-    float: none;
-    text-align: left;
-    padding-right: 0;
-}
-
-[class^="fields-group-"] .choice .label {
-    display: inline;
-}
-
-[class^="fields-group-"] .field .control {
-    float: none;
-    width: auto;
-    margin-left: 0;
-}
-
-@media screen and (max-width: 960px) {
-    [class^="fields-group-"] .field {
-        width: 100% !important;
-        margin-bottom: 20px !important;
-    }
-}
-
-[class^="fields-group-"] {
-    letter-spacing: -0.31em; /* webkit */
-    word-spacing: -0.43em; /* IE < 8 && gecko */
-}
-
-[class^="fields-group-"] > * {
-    letter-spacing: normal;
-    word-spacing: normal;
-}
-
-/*
-    Form field with nested controls inside
--------------------------------------- */
-.nested {
-    padding: 6px 0 0;
-}
-
-.nested .choice .label,
-.nested .choice .control {
-    float: none;
-    width: auto;
-    position: static;
-    left: auto;
-    text-align: left;
-    display: inline;
-    padding: 0;
-}
-
-.control *:first-child {
-    /*margin-top: 0;*/
-}
-
-.nested .field {
-    width: auto;
-    padding: 0;
-    margin: 5px 0;
-    display: block;
-}
-
-.nested .field:first-child {
-    margin-top: 0;
-}
-
-.nested .field:last-child {
-    margin-bottom: 0;
-}
-
-/*
-    Cols
--------------------------------------- */
-.form-cols  .fieldset {
-    padding-right: 0;
-}
-
-.form-cols  .fieldset > .field {
-    width: 50%;
-    display: inline-block;
-    vertical-align: top;
-    padding-right: 20px;
-}
-
-.form-cols  .fieldset > .with-tooltip:not(.choice) .tooltip {
-    right: 20px;
-}
-
-@media screen and (max-width: 960px) {
-    .form-cols  .fieldset > .field {
-        width: 100% !important;
-        display: block;
-    }
-}
-
-.buttons[note]:after {
-    content: '* ' attr(note);
-    display: block;
-    clear: both;
-    font-size: 11px;
-    color: red;
-    margin-top: 10px;
-}
-
-.qty .control,
-.qty .label {
-    display: inline-block;
-    vertical-align: middle;
-    margin: 0;
-}
-
-.qty .input-text {
-    width: 3em;
-    margin: 0;
-}
-
-/*
-    Clearfix
--------------------------------------- */
-.buttons-set:before,
-.buttons-set:after,
-.form-inline .field:before,
-.form-inline .field:after,
-.form-actions:before,
-.form-actions:after,
-.clearfix:before,
-.clearfix:after {
-    content: "";
-    display: table;
-}
-
-.buttons-set:after,
-.form-inline .field:after,
-.form-actions:after,
-.clearfix:after {
-    clear: both;
-}
-/* ==========================================================================
-   form.css (end)
-   ========================================================================== */
-
-
-/* =============================================================================
-   components.css (begin)
-   ========================================================================== */
-.sorter {
-    line-height: 25px;
-    padding: 5px 0;
-    border:solid #999;
-    border-width: 1px 0;
-}
-.view-mode {
-    margin: 0;
-    float: left;
-    white-space: nowrap;
-}
-.sort-by {
-    float: right;
-    white-space: nowrap;
-    line-height: normal;
-}
-.sort-by select {
-    width: auto;
-    margin: 0;
-}
-.sort-by a {
-    display: inline-block;
-    width: 8px;
-    height: 11px;
-    margin: 0 0 0 3px;
-    text-decoration: none;
-    color: #000;
-    text-indent: -9999px;
-    background: url(images/sorter-bg.png) no-repeat 0 0;
-}
-.sort-by a:hover {
-    background-position: 0 -12px;
-}
-.sort-asc a {
-    background-position: -9px 0;
-}
-.sort-asc a:hover {
-    background-position: -9px -12px;
-}
-.view-icons strong,
-.view-icons a {
-    width: 15px;
-    height: 15px;
-    display: inline-block;
-    text-indent: -9999px;
-    line-height: normal;
-    background: url(images/view-mode-bg.png) no-repeat 0 0;
-}
-.view-icons strong.view-list {
-    background-position: -16px 0;
-}
-.view-icons a.view-grid {
-    background-position: 0 -16px;
-}
-.view-icons a.view-grid:hover {
-    background-position: 0 -32px;
-}
-.view-icons a.view-list {
-    background-position: -16px -16px;
-}
-
-.view-icons a.view-list:hover {
-    background-position: -16px -32px;
-}
-.sorter:after {
-    content:"";
-    display:table;
-    clear: both;
-}
-
-/* =============================================================================
-   Footer Blocks
-   ========================================================================== */
-.footer-links {
-    margin-bottom: 12px;
-}
-.switcher {}
-.switcher ul {
-    margin: 0;
-    padding: 0;
-    list-style: none;
-}
-.switcher .current {
-    display: none;
-}
-.copyrights {
-    display: block;
-    margin: 12px 0;
-}
-.bug-report {
-    margin: 12px 0;
-}
-
-/* =============================================================================
-   Simple Block
-   ========================================================================== */
-.block {}
-.block-title,
-.block-list > li,
-.block-footer {
-    padding:5px 0;
-}
-.block-subtitle {
-    margin:5px 0;
-    font-weight:bold;
-}
-.block-list {
-    list-style:none;
-    padding:0;
-}
-.block-footer:after {
-    content:'';
-    width:100%;
-    display:table;
-    clear:both;
-}
-
-/* =============================================================================
-   Auth, User Block (Login, Register Pages)
-   ========================================================================== */
-.block-user {
-    margin:0 0 15px 0;
-}
-.block-user .block-title {
-    text-transform:uppercase;
-}
-.block-user .forgot-link {
-    display:inline-block;
-    margin:7px 0 5px;
-}
-.block-user .block-footer .button {
-    float:right;
-}
-.block-user .block-content {
-    padding-top:12px;
-}
-.block-user .block-content p {
-    margin-top:0;
-}
-.block-login .block-content {
-    min-height:150px;
-}
-
-/* =============================================================================
-   Search Form
-   ========================================================================== */
-.form-search {
-    margin:0 0 10px 0;
-}
-.form-search label {
-    vertical-align:top;
-}
-.form-search input[type=search],
-.form-search input.search {
-    margin-bottom:0;
-    min-width:160px;
-}
-.form-search strong {
-    display:none;
-}
-.search-form-submit {
-
-}
-
-/* =============================================================================
-   Quick access links
-   ========================================================================== */
-.quick-access {
-    float:right;
-    margin:12px 0 0 0;
-}
-.quick-access .nav > ul > li {
-    margin:0 22px 0 0;
-}
-.quick-access .nav > ul > li:after {
-    content:'';
-}
-.quick-access .items-qty {
-    font-size:11px;
-}
-.quick-access .nav > .button {
-    margin:-3px 0 0 0;
-}
-
-/* =============================================================================
-   Header
-   ========================================================================== */
-.page-header .arrow {
-    margin:0 0 0 3px;
-    cursor:pointer;
-    color:#919191;
-    font-size:9px;
-    vertical-align:middle;
-}
-.page-header-inner:after {
-    content:'';
-    display:table;
-    width:100%;
-}
-.menu-top {
-    list-style:none;
-    margin:0 0 10px 0;
-}
-.menu-top li {
-    display:inline-block;
-    margin:0 25px 0 0;
-}
-.menu-top li a {
-    text-decoration:underline;
-}
-.menu-top li a span {
-    text-transform:none;
-}
-.menu-top dl {}
-.menu-top dt {
-    display:inline;
-}
-.menu-top dd {
-    display:inline;
-    margin:0 25px 0 0;
-}
-/* =============================================================================
-   components.css (end)
-   ========================================================================== */
-
-
-/* =============================================================================
-   print.css (begin)
-   ========================================================================== */
-
-/* ==|== print styles =======================================================
-   Print styles.
-   Inlined to avoid required HTTP connection: h5bp.com/r
-   ========================================================================== */
-
-@media print {
-    * {
-        background: transparent !important;
-        color: black !important;
-        box-shadow: none !important;
-        text-shadow: none !important;
-        filter: none !important;
-        -ms-filter: none !important;
-    }
-
-    /* Black prints faster: h5bp.com/s */
-    a, a:visited {
-        text-decoration: underline;
-    }
-
-    a[href]:after {
-        content: " (" attr(href) ")";
-    }
-
-    abbr[title]:after {
-        content: " (" attr(title) ")";
-    }
-
-    .ir a:after, a[href^="javascript:"]:after, a[href^="#"]:after {
-        content: "";
-    }
-
-    /* Don't show links for images, or javascript/internal links */
-    pre, blockquote {
-        border: 1px solid #999;
-        page-break-inside: avoid;
-    }
-
-    thead {
-        display: table-header-group;
-    }
-
-    /* h5bp.com/t */
-    tr, img {
-        page-break-inside: avoid;
-    }
-
-    img {
-        max-width: 100% !important;
-    }
-
-    @page {
-        margin: 0.5cm;
-    }
-
-    p, h2, h3 {
-        orphans: 3;
-        widows: 3;
-    }
-
-    h2, h3 {
-        page-break-after: avoid;
-    }
-}
-/* =============================================================================
-   print.css (end)
-   ========================================================================== */
-
-
-/* =============================================================================
-   utils.css (begin)
-   ========================================================================== */
-/*
-    Helpers and Utils
--------------------------------------- */
-
-/* Hide from both screenreaders and browsers: h5bp.com/u */
-.hidden {
-    display: none;
-    visibility: hidden;
-}
-
-input.no-display,
-.no-display {
-    display: none;
-}
-
-/* Hide visually and from screenreaders, but maintain layout */
-.invisible {
-    visibility: hidden;
-}
-
-/* Contain floats: h5bp.com/q */
-.clearfix:before,
-.clearfix:after {
-    content: "";
-    display: table;
-}
-
-.clearfix:after {
-    clear: both;
-}
-/* =============================================================================
-   utils.css (end)
-   ========================================================================== */
\ No newline at end of file
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 25284d00b6598..55d1128d73b75 100644
--- a/app/design/adminhtml/Magento/backend/web/mui/styles/table.less
+++ b/app/design/adminhtml/Magento/backend/web/mui/styles/table.less
@@ -12,54 +12,22 @@ table {
     }
 
     thead {
-        background: @grid-filters-background-color;
-        color: @grid-headings-color;
-        .headings {
-            background: @grid-headings-background-color;
-        }
         a {
-            color: @grid-headings-color;
             display: block;
             label {
-                color: @grid-headings-color;
                 cursor: pointer;
-                display: block;
-            }
-        }
-        a:hover,
-        a:focus {
-            color: @grid-headings-color-darker;
-            text-decoration: none;
-        }
-        tr th {
-            &:extend(.delete-first-last-border all);
-        }
-    }
-
-    tfoot {
-        background: @grid-tfoot-background-color;
-        color: @grid-tfoot-color;
-        tr {
-            th,
-            td {
-                text-align: left;
-                &:extend(.delete-first-last-border all);
             }
         }
     }
 
     th {
         background: transparent;
-        border: solid @grid-headings-border;
-        border-width: 0 1px;
         font-size: 14px;
         padding: 6px 10px;
         text-align: center;
     }
 
     td {
-        border: solid @grid-td-border;
-        border-width: 0 1px;
         padding: 6px 10px 7px;
         vertical-align: top;
     }
@@ -67,33 +35,17 @@ table {
     tbody {
         tr {
             td {
-                background: @grid-td-light;
-                color: @grid-td-color;
                 padding-top: 12px;
                 &:first-child {
-                    border-left: 0;
                     input[type="checkbox"] {
                         margin: 0;
                     }
                 }
-                &:last-child {
-                    border-right: 0;
-                }
             }
             &:last-child th,
             &:last-child td {
                 border-bottom-width: 1px;
             }
-            &:nth-child(odd) td,
-            &:nth-child(odd) th {
-                background-color: @grid-td-dark;
-            }
-        }
-        &.even tr td {
-            background: @grid-td-light;
-        }
-        &.odd tr td {
-            background: @grid-td-dark;
         }
     }
 
@@ -118,45 +70,6 @@ table {
 //    Grid table header filters and settings
 //--------------------------------------
 
-.not-sort {
-    padding-right: 10px;
-}
-
-.sort-arrow-asc,
-.sort-arrow-desc {
-    padding-right: 10px;
-    position: relative;
-    &:after {
-        right: -11px;
-        top: -1px;
-        position: absolute;
-        width: 23px;
-    }
-    &:hover:after {
-        color: @grid-headings-color-darker;
-    }
-}
-
-.sort-arrow-asc {
-    .icon-font(
-        @icon-arrow-down-thin,
-        @_icon-font-color: @grid-headings-color,
-        @_icon-font-color-hover: @grid-headings-color-darker,
-        @_icon-font-size: 13px,
-        @_icon-font-position: after
-    );
-}
-
-.sort-arrow-desc {
-    .icon-font(
-        @icon-arrow-up-thin,
-        @_icon-font-color: @grid-headings-color,
-        @_icon-font-color-hover: @grid-headings-color-darker,
-        @_icon-font-size: 13px,
-        @_icon-font-position: after
-    );
-}
-
 .grid-actions,
 .pager,
 .massaction,
@@ -172,73 +85,10 @@ table {
 //    Table Filters
 //--------------------------------------
 .filter {
-    th {
-        border: 0 solid @grid-filters-border;
-        padding: 6px 3px;
-        vertical-align: top;
-    }
-    .ui-datepicker-trigger {
-        cursor: pointer;
-        margin-top: 2px;
-    }
-    .input-text {
-        padding: 0 5px;
-    }
-    .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: @grid-headings-color,
-                @_icon-font-color-hover: @grid-headings-color-darker,
-                @_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 {
-                outline: 0;
-                box-shadow: none;
-            }
-            &:before {
-                width: 35px;
-                height: 29px;
-                margin-left: 5px;
-            }
-        }
-    }
-
     select {
-        border-color: @grid-headings-border;
-        margin: 0;
-        padding: 0;
         width: 99%;
     }
-
     input.input-text {
-        border-color: @grid-headings-border;
-        margin: 0;
         width: 99%;
         &::-webkit-input-placeholder {
             color: @grid-filters-placeholder-color !important;
@@ -263,8 +113,6 @@ table {
 //    Table Grid
 //--------------------------------------
 .grid {
-    background: @grid-frame-background-color;
-    .style18();
     padding: 15px;
 
     table {
@@ -278,17 +126,14 @@ table {
         &:hover td,
         &:nth-child(odd):hover th,
         &:nth-child(odd):hover td {
-            background-color: @grid-td-background-color-hover;
             cursor: pointer;
             &.empty-text {
-                background-color: @grid-td-dark;
                 cursor: default;
             }
         }
     }
 
     .empty-text {
-        font: @h2font;
         text-align: center;
         white-space: nowrap;
     }
@@ -461,7 +306,6 @@ td.col-type {
 //    Data table
 //--------------------------------------
 .data-table {
-    border-collapse: separate; // do not remove this! without this rule in FF when table has only 1 row bottom and side borders disappear
     width: 100%;
     thead,
     tfoot,
@@ -773,13 +617,6 @@ td.col-type {
 }
 
 .pager {
-    font-size: 13px;
-    .pages-total-found {
-        margin-right: 25px;
-    }
-    .view-pages .select {
-        margin: 0 7px;
-    }
     .link-feed {
         font-size: 12px;
         margin: 7px 15px 0 0;
@@ -787,58 +624,6 @@ td.col-type {
         right: 0;
         top: 0;
     }
-    .action-previous,
-    .action-next {
-        .button-as-link();
-        line-height: .6;
-        overflow: hidden;
-        width: 20px;
-        &:before {
-            margin-left: -10px;
-        }
-        &.disabled {
-            opacity: .3;
-        }
-    }
-    .action-previous {
-        .icon-font(
-            @icon-prev,
-            @_icon-font-color: @pager-actions__color,
-            @_icon-font-color-hover: @pager-actions__color-hover,
-            @_icon-font-size: 40px,
-            @_icon-font-text-hide: true
-        );
-    }
-    .action-next {
-        .icon-font(
-            @icon-next,
-            @_icon-font-color: @pager-actions__color,
-            @_icon-font-color-hover: @pager-actions__color-hover,
-            @_icon-font-size: 40px,
-            @_icon-font-text-hide: true
-        );
-    }
-    .input-text {
-        height: 25px;
-        line-height: 16px;
-        margin-right: 5px;
-        text-align: center;
-        width: 25px;
-        vertical-align: top;
-    }
-    label.page {
-        &:extend(.visually-hidden all);
-    }
-    .pages-total {
-        line-height: 25px;
-        vertical-align: top;
-    }
-}
-
-.grid .pager {
-    margin: 15px 0 0;
-    position: relative;
-    text-align: center;
 }
 
 //
diff --git a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less
index 9ac575858255c..300a715075c87 100644
--- a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less
@@ -618,7 +618,7 @@ body.catalog-product-compare-index {
             .attribute.label {
                 display: block;
                 width: 100%;
-                word-break: break-all;
+                word-wrap: break-word;
             }
         }
         &.attribute {
diff --git a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_listings.less b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_listings.less
index b8043307c3da7..965015a63e662 100644
--- a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_listings.less
+++ b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_listings.less
@@ -46,9 +46,7 @@
             &:extend(.abs-product-link all);
             display: block;
             margin: @indent__xs 0;
-            word-break: break-all;
-            //  Non standard for webkit
-            word-break: break-word;
+            word-wrap: break-word;
             -webkit-hyphens: auto;
             -moz-hyphens: auto;
             -ms-hyphens: auto;
diff --git a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less
index 6b986fee61ba5..e4ba22703343f 100644
--- a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less
@@ -212,7 +212,7 @@
         }
     }
     .product.attibute.sku {
-        word-break: break-all;
+        word-wrap: break-word;
     }
     .product {
         &-add-form {
@@ -726,7 +726,7 @@ body.catalog-product-compare-index {
             .attribute.label {
                 display: block;
                 width: 100%;
-                word-break: break-all;
+                word-wrap: break-word;
             }
         }
         &.attribute {
diff --git a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less
index 284a6ed776349..f0f326a206b1c 100644
--- a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less
+++ b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less
@@ -45,9 +45,7 @@
             &:extend(.abs-product-link all);
             display: block;
             margin: @indent__xs 0;
-            word-break: break-all;
-            //  Non standard for webkit
-            word-break: break-word;
+            word-wrap: break-word;
             -webkit-hyphens: auto;
             -moz-hyphens: auto;
             -ms-hyphens: auto;
diff --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json
index 41482866c1b24..5f5074addbc39 100644
--- a/dev/tests/functional/composer.json
+++ b/dev/tests/functional/composer.json
@@ -1,6 +1,6 @@
 {
     "require": {
-        "magento/mtf": "1.0.0-rc21",
+        "magento/mtf": "1.0.0-rc22",
         "php": "~5.5.0|~5.6.0",
         "phpunit/phpunit": "4.1.0",
         "phpunit/phpunit-selenium": ">=1.2",
diff --git a/dev/tests/functional/credentials.xml.dist b/dev/tests/functional/credentials.xml.dist
index 6c23762bae421..80746c30f0380 100644
--- a/dev/tests/functional/credentials.xml.dist
+++ b/dev/tests/functional/credentials.xml.dist
@@ -7,35 +7,38 @@
 -->
 <replace xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="./vendor/magento/mtf/Magento/Mtf/Fixture/InjectableFixture/etc/replace.xsd">
+    <field path="carriers/fedex/account" value="" />
+    <field path="carriers/fedex/meter_number" value="" />
+    <field path="carriers/fedex/key" value="" />
+    <field path="carriers/fedex/password" value="" />
 
-    <field path="section/carriers_dhl_id/value" value="" />
-    <field path="section/carriers_dhl_password/value" value="" />
-    <field path="section/carriers_dhl_account/value" value="" />
+    <field path="payment/authorizenet/login" value="" />
+    <field path="payment/authorizenet/trans_key" value="" />
 
-    <field path="section/carriers_fedex_account/value" value="" />
-    <field path="section/carriers_fedex_meter_number/value" value="" />
-    <field path="section/carriers_fedex_key/value" value="" />
-    <field path="section/carriers_fedex_password/value" value="" />
+    <field path="payment/paypal_group_all_in_one/wpp_usuk/wpp_required_settings/wpp_and_express_checkout/business_account" value="" />
+    <field path="payment/paypal_group_all_in_one/wpp_usuk/wpp_required_settings/wpp_and_express_checkout/api_username" value="" />
+    <field path="payment/paypal_group_all_in_one/wpp_usuk/wpp_required_settings/wpp_and_express_checkout/api_password" value="" />
+    <field path="payment/paypal_group_all_in_one/wpp_usuk/wpp_required_settings/wpp_and_express_checkout/api_signature" value="" />
 
-    <field path="section/carriers_ups_password/value" value="" />
-    <field path="section/carriers_ups_username/value" value="" />
-    <field path="section/carriers_ups_access_license_number/value" value="" />
-    <field path="section/carriers_ups_shipper_number/value" value="" />
+    <field path="payment/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_required/paypal_payflow_api_settings/business_account" value="" />
+    <field path="payment/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_required/paypal_payflow_api_settings/partner" value="" />
+    <field path="payment/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_required/paypal_payflow_api_settings/user" value="" />
+    <field path="payment/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_required/paypal_payflow_api_settings/pwd" value="" />
+    <field path="payment/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_required/paypal_payflow_api_settings/vendor" value="" />
 
-    <field path="section/carriers_usps_userid/value" value="" />
-    <field path="section/carriers_usps_password/value" value="" />
+    <field path="carriers/ups/password" value="" />
+    <field path="carriers/ups/username" value="" />
+    <field path="carriers/ups/access_license_number" value="" />
+    <field path="carriers/ups/shipper_number" value="" />
 
-    <field path="section/payment_authorizenet_login/value" value="" />
-    <field path="section/payment_authorizenet_trans_key/value" value="" />
+    <field path="carriers/usps/userid" value="" />
+    <field path="carriers/usps/password" value="" />
 
-    <field path="section/payment_paypal_group_all_in_one_wpp_usuk_wpp_required_settings_wpp_and_express_checkout_business_account/value" value="" />
-    <field path="section/payment_paypal_group_all_in_one_wpp_usuk_wpp_required_settings_wpp_and_express_checkout_api_username/value" value="" />
-    <field path="section/payment_paypal_group_all_in_one_wpp_usuk_wpp_required_settings_wpp_and_express_checkout_api_password/value" value="" />
-    <field path="section/payment_paypal_group_all_in_one_wpp_usuk_wpp_required_settings_wpp_and_express_checkout_api_signature/value" value="" />
+    <field replace="carriers_dhl_id_us" value="" />
+    <field replace="carriers_dhl_password_us" value="" />
+    <field replace="carriers_dhl_account_us" value="" />
 
-    <field path="section/payment_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_paypal_payflow_required_paypal_payflow_api_settings_business_account/value" value="" />
-    <field path="section/payment_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_paypal_payflow_required_paypal_payflow_api_settings_partner/value" value="" />
-    <field path="section/payment_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_paypal_payflow_required_paypal_payflow_api_settings_user/value" value="" />
-    <field path="section/payment_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_paypal_payflow_required_paypal_payflow_api_settings_pwd/value" value="" />
-    <field path="section/payment_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_paypal_payflow_required_paypal_payflow_api_settings_vendor/value" value="" />
+    <field replace="carriers_dhl_id_eu" value="" />
+    <field replace="carriers_dhl_password_eu" value="" />
+    <field replace="carriers_dhl_account_eu" value="" />
 </replace>
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml
index e15167c85b4c6..b0c8be8dae155 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0"?>
 <!--
 /**
  * Copyright © 2015 Magento. All rights reserved.
@@ -8,18 +8,63 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd">
     <repository class="Magento\Config\Test\Repository\ConfigData">
         <dataset name="store_information">
-            <field path="general/store_information/name" scope="general" scope_id="1" label="" xsi:type="string">Store 1</field>
-            <field path="general/store_information/phone" scope="general" scope_id="1" label="" xsi:type="string">1234-123-123</field>
-            <field path="general/store_information/country_id" scope="general" scope_id="1" label="United States" xsi:type="string">US</field>
-            <field path="general/store_information/region_id" scope="general" scope_id="1" label="California" xsi:type="string">12</field>
-            <field path="general/store_information/postcode" scope="general" scope_id="1" label="" xsi:type="string">90322</field>
-            <field path="general/store_information/city" scope="general" scope_id="1" label="" xsi:type="string">Culver City</field>
-            <field path="general/store_information/street_line1" scope="general" scope_id="1" label="" xsi:type="string">10441 Jefferson Blvd</field>
-            <field path="general/store_information/street_line2" scope="general" scope_id="1" label="" xsi:type="string">Suite 200</field>
+            <field name="general/store_information/name" xsi:type="array">
+                <item name="scope" xsi:type="string">general</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="string">Store 1</item>
+            </field>
+            <field name="general/store_information/phone" xsi:type="array">
+                <item name="scope" xsi:type="string">general</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="string">1234-123-123</item>
+            </field>
+            <field name="general/store_information/country_id" xsi:type="array">
+                <item name="scope" xsi:type="string">general</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">United States</item>
+                <item name="value" xsi:type="string">US</item>
+            </field>
+            <field name="general/store_information/region_id" xsi:type="array">
+                <item name="scope" xsi:type="string">general</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">California</item>
+                <item name="value" xsi:type="number">12</item>
+            </field>
+            <field name="general/store_information/postcode" xsi:type="array">
+                <item name="scope" xsi:type="string">general</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="number">90322</item>
+            </field>
+            <field name="general/store_information/city" xsi:type="array">
+                <item name="scope" xsi:type="string">general</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="string">Culver City</item>
+            </field>
+            <field name="general/store_information/street_line1" xsi:type="array">
+                <item name="scope" xsi:type="string">general</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="string">10441 Jefferson Blvd</item>
+            </field>
+            <field name="general/store_information/street_line2" xsi:type="array">
+                <item name="scope" xsi:type="string">general</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="string">Suite 200</item>
+            </field>
         </dataset>
 
         <dataset name="admin_session_lifetime_1_hour">
-            <field path="admin/security/session_lifetime" scope="default" scope_id="0" label="3600" xsi:type="string">3600</field>
+            <field name="admin/security/session_lifetime" xsi:type="array">
+                <item name="scope" xsi:type="string">default</item>
+                <item name="scope_id" xsi:type="number">0</item>
+                <item name="label" xsi:type="number">3600</item>
+                <item name="value" xsi:type="number">3600</item>
+            </field>
         </dataset>
     </repository>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Product/Composite/Configure.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Product/Composite/Configure.php
index ee0bef81cc505..59d90eddd8a9f 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Product/Composite/Configure.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Product/Composite/Configure.php
@@ -19,7 +19,7 @@ class Configure extends \Magento\Catalog\Test\Block\Adminhtml\Product\Composite\
      *
      * @var string
      */
-    protected $option = '//div[@class="fields options"]//label[.="%option_name%"]//following-sibling::*//%selector%';
+    protected $option = '//div[@class="composite-bundle"]//label[.="%option_name%"]//following-sibling::*//%selector%';
 
     /**
      * Fill options for the product
diff --git a/dev/tests/functional/tests/app/Magento/CatalogInventory/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/CatalogInventory/Test/Repository/ConfigData.xml
index 7ad8d687b34cb..c5c199c1a54bb 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogInventory/Test/Repository/ConfigData.xml
+++ b/dev/tests/functional/tests/app/Magento/CatalogInventory/Test/Repository/ConfigData.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0"?>
 <!--
 /**
  * Copyright © 2015 Magento. All rights reserved.
@@ -8,19 +8,39 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd">
     <repository class="Magento\Config\Test\Repository\ConfigData">
         <dataset name="display_out_of_stock">
-            <field path="cataloginventory/options/show_out_of_stock" scope="cataloginventory" scope_id="1" label="Yes" xsi:type="string">1</field>
+            <field name="cataloginventory/options/show_out_of_stock" xsi:type="array">
+                <item name="scope" xsi:type="string">cataloginventory</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
         </dataset>
 
         <dataset name="backorders_allow_qty_below">
-            <field path="cataloginventory/item_options/backorders" scope="cataloginventory" scope_id="1" label="Allow Qty Below 0" xsi:type="string">1</field>
+            <field name="cataloginventory/item_options/backorders" xsi:type="array">
+                <item name="scope" xsi:type="string">cataloginventory</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Allow Qty Below 0</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
         </dataset>
 
         <dataset name="display_out_of_stock_rollback">
-            <field path="cataloginventory/options/show_out_of_stock" scope="cataloginventory" scope_id="1" label="No" xsi:type="string">0</field>
+            <field name="cataloginventory/options/show_out_of_stock" xsi:type="array">
+                <item name="scope" xsi:type="string">cataloginventory</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
         </dataset>
 
         <dataset name="backorders_allow_qty_below_rollback">
-            <field path="cataloginventory/item_options/backorders" scope="cataloginventory" scope_id="1" label="No Backorders" xsi:type="string">0</field>
+            <field name="cataloginventory/item_options/backorders" xsi:type="array">
+                <item name="scope" xsi:type="string">cataloginventory</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No Backorders</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
         </dataset>
     </repository>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart.xml
index 9c79804bfe3b2..e83f70cc78018 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart.xml
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart.xml
@@ -5,162 +5,165 @@
  * See COPYING.txt for license details.
  */
  -->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
-  <fixture name="cart" module="Magento_Checkout" type="flat" entity_type="quote" repository_class="Magento\Checkout\Test\Repository\Cart" handler_interface="Magento\Checkout\Test\Handler\Cart\CartInterface" class="Magento\Checkout\Test\Fixture\Cart">
-    <field name="entity_id" is_required="1">
-      <default_value xsi:type="null"/>
-    </field>
-    <field name="store_id" is_required="">
-      <default_value xsi:type="number">0</default_value>
-    </field>
-    <field name="created_at" is_required="">
-      <default_value xsi:type="string">CURRENT_TIMESTAMP</default_value>
-    </field>
-    <field name="updated_at" is_required="">
-      <default_value xsi:type="string">0000-00-00 00:00:00</default_value>
-    </field>
-    <field name="converted_at" is_required="">
-      <default_value xsi:type="null"/>
-    </field>
-    <field name="is_active" is_required="">
-      <default_value xsi:type="string">1</default_value>
-    </field>
-    <field name="is_virtual" is_required="">
-      <default_value xsi:type="number">0</default_value>
-    </field>
-    <field name="is_multi_shipping" is_required="">
-      <default_value xsi:type="number">0</default_value>
-    </field>
-    <field name="items" source="Magento\Checkout\Test\Fixture\Cart\Items"/>
-    <field name="items_count" is_required="">
-      <default_value xsi:type="number">0</default_value>
-    </field>
-    <field name="items_qty" is_required="">
-      <default_value xsi:type="string">0.0000</default_value>
-    </field>
-    <field name="orig_order_id" is_required="">
-      <default_value xsi:type="number">0</default_value>
-    </field>
-    <field name="store_to_base_rate" is_required="">
-      <default_value xsi:type="string">0.0000</default_value>
-    </field>
-    <field name="store_to_quote_rate" is_required="">
-      <default_value xsi:type="string">0.0000</default_value>
-    </field>
-    <field name="base_currency_code" is_required="">
-      <default_value xsi:type="null"/>
-    </field>
-    <field name="store_currency_code" is_required="">
-      <default_value xsi:type="null"/>
-    </field>
-    <field name="quote_currency_code" is_required="">
-      <default_value xsi:type="null"/>
-    </field>
-    <field name="grand_total" is_required="">
-      <default_value xsi:type="string">0.0000</default_value>
-    </field>
-    <field name="base_grand_total" is_required="">
-      <default_value xsi:type="string">0.0000</default_value>
-    </field>
-    <field name="checkout_method" is_required="">
-      <default_value xsi:type="null"/>
-    </field>
-    <field name="customer_id" is_required="">
-      <default_value xsi:type="number">0</default_value>
-    </field>
-    <field name="customer_tax_class_id" is_required="">
-      <default_value xsi:type="number">0</default_value>
-    </field>
-    <field name="customer_group_id" is_required="">
-      <default_value xsi:type="number">0</default_value>
-    </field>
-    <field name="customer_email" is_required="">
-      <default_value xsi:type="null"/>
-    </field>
-    <field name="customer_prefix" is_required="">
-      <default_value xsi:type="null"/>
-    </field>
-    <field name="customer_firstname" is_required="">
-      <default_value xsi:type="null"/>
-    </field>
-    <field name="customer_middlename" is_required="">
-      <default_value xsi:type="null"/>
-    </field>
-    <field name="customer_lastname" is_required="">
-      <default_value xsi:type="null"/>
-    </field>
-    <field name="customer_suffix" is_required="">
-      <default_value xsi:type="null"/>
-    </field>
-    <field name="customer_dob" is_required="">
-      <default_value xsi:type="null"/>
-    </field>
-    <field name="customer_note" is_required="">
-      <default_value xsi:type="null"/>
-    </field>
-    <field name="customer_note_notify" is_required="">
-      <default_value xsi:type="string">1</default_value>
-    </field>
-    <field name="customer_is_guest" is_required="">
-      <default_value xsi:type="number">0</default_value>
-    </field>
-    <field name="remote_ip" is_required="">
-      <default_value xsi:type="null"/>
-    </field>
-    <field name="applied_rule_ids" is_required="">
-      <default_value xsi:type="null"/>
-    </field>
-    <field name="reserved_order_id" is_required="">
-      <default_value xsi:type="null"/>
-    </field>
-    <field name="password_hash" is_required="">
-      <default_value xsi:type="null"/>
-    </field>
-    <field name="coupon_code" is_required="">
-      <default_value xsi:type="null"/>
-    </field>
-    <field name="global_currency_code" is_required="">
-      <default_value xsi:type="null"/>
-    </field>
-    <field name="base_to_global_rate" is_required="">
-      <default_value xsi:type="null"/>
-    </field>
-    <field name="base_to_quote_rate" is_required="">
-      <default_value xsi:type="null"/>
-    </field>
-    <field name="customer_taxvat" is_required="">
-      <default_value xsi:type="null"/>
-    </field>
-    <field name="customer_gender" is_required="">
-      <default_value xsi:type="null"/>
-    </field>
-    <field name="subtotal" is_required="">
-      <default_value xsi:type="null"/>
-    </field>
-    <field name="base_subtotal" is_required="">
-      <default_value xsi:type="null"/>
-    </field>
-    <field name="subtotal_with_discount" is_required="">
-      <default_value xsi:type="null"/>
-    </field>
-    <field name="base_subtotal_with_discount" is_required="">
-      <default_value xsi:type="null"/>
-    </field>
-    <field name="is_changed" is_required="">
-      <default_value xsi:type="null"/>
-    </field>
-    <field name="trigger_recollec" is_required="">
-      <default_value xsi:type="number">0</default_value>
-    </field>
-    <field name="ext_shipping_info" is_required="">
-      <default_value xsi:type="null"/>
-    </field>
-    <field name="is_persistent" is_required="">
-      <default_value xsi:type="number">0</default_value>
-    </field>
-    <field name="gift_message_id" is_required="">
-      <default_value xsi:type="null"/>
-    </field>
-    <field name="checkout_data" group="" source="Magento\Checkout\Test\Fixture\Cart\CheckoutData"/>
-  </fixture>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
+    <fixture name="cart" module="Magento_Checkout" type="flat" entity_type="quote" repository_class="Magento\Checkout\Test\Repository\Cart" handler_interface="Magento\Checkout\Test\Handler\Cart\CartInterface" class="Magento\Checkout\Test\Fixture\Cart">
+        <field name="entity_id" is_required="1">
+            <default_value xsi:type="null"/>
+        </field>
+        <field name="store_id" is_required="">
+            <default_value xsi:type="number">0</default_value>
+        </field>
+        <field name="created_at" is_required="">
+            <default_value xsi:type="string">CURRENT_TIMESTAMP</default_value>
+        </field>
+        <field name="updated_at" is_required="">
+            <default_value xsi:type="string">0000-00-00 00:00:00</default_value>
+        </field>
+        <field name="converted_at" is_required="">
+            <default_value xsi:type="null"/>
+        </field>
+        <field name="is_active" is_required="">
+            <default_value xsi:type="string">1</default_value>
+        </field>
+        <field name="is_virtual" is_required="">
+            <default_value xsi:type="number">0</default_value>
+        </field>
+        <field name="is_multi_shipping" is_required="">
+            <default_value xsi:type="number">0</default_value>
+        </field>
+        <field name="items" source="Magento\Checkout\Test\Fixture\Cart\Items"/>
+        <field name="items_count" is_required="">
+            <default_value xsi:type="number">0</default_value>
+        </field>
+        <field name="items_qty" is_required="">
+            <default_value xsi:type="string">0.0000</default_value>
+        </field>
+        <field name="orig_order_id" is_required="">
+            <default_value xsi:type="number">0</default_value>
+        </field>
+        <field name="store_to_base_rate" is_required="">
+            <default_value xsi:type="string">0.0000</default_value>
+        </field>
+        <field name="store_to_quote_rate" is_required="">
+            <default_value xsi:type="string">0.0000</default_value>
+        </field>
+        <field name="base_currency_code" is_required="">
+            <default_value xsi:type="null"/>
+        </field>
+        <field name="store_currency_code" is_required="">
+            <default_value xsi:type="null"/>
+        </field>
+        <field name="quote_currency_code" is_required="">
+            <default_value xsi:type="null"/>
+        </field>
+        <field name="grand_total" is_required="">
+            <default_value xsi:type="string">0.0000</default_value>
+        </field>
+        <field name="base_grand_total" is_required="">
+            <default_value xsi:type="string">0.0000</default_value>
+        </field>
+        <field name="checkout_method" is_required="">
+            <default_value xsi:type="null"/>
+        </field>
+        <field name="customer_id" is_required="">
+            <default_value xsi:type="number">0</default_value>
+        </field>
+        <field name="customer_tax_class_id" is_required="">
+            <default_value xsi:type="number">0</default_value>
+        </field>
+        <field name="customer_group_id" is_required="">
+            <default_value xsi:type="number">0</default_value>
+        </field>
+        <field name="customer_email" is_required="">
+            <default_value xsi:type="null"/>
+        </field>
+        <field name="customer_prefix" is_required="">
+            <default_value xsi:type="null"/>
+        </field>
+        <field name="customer_firstname" is_required="">
+            <default_value xsi:type="null"/>
+        </field>
+        <field name="customer_middlename" is_required="">
+            <default_value xsi:type="null"/>
+        </field>
+        <field name="customer_lastname" is_required="">
+            <default_value xsi:type="null"/>
+        </field>
+        <field name="customer_suffix" is_required="">
+            <default_value xsi:type="null"/>
+        </field>
+        <field name="customer_dob" is_required="">
+            <default_value xsi:type="null"/>
+        </field>
+        <field name="customer_note" is_required="">
+            <default_value xsi:type="null"/>
+        </field>
+        <field name="customer_note_notify" is_required="">
+            <default_value xsi:type="string">1</default_value>
+        </field>
+        <field name="customer_is_guest" is_required="">
+            <default_value xsi:type="number">0</default_value>
+        </field>
+        <field name="remote_ip" is_required="">
+            <default_value xsi:type="null"/>
+        </field>
+        <field name="applied_rule_ids" is_required="">
+            <default_value xsi:type="null"/>
+        </field>
+        <field name="reserved_order_id" is_required="">
+            <default_value xsi:type="null"/>
+        </field>
+        <field name="password_hash" is_required="">
+            <default_value xsi:type="null"/>
+        </field>
+        <field name="coupon_code" is_required="">
+            <default_value xsi:type="null"/>
+        </field>
+        <field name="global_currency_code" is_required="">
+            <default_value xsi:type="null"/>
+        </field>
+        <field name="base_to_global_rate" is_required="">
+            <default_value xsi:type="null"/>
+        </field>
+        <field name="base_to_quote_rate" is_required="">
+            <default_value xsi:type="null"/>
+        </field>
+        <field name="customer_taxvat" is_required="">
+            <default_value xsi:type="null"/>
+        </field>
+        <field name="customer_gender" is_required="">
+            <default_value xsi:type="null"/>
+        </field>
+        <field name="subtotal" is_required="">
+            <default_value xsi:type="null"/>
+        </field>
+        <field name="base_subtotal" is_required="">
+            <default_value xsi:type="null"/>
+        </field>
+        <field name="subtotal_with_discount" is_required="">
+            <default_value xsi:type="null"/>
+        </field>
+        <field name="base_subtotal_with_discount" is_required="">
+            <default_value xsi:type="null"/>
+        </field>
+        <field name="is_changed" is_required="">
+            <default_value xsi:type="null"/>
+        </field>
+        <field name="trigger_recollec" is_required="">
+            <default_value xsi:type="number">0</default_value>
+        </field>
+        <field name="ext_shipping_info" is_required="">
+            <default_value xsi:type="null"/>
+        </field>
+        <field name="is_persistent" is_required="">
+            <default_value xsi:type="number">0</default_value>
+        </field>
+        <field name="gift_message_id" is_required="">
+            <default_value xsi:type="null"/>
+        </field>
+        <field name="shipping_method" is_required="">
+            <default_value xsi:type="null"/>
+        </field>
+        <field name="checkout_data" group="" source="Magento\Checkout\Test\Fixture\Cart\CheckoutData"/>
+    </fixture>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Repository/ConfigData.xml
index cc48fe65a7363..16e8dc69362c7 100644
--- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Repository/ConfigData.xml
+++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Repository/ConfigData.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0"?>
 <!--
 /**
  * Copyright © 2015 Magento. All rights reserved.
@@ -8,11 +8,21 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd">
     <repository class="Magento\Config\Test\Repository\ConfigData">
         <dataset name="checkout_term_condition">
-            <field path="checkout/options/enable_agreements" scope="checkout" scope_id="1" label="Yes" xsi:type="string">1</field>
+            <field name="checkout/options/enable_agreements" xsi:type="array">
+                <item name="scope" xsi:type="string">checkout</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
         </dataset>
 
         <dataset name="checkout_term_condition_rollback">
-            <field path="checkout/options/enable_agreements" scope="checkout" scope_id="1" label="No" xsi:type="string">0</field>
+            <field name="checkout/options/enable_agreements" xsi:type="array">
+                <item name="scope" xsi:type="string">checkout</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
         </dataset>
     </repository>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Cms/Test/Repository/ConfigData.xml
index 2cdd702804970..711c7fbb32c1c 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Repository/ConfigData.xml
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Repository/ConfigData.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0"?>
 <!--
 /**
  * Copyright © 2015 Magento. All rights reserved.
@@ -8,7 +8,12 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd">
     <repository class="Magento\Config\Test\Repository\ConfigData">
         <dataset name="wysiwyg_disabled">
-            <field path="cms/wysiwyg/enabled" scope="default" scope_id="0" label="Disabled Completely" xsi:type="string">disabled</field>
+            <field name="cms/wysiwyg/enabled" xsi:type="array">
+                <item name="scope" xsi:type="string">default</item>
+                <item name="scope_id" xsi:type="number">0</item>
+                <item name="label" xsi:type="string">Disabled Completely</item>
+                <item name="value" xsi:type="string">disabled</item>
+            </field>
         </dataset>
     </repository>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Config/Test/Handler/ConfigData/Curl.php b/dev/tests/functional/tests/app/Magento/Config/Test/Handler/ConfigData/Curl.php
index 1ac33d18a9970..8f056deaa461f 100644
--- a/dev/tests/functional/tests/app/Magento/Config/Test/Handler/ConfigData/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Config/Test/Handler/ConfigData/Curl.php
@@ -56,7 +56,10 @@ protected function prepareData(FixtureInterface $fixture)
         $result = [];
         $fields = $fixture->getData();
         if (isset($fields['section'])) {
-            foreach ($fields['section'] as $itemSection) {
+            foreach ($fields['section'] as $key => $itemSection) {
+                if (is_array($itemSection)) {
+                    $itemSection['path'] = $key;
+                }
                 parse_str($this->prepareConfigPath($itemSection), $configPath);
                 $result = array_merge_recursive($result, $configPath);
             }
diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Repository/ConfigData.xml
index 46e7d3bd7fd8d..1d7fabcdeb20a 100644
--- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Repository/ConfigData.xml
+++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Repository/ConfigData.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0"?>
 <!--
 /**
  * Copyright © 2015 Magento. All rights reserved.
@@ -8,28 +8,133 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd">
     <repository class="Magento\Config\Test\Repository\ConfigData">
         <dataset name="config_currency_symbols_usd_and_uah">
-            <field path="currency/options/allow" scope="currency" scope_id="1" xsi:type="array">
-                <item name="US Dollar" xsi:type="string">USD</item>
-                <item name="Ukrainian Hryvnia" xsi:type="string">UAH</item>
+            <field name="currency/options/allow" xsi:type="array">
+                <item name="scope" xsi:type="string">currency</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="value" xsi:type="array">
+                    <item name="US Dollar" xsi:type="string">USD</item>
+                    <item name="Ukrainian Hryvnia" xsi:type="string">UAH</item>
+                </item>
             </field>
         </dataset>
 
         <dataset name="config_currency_symbols_usd_and_uah_rollback">
-            <field path="currency/options/allow" scope="currency" scope_id="1" xsi:type="array">
-                <item name="US Dollar" xsi:type="string">USD</item>
+            <field name="currency/options/allow" xsi:type="array">
+                <item name="scope" xsi:type="string">currency</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="value" xsi:type="array">
+                    <item name="US Dollar" xsi:type="string">USD</item>
+                </item>
             </field>
         </dataset>
 
         <dataset name="config_currency_symbols_usd_and_chf">
-            <field path="currency/options/allow" scope="currency" scope_id="1" xsi:type="array">
-                <item name="US Dollar" xsi:type="string">USD</item>
-                <item name="Swiss Franc" xsi:type="string">CHF</item>
+            <field name="currency/options/allow" xsi:type="array">
+                <item name="scope" xsi:type="string">currency</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="value" xsi:type="array">
+                    <item name="US Dollar" xsi:type="string">USD</item>
+                    <item name="Swiss Franc" xsi:type="string">CHF</item>
+                </item>
             </field>
         </dataset>
 
         <dataset name="config_currency_symbols_usd">
-            <field path="currency/options/allow" scope="currency" scope_id="1" label="" xsi:type="array">
-                <item name="US Dollar" xsi:type="string">USD</item>
+            <field name="currency/options/allow" xsi:type="array">
+                <item name="scope" xsi:type="string">currency</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="array">
+                    <item name="US Dollar" xsi:type="string">USD</item>
+                </item>
+            </field>
+        </dataset>
+
+        <dataset name="config_base_currency_ch">
+            <field name="currency/options/allow" xsi:type="array">
+                <item name="scope" xsi:type="string">currency</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="value" xsi:type="array">
+                    <item name="Swiss Franc" xsi:type="string">CHF</item>
+                </item>
+            </field>
+            <field name="currency/options/base" xsi:type="array">
+                <item name="scope" xsi:type="string">currency</item>
+                <item name="label" xsi:type="string">Swiss Franc</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="value" xsi:type="string">CHF</item>
+            </field>
+            <field name="currency/options/default" xsi:type="array">
+                <item name="scope" xsi:type="string">currency</item>
+                <item name="label" xsi:type="string">Swiss Franc</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="value" xsi:type="string">CHF</item>
+            </field>
+        </dataset>
+
+        <dataset name="config_base_currency_ch_rollback">
+            <field name="currency/options/allow" xsi:type="array">
+                <item name="scope" xsi:type="string">currency</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="value" xsi:type="array">
+                    <item name="US Dollar" xsi:type="string">USD</item>
+                </item>
+            </field>
+            <field name="currency/options/base" xsi:type="array">
+                <item name="scope" xsi:type="string">currency</item>
+                <item name="label" xsi:type="string">US Dollar</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="value" xsi:type="string">USD</item>
+            </field>
+            <field name="currency/options/default" xsi:type="array">
+                <item name="scope" xsi:type="string">currency</item>
+                <item name="label" xsi:type="string">US Dollar</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="value" xsi:type="string">USD</item>
+            </field>
+        </dataset>
+
+        <dataset name="config_base_currency_gb">
+            <field name="currency/options/allow" xsi:type="array">
+                <item name="scope" xsi:type="string">currency</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="value" xsi:type="array">
+                    <item name="British Pound Sterling" xsi:type="string">GBP</item>
+                </item>
+            </field>
+            <field name="currency/options/base" xsi:type="array">
+                <item name="scope" xsi:type="string">currency</item>
+                <item name="label" xsi:type="string">British Pound Sterling</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="value" xsi:type="string">GBP</item>
+            </field>
+            <field name="currency/options/default" xsi:type="array">
+                <item name="scope" xsi:type="string">currency</item>
+                <item name="label" xsi:type="string">British Pound Sterling</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="value" xsi:type="string">GBP</item>
+            </field>
+        </dataset>
+
+        <dataset name="config_base_currency_gb_rollback">
+            <field name="currency/options/allow" xsi:type="array">
+                <item name="scope" xsi:type="string">currency</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="value" xsi:type="array">
+                    <item name="US Dollar" xsi:type="string">USD</item>
+                </item>
+            </field>
+            <field name="currency/options/base" xsi:type="array">
+                <item name="scope" xsi:type="string">currency</item>
+                <item name="label" xsi:type="string">US Dollar</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="value" xsi:type="string">USD</item>
+            </field>
+            <field name="currency/options/default" xsi:type="array">
+                <item name="scope" xsi:type="string">currency</item>
+                <item name="label" xsi:type="string">US Dollar</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="value" xsi:type="string">USD</item>
             </field>
         </dataset>
     </repository>
diff --git a/dev/tests/functional/tests/app/Magento/Dhl/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Dhl/Test/Repository/ConfigData.xml
index ba7829d151c99..12cd6941273dd 100644
--- a/dev/tests/functional/tests/app/Magento/Dhl/Test/Repository/ConfigData.xml
+++ b/dev/tests/functional/tests/app/Magento/Dhl/Test/Repository/ConfigData.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0"?>
 <!--
 /**
  * Copyright © 2015 Magento. All rights reserved.
@@ -8,17 +8,120 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd">
     <repository class="Magento\Config\Test\Repository\ConfigData">
         <dataset name="disable_shipping_all">
-            <field path="carriers/dhl/active" scope="carriers" scope_id="1" label="No" xsi:type="string">0</field>
+            <field name="carriers/dhl/active" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
         </dataset>
 
         <dataset name="dhl_eu">
-            <field path="carriers/dhl/active" scope="carriers" scope_id="1" label="Yes" xsi:type="string">1</field>
-            <field path="carriers/dhl/gateway_url" scope="carriers" scope_id="1" label="" xsi:type="string">https://xmlpitest-ea.dhl.com/XMLShippingServlet</field>
-            <field path="carriers/dhl/id" scope="carriers" scope_id="1" label="" xsi:type="string">CARRIERS_DHL_ID</field>
-            <field path="carriers/dhl/password" scope="carriers" scope_id="1" label="" xsi:type="string">CARRIERS_DHL_PASSWORD</field>
-            <field path="carriers/dhl/account" scope="carriers" scope_id="1" label="" xsi:type="string">CARRIERS_DHL_ACCOUNT</field>
-            <field path="carriers/dhl/showmethod" scope="carriers" scope_id="1" label="Yes" xsi:type="string">1</field>
-            <field path="carriers/dhl/debug" scope="carriers" scope_id="1" label="Yes" xsi:type="string">1</field>
+            <field name="carriers/dhl/active" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="carriers/dhl/gateway_url" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="string">https://xmlpitest-ea.dhl.com/XMLShippingServlet</item>
+            </field>
+            <field name="carriers/dhl/id" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="string">%carriers_dhl_id_eu%</item>
+            </field>
+            <field name="carriers/dhl/password" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="string">%carriers_dhl_password_eu%</item>
+            </field>
+            <field name="carriers/dhl/account" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="string">%carriers_dhl_account_eu%</item>
+            </field>
+            <field name="carriers/dhl/showmethod" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="carriers/dhl/debug" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+        </dataset>
+
+        <dataset name="dhl_eu_rollback">
+            <field name="carriers/dhl/active" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+        </dataset>
+
+        <dataset name="dhl_us">
+            <field name="carriers/dhl/active" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="carriers/dhl/gateway_url" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="string">https://xmlpi-ea.dhl.com/XMLShippingServlet</item>
+            </field>
+            <field name="carriers/dhl/id" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="string">%carriers_dhl_id_us%</item>
+            </field>
+            <field name="carriers/dhl/password" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="string">%carriers_dhl_password_us%</item>
+            </field>
+            <field name="carriers/dhl/account" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="string">%carriers_dhl_account_us%</item>
+            </field>
+            <field name="carriers/dhl/showmethod" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="carriers/dhl/debug" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+        </dataset>
+
+        <dataset name="dhl_us_rollback">
+            <field name="carriers/dhl/active" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
         </dataset>
     </repository>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Dhl/Test/TestCase/OnePageCheckoutTest.xml b/dev/tests/functional/tests/app/Magento/Dhl/Test/TestCase/OnePageCheckoutTest.xml
new file mode 100644
index 0000000000000..6b6a97b9d49e6
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Dhl/Test/TestCase/OnePageCheckoutTest.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
+    <testCase name="Magento\Checkout\Test\TestCase\OnePageCheckoutTest">
+        <variation name="OnePageCheckoutTestVariation20">
+            <data name="description" xsi:type="string">MAGETWO-12850 – Use DHL International (EU) Online Shipping Carrier on Checkout as a Registered Customer</data>
+            <data name="products" xsi:type="string">catalogProductSimple::default, configurableProduct::default, bundleProduct::bundle_fixed_product</data>
+            <data name="checkoutMethod" xsi:type="string">login</data>
+            <data name="customer/dataSet" xsi:type="string">customer_DE</data>
+            <data name="address/dataSet" xsi:type="string">customer_DE</data>
+            <data name="billingAddress/dataSet" xsi:type="string">customer_DE</data>
+            <data name="shipping/shipping_service" xsi:type="string">DHL</data>
+            <data name="shipping/shipping_method" xsi:type="string">Express worldwide</data>
+            <data name="cart/data/shipping_method" xsi:type="string">Express worldwide</data>
+            <data name="payment/method" xsi:type="string">checkmo</data>
+            <data name="configData" xsi:type="string">checkmo, dhl_eu, shipping_origin_CH, config_base_currency_ch</data>
+            <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+            <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage"/>
+            <constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGrid"/>
+            <constraint name="Magento\Checkout\Test\Constraint\AssertCartIsEmpty"/>
+        </variation>
+    </testCase>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Fedex/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Fedex/Test/Repository/ConfigData.xml
index f9e73dddcd2ba..55edec45ea52e 100644
--- a/dev/tests/functional/tests/app/Magento/Fedex/Test/Repository/ConfigData.xml
+++ b/dev/tests/functional/tests/app/Magento/Fedex/Test/Repository/ConfigData.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0"?>
 <!--
 /**
  * Copyright © 2015 Magento. All rights reserved.
@@ -8,16 +8,60 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd">
     <repository class="Magento\Config\Test\Repository\ConfigData">
         <dataset name="disable_shipping_all">
-            <field path="carriers/fedex/active" scope="carriers" scope_id="1" label="No" xsi:type="string">0</field>
+            <field name="carriers/fedex/active" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
         </dataset>
 
         <dataset name="fedex">
-            <field path="carriers/fedex/active" scope="carriers" scope_id="1" label="Yes" xsi:type="string">1</field>
-            <field path="carriers/fedex/account" scope="carriers" scope_id="1" label="" xsi:type="string">CARRIERS_FEDEX_ACCOUNT</field>
-            <field path="carriers/fedex/meter_number" scope="carriers" scope_id="1" label="" xsi:type="string">CARRIERS_FEDEX_METER_NUMBER</field>
-            <field path="carriers/fedex/key" scope="carriers" scope_id="1" label="" xsi:type="string">CARRIERS_FEDEX_KEY</field>
-            <field path="carriers/fedex/password" scope="carriers" scope_id="1" label="" xsi:type="string">CARRIERS_FEDEX_PASSWORD</field>
-            <field path="carriers/fedex/sandbox_mode" scope="carriers" scope_id="1" label="Yes" xsi:type="string">1</field>
+            <field name="carriers/fedex/active" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="carriers/fedex/account" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="string">CARRIERS_FEDEX_ACCOUNT</item>
+            </field>
+            <field name="carriers/fedex/meter_number" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="string">CARRIERS_FEDEX_METER_NUMBER</item>
+            </field>
+            <field name="carriers/fedex/key" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="string">CARRIERS_FEDEX_KEY</item>
+            </field>
+            <field name="carriers/fedex/password" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="string">CARRIERS_FEDEX_PASSWORD</item>
+            </field>
+            <field name="carriers/fedex/sandbox_mode" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+        </dataset>
+
+        <dataset name="fedex_rollback">
+            <field name="carriers/fedex/active" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
         </dataset>
     </repository>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Fedex/Test/TestCase/OnePageCheckoutTest.xml b/dev/tests/functional/tests/app/Magento/Fedex/Test/TestCase/OnePageCheckoutTest.xml
new file mode 100644
index 0000000000000..2c81ac17aeccd
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Fedex/Test/TestCase/OnePageCheckoutTest.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
+    <testCase name="Magento\Checkout\Test\TestCase\OnePageCheckoutTest">
+        <variation name="OnePageCheckoutTestVariation22">
+            <data name="description" xsi:type="string">Checkout as guest using FedEx with US shipping origin and UK customer</data>
+            <data name="products" xsi:type="string">catalogProductSimple::default, configurableProduct::default, bundleProduct::bundle_fixed_product</data>
+            <data name="checkoutMethod" xsi:type="string">guest</data>
+            <data name="customer/dataSet" xsi:type="string">customer_UK</data>
+            <data name="address/dataSet" xsi:type="string">customer_UK</data>
+            <data name="billingAddress/dataSet" xsi:type="string">customer_UK</data>
+            <data name="shipping/shipping_service" xsi:type="string">Federal Express</data>
+            <data name="shipping/shipping_method" xsi:type="string">International Economy</data>
+            <data name="cart/data/shipping_method" xsi:type="string">International Economy</data>
+            <data name="payment/method" xsi:type="string">checkmo</data>
+            <data name="configData" xsi:type="string">checkmo, fedex, shipping_origin_US_CA</data><!--<data name="issue" xsi:type="string">Rating is temporarily unavailable - Error in FEDEX</data>-->
+            <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage"/>
+            <constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGrid"/>
+            <constraint name="Magento\Checkout\Test\Constraint\AssertCartIsEmpty"/>
+        </variation>
+        <variation name="OnePageCheckoutTestVariation23">
+            <data name="description" xsi:type="string">MAGETWO-12849 – Use FedEx Online Shipping Carrier on Checkout as a Registered Customer</data>
+            <data name="products" xsi:type="string">catalogProductSimple::default, configurableProduct::default, bundleProduct::bundle_fixed_product</data>
+            <data name="checkoutMethod" xsi:type="string">login</data>
+            <data name="customer/dataSet" xsi:type="string">customer_DE</data>
+            <data name="address/dataSet" xsi:type="string">customer_DE</data>
+            <data name="billingAddress/dataSet" xsi:type="string">customer_DE</data>
+            <data name="shipping/shipping_service" xsi:type="string">Federal Express</data>
+            <data name="shipping/shipping_method" xsi:type="string">Ground</data>
+            <data name="cart/data/shipping_method" xsi:type="string">Ground</data>
+            <data name="payment/method" xsi:type="string">checkmo</data>
+            <data name="configData" xsi:type="string">checkmo, fedex, shipping_origin_US_CA</data>
+            <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+            <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage"/>
+            <constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGrid"/>
+            <constraint name="Magento\Checkout\Test\Constraint\AssertCartIsEmpty"/>
+        </variation>
+    </testCase>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/ConfigData.xml
index 2808d830e70af..57be761d32021 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/ConfigData.xml
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/ConfigData.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0"?>
 <!--
 /**
  * Copyright © 2015 Magento. All rights reserved.
@@ -8,8 +8,18 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd">
     <repository class="Magento\Config\Test\Repository\ConfigData">
         <dataset name="enable_gift_messages">
-            <field path="sales/gift_options/allow_order" scope="sales" scope_id="1" label="Yes" xsi:type="string">1</field>
-            <field path="sales/gift_options/allow_items" scope="sales" scope_id="1" label="Yes" xsi:type="string">1</field>
+            <field name="sales/gift_options/allow_order" xsi:type="array">
+                <item name="scope" xsi:type="string">sales</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="sales/gift_options/allow_items" xsi:type="array">
+                <item name="scope" xsi:type="string">sales</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
         </dataset>
     </repository>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Msrp/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Msrp/Test/Repository/ConfigData.xml
index c9737f23ecf8e..8a923962f59a7 100644
--- a/dev/tests/functional/tests/app/Magento/Msrp/Test/Repository/ConfigData.xml
+++ b/dev/tests/functional/tests/app/Magento/Msrp/Test/Repository/ConfigData.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0"?>
 <!--
 /**
  * Copyright © 2015 Magento. All rights reserved.
@@ -8,21 +8,51 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd">
     <repository class="Magento\Config\Test\Repository\ConfigData">
         <dataset name="msrp">
-            <field path="sales/msrp/enabled" scope="sales" scope_id="1" label="Yes" xsi:type="string">1</field>
+            <field name="sales/msrp/enabled" xsi:type="array">
+                <item name="scope" xsi:type="string">sales</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
         </dataset>
 
         <dataset name="msrp_rollback">
-            <field path="sales/msrp/enabled" scope="sales" scope_id="1" label="No" xsi:type="string">0</field>
+            <field name="sales/msrp/enabled" xsi:type="array">
+                <item name="scope" xsi:type="string">sales</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
         </dataset>
 
         <dataset name="msrp_before_order_confirmation">
-            <field path="sales/msrp/enabled" scope="sales" scope_id="1" label="Yes" xsi:type="string">1</field>
-            <field path="sales/msrp/display_price_type" scope="sales" scope_id="1" label="Before Order Confirmation" xsi:type="string">3</field>
+            <field name="sales/msrp/enabled" xsi:type="array">
+                <item name="scope" xsi:type="string">sales</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="sales/msrp/display_price_type" xsi:type="array">
+                <item name="scope" xsi:type="string">sales</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Before Order Confirmation</item>
+                <item name="value" xsi:type="number">3</item>
+            </field>
         </dataset>
 
         <dataset name="msrp_before_order_confirmation_rollback">
-            <field path="sales/msrp/enabled" scope="sales" scope_id="1" label="No" xsi:type="string">0</field>
-            <field path="sales/msrp/display_price_type" scope="sales" scope_id="1" label="On Gesture" xsi:type="string">1</field>
+            <field name="sales/msrp/enabled" xsi:type="array">
+                <item name="scope" xsi:type="string">sales</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="sales/msrp/display_price_type" xsi:type="array">
+                <item name="scope" xsi:type="string">sales</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">On Gesture</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
         </dataset>
     </repository>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/OfflinePayments/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/OfflinePayments/Test/Repository/ConfigData.xml
index 4e462dd75db2f..068ba80021019 100644
--- a/dev/tests/functional/tests/app/Magento/OfflinePayments/Test/Repository/ConfigData.xml
+++ b/dev/tests/functional/tests/app/Magento/OfflinePayments/Test/Repository/ConfigData.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0"?>
 <!--
 /**
  * Copyright © 2015 Magento. All rights reserved.
@@ -8,87 +8,223 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd">
     <repository class="Magento\Config\Test\Repository\ConfigData">
         <dataset name="cashondelivery">
-            <field path="payment/cashondelivery/active" scope="payment" scope_id="1" label="Yes" xsi:type="string">1</field>
+            <field name="payment/cashondelivery/active" xsi:type="array">
+                <item name="scope" xsi:type="string">payment</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
         </dataset>
 
         <dataset name="cashondelivery_rollback">
-            <field path="payment/cashondelivery/active" scope="payment" scope_id="1" label="No" xsi:type="string">0</field>
+            <field name="payment/cashondelivery/active" xsi:type="array">
+                <item name="scope" xsi:type="string">payment</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
         </dataset>
 
         <dataset name="cashondelivery_specificcountry_gb">
-            <field path="payment/cashondelivery/active" scope="payment" scope_id="1" label="Yes" xsi:type="string">1</field>
-            <field path="payment/cashondelivery/allowspecific" scope="payment" scope_id="1" label="Specific Countries" xsi:type="string">1</field>
-            <field path="payment/cashondelivery/specificcountry" scope="payment" scope_id="1" xsi:type="array">
-                <item name="United Kingdom" xsi:type="string">GB</item>
+            <field name="payment/cashondelivery/active" xsi:type="array">
+                <item name="scope" xsi:type="string">payment</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="payment/cashondelivery/allowspecific" xsi:type="array">
+                <item name="scope" xsi:type="string">payment</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Specific Countries</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="payment/cashondelivery/specificcountry" xsi:type="array">
+                <item name="scope" xsi:type="string">payment</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="value" xsi:type="array">
+                    <item name="United Kingdom" xsi:type="string">GB</item>
+                </item>
             </field>
         </dataset>
 
         <dataset name="cashondelivery_specificcountry_gb_rollback">
-            <field path="payment/cashondelivery/active" scope="payment" scope_id="1" label="No" xsi:type="string">0</field>
-            <field path="payment/cashondelivery/allowspecific" scope="payment" scope_id="1" label="All Allowed Countries" xsi:type="string">0</field>
+            <field name="payment/cashondelivery/active" xsi:type="array">
+                <item name="scope" xsi:type="string">payment</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="payment/cashondelivery/allowspecific" xsi:type="array">
+                <item name="scope" xsi:type="string">payment</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">All Allowed Countries</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
         </dataset>
 
         <dataset name="checkmo">
-            <field path="payment/checkmo/active" scope="payment" scope_id="1" label="Yes" xsi:type="string">1</field>
+            <field name="payment/checkmo/active" xsi:type="array">
+                <item name="scope" xsi:type="string">payment</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
         </dataset>
 
         <dataset name="checkmo_disabled">
-            <field path="payment/checkmo/active" scope="payment" scope_id="1" label="No" xsi:type="string">0</field>
+            <field name="payment/checkmo/active" xsi:type="array">
+                <item name="scope" xsi:type="string">payment</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
         </dataset>
 
         <dataset name="checkmo_specificcountry_gb">
-            <field path="payment/checkmo/active" scope="payment" scope_id="1" label="Yes" xsi:type="string">1</field>
-            <field path="payment/checkmo/allowspecific" scope="payment" scope_id="1" label="Specific Countries" xsi:type="string">1</field>
-            <field path="payment/checkmo/specificcountry" scope="payment" scope_id="1" xsi:type="array">
-                <item name="United Kingdom" xsi:type="string">GB</item>
+            <field name="payment/checkmo/active" xsi:type="array">
+                <item name="scope" xsi:type="string">payment</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="payment/checkmo/allowspecific" xsi:type="array">
+                <item name="scope" xsi:type="string">payment</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Specific Countries</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="payment/checkmo/specificcountry" xsi:type="array">
+                <item name="scope" xsi:type="string">payment</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="value" xsi:type="array">
+                    <item name="United Kingdom" xsi:type="string">GB</item>
+                </item>
             </field>
         </dataset>
 
         <dataset name="checkmo_specificcountry_gb_rollback">
-            <field path="payment/checkmo/active" scope="payment" scope_id="1" label="No" xsi:type="string">0</field>
-            <field path="payment/checkmo/allowspecific" scope="payment" scope_id="1" label="All Allowed Countries" xsi:type="string">0</field>
+            <field name="payment/checkmo/active" xsi:type="array">
+                <item name="scope" xsi:type="string">payment</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="payment/checkmo/allowspecific" xsi:type="array">
+                <item name="scope" xsi:type="string">payment</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">All Allowed Countries</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
         </dataset>
 
         <dataset name="banktransfer">
-            <field path="payment/banktransfer/active" scope="payment" scope_id="1" label="Yes" xsi:type="string">1</field>
+            <field name="payment/banktransfer/active" xsi:type="array">
+                <item name="scope" xsi:type="string">payment</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
         </dataset>
 
         <dataset name="banktransfer_rollback">
-            <field path="payment/banktransfer/active" scope="payment" scope_id="1" label="No" xsi:type="string">0</field>
+            <field name="payment/banktransfer/active" xsi:type="array">
+                <item name="scope" xsi:type="string">payment</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
         </dataset>
 
         <dataset name="banktransfer_specificcountry_gb">
-            <field path="payment/banktransfer/active" scope="payment" scope_id="1" label="Yes" xsi:type="string">1</field>
-            <field path="payment/banktransfer/allowspecific" scope="payment" scope_id="1" label="Specific Countries" xsi:type="string">1</field>
-            <field path="payment/banktransfer/specificcountry" scope="payment" scope_id="1" xsi:type="array">
-                <item name="United Kingdom" xsi:type="string">GB</item>
+            <field name="payment/banktransfer/active" xsi:type="array">
+                <item name="scope" xsi:type="string">payment</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="payment/banktransfer/allowspecific" xsi:type="array">
+                <item name="scope" xsi:type="string">payment</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Specific Countries</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="payment/banktransfer/specificcountry" xsi:type="array">
+                <item name="scope" xsi:type="string">payment</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="value" xsi:type="array">
+                    <item name="United Kingdom" xsi:type="string">GB</item>
+                </item>
             </field>
         </dataset>
 
         <dataset name="banktransfer_specificcountry_gb_rollback">
-            <field path="payment/banktransfer/active" scope="payment" scope_id="1" label="No" xsi:type="string">0</field>
-            <field path="payment/banktransfer/allowspecific" scope="payment" scope_id="1" label="All Allowed Countries" xsi:type="string">0</field>
+            <field name="payment/banktransfer/active" xsi:type="array">
+                <item name="scope" xsi:type="string">payment</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="payment/banktransfer/allowspecific" xsi:type="array">
+                <item name="scope" xsi:type="string">payment</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">All Allowed Countries</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
         </dataset>
 
         <dataset name="purchaseorder">
-            <field path="payment/purchaseorder/active" scope="payment" scope_id="1" label="Yes" xsi:type="string">1</field>
+            <field name="payment/purchaseorder/active" xsi:type="array">
+                <item name="scope" xsi:type="string">payment</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
         </dataset>
 
         <dataset name="purchaseorder_rollback">
-            <field path="payment/purchaseorder/active" scope="payment" scope_id="1" label="No" xsi:type="string">0</field>
+            <field name="payment/purchaseorder/active" xsi:type="array">
+                <item name="scope" xsi:type="string">payment</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
         </dataset>
 
         <dataset name="purchaseorder_specificcountry_gb">
-            <field path="payment/purchaseorder/active" scope="payment" scope_id="1" label="Yes" xsi:type="string">1</field>
-            <field path="payment/purchaseorder/allowspecific" scope="payment" scope_id="1" label="Specific Countries" xsi:type="string">1</field>
-            <field path="payment/purchaseorder/specificcountry" scope="payment" scope_id="1" xsi:type="array">
-                <item name="United Kingdom" xsi:type="string">GB</item>
+            <field name="payment/purchaseorder/active" xsi:type="array">
+                <item name="scope" xsi:type="string">payment</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="payment/purchaseorder/allowspecific" xsi:type="array">
+                <item name="scope" xsi:type="string">payment</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Specific Countries</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="payment/purchaseorder/specificcountry" xsi:type="array">
+                <item name="scope" xsi:type="string">payment</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="value" xsi:type="array">
+                    <item name="United Kingdom" xsi:type="string">GB</item>
+                </item>
             </field>
         </dataset>
 
         <dataset name="purchaseorder_specificcountry_gb_rollback">
-            <field path="payment/purchaseorder/active" scope="payment" scope_id="1" label="No" xsi:type="string">0</field>
-            <field path="payment/purchaseorder/allowspecific" scope="payment" scope_id="1" label="All Allowed Countries" xsi:type="string">0</field>
+            <field name="payment/purchaseorder/active" xsi:type="array">
+                <item name="scope" xsi:type="string">payment</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="payment/purchaseorder/allowspecific" xsi:type="array">
+                <item name="scope" xsi:type="string">payment</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">All Allowed Countries</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
         </dataset>
     </repository>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/OfflineShipping/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/OfflineShipping/Test/Repository/ConfigData.xml
index 981f0cc04fd69..f928c549333c3 100644
--- a/dev/tests/functional/tests/app/Magento/OfflineShipping/Test/Repository/ConfigData.xml
+++ b/dev/tests/functional/tests/app/Magento/OfflineShipping/Test/Repository/ConfigData.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0"?>
 <!--
 /**
  * Copyright © 2015 Magento. All rights reserved.
@@ -8,47 +8,147 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd">
     <repository class="Magento\Config\Test\Repository\ConfigData">
         <dataset name="freeshipping">
-            <field path="carriers/freeshipping/active" scope="carriers" scope_id="1" label="Yes" xsi:type="string">1</field>
+            <field name="carriers/freeshipping/active" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
         </dataset>
 
         <dataset name="freeshipping_rollback">
-            <field path="carriers/freeshipping/active" scope="carriers" scope_id="1" label="No" xsi:type="string">0</field>
+            <field name="carriers/freeshipping/active" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
         </dataset>
 
         <dataset name="freeshipping_minimum_order_amount_100">
-            <field path="carriers/freeshipping/active" scope="carriers" scope_id="1" label="Yes" xsi:type="string">1</field>
-            <field path="carriers/freeshipping/free_shipping_subtotal" scope="carriers" scope_id="1" label="" xsi:type="string">100</field>
+            <field name="carriers/freeshipping/active" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="carriers/freeshipping/free_shipping_subtotal" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="number">100</item>
+            </field>
         </dataset>
 
         <dataset name="freeshipping_minimum_order_amount_100_rollback">
-            <field path="carriers/freeshipping/active" scope="carriers" scope_id="1" label="Yes" xsi:type="string">0</field>
-            <field path="carriers/freeshipping/free_shipping_subtotal" scope="carriers" scope_id="1" label="" xsi:type="string">0</field>
+            <field name="carriers/freeshipping/active" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="carriers/freeshipping/free_shipping_subtotal" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="number">0</item>
+            </field>
         </dataset>
 
         <dataset name="freeshipping_specificcountry_gb">
-            <field path="carriers/freeshipping/active" scope="carriers" scope_id="1" label="Yes" xsi:type="string">1</field>
-            <field path="carriers/freeshipping/sallowspecific" scope="carriers" scope_id="1" label="Specific Countries" xsi:type="string">1</field>
-            <field path="carriers/freeshipping/specificcountry/active" scope="carriers" scope_id="1" label="United Kingdom" xsi:type="string">GB</field>
+            <field name="carriers/freeshipping/active" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="carriers/freeshipping/sallowspecific" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Specific Countries</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="carriers/freeshipping/specificcountry/active" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">United Kingdom</item>
+                <item name="value" xsi:type="string">GB</item>
+            </field>
         </dataset>
 
         <dataset name="freeshipping_specificcountry_gb_rollback">
-            <field path="carriers/freeshipping/active" scope="carriers" scope_id="1" label="No" xsi:type="string">0</field>
-            <field path="carriers/freeshipping/sallowspecific" scope="carriers" scope_id="1" label="All Allowed Countries" xsi:type="string">0</field>
+            <field name="carriers/freeshipping/active" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="carriers/freeshipping/sallowspecific" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">All Allowed Countries</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
         </dataset>
 
         <dataset name="disable_shipping_all">
-            <field path="carriers/flatrate/active" scope="carriers" scope_id="1" label="No" xsi:type="string">0</field>
-            <field path="carriers/freeshipping/active" scope="carriers" scope_id="1" label="All Allowed Countries" xsi:type="string">0</field>
+            <field name="carriers/flatrate/active" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="carriers/freeshipping/active" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">All Allowed Countries</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
         </dataset>
 
         <dataset name="flatrate">
-            <field path="carriers/flatrate/active" scope="carriers" scope_id="1" label="Yes" xsi:type="string">1</field>
-            <field path="carriers/flatrate/title" scope="carriers" scope_id="1" label="" xsi:type="string">Flat Rate</field>
-            <field path="carriers/flatrate/name" scope="carriers" scope_id="1" label="" xsi:type="string">Fixed</field>
-            <field path="carriers/flatrate/type" scope="carriers" scope_id="1" label="Per Item" xsi:type="string">I</field>
-            <field path="carriers/flatrate/price" scope="carriers" scope_id="1" label="" xsi:type="string">5</field>
-            <field path="carriers/flatrate/handling_type" scope="carriers" scope_id="1" label="Fixed" xsi:type="string">F</field>
-            <field path="carriers/flatrate/specificerrmsg" scope="carriers" scope_id="1" label="" xsi:type="string">This shipping method is not available. To use this shipping method, please contact us.</field>
+            <field name="carriers/flatrate/active" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="carriers/flatrate/title" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="string">Flat Rate</item>
+            </field>
+            <field name="carriers/flatrate/name" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="string">Fixed</item>
+            </field>
+            <field name="carriers/flatrate/type" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Per Item</item>
+                <item name="value" xsi:type="string">I</item>
+            </field>
+            <field name="carriers/flatrate/price" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="number">5</item>
+            </field>
+            <field name="carriers/flatrate/handling_type" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Fixed</item>
+                <item name="value" xsi:type="string">F</item>
+            </field>
+            <field name="carriers/flatrate/specificerrmsg" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="string">This shipping method is not available. To use this shipping method, please contact us.</item>
+            </field>
         </dataset>
     </repository>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/Repository/ConfigData.xml
index 6dee26f7ffb41..3a966e5bdb601 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Repository/ConfigData.xml
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Repository/ConfigData.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0"?>
 <!--
 /**
  * Copyright © 2015 Magento. All rights reserved.
@@ -8,9 +8,24 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd">
     <repository class="Magento\Config\Test\Repository\ConfigData">
         <dataset name="compare_products">
-            <field path="catalog/recently_products/scope" scope="catalog" scope_id="1" label="Website" xsi:type="string">Website</field>
-            <field path="catalog/recently_products/viewed_count" scope="catalog" scope_id="1" label="" xsi:type="string">5</field>
-            <field path="catalog/recently_products/compared_count" scope="catalog" scope_id="1" label="" xsi:type="string">12</field>
+            <field name="catalog/recently_products/scope" xsi:type="array">
+                <item name="scope" xsi:type="string">catalog</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Website</item>
+                <item name="value" xsi:type="string">Website</item>
+            </field>
+            <field name="catalog/recently_products/viewed_count" xsi:type="array">
+                <item name="scope" xsi:type="string">catalog</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="number">5</item>
+            </field>
+            <field name="catalog/recently_products/compared_count" xsi:type="array">
+                <item name="scope" xsi:type="string">catalog</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="number">12</item>
+            </field>
         </dataset>
     </repository>
 </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 d0d39798fa775..b2030524e5eec 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 p button';
+    protected $updateItems = '#order-items_grid button[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/Totals.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Totals.php
index 39adad4c9f1f3..d115c34ba092c 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Totals.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Totals.php
@@ -20,7 +20,7 @@ class Totals extends Block
      *
      * @var string
      */
-    protected $submitOrder = '.order-totals-bottom button';
+    protected $submitOrder = '.order-totals-actions button';
 
     /**
      * Click 'Submit Order' button
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderInOrdersGrid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderInOrdersGrid.php
index 291aebbec04ac..caedcda461f4d 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderInOrdersGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderInOrdersGrid.php
@@ -47,7 +47,7 @@ public function assert(OrderInjectable $order, OrderIndex $orderIndex, $status,
         ];
         $errorMessage = implode(', ', $filter);
         \PHPUnit_Framework_Assert::assertTrue(
-            $orderIndex->getSalesOrderGrid()->isRowVisible($filter),
+            $orderIndex->getSalesOrderGrid()->isRowVisible(array_filter($filter)),
             'Order with following data \'' . $errorMessage . '\' is absent in Orders grid.'
         );
     }
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Shipping/Test/Repository/ConfigData.xml
index bc7b74da9b8a6..a4951bbe6e3fb 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Repository/ConfigData.xml
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Repository/ConfigData.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0"?>
 <!--
 /**
  * Copyright © 2015 Magento. All rights reserved.
@@ -8,20 +8,108 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd">
     <repository class="Magento\Config\Test\Repository\ConfigData">
         <dataset name="shipping_origin_US_CA">
-            <field path="shipping/origin/country_id" scope="shipping" scope_id="1" label="United States" xsi:type="string">US</field>
-            <field path="shipping/origin/region_id" scope="shipping" scope_id="1" label="California" xsi:type="string">12</field>
-            <field path="shipping/origin/postcode" scope="shipping" scope_id="1" label="" xsi:type="string">90232</field>
-            <field path="shipping/origin/city" scope="shipping" scope_id="1" label="" xsi:type="string">Culver City</field>
-            <field path="shipping/origin/street_line1" scope="shipping" scope_id="1" label="" xsi:type="string">10441 Jefferson Blvd</field>
-            <field path="shipping/origin/street_line2" scope="shipping" scope_id="1" label="" xsi:type="string">Suite 200</field>
+            <field name="shipping/origin/country_id" xsi:type="array">
+                <item name="scope" xsi:type="string">shipping</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">United States</item>
+                <item name="value" xsi:type="string">US</item>
+            </field>
+            <field name="shipping/origin/region_id" xsi:type="array">
+                <item name="scope" xsi:type="string">shipping</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">California</item>
+                <item name="value" xsi:type="number">12</item>
+            </field>
+            <field name="shipping/origin/postcode" xsi:type="array">
+                <item name="scope" xsi:type="string">shipping</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="number">90232</item>
+            </field>
+            <field name="shipping/origin/city" xsi:type="array">
+                <item name="scope" xsi:type="string">shipping</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="string">Culver City</item>
+            </field>
+            <field name="shipping/origin/street_line1" xsi:type="array">
+                <item name="scope" xsi:type="string">shipping</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="string">10441 Jefferson Blvd</item>
+            </field>
+            <field name="shipping/origin/street_line2" xsi:type="array">
+                <item name="scope" xsi:type="string">shipping</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="string">Suite 200</item>
+            </field>
         </dataset>
 
         <dataset name="shipping_origin_US_LA">
-            <field path="shipping/origin/country_id" scope="carriers" scope_id="1" label="United States" xsi:type="string">US</field>
-            <field path="shipping/origin/region_id" scope="shipping" scope_id="1" label="California" xsi:type="string">12</field>
-            <field path="shipping/origin/postcode" scope="shipping" scope_id="1" label="" xsi:type="string">90024</field>
-            <field path="shipping/origin/city" scope="shipping" scope_id="1" label="" xsi:type="string">Los Angeles</field>
-            <field path="shipping/origin/street_line1" scope="shipping" scope_id="1" label="" xsi:type="string">1419 Westwood Blvd</field>
+            <field name="shipping/origin/country_id" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">United States</item>
+                <item name="value" xsi:type="string">US</item>
+            </field>
+            <field name="shipping/origin/region_id" xsi:type="array">
+                <item name="scope" xsi:type="string">shipping</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">California</item>
+                <item name="value" xsi:type="number">12</item>
+            </field>
+            <field name="shipping/origin/postcode" xsi:type="array">
+                <item name="scope" xsi:type="string">shipping</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="number">90024</item>
+            </field>
+            <field name="shipping/origin/city" xsi:type="array">
+                <item name="scope" xsi:type="string">shipping</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="string">Los Angeles</item>
+            </field>
+            <field name="shipping/origin/street_line1" xsi:type="array">
+                <item name="scope" xsi:type="string">shipping</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="string">1419 Westwood Blvd</item>
+            </field>
+        </dataset>
+
+        <dataset name="shipping_origin_CH">
+            <field name="shipping/origin/country_id" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">United Kingdom</item>
+                <item name="value" xsi:type="string">CH</item>
+            </field>
+            <field name="shipping/origin/region_id" xsi:type="array">
+                <item name="scope" xsi:type="string">shipping</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Bern</item>
+                <item name="value" xsi:type="number">107</item>
+            </field>
+            <field name="shipping/origin/postcode" xsi:type="array">
+                <item name="scope" xsi:type="string">shipping</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="number">3005</item>
+            </field>
+            <field name="shipping/origin/city" xsi:type="array">
+                <item name="scope" xsi:type="string">shipping</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="string">Bern</item>
+            </field>
+            <field name="shipping/origin/street_line1" xsi:type="array">
+                <item name="scope" xsi:type="string">shipping</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="string">Weinbergstrasse 4</item>
+            </field>
         </dataset>
     </repository>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/ConfigData.xml
index 80d59a361d73a..62f7c6f168f63 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/ConfigData.xml
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/ConfigData.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0"?>
 <!--
 /**
  * Copyright © 2015 Magento. All rights reserved.
@@ -8,168 +8,738 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd">
     <repository class="Magento\Config\Test\Repository\ConfigData">
         <dataset name="shipping_tax_class_taxable_goods">
-            <field path="tax/classes/shipping_tax_class" scope="tax" scope_id="1" label="Taxable Goods" xsi:type="string">2</field>
+            <field name="tax/classes/shipping_tax_class" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Taxable Goods</item>
+                <item name="value" xsi:type="number">2</item>
+            </field>
         </dataset>
 
         <dataset name="shipping_tax_class_taxable_goods_rollback">
-            <field path="tax/classes/shipping_tax_class" scope="tax" scope_id="1" label="None" xsi:type="string">0</field>
+            <field name="tax/classes/shipping_tax_class" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">None</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
         </dataset>
 
         <dataset name="default_tax_configuration">
-            <field path="tax/classes/shipping_tax_class" scope="tax" scope_id="1" label="None" xsi:type="string">0</field>
-            <field path="tax/calculation/algorithm" scope="tax" scope_id="1" label="Total" xsi:type="string">TOTAL_BASE_CALCULATION</field>
-            <field path="tax/calculation/price_includes_tax" scope="tax" scope_id="1" label="Excluding Tax" xsi:type="string">0</field>
-            <field path="tax/calculation/shipping_includes_tax" scope="tax" scope_id="1" label="Excluding Tax" xsi:type="string">0</field>
-            <field path="tax/calculation/apply_after_discount" scope="tax" scope_id="1" label="Before Discount" xsi:type="string">0</field>
-            <field path="tax/calculation/discount_tax" scope="tax" scope_id="1" label="Excluding Tax" xsi:type="string">0</field>
-            <field path="tax/calculation/cross_border_trade_enabled" scope="tax" scope_id="1" label="No" xsi:type="string">0</field>
-            <field path="tax/display/type" scope="tax" scope_id="1" label="Excluding Tax" xsi:type="string">1</field>
-            <field path="tax/display/shipping" scope="tax" scope_id="1" label="Excluding Tax" xsi:type="string">1</field>
-            <field path="tax/cart_display/price" scope="tax" scope_id="1" label="Excluding Tax" xsi:type="string">1</field>
-            <field path="tax/cart_display/subtotal" scope="tax" scope_id="1" label="Excluding Tax" xsi:type="string">1</field>
-            <field path="tax/cart_display/shipping" scope="tax" scope_id="1" label="Excluding Tax" xsi:type="string">1</field>
-            <field path="tax/cart_display/grandtotal" scope="tax" scope_id="1" label="No" xsi:type="string">0</field>
-            <field path="tax/cart_display/full_summary" scope="tax" scope_id="1" label="No" xsi:type="string">0</field>
-            <field path="tax/sales_display/price" scope="tax" scope_id="1" label="Excluding Tax" xsi:type="string">1</field>
-            <field path="tax/sales_display/subtotal" scope="tax" scope_id="1" label="Excluding Tax" xsi:type="string">1</field>
-            <field path="tax/sales_display/shipping" scope="tax" scope_id="1" label="Excluding Tax" xsi:type="string">1</field>
-            <field path="tax/sales_display/grandtotal" scope="tax" scope_id="1" label="No" xsi:type="string">0</field>
+            <field name="tax/classes/shipping_tax_class" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">None</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/calculation/algorithm" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Total</item>
+                <item name="value" xsi:type="string">TOTAL_BASE_CALCULATION</item>
+            </field>
+            <field name="tax/calculation/price_includes_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding Tax</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/calculation/shipping_includes_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding Tax</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/calculation/apply_after_discount" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Before Discount</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/calculation/discount_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding Tax</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/calculation/cross_border_trade_enabled" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/display/type" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding Tax</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/display/shipping" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding Tax</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/cart_display/price" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding Tax</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/cart_display/subtotal" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding Tax</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/cart_display/shipping" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding Tax</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/cart_display/grandtotal" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/cart_display/full_summary" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/sales_display/price" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding Tax</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/sales_display/subtotal" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding Tax</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/sales_display/shipping" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding Tax</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/sales_display/grandtotal" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
         </dataset>
 
         <dataset name="display_including_tax">
-            <field path="tax/display/type" scope="tax" scope_id="1" label="Including Tax" xsi:type="string">2</field>
-            <field path="tax/display/shipping" scope="tax" scope_id="1" label="Including Tax" xsi:type="string">2</field>
-            <field path="tax/cart_display/price" scope="tax" scope_id="1" label="Including Tax" xsi:type="string">2</field>
-            <field path="tax/cart_display/subtotal" scope="tax" scope_id="1" label="Including Tax" xsi:type="string">2</field>
-            <field path="tax/cart_display/shipping" scope="tax" scope_id="1" label="Including Tax" xsi:type="string">2</field>
-            <field path="tax/cart_display/grandtotal" scope="tax" scope_id="1" label="Yes" xsi:type="string">1</field>
-            <field path="tax/cart_display/full_summary" scope="tax" scope_id="1" label="No" xsi:type="string">0</field>
-            <field path="tax/sales_display/price" scope="tax" scope_id="1" label="Including Tax" xsi:type="string">2</field>
-            <field path="tax/sales_display/subtotal" scope="tax" scope_id="1" label="Including Tax" xsi:type="string">2</field>
-            <field path="tax/sales_display/shipping" scope="tax" scope_id="1" label="Including Tax" xsi:type="string">2</field>
-            <field path="tax/sales_display/grandtotal" scope="tax" scope_id="1" label="Yes" xsi:type="string">1</field>
+            <field name="tax/display/type" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including Tax</item>
+                <item name="value" xsi:type="number">2</item>
+            </field>
+            <field name="tax/display/shipping" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including Tax</item>
+                <item name="value" xsi:type="number">2</item>
+            </field>
+            <field name="tax/cart_display/price" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including Tax</item>
+                <item name="value" xsi:type="number">2</item>
+            </field>
+            <field name="tax/cart_display/subtotal" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including Tax</item>
+                <item name="value" xsi:type="number">2</item>
+            </field>
+            <field name="tax/cart_display/shipping" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including Tax</item>
+                <item name="value" xsi:type="number">2</item>
+            </field>
+            <field name="tax/cart_display/grandtotal" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/cart_display/full_summary" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/sales_display/price" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including Tax</item>
+                <item name="value" xsi:type="number">2</item>
+            </field>
+            <field name="tax/sales_display/subtotal" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including Tax</item>
+                <item name="value" xsi:type="number">2</item>
+            </field>
+            <field name="tax/sales_display/shipping" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including Tax</item>
+                <item name="value" xsi:type="number">2</item>
+            </field>
+            <field name="tax/sales_display/grandtotal" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
         </dataset>
 
         <dataset name="display_excluding_including_tax">
-            <field path="tax/display/type" scope="tax" scope_id="1" label="Including and Excluding Tax" xsi:type="string">3</field>
-            <field path="tax/display/shipping" scope="tax" scope_id="1" label="Including and Excluding Tax" xsi:type="string">3</field>
-            <field path="tax/cart_display/price" scope="tax" scope_id="1" label="Including and Excluding Tax" xsi:type="string">3</field>
-            <field path="tax/cart_display/subtotal" scope="tax" scope_id="1" label="Including and Excluding Tax" xsi:type="string">3</field>
-            <field path="tax/cart_display/shipping" scope="tax" scope_id="1" label="Including and Excluding Tax" xsi:type="string">3</field>
-            <field path="tax/cart_display/grandtotal" scope="tax" scope_id="1" label="Yes" xsi:type="string">1</field>
-            <field path="tax/cart_display/full_summary" scope="tax" scope_id="1" label="No" xsi:type="string">0</field>
-            <field path="tax/sales_display/price" scope="tax" scope_id="1" label="Including and Excluding Tax" xsi:type="string">3</field>
-            <field path="tax/sales_display/subtotal" scope="tax" scope_id="1" label="Including and Excluding Tax" xsi:type="string">3</field>
-            <field path="tax/sales_display/shipping" scope="tax" scope_id="1" label="Including and Excluding Tax" xsi:type="string">3</field>
-            <field path="tax/sales_display/grandtotal" scope="tax" scope_id="1" label="Yes" xsi:type="string">1</field>
+            <field name="tax/display/type" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including and Excluding Tax</item>
+                <item name="value" xsi:type="number">3</item>
+            </field>
+            <field name="tax/display/shipping" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including and Excluding Tax</item>
+                <item name="value" xsi:type="number">3</item>
+            </field>
+            <field name="tax/cart_display/price" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including and Excluding Tax</item>
+                <item name="value" xsi:type="number">3</item>
+            </field>
+            <field name="tax/cart_display/subtotal" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including and Excluding Tax</item>
+                <item name="value" xsi:type="number">3</item>
+            </field>
+            <field name="tax/cart_display/shipping" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including and Excluding Tax</item>
+                <item name="value" xsi:type="number">3</item>
+            </field>
+            <field name="tax/cart_display/grandtotal" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/cart_display/full_summary" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/sales_display/price" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including and Excluding Tax</item>
+                <item name="value" xsi:type="number">3</item>
+            </field>
+            <field name="tax/sales_display/subtotal" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including and Excluding Tax</item>
+                <item name="value" xsi:type="number">3</item>
+            </field>
+            <field name="tax/sales_display/shipping" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including and Excluding Tax</item>
+                <item name="value" xsi:type="number">3</item>
+            </field>
+            <field name="tax/sales_display/grandtotal" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
         </dataset>
 
         <dataset name="row_cat_incl_ship_excl_after_disc_on_excl">
-            <field path="tax/calculation/algorithm" scope="tax" scope_id="1" label="Row Total" xsi:type="string">ROW_BASE_CALCULATION</field>
-            <field path="tax/calculation/price_includes_tax" scope="tax" scope_id="1" label="Including Tax" xsi:type="string">1</field>
-            <field path="tax/calculation/shipping_includes_tax" scope="tax" scope_id="1" label="Excluding Tax" xsi:type="string">0</field>
-            <field path="tax/calculation/apply_after_discount" scope="tax" scope_id="1" label="After Discount" xsi:type="string">1</field>
-            <field path="tax/calculation/discount_tax" scope="tax" scope_id="1" label="Excluding Tax" xsi:type="string">0</field>
-            <field path="tax/calculation/cross_border_trade_enabled" scope="tax" scope_id="1" label="No" xsi:type="string">0</field>
+            <field name="tax/calculation/algorithm" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Row Total</item>
+                <item name="value" xsi:type="string">ROW_BASE_CALCULATION</item>
+            </field>
+            <field name="tax/calculation/price_includes_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including Tax</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/calculation/shipping_includes_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding Tax</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/calculation/apply_after_discount" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">After Discount</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/calculation/discount_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding Tax</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/calculation/cross_border_trade_enabled" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
         </dataset>
 
         <dataset name="row_cat_excl_ship_incl_before_disc_on_incl">
-            <field path="tax/calculation/algorithm" scope="tax" scope_id="1" label="Row Total" xsi:type="string">ROW_BASE_CALCULATION</field>
-            <field path="tax/calculation/price_includes_tax" scope="tax" scope_id="1" label="Excluding Tax" xsi:type="string">0</field>
-            <field path="tax/calculation/shipping_includes_tax" scope="tax" scope_id="1" label="Including Tax" xsi:type="string">1</field>
-            <field path="tax/calculation/apply_after_discount" scope="tax" scope_id="1" label="Before Discount" xsi:type="string">0</field>
-            <field path="tax/calculation/discount_tax" scope="tax" scope_id="1" label="Including Tax" xsi:type="string">1</field>
-            <field path="tax/calculation/cross_border_trade_enabled" scope="tax" scope_id="1" label="No" xsi:type="string">0</field>
+            <field name="tax/calculation/algorithm" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Row Total</item>
+                <item name="value" xsi:type="string">ROW_BASE_CALCULATION</item>
+            </field>
+            <field name="tax/calculation/price_includes_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding Tax</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/calculation/shipping_includes_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including Tax</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/calculation/apply_after_discount" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Before Discount</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/calculation/discount_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including Tax</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/calculation/cross_border_trade_enabled" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
         </dataset>
 
         <dataset name="total_cat_excl_ship_incl_after_disc_on_excl">
-            <field path="tax/calculation/algorithm" scope="tax" scope_id="1" label="Total" xsi:type="string">TOTAL_BASE_CALCULATION</field>
-            <field path="tax/calculation/price_includes_tax" scope="tax" scope_id="1" label="Excluding Tax" xsi:type="string">0</field>
-            <field path="tax/calculation/shipping_includes_tax" scope="tax" scope_id="1" label="Including Tax" xsi:type="string">1</field>
-            <field path="tax/calculation/apply_after_discount" scope="tax" scope_id="1" label="After Discount" xsi:type="string">1</field>
-            <field path="tax/calculation/discount_tax" scope="tax" scope_id="1" label="Excluding Tax" xsi:type="string">0</field>
-            <field path="tax/calculation/cross_border_trade_enabled" scope="tax" scope_id="1" label="No" xsi:type="string">0</field>
+            <field name="tax/calculation/algorithm" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Total</item>
+                <item name="value" xsi:type="string">TOTAL_BASE_CALCULATION</item>
+            </field>
+            <field name="tax/calculation/price_includes_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding Tax</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/calculation/shipping_includes_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including Tax</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/calculation/apply_after_discount" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">After Discount</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/calculation/discount_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding Tax</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/calculation/cross_border_trade_enabled" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
         </dataset>
 
         <dataset name="row_cat_incl_ship_excl_before_disc_on_incl">
-            <field path="tax/calculation/algorithm" scope="tax" scope_id="1" label="Row Total" xsi:type="string">ROW_BASE_CALCULATION</field>
-            <field path="tax/calculation/price_includes_tax" scope="tax" scope_id="1" label="Including Tax" xsi:type="string">1</field>
-            <field path="tax/calculation/shipping_includes_tax" scope="tax" scope_id="1" label="Excluding Tax" xsi:type="string">0</field>
-            <field path="tax/calculation/apply_after_discount" scope="tax" scope_id="1" label="Before Discount" xsi:type="string">0</field>
-            <field path="tax/calculation/discount_tax" scope="tax" scope_id="1" label="Including Tax" xsi:type="string">1</field>
-            <field path="tax/calculation/cross_border_trade_enabled" scope="tax" scope_id="1" label="No" xsi:type="string">0</field>
+            <field name="tax/calculation/algorithm" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Row Total</item>
+                <item name="value" xsi:type="string">ROW_BASE_CALCULATION</item>
+            </field>
+            <field name="tax/calculation/price_includes_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including Tax</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/calculation/shipping_includes_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding Tax</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/calculation/apply_after_discount" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Before Discount</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/calculation/discount_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including Tax</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/calculation/cross_border_trade_enabled" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
         </dataset>
 
         <dataset name="unit_cat_incl_ship_incl_before_disc_on_incl">
-            <field path="tax/calculation/algorithm" scope="tax" scope_id="1" label="" xsi:type="string">UNIT_BASE_CALCULATION</field>
-            <field path="tax/calculation/price_includes_tax" scope="tax" scope_id="1" label="Including Tax" xsi:type="string">1</field>
-            <field path="tax/calculation/shipping_includes_tax" scope="tax" scope_id="1" label="Excluding Tax" xsi:type="string">0</field>
-            <field path="tax/calculation/apply_after_discount" scope="tax" scope_id="1" label="After Discount" xsi:type="string">1</field>
-            <field path="tax/calculation/discount_tax" scope="tax" scope_id="1" label="Including Tax" xsi:type="string">1</field>
-            <field path="tax/calculation/cross_border_trade_enabled" scope="tax" scope_id="1" label="No" xsi:type="string">0</field>
+            <field name="tax/calculation/algorithm" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="string">UNIT_BASE_CALCULATION</item>
+            </field>
+            <field name="tax/calculation/price_includes_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including Tax</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/calculation/shipping_includes_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding Tax</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/calculation/apply_after_discount" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">After Discount</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/calculation/discount_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including Tax</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/calculation/cross_border_trade_enabled" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
         </dataset>
 
         <dataset name="total_cat_excl_ship_incl_before_disc_on_incl">
-            <field path="tax/calculation/algorithm" scope="tax" scope_id="1" label="Total" xsi:type="string">TOTAL_BASE_CALCULATION</field>
-            <field path="tax/calculation/price_includes_tax" scope="tax" scope_id="1" label="Excluding Tax" xsi:type="string">0</field>
-            <field path="tax/calculation/shipping_includes_tax" scope="tax" scope_id="1" label="Including Tax" xsi:type="string">1</field>
-            <field path="tax/calculation/apply_after_discount" scope="tax" scope_id="1" label="Before Discount" xsi:type="string">0</field>
-            <field path="tax/calculation/discount_tax" scope="tax" scope_id="1" label="Including Tax" xsi:type="string">1</field>
-            <field path="tax/calculation/cross_border_trade_enabled" scope="tax" scope_id="1" label="No" xsi:type="string">0</field>
+            <field name="tax/calculation/algorithm" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Total</item>
+                <item name="value" xsi:type="string">TOTAL_BASE_CALCULATION</item>
+            </field>
+            <field name="tax/calculation/price_includes_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding Tax</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/calculation/shipping_includes_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including Tax</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/calculation/apply_after_discount" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Before Discount</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/calculation/discount_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including Tax</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/calculation/cross_border_trade_enabled" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
         </dataset>
 
         <dataset name="unit_cat_excl_ship_excl_after_disc_on_excl">
-            <field path="tax/calculation/algorithm" scope="tax" scope_id="1" label="Unit Price" xsi:type="string">UNIT_BASE_CALCULATION</field>
-            <field path="tax/calculation/price_includes_tax" scope="tax" scope_id="1" label="Excluding Tax" xsi:type="string">0</field>
-            <field path="tax/calculation/shipping_includes_tax" scope="tax" scope_id="1" label="Excluding Tax" xsi:type="string">0</field>
-            <field path="tax/calculation/apply_after_discount" scope="tax" scope_id="1" label="After Discount" xsi:type="string">1</field>
-            <field path="tax/calculation/discount_tax" scope="tax" scope_id="1" label="Excluding Tax" xsi:type="string">0</field>
-            <field path="tax/calculation/cross_border_trade_enabled" scope="tax" scope_id="1" label="No" xsi:type="string">0</field>
+            <field name="tax/calculation/algorithm" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Unit Price</item>
+                <item name="value" xsi:type="string">UNIT_BASE_CALCULATION</item>
+            </field>
+            <field name="tax/calculation/price_includes_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding Tax</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/calculation/shipping_includes_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding Tax</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/calculation/apply_after_discount" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">After Discount</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/calculation/discount_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding Tax</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/calculation/cross_border_trade_enabled" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
         </dataset>
 
         <dataset name="total_cat_incl_ship_excl_before_disc_on_excl">
-            <field path="tax/calculation/algorithm" scope="tax" scope_id="1" label="Total" xsi:type="string">TOTAL_BASE_CALCULATION</field>
-            <field path="tax/calculation/price_includes_tax" scope="tax" scope_id="1" label="Including Tax" xsi:type="string">1</field>
-            <field path="tax/calculation/shipping_includes_tax" scope="tax" scope_id="1" label="Excluding Tax" xsi:type="string">0</field>
-            <field path="tax/calculation/apply_after_discount" scope="tax" scope_id="1" label="Before Discount" xsi:type="string">0</field>
-            <field path="tax/calculation/discount_tax" scope="tax" scope_id="1" label="Excluding Tax" xsi:type="string">0</field>
-            <field path="tax/calculation/cross_border_trade_enabled" scope="tax" scope_id="1" label="No" xsi:type="string">0</field>
+            <field name="tax/calculation/algorithm" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Total</item>
+                <item name="value" xsi:type="string">TOTAL_BASE_CALCULATION</item>
+            </field>
+            <field name="tax/calculation/price_includes_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including Tax</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/calculation/shipping_includes_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding Tax</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/calculation/apply_after_discount" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Before Discount</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/calculation/discount_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding Tax</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/calculation/cross_border_trade_enabled" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
         </dataset>
 
         <dataset name="total_cat_excl_ship_incl_after_disc_on_incl">
-            <field path="tax/calculation/algorithm" scope="tax" scope_id="1" label="Total" xsi:type="string">TOTAL_BASE_CALCULATION</field>
-            <field path="tax/calculation/price_includes_tax" scope="tax" scope_id="1" label="Excluding Tax" xsi:type="string">0</field>
-            <field path="tax/calculation/shipping_includes_tax" scope="tax" scope_id="1" label="Including Tax" xsi:type="string">1</field>
-            <field path="tax/calculation/apply_after_discount" scope="tax" scope_id="1" label="After Discount" xsi:type="string">1</field>
-            <field path="tax/calculation/discount_tax" scope="tax" scope_id="1" label="Including Tax" xsi:type="string">1</field>
-            <field path="tax/calculation/cross_border_trade_enabled" scope="tax" scope_id="1" label="No" xsi:type="string">0</field>
+            <field name="tax/calculation/algorithm" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Total</item>
+                <item name="value" xsi:type="string">TOTAL_BASE_CALCULATION</item>
+            </field>
+            <field name="tax/calculation/price_includes_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding Tax</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/calculation/shipping_includes_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including Tax</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/calculation/apply_after_discount" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">After Discount</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/calculation/discount_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including Tax</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/calculation/cross_border_trade_enabled" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
         </dataset>
 
         <dataset name="unit_cat_excl_ship_incl_after_disc_on_excl">
-            <field path="tax/calculation/algorithm" scope="tax" scope_id="1" label="Unit Price" xsi:type="string">UNIT_BASE_CALCULATION</field>
-            <field path="tax/calculation/price_includes_tax" scope="tax" scope_id="1" label="Excluding Tax" xsi:type="string">0</field>
-            <field path="tax/calculation/shipping_includes_tax" scope="tax" scope_id="1" label="Including Tax" xsi:type="string">1</field>
-            <field path="tax/calculation/apply_after_discount" scope="tax" scope_id="1" label="After Discount" xsi:type="string">1</field>
-            <field path="tax/calculation/discount_tax" scope="tax" scope_id="1" label="Excluding Tax" xsi:type="string">0</field>
-            <field path="tax/calculation/cross_border_trade_enabled" scope="tax" scope_id="1" label="No" xsi:type="string">0</field>
+            <field name="tax/calculation/algorithm" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Unit Price</item>
+                <item name="value" xsi:type="string">UNIT_BASE_CALCULATION</item>
+            </field>
+            <field name="tax/calculation/price_includes_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding Tax</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/calculation/shipping_includes_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including Tax</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/calculation/apply_after_discount" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">After Discount</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/calculation/discount_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding Tax</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/calculation/cross_border_trade_enabled" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
         </dataset>
 
         <dataset name="cross_border_enabled_price_incl_tax">
-            <field path="tax/calculation/algorithm" scope="tax" scope_id="1" label="Total" xsi:type="string">TOTAL_BASE_CALCULATION</field>
-            <field path="tax/calculation/price_includes_tax" scope="tax" scope_id="1" label="Including Tax" xsi:type="string">1</field>
-            <field path="tax/calculation/shipping_includes_tax" scope="tax" scope_id="1" label="Including Tax" xsi:type="string">1</field>
-            <field path="tax/calculation/apply_after_discount" scope="tax" scope_id="1" label="" xsi:type="string">0</field>
-            <field path="tax/calculation/discount_tax" scope="tax" scope_id="1" label="Including Tax" xsi:type="string">1</field>
-            <field path="tax/calculation/cross_border_trade_enabled" scope="tax" scope_id="1" label="Yes" xsi:type="string">1</field>
+            <field name="tax/calculation/algorithm" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Total</item>
+                <item name="value" xsi:type="string">TOTAL_BASE_CALCULATION</item>
+            </field>
+            <field name="tax/calculation/price_includes_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including Tax</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/calculation/shipping_includes_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including Tax</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/calculation/apply_after_discount" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/calculation/discount_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including Tax</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/calculation/cross_border_trade_enabled" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
         </dataset>
 
         <dataset name="cross_border_enabled_price_excl_tax">
-            <field path="tax/calculation/algorithm" scope="tax" scope_id="1" label="Total" xsi:type="string">TOTAL_BASE_CALCULATION</field>
-            <field path="tax/calculation/price_includes_tax" scope="tax" scope_id="1" label="Excluding Tax" xsi:type="string">0</field>
-            <field path="tax/calculation/shipping_includes_tax" scope="tax" scope_id="1" label="Excluding Tax" xsi:type="string">0</field>
-            <field path="tax/calculation/apply_after_discount" scope="tax" scope_id="1" label="" xsi:type="string">0</field>
-            <field path="tax/calculation/discount_tax" scope="tax" scope_id="1" label="Excluding Tax" xsi:type="string">0</field>
-            <field path="tax/calculation/cross_border_trade_enabled" scope="tax" scope_id="1" label="Yes" xsi:type="string">1</field>
+            <field name="tax/calculation/algorithm" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Total</item>
+                <item name="value" xsi:type="string">TOTAL_BASE_CALCULATION</item>
+            </field>
+            <field name="tax/calculation/price_includes_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding Tax</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/calculation/shipping_includes_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding Tax</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/calculation/apply_after_discount" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/calculation/discount_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding Tax</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/calculation/cross_border_trade_enabled" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
         </dataset>
     </repository>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Ups/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Ups/Test/Repository/ConfigData.xml
index 3d29ba87a2ae0..5351224a4f52e 100644
--- a/dev/tests/functional/tests/app/Magento/Ups/Test/Repository/ConfigData.xml
+++ b/dev/tests/functional/tests/app/Magento/Ups/Test/Repository/ConfigData.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0"?>
 <!--
 /**
  * Copyright © 2015 Magento. All rights reserved.
@@ -8,42 +8,155 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd">
     <repository class="Magento\Config\Test\Repository\ConfigData">
         <dataset name="disable_shipping_all">
-            <field path="carriers/ups/active" scope="carriers" scope_id="1" label="No" xsi:type="string">0</field>
+            <field name="carriers/ups/active" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
         </dataset>
 
         <dataset name="ups">
-            <field path="carriers/ups/active" scope="carriers" scope_id="1" label="Yes" xsi:type="string">1</field>
-            <field path="carriers/ups/active_rma" scope="carriers" scope_id="1" label="Yes" xsi:type="string">1</field>
-            <field path="carriers/ups/type" scope="carriers" scope_id="1" label="United Parcel Service XML" xsi:type="string">UPS_XML</field>
-            <field path="carriers/ups/is_account_live" scope="carriers" scope_id="1" label="No" xsi:type="string">0</field>
-            <field path="carriers/ups/password" scope="carriers" scope_id="1" label="" xsi:type="string">CARRIERS_UPS_PASSWORD</field>
-            <field path="carriers/ups/username" scope="carriers" scope_id="1" label="" xsi:type="string">CARRIERS_UPS_USERNAME</field>
-            <field path="carriers/ups/mode_xml" scope="carriers" scope_id="1" label="Development" xsi:type="string">0</field>
-            <field path="carriers/ups/gateway_url" scope="carriers" scope_id="1" label="" xsi:type="string">https://wwwcie.ups.com/ups.app/xml/Rate</field>
-            <field path="carriers/ups/origin_shipment" scope="carriers" scope_id="1" label="" xsi:type="string">Shipments Originating in United States</field>
-            <field path="carriers/ups/access_license_number" scope="carriers" scope_id="1" label="" xsi:type="string">CARRIERS_UPS_ACCESS_LICENSE_NUMBER</field>
-            <field path="carriers/ups/negotiated_active" scope="carriers" scope_id="1" label="No" xsi:type="string">0</field>
-            <field path="carriers/ups/shipper_number" scope="carriers" scope_id="1" label="" xsi:type="string">CARRIERS_UPS_SHIPPER_NUMBER</field>
-            <field path="carriers/ups/container" scope="carriers" scope_id="1" label="Customer Packaging" xsi:type="string">CP</field>
-            <field path="carriers/ups/dest_type" scope="carriers" scope_id="1" label="Residential" xsi:type="string">RES</field>
-            <field path="carriers/ups/tracking_xml_url" scope="carriers" scope_id="1" label="" xsi:type="string">https://wwwcie.ups.com/ups.app/xml/Track</field>
-            <field path="carriers/ups/unit_of_measure" scope="carriers" scope_id="1" label="LBS" xsi:type="string">LBS</field>
-            <field path="carriers/ups/allowed_methods" scope="carriers" scope_id="1" xsi:type="array">
-                <item name="UPS Standard" xsi:type="string">11</item>
-                <item name="UPS Three-Day Select" xsi:type="string">12</item>
-                <item name="UPS Next Day Air Early A.M." xsi:type="string">14</item>
-                <item name="UPS Worldwide Express Plus" xsi:type="string">54</item>
-                <item name="UPS Second Day Air A.M." xsi:type="string">59</item>
-                <item name="UPS Worldwide Saver" xsi:type="string">65</item>
-                <item name="UPS Next Day Air" xsi:type="string">01</item>
-                <item name="UPS Second Day Air" xsi:type="string">02</item>
-                <item name="UPS Ground" xsi:type="string">03</item>
-                <item name="UPS Worldwide Express" xsi:type="string">07</item>
-                <item name="UPS Worldwide Expedited" xsi:type="string">08</item>
-            </field>
-            <field path="carriers/ups/sallowspecific" scope="carriers" scope_id="1" label="All Allowed Countries" xsi:type="string">0</field>
-            <field path="carriers/ups/showmethod" scope="carriers" scope_id="1" label="No" xsi:type="string">0</field>
-            <field path="carriers/ups/debug" scope="carriers" scope_id="1" label="Yes" xsi:type="string">1</field>
+            <field name="carriers/ups/active" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="carriers/ups/active_rma" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="carriers/ups/type" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">United Parcel Service XML</item>
+                <item name="value" xsi:type="string">UPS_XML</item>
+            </field>
+            <field name="carriers/ups/is_account_live" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="carriers/ups/password" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="string">CARRIERS_UPS_PASSWORD</item>
+            </field>
+            <field name="carriers/ups/username" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="string">CARRIERS_UPS_USERNAME</item>
+            </field>
+            <field name="carriers/ups/mode_xml" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Development</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="carriers/ups/gateway_xml_url" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="string">https://wwwcie.ups.com/ups.app/xml/Rate</item>
+            </field>
+            <field name="carriers/ups/origin_shipment" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="string">Shipments Originating in United States</item>
+            </field>
+            <field name="carriers/ups/access_license_number" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="string">CARRIERS_UPS_ACCESS_LICENSE_NUMBER</item>
+            </field>
+            <field name="carriers/ups/negotiated_active" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="carriers/ups/shipper_number" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="string">CARRIERS_UPS_SHIPPER_NUMBER</item>
+            </field>
+            <field name="carriers/ups/container" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Customer Packaging</item>
+                <item name="value" xsi:type="string">CP</item>
+            </field>
+            <field name="carriers/ups/dest_type" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Residential</item>
+                <item name="value" xsi:type="string">RES</item>
+            </field>
+            <field name="carriers/ups/tracking_xml_url" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="string">https://wwwcie.ups.com/ups.app/xml/Track</item>
+            </field>
+            <field name="carriers/ups/unit_of_measure" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">LBS</item>
+                <item name="value" xsi:type="string">LBS</item>
+            </field>
+            <field name="carriers/ups/allowed_methods" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="value" xsi:type="array">
+                    <item name="UPS Standard" xsi:type="string">11</item>
+                    <item name="UPS Three-Day Select" xsi:type="string">12</item>
+                    <item name="UPS Next Day Air Early A.M." xsi:type="string">14</item>
+                    <item name="UPS Worldwide Express Plus" xsi:type="string">54</item>
+                    <item name="UPS Second Day Air A.M." xsi:type="string">59</item>
+                    <item name="UPS Worldwide Saver" xsi:type="string">65</item>
+                    <item name="UPS Next Day Air" xsi:type="string">01</item>
+                    <item name="UPS Second Day Air" xsi:type="string">02</item>
+                    <item name="UPS Ground" xsi:type="string">03</item>
+                    <item name="UPS Worldwide Express" xsi:type="string">07</item>
+                    <item name="UPS Worldwide Expedited" xsi:type="string">08</item>
+                </item>
+            </field>
+            <field name="carriers/ups/sallowspecific" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">All Allowed Countries</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="carriers/ups/showmethod" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="carriers/ups/debug" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+        </dataset>
+
+        <dataset name="ups_rollback">
+            <field name="carriers/ups/active" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
         </dataset>
     </repository>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Ups/Test/TestCase/OnePageCheckoutTest.xml b/dev/tests/functional/tests/app/Magento/Ups/Test/TestCase/OnePageCheckoutTest.xml
new file mode 100644
index 0000000000000..850c839e08fd3
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Ups/Test/TestCase/OnePageCheckoutTest.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
+    <testCase name="Magento\Checkout\Test\TestCase\OnePageCheckoutTest">
+        <variation name="OnePageCheckoutTestVariation24">
+            <data name="description" xsi:type="string">MAGETWO-12848 – Use UPS Online Shipping Carrier on Checkout as a Registered Customer</data>
+            <data name="products" xsi:type="string">catalogProductSimple::default, configurableProduct::default, bundleProduct::bundle_fixed_product</data>
+            <data name="checkoutMethod" xsi:type="string">login</data>
+            <data name="customer/dataSet" xsi:type="string">customer_US</data>
+            <data name="billingAddress/dataSet" xsi:type="string">customer_US</data>
+            <data name="shipping/shipping_service" xsi:type="string">United Parcel Service</data>
+            <data name="shipping/shipping_method" xsi:type="string">UPS Ground</data>
+            <data name="cart/data/shipping_method" xsi:type="string">UPS Ground</data>
+            <data name="payment/method" xsi:type="string">checkmo</data>
+            <data name="configData" xsi:type="string">checkmo, ups, shipping_origin_US_CA</data>
+            <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+            <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage"/>
+            <constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGrid"/>
+            <constraint name="Magento\Checkout\Test\Constraint\AssertCartIsEmpty"/>
+        </variation>
+        <variation name="OnePageCheckoutTestVariation25">
+            <data name="description" xsi:type="string">Checkout as guest using UPS with US shipping origin and UK customer</data>
+            <data name="products" xsi:type="string">catalogProductSimple::default, configurableProduct::default, bundleProduct::bundle_fixed_product</data>
+            <data name="checkoutMethod" xsi:type="string">guest</data>
+            <data name="customer/dataSet" xsi:type="string">customer_UK</data>
+            <data name="address/dataSet" xsi:type="string">customer_UK</data>
+            <data name="billingAddress/dataSet" xsi:type="string">customer_UK</data>
+            <data name="shipping/shipping_service" xsi:type="string">United Parcel Service</data>
+            <data name="shipping/shipping_method" xsi:type="string">UPS Worldwide Expedited</data>
+            <data name="cart/data/shipping_method" xsi:type="string">UPS Worldwide Expedited</data>
+            <data name="payment/method" xsi:type="string">checkmo</data>
+            <data name="configData" xsi:type="string">checkmo, ups, shipping_origin_US_CA</data>
+            <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage"/>
+            <constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGrid"/>
+            <constraint name="Magento\Checkout\Test\Constraint\AssertCartIsEmpty"/>
+        </variation>
+    </testCase>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Usps/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Usps/Test/Repository/ConfigData.xml
index 00deb1ffd6069..03dbba33fad4b 100644
--- a/dev/tests/functional/tests/app/Magento/Usps/Test/Repository/ConfigData.xml
+++ b/dev/tests/functional/tests/app/Magento/Usps/Test/Repository/ConfigData.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0"?>
 <!--
 /**
  * Copyright © 2015 Magento. All rights reserved.
@@ -8,15 +8,54 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd">
     <repository class="Magento\Config\Test\Repository\ConfigData">
         <dataset name="disable_shipping_all">
-            <field path="carriers/usps/active" scope="carriers" scope_id="1" label="No" xsi:type="string">0</field>
+            <field name="carriers/usps/active" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
         </dataset>
 
         <dataset name="usps">
-            <field path="carriers/usps/active" scope="carriers" scope_id="1" label="Yes" xsi:type="string">1</field>
-            <field path="carriers/usps/gateway_url" scope="carriers" scope_id="1" label="" xsi:type="string">http://production.shippingapis.com/ShippingAPI.dll</field>
-            <field path="carriers/usps/gateway_secure_url" scope="carriers" scope_id="1" label="" xsi:type="string">https://secure.shippingapis.com/ShippingAPI.dll</field>
-            <field path="carriers/usps/userid" scope="carriers" scope_id="1" label="" xsi:type="string">CARRIERS_USPS_USERID</field>
-            <field path="carriers/usps/password" scope="carriers" scope_id="1" label="" xsi:type="string">CARRIERS_USPS_PASSWORD</field>
+            <field name="carriers/usps/active" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="carriers/usps/gateway_url" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="string">http://production.shippingapis.com/ShippingAPI.dll</item>
+            </field>
+            <field name="carriers/usps/gateway_secure_url" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="string">https://secure.shippingapis.com/ShippingAPI.dll</item>
+            </field>
+            <field name="carriers/usps/userid" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="string">CARRIERS_USPS_USERID</item>
+            </field>
+            <field name="carriers/usps/password" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="string">CARRIERS_USPS_PASSWORD</item>
+            </field>
+        </dataset>
+
+        <dataset name="usps_rollback">
+            <field name="carriers/usps/active" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
         </dataset>
     </repository>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Usps/Test/TestCase/OnePageCheckoutTest.xml b/dev/tests/functional/tests/app/Magento/Usps/Test/TestCase/OnePageCheckoutTest.xml
new file mode 100644
index 0000000000000..db8db09e418ca
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Usps/Test/TestCase/OnePageCheckoutTest.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
+    <testCase name="Magento\Checkout\Test\TestCase\OnePageCheckoutTest">
+        <variation name="OnePageCheckoutTestVariation26">
+            <data name="description" xsi:type="string">MAGETWO-12444 – Use USPS Online Shipping Carrier on Checkout as a Registered Customer</data>
+            <data name="products" xsi:type="string">catalogProductSimple::default, configurableProduct::default, bundleProduct::bundle_fixed_product</data>
+            <data name="checkoutMethod" xsi:type="string">login</data>
+            <data name="customer/dataSet" xsi:type="string">customer_US</data>
+            <data name="billingAddress/dataSet" xsi:type="string">customer_US</data>
+            <data name="shipping/shipping_service" xsi:type="string">United States Postal Service</data>
+            <data name="shipping/shipping_method" xsi:type="string">Priority Mail 1-Day</data>
+            <data name="cart/data/shipping_method" xsi:type="string">Priority Mail 1-Day</data>
+            <data name="payment/method" xsi:type="string">checkmo</data>
+            <data name="configData" xsi:type="string">checkmo, usps, shipping_origin_US_CA</data>
+            <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+            <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage"/>
+            <constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGrid"/>
+            <constraint name="Magento\Checkout\Test\Constraint\AssertCartIsEmpty"/>
+        </variation>
+        <variation name="OnePageCheckoutTestVariation27">
+            <data name="description" xsi:type="string">Checkout as guest using USPS with US shipping origin and UK customer</data>
+            <data name="products" xsi:type="string">catalogProductSimple::default, configurableProduct::default, bundleProduct::bundle_fixed_product</data>
+            <data name="checkoutMethod" xsi:type="string">guest</data>
+            <data name="customer/dataSet" xsi:type="string">customer_UK</data>
+            <data name="address/dataSet" xsi:type="string">customer_UK</data>
+            <data name="billingAddress/dataSet" xsi:type="string">customer_UK</data>
+            <data name="shipping/shipping_service" xsi:type="string">United States Postal Service</data>
+            <data name="shipping/shipping_method" xsi:type="string">Priority Mail International</data>
+            <data name="cart/data/shipping_method" xsi:type="string">Priority Mail International</data>
+            <data name="payment/method" xsi:type="string">checkmo</data>
+            <data name="configData" xsi:type="string">checkmo, usps, shipping_origin_US_CA</data>
+            <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage"/>
+            <constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGrid"/>
+            <constraint name="Magento\Checkout\Test\Constraint\AssertCartIsEmpty"/>
+        </variation>
+    </testCase>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Weee/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Weee/Test/Repository/ConfigData.xml
index 754c0ceb95f07..c78a826e8500c 100644
--- a/dev/tests/functional/tests/app/Magento/Weee/Test/Repository/ConfigData.xml
+++ b/dev/tests/functional/tests/app/Magento/Weee/Test/Repository/ConfigData.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0"?>
 <!--
 /**
  * Copyright © 2015 Magento. All rights reserved.
@@ -8,132 +8,642 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd">
     <repository class="Magento\Config\Test\Repository\ConfigData">
         <dataset name="default_tax_configuration">
-            <field path="tax/weee/enable" scope="tax" scope_id="1" label="No" xsi:type="string">0</field>
-            <field path="tax/weee/display_list" scope="tax" scope_id="1" label="Including FPT and FPT description" xsi:type="string">1</field>
-            <field path="tax/weee/display" scope="tax" scope_id="1" label="Including FPT and FPT description" xsi:type="string">1</field>
-            <field path="tax/weee/display_sales" scope="tax" scope_id="1" label="Including FPT and FPT description" xsi:type="string">1</field>
-            <field path="tax/weee/apply_vat" scope="tax" scope_id="1" label="No" xsi:type="string">0</field>
-            <field path="tax/weee/include_in_subtotal" scope="tax" scope_id="1" label="No" xsi:type="string">0</field>
+            <field name="tax/weee/enable" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/weee/display_list" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including FPT and FPT description</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/weee/display" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including FPT and FPT description</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/weee/display_sales" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including FPT and FPT description</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/weee/apply_vat" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/weee/include_in_subtotal" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
         </dataset>
 
         <dataset name="tax_with_fpt_taxed_cat_excl_disc_on_excl">
-            <field path="tax/calculation/algorithm" scope="tax" scope_id="1" label="Total" xsi:type="string">TOTAL_BASE_CALCULATION</field>
-            <field path="tax/calculation/price_includes_tax" scope="tax" scope_id="1" label="Excluding Tax" xsi:type="string">0</field>
-            <field path="tax/calculation/shipping_includes_tax" scope="tax" scope_id="1" label="Excluding Tax" xsi:type="string">0</field>
-            <field path="tax/calculation/apply_after_discount" scope="tax" scope_id="1" label="After Discount" xsi:type="string">1</field>
-            <field path="tax/calculation/discount_tax" scope="tax" scope_id="1" label="Excluding Tax" xsi:type="string">0</field>
-            <field path="tax/calculation/cross_border_trade_enabled" scope="tax" scope_id="1" label="No" xsi:type="string">0</field>
-            <field path="tax/weee/enable" scope="tax" scope_id="1" label="Yes" xsi:type="string">1</field>
-            <field path="tax/weee/display_list" scope="tax" scope_id="1" label="Excluding FPT, FPT description, final price" xsi:type="string">2</field>
-            <field path="tax/weee/display" scope="tax" scope_id="1" label="Excluding FPT, FPT description, final price" xsi:type="string">2</field>
-            <field path="tax/weee/display_sales" scope="tax" scope_id="1" label="Excluding FPT, FPT description, final price" xsi:type="string">2</field>
-            <field path="tax/weee/apply_vat" scope="tax" scope_id="1" label="Yes" xsi:type="string">1</field>
-            <field path="tax/weee/include_in_subtotal" scope="tax" scope_id="1" label="Yes" xsi:type="string">1</field>
+            <field name="tax/calculation/algorithm" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Total</item>
+                <item name="value" xsi:type="string">TOTAL_BASE_CALCULATION</item>
+            </field>
+            <field name="tax/calculation/price_includes_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding Tax</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/calculation/shipping_includes_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding Tax</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/calculation/apply_after_discount" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">After Discount</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/calculation/discount_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding Tax</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/calculation/cross_border_trade_enabled" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/weee/enable" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/weee/display_list" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding FPT, FPT description, final price</item>
+                <item name="value" xsi:type="number">2</item>
+            </field>
+            <field name="tax/weee/display" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding FPT, FPT description, final price</item>
+                <item name="value" xsi:type="number">2</item>
+            </field>
+            <field name="tax/weee/display_sales" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding FPT, FPT description, final price</item>
+                <item name="value" xsi:type="number">2</item>
+            </field>
+            <field name="tax/weee/apply_vat" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/weee/include_in_subtotal" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
         </dataset>
 
         <dataset name="tax_with_fpt_taxed_cat_excl_disc_on_incl">
-            <field path="tax/calculation/algorithm" scope="tax" scope_id="1" label="Total" xsi:type="string">TOTAL_BASE_CALCULATION</field>
-            <field path="tax/calculation/price_includes_tax" scope="tax" scope_id="1" label="Excluding Tax" xsi:type="string">0</field>
-            <field path="tax/calculation/shipping_includes_tax" scope="tax" scope_id="1" label="Excluding Tax" xsi:type="string">0</field>
-            <field path="tax/calculation/apply_after_discount" scope="tax" scope_id="1" label="" xsi:type="string">0</field>
-            <field path="tax/calculation/discount_tax" scope="tax" scope_id="1" label="Including Tax" xsi:type="string">1</field>
-            <field path="tax/calculation/cross_border_trade_enabled" scope="tax" scope_id="1" label="No" xsi:type="string">0</field>
-            <field path="tax/weee/enable" scope="tax" scope_id="1" label="Yes" xsi:type="string">1</field>
-            <field path="tax/weee/display_list" scope="tax" scope_id="1" label="Including FPT and FPT description" xsi:type="string">1</field>
-            <field path="tax/weee/display" scope="tax" scope_id="1" label="Including FPT and FPT description" xsi:type="string">1</field>
-            <field path="tax/weee/display_sales" scope="tax" scope_id="1" label="Including FPT and FPT description" xsi:type="string">1</field>
-            <field path="tax/weee/apply_vat" scope="tax" scope_id="1" label="Yes" xsi:type="string">1</field>
-            <field path="tax/weee/include_in_subtotal" scope="tax" scope_id="1" label="Yes" xsi:type="string">1</field>
+            <field name="tax/calculation/algorithm" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Total</item>
+                <item name="value" xsi:type="string">TOTAL_BASE_CALCULATION</item>
+            </field>
+            <field name="tax/calculation/price_includes_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding Tax</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/calculation/shipping_includes_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding Tax</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/calculation/apply_after_discount" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/calculation/discount_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including Tax</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/calculation/cross_border_trade_enabled" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/weee/enable" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/weee/display_list" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including FPT and FPT description</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/weee/display" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including FPT and FPT description</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/weee/display_sales" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including FPT and FPT description</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/weee/apply_vat" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/weee/include_in_subtotal" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
         </dataset>
 
         <dataset name="tax_with_fpt_taxed_cat_incl_disc_on_excl">
-            <field path="tax/calculation/algorithm" scope="tax" scope_id="1" label="Total" xsi:type="string">TOTAL_BASE_CALCULATION</field>
-            <field path="tax/calculation/price_includes_tax" scope="tax" scope_id="1" label="Including Tax" xsi:type="string">1</field>
-            <field path="tax/calculation/shipping_includes_tax" scope="tax" scope_id="1" label="Including Tax" xsi:type="string">1</field>
-            <field path="tax/calculation/apply_after_discount" scope="tax" scope_id="1" label="After Discount" xsi:type="string">1</field>
-            <field path="tax/calculation/discount_tax" scope="tax" scope_id="1" label="Excluding Tax" xsi:type="string">0</field>
-            <field path="tax/calculation/cross_border_trade_enabled" scope="tax" scope_id="1" label="No" xsi:type="string">0</field>
-            <field path="tax/weee/enable" scope="tax" scope_id="1" label="Yes" xsi:type="string">1</field>
-            <field path="tax/weee/display_list" scope="tax" scope_id="1" label="Excluding FPT, FPT description, final price" xsi:type="string">2</field>
-            <field path="tax/weee/display" scope="tax" scope_id="1" label="Excluding FPT, FPT description, final price" xsi:type="string">2</field>
-            <field path="tax/weee/display_sales" scope="tax" scope_id="1" label="Excluding FPT, FPT description, final price" xsi:type="string">2</field>
-            <field path="tax/weee/apply_vat" scope="tax" scope_id="1" label="Yes" xsi:type="string">1</field>
-            <field path="tax/weee/include_in_subtotal" scope="tax" scope_id="1" label="Yes" xsi:type="string">1</field>
+            <field name="tax/calculation/algorithm" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Total</item>
+                <item name="value" xsi:type="string">TOTAL_BASE_CALCULATION</item>
+            </field>
+            <field name="tax/calculation/price_includes_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including Tax</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/calculation/shipping_includes_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including Tax</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/calculation/apply_after_discount" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">After Discount</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/calculation/discount_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding Tax</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/calculation/cross_border_trade_enabled" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/weee/enable" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/weee/display_list" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding FPT, FPT description, final price</item>
+                <item name="value" xsi:type="number">2</item>
+            </field>
+            <field name="tax/weee/display" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding FPT, FPT description, final price</item>
+                <item name="value" xsi:type="number">2</item>
+            </field>
+            <field name="tax/weee/display_sales" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding FPT, FPT description, final price</item>
+                <item name="value" xsi:type="number">2</item>
+            </field>
+            <field name="tax/weee/apply_vat" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/weee/include_in_subtotal" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
         </dataset>
 
         <dataset name="tax_with_fpt_taxed_cat_incl_disc_on_incl">
-            <field path="tax/calculation/algorithm" scope="tax" scope_id="1" label="Total" xsi:type="string">TOTAL_BASE_CALCULATION</field>
-            <field path="tax/calculation/price_includes_tax" scope="tax" scope_id="1" label="Including Tax" xsi:type="string">1</field>
-            <field path="tax/calculation/shipping_includes_tax" scope="tax" scope_id="1" label="Including Tax" xsi:type="string">1</field>
-            <field path="tax/calculation/apply_after_discount" scope="tax" scope_id="1" label="" xsi:type="string">0</field>
-            <field path="tax/calculation/discount_tax" scope="tax" scope_id="1" label="Including Tax" xsi:type="string">1</field>
-            <field path="tax/calculation/cross_border_trade_enabled" scope="tax" scope_id="1" label="No" xsi:type="string">0</field>
-            <field path="tax/weee/enable" scope="tax" scope_id="1" label="Yes" xsi:type="string">1</field>
-            <field path="tax/weee/display_list" scope="tax" scope_id="1" label="Including FPT and FPT description" xsi:type="string">1</field>
-            <field path="tax/weee/display" scope="tax" scope_id="1" label="Including FPT and FPT description" xsi:type="string">1</field>
-            <field path="tax/weee/display_sales" scope="tax" scope_id="1" label="Including FPT and FPT description" xsi:type="string">1</field>
-            <field path="tax/weee/apply_vat" scope="tax" scope_id="1" label="Yes" xsi:type="string">1</field>
-            <field path="tax/weee/include_in_subtotal" scope="tax" scope_id="1" label="Yes" xsi:type="string">1</field>
+            <field name="tax/calculation/algorithm" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Total</item>
+                <item name="value" xsi:type="string">TOTAL_BASE_CALCULATION</item>
+            </field>
+            <field name="tax/calculation/price_includes_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including Tax</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/calculation/shipping_includes_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including Tax</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/calculation/apply_after_discount" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/calculation/discount_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including Tax</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/calculation/cross_border_trade_enabled" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/weee/enable" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/weee/display_list" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including FPT and FPT description</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/weee/display" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including FPT and FPT description</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/weee/display_sales" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including FPT and FPT description</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/weee/apply_vat" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/weee/include_in_subtotal" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
         </dataset>
 
         <dataset name="tax_with_fpt_cat_excl_disc_on_excl">
-            <field path="tax/calculation/algorithm" scope="tax" scope_id="1" label="Total" xsi:type="string">TOTAL_BASE_CALCULATION</field>
-            <field path="tax/calculation/price_includes_tax" scope="tax" scope_id="1" label="Excluding Tax" xsi:type="string">0</field>
-            <field path="tax/calculation/shipping_includes_tax" scope="tax" scope_id="1" label="Excluding Tax" xsi:type="string">0</field>
-            <field path="tax/calculation/apply_after_discount" scope="tax" scope_id="1" label="After Discount" xsi:type="string">1</field>
-            <field path="tax/calculation/discount_tax" scope="tax" scope_id="1" label="Excluding Tax" xsi:type="string">0</field>
-            <field path="tax/calculation/cross_border_trade_enabled" scope="tax" scope_id="1" label="No" xsi:type="string">0</field>
-            <field path="tax/weee/enable" scope="tax" scope_id="1" label="Yes" xsi:type="string">1</field>
-            <field path="tax/weee/display_list" scope="tax" scope_id="1" label="Excluding FPT, FPT description, final price" xsi:type="string">2</field>
-            <field path="tax/weee/display" scope="tax" scope_id="1" label="Excluding FPT, FPT description, final price" xsi:type="string">2</field>
-            <field path="tax/weee/display_sales" scope="tax" scope_id="1" label="Excluding FPT, FPT description, final price" xsi:type="string">2</field>
-            <field path="tax/weee/apply_vat" scope="tax" scope_id="1" label="No" xsi:type="string">0</field>
-            <field path="tax/weee/include_in_subtotal" scope="tax" scope_id="1" label="Yes" xsi:type="string">1</field>
+            <field name="tax/calculation/algorithm" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Total</item>
+                <item name="value" xsi:type="string">TOTAL_BASE_CALCULATION</item>
+            </field>
+            <field name="tax/calculation/price_includes_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding Tax</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/calculation/shipping_includes_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding Tax</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/calculation/apply_after_discount" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">After Discount</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/calculation/discount_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding Tax</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/calculation/cross_border_trade_enabled" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/weee/enable" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/weee/display_list" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding FPT, FPT description, final price</item>
+                <item name="value" xsi:type="number">2</item>
+            </field>
+            <field name="tax/weee/display" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding FPT, FPT description, final price</item>
+                <item name="value" xsi:type="number">2</item>
+            </field>
+            <field name="tax/weee/display_sales" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding FPT, FPT description, final price</item>
+                <item name="value" xsi:type="number">2</item>
+            </field>
+            <field name="tax/weee/apply_vat" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/weee/include_in_subtotal" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
         </dataset>
 
         <dataset name="tax_with_fpt_cat_excl_disc_on_incl">
-            <field path="tax/calculation/algorithm" scope="tax" scope_id="1" label="Total" xsi:type="string">TOTAL_BASE_CALCULATION</field>
-            <field path="tax/calculation/price_includes_tax" scope="tax" scope_id="1" label="Excluding Tax" xsi:type="string">0</field>
-            <field path="tax/calculation/shipping_includes_tax" scope="tax" scope_id="1" label="Excluding Tax" xsi:type="string">0</field>
-            <field path="tax/calculation/apply_after_discount" scope="tax" scope_id="1" label="" xsi:type="string">0</field>
-            <field path="tax/calculation/discount_tax" scope="tax" scope_id="1" label="Including Tax" xsi:type="string">1</field>
-            <field path="tax/calculation/cross_border_trade_enabled" scope="tax" scope_id="1" label="No" xsi:type="string">0</field>
-            <field path="tax/weee/enable" scope="tax" scope_id="1" label="Yes" xsi:type="string">1</field>
-            <field path="tax/weee/display_list" scope="tax" scope_id="1" label="Excluding FPT, FPT description, final price" xsi:type="string">2</field>
-            <field path="tax/weee/display" scope="tax" scope_id="1" label="Excluding FPT, FPT description, final price" xsi:type="string">2</field>
-            <field path="tax/weee/display_sales" scope="tax" scope_id="1" label="Excluding FPT, FPT description, final price" xsi:type="string">2</field>
-            <field path="tax/weee/apply_vat" scope="tax" scope_id="1" label="No" xsi:type="string">0</field>
-            <field path="tax/weee/include_in_subtotal" scope="tax" scope_id="1" label="Yes" xsi:type="string">1</field>
+            <field name="tax/calculation/algorithm" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Total</item>
+                <item name="value" xsi:type="string">TOTAL_BASE_CALCULATION</item>
+            </field>
+            <field name="tax/calculation/price_includes_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding Tax</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/calculation/shipping_includes_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding Tax</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/calculation/apply_after_discount" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/calculation/discount_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including Tax</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/calculation/cross_border_trade_enabled" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/weee/enable" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/weee/display_list" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding FPT, FPT description, final price</item>
+                <item name="value" xsi:type="number">2</item>
+            </field>
+            <field name="tax/weee/display" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding FPT, FPT description, final price</item>
+                <item name="value" xsi:type="number">2</item>
+            </field>
+            <field name="tax/weee/display_sales" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding FPT, FPT description, final price</item>
+                <item name="value" xsi:type="number">2</item>
+            </field>
+            <field name="tax/weee/apply_vat" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/weee/include_in_subtotal" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
         </dataset>
 
         <dataset name="tax_with_fpt_cat_incl_disc_on_excl">
-            <field path="tax/calculation/algorithm" scope="tax" scope_id="1" label="Total" xsi:type="string">TOTAL_BASE_CALCULATION</field>
-            <field path="tax/calculation/price_includes_tax" scope="tax" scope_id="1" label="Including Tax" xsi:type="string">1</field>
-            <field path="tax/calculation/shipping_includes_tax" scope="tax" scope_id="1" label="Including Tax" xsi:type="string">1</field>
-            <field path="tax/calculation/apply_after_discount" scope="tax" scope_id="1" label="After Discount" xsi:type="string">1</field>
-            <field path="tax/calculation/discount_tax" scope="tax" scope_id="1" label="Excluding Tax" xsi:type="string">0</field>
-            <field path="tax/calculation/cross_border_trade_enabled" scope="tax" scope_id="1" label="No" xsi:type="string">0</field>
-            <field path="tax/weee/enable" scope="tax" scope_id="1" label="Yes" xsi:type="string">1</field>
-            <field path="tax/weee/display_list" scope="tax" scope_id="1" label="Excluding FPT, FPT description, final price" xsi:type="string">2</field>
-            <field path="tax/weee/display" scope="tax" scope_id="1" label="Excluding FPT, FPT description, final price" xsi:type="string">2</field>
-            <field path="tax/weee/display_sales" scope="tax" scope_id="1" label="Excluding FPT, FPT description, final price" xsi:type="string">2</field>
-            <field path="tax/weee/apply_vat" scope="tax" scope_id="1" label="No" xsi:type="string">0</field>
-            <field path="tax/weee/include_in_subtotal" scope="tax" scope_id="1" label="Yes" xsi:type="string">1</field>
+            <field name="tax/calculation/algorithm" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Total</item>
+                <item name="value" xsi:type="string">TOTAL_BASE_CALCULATION</item>
+            </field>
+            <field name="tax/calculation/price_includes_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including Tax</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/calculation/shipping_includes_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including Tax</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/calculation/apply_after_discount" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">After Discount</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/calculation/discount_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding Tax</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/calculation/cross_border_trade_enabled" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/weee/enable" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/weee/display_list" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding FPT, FPT description, final price</item>
+                <item name="value" xsi:type="number">2</item>
+            </field>
+            <field name="tax/weee/display" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding FPT, FPT description, final price</item>
+                <item name="value" xsi:type="number">2</item>
+            </field>
+            <field name="tax/weee/display_sales" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Excluding FPT, FPT description, final price</item>
+                <item name="value" xsi:type="number">2</item>
+            </field>
+            <field name="tax/weee/apply_vat" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/weee/include_in_subtotal" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
         </dataset>
 
         <dataset name="tax_with_fpt_cat_incl_disc_on_incl">
-            <field path="tax/calculation/algorithm" scope="tax" scope_id="1" label="Total" xsi:type="string">TOTAL_BASE_CALCULATION</field>
-            <field path="tax/calculation/price_includes_tax" scope="tax" scope_id="1" label="Including Tax" xsi:type="string">1</field>
-            <field path="tax/calculation/shipping_includes_tax" scope="tax" scope_id="1" label="Including Tax" xsi:type="string">1</field>
-            <field path="tax/calculation/apply_after_discount" scope="tax" scope_id="1" label="" xsi:type="string">0</field>
-            <field path="tax/calculation/discount_tax" scope="tax" scope_id="1" label="Including Tax" xsi:type="string">1</field>
-            <field path="tax/calculation/cross_border_trade_enabled" scope="tax" scope_id="1" label="No" xsi:type="string">0</field>
-            <field path="tax/weee/enable" scope="tax" scope_id="1" label="Yes" xsi:type="string">1</field>
-            <field path="tax/weee/display_list" scope="tax" scope_id="1" label="Including FPT and FPT description" xsi:type="string">1</field>
-            <field path="tax/weee/display" scope="tax" scope_id="1" label="Including FPT and FPT description" xsi:type="string">1</field>
-            <field path="tax/weee/display_sales" scope="tax" scope_id="1" label="Including FPT and FPT description" xsi:type="string">1</field>
-            <field path="tax/weee/apply_vat" scope="tax" scope_id="1" label="No" xsi:type="string">0</field>
-            <field path="tax/weee/include_in_subtotal" scope="tax" scope_id="1" label="Yes" xsi:type="string">1</field>
+            <field name="tax/calculation/algorithm" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Total</item>
+                <item name="value" xsi:type="string">TOTAL_BASE_CALCULATION</item>
+            </field>
+            <field name="tax/calculation/price_includes_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including Tax</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/calculation/shipping_includes_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including Tax</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/calculation/apply_after_discount" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/calculation/discount_tax" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including Tax</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/calculation/cross_border_trade_enabled" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/weee/enable" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/weee/display_list" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including FPT and FPT description</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/weee/display" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including FPT and FPT description</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/weee/display_sales" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Including FPT and FPT description</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="tax/weee/apply_vat" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="tax/weee/include_in_subtotal" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
         </dataset>
     </repository>
 </config>
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/AccountTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/AccountTest.php
index e2ed84e36d433..6ad2de635d280 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/AccountTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/AccountTest.php
@@ -116,7 +116,7 @@ public function testNeedsConfirmation()
         $result = $this->accountBlock->initForm()->toHtml();
 
         // Verify confirmation controls are present
-        $this->assertContains('<div class="field field-confirmation "', $result);
+        $this->assertContains('<div class="admin__field field field-confirmation "', $result);
         $this->assertContains('<select id="_accountconfirmation"', $result);
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/CartTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/CartTest.php
index f8e757f20d8a6..e68f3c496b63b 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/CartTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/CartTest.php
@@ -58,7 +58,8 @@ public function testConfigureAction()
         $this->getRequest()->setParam('id', $itemId);
         $this->dispatch('backend/customer/cart_product_composite_cart/configure');
         $this->assertContains(
-            '<input id="product_composite_configure_input_qty" class="input-text" type="text" name="qty" value="1">',
+            '<input id="product_composite_configure_input_qty" class="input-text admin__control-text qty"'
+            . ' type="text" name="qty" value="1">',
             $this->getResponse()->getBody()
         );
     }
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 6e685a08549aa..1313db5e278a0 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
@@ -152,7 +152,7 @@ public function testConfigureProductToAddAction()
         $body = $this->getResponse()->getBody();
 
         $this->assertNotEmpty($body);
-        $this->assertContains('>Quantity</label>', $body);
+        $this->assertContains('><span>Quantity</span></label>', $body);
         $this->assertContains('>Test Configurable</label>', $body);
         $this->assertContains('"code":"test_configurable","label":"Test Configurable"', $body);
         $this->assertContains('"productId":"1"', $body);
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php b/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php
index 8f5798e80294d..9240d89da1fc9 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php
@@ -413,11 +413,12 @@ public function getAfterElementJs()
     public function getLabelHtml($idSuffix = '')
     {
         if ($this->getLabel() !== null) {
-            $html = '<label class="label" for="' . $this->getHtmlId() . $idSuffix . '"' . $this->_getUiId(
-                'label'
-            ) . '><span>' . $this->_escape(
-                $this->getLabel()
-            ) . '</span></label>' . "\n";
+            $html = '<label class="label admin__field-label" for="' .
+                $this->getHtmlId() . $idSuffix . '"' . $this->_getUiId(
+                    'label'
+                ) . '><span>' . $this->_escape(
+                    $this->getLabel()
+                ) . '</span></label>' . "\n";
         } else {
             $html = '';
         }
@@ -449,7 +450,7 @@ public function getDefaultHtml()
     public function getHtml()
     {
         if ($this->getRequired()) {
-            $this->addClass('required-entry');
+            $this->addClass('required-entry _required');
         }
         if ($this->_renderer) {
             $html = $this->_renderer->render($this);
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Multiline.php b/lib/internal/Magento/Framework/Data/Form/Element/Multiline.php
index e596cc69c7ffe..641d6ec936c0d 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Multiline.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Multiline.php
@@ -71,11 +71,11 @@ public function getElementHtml()
 
         for ($i = 0; $i < $lineCount; $i++) {
             if ($i == 0 && $this->getRequired()) {
-                $this->setClass('input-text required-entry');
+                $this->setClass('input-text admin__control-text required-entry _required');
             } else {
-                $this->setClass('input-text');
+                $this->setClass('input-text admin__control-text');
             }
-            $html .= '<div class="multi-input"><input id="' .
+            $html .= '<div class="multi-input admin__field-control"><input id="' .
                 $this->getHtmlId() .
                 $i .
                 '" name="' .
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Multiselect.php b/lib/internal/Magento/Framework/Data/Form/Element/Multiselect.php
index 3cfb4b8b8a77b..fb17c96af2ad1 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Multiselect.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Multiselect.php
@@ -54,7 +54,7 @@ public function getName()
      */
     public function getElementHtml()
     {
-        $this->addClass('select multiselect');
+        $this->addClass('select multiselect admin__control-multiselect');
         $html = '';
         if ($this->getCanBeEmpty()) {
             $html .= '<input type="hidden" name="' . parent::getName() . '" value="" />';
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Select.php b/lib/internal/Magento/Framework/Data/Form/Element/Select.php
index 003a934ed5d2f..6e80fe5cd177e 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Select.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Select.php
@@ -39,7 +39,7 @@ public function __construct(
      */
     public function getElementHtml()
     {
-        $this->addClass('select');
+        $this->addClass('select admin__control-select');
 
         $html = '';
         if ($this->getBeforeElementHtml()) {
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Text.php b/lib/internal/Magento/Framework/Data/Form/Element/Text.php
index 95a12c0b133a4..e29188cf6ba01 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Text.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Text.php
@@ -39,7 +39,7 @@ public function __construct(
      */
     public function getHtml()
     {
-        $this->addClass('input-text');
+        $this->addClass('input-text admin__control-text');
         return parent::getHtml();
     }
 
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Time.php b/lib/internal/Magento/Framework/Data/Form/Element/Time.php
index 174c43082d2e2..240dd9e9db2e3 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Time.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Time.php
@@ -52,7 +52,7 @@ public function getName()
      */
     public function getElementHtml()
     {
-        $this->addClass('select');
+        $this->addClass('select admin__control-select');
 
         $value_hrs = 0;
         $value_min = 0;
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/AbstractElementTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/AbstractElementTest.php
index 15f30f19b442c..eb351e549c09a 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/AbstractElementTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/AbstractElementTest.php
@@ -326,10 +326,10 @@ public function testGetHtmlWithoutRenderer()
             $this->getMock('Magento\Framework\Data\Form\AbstractForm', [], [], '', false)
         );
         $expectedHtml = '<span class="field-row">' . "\n"
-            . '<input id="" name=""  data-ui-id="form-element-" value="" class=" required-entry"/></span>' . "\n";
+            . '<input id="" name=""  data-ui-id="form-element-" value="" class=" required-entry _required"/></span>' . "\n";
 
         $this->assertEquals($expectedHtml, $this->_model->getHtml());
-        $this->assertEquals(' required-entry', $this->_model->getClass());
+        $this->assertEquals(' required-entry _required', $this->_model->getClass());
     }
 
     /**
@@ -351,7 +351,7 @@ public function testGetHtmlWithRenderer()
         $this->_model->setRenderer($rendererMock);
 
         $this->assertEquals($expectedHtml, $this->_model->getHtml());
-        $this->assertEquals(' required-entry', $this->_model->getClass());
+        $this->assertEquals(' required-entry _required', $this->_model->getClass());
     }
 
     /**
@@ -541,7 +541,7 @@ public function testGetDefaultHtmlDataProvider()
                     'value' => 'some-value',
                 ],
                 '<span class="field-row">' . "\n"
-                    . '<label class="label" for="html-id" data-ui-id="form-element-some-namelabel">'
+                    . '<label class="label admin__field-label" for="html-id" data-ui-id="form-element-some-namelabel">'
                     . '<span>some label</span></label>' . "\n"
                     . '<input id="html-id" name="some-name"  data-ui-id="form-element-some-name" value="some-value" />'
                     . '</span>' . "\n"
@@ -554,7 +554,7 @@ public function testGetDefaultHtmlDataProvider()
                     'value' => 'some-value',
                     'no_span' => true,
                 ],
-                '<label class="label" for="html-id" data-ui-id="form-element-some-namelabel">'
+                '<label class="label admin__field-label" for="html-id" data-ui-id="form-element-some-namelabel">'
                     . '<span>some label</span></label>' . "\n"
                     . '<input id="html-id" name="some-name"  data-ui-id="form-element-some-name" value="some-value" />'
             ],
@@ -582,7 +582,7 @@ public function getLabelHtmlDataProvider()
                     'label' => 'some-label',
                     'html_id' => 'some-html-id',
                 ],
-                '<label class="label" for="some-html-id" data-ui-id="form-element-label">'
+                '<label class="label admin__field-label" for="some-html-id" data-ui-id="form-element-label">'
                     . '<span>some-label</span></label>' . "\n"
             ],
             [
@@ -591,7 +591,7 @@ public function getLabelHtmlDataProvider()
                     'label' => 'some-label',
                     'html_id' => 'some-html-id',
                 ],
-                '<label class="label" for="some-html-idsuffix" data-ui-id="form-element-label">'
+                '<label class="label admin__field-label" for="some-html-idsuffix" data-ui-id="form-element-label">'
                     . '<span>some-label</span></label>' . "\n"
             ],
         ];
diff --git a/lib/web/css/source/lib/_navigation.less b/lib/web/css/source/lib/_navigation.less
index 6cf85b4ba0474..6bc9cb68b2433 100644
--- a/lib/web/css/source/lib/_navigation.less
+++ b/lib/web/css/source/lib/_navigation.less
@@ -85,7 +85,7 @@
                 .css(line-height, @_nav-level0-item-line-height);
                 .css(padding, @_nav-level0-item-padding);
                 .css(text-transform, @_nav-level0-text-transform);
-                word-break: break-all;
+                word-wrap: break-word;
             }
             &.active {
                 .all-category {
@@ -126,7 +126,7 @@
         }
         .submenu {
             > li {
-                word-break: break-all;
+                word-wrap: break-word;
             }
             &:not(:first-child) {
                 .css(background, @_submenu-background-color);
diff --git a/lib/web/css/source/lib/_typography.less b/lib/web/css/source/lib/_typography.less
index f59620c615f53..08204252e43b2 100644
--- a/lib/web/css/source/lib/_typography.less
+++ b/lib/web/css/source/lib/_typography.less
@@ -51,8 +51,7 @@
 }
 
 .wrap-words() {
-    word-break: break-all;
-    word-break: break-word;
+    word-wrap: break-word;
     .hyphens();
 }
 
@@ -379,7 +378,7 @@
         .css(margin, 0 0 @indent__s);
         .css(line-height, @line-height__base);
         .css(padding, @indent__s);
-        word-break: break-all;
+        word-wrap: break-word;
         word-wrap: break-word;
         code {
             padding: 0;
diff --git a/nginx.conf.sample b/nginx.conf.sample
index 2ea2b6ce58488..cab0b839ffe10 100644
--- a/nginx.conf.sample
+++ b/nginx.conf.sample
@@ -18,22 +18,17 @@
 # }
 
 
-root $MAGE_ROOT;
-
+root $MAGE_ROOT/pub;
 
 index index.php;
 autoindex off;
-# disable_symlinks on;
 charset off;
 
-location /setup/ {
-    rewrite / /setup/index.php;
-
-    location /setup/pub/ {}
+location /setup {
+    root $MAGE_ROOT;
 
-    location /setup/index.php {
+    location ~ ^/setup/index.php {
         fastcgi_pass   fastcgi_backend;
-
         fastcgi_index  index.php;
         fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
         include        fastcgi_params;
@@ -41,103 +36,87 @@ location /setup/ {
 }
 
 location / {
-    root $MAGE_ROOT/pub;
-
-    location / {
-        rewrite / /index.php ;
-    }
-
-    location /static/ {
-
-        if ($MAGE_MODE = "production") {
-            expires max;
-        }
-
-        location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ {
-               add_header Cache-Control "public";
-               expires +1y;
-
-            if (!-f $request_filename) {
-                rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last;
-            }
-        }
-
-        location ~* \.(zip|gz|gzip|bz2|csv|xml)$ {
-            add_header Cache-Control "no-store";
-                expires    off;
+    try_files $uri $uri/ /index.php?$args;
+}
 
-            if (!-f $request_filename) {
-                   rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last;
-            }
+location /pub {
+    alias $MAGE_ROOT/pub;
+}
 
-        }
+location /static/ {
+    if ($MAGE_MODE = "production") {
+        expires max;
+    }
+    location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ {
+        add_header Cache-Control "public";
+        expires +1y;
 
         if (!-f $request_filename) {
             rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last;
         }
     }
-
-    location /media/ {
-
-        location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ {
-            add_header Cache-Control "public";
-            expires +1y;
-
-            if (!-f $request_filename) {
-                rewrite / /get.php;
-            }
-        }
-
-        location ~* \.(zip|gz|gzip|bz2|csv|xml)$ {
-            add_header Cache-Control "no-store";
-            expires    off;
-
-            if (!-f $request_filename) {
-                rewrite / /get.php;
-            }
-        }
+    location ~* \.(zip|gz|gzip|bz2|csv|xml)$ {
+        add_header Cache-Control "no-store";
+        expires    off;
 
         if (!-f $request_filename) {
-            rewrite / /get.php;
+           rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last;
         }
     }
-
-    location /media/customer/ {
-        deny all;
+    if (!-f $request_filename) {
+        rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last;
     }
+}
 
-    location /media/downloadable/ {
-        deny all;
+location /media/ {
+    try_files $uri $uri/ /get.php?$args;
+    location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ {
+        add_header Cache-Control "public";
+        expires +1y;
+        try_files $uri $uri/ /get.php?$args;
     }
-
-    location ~ /media/theme_customization/.*\.xml$ {
-        deny all;
+    location ~* \.(zip|gz|gzip|bz2|csv|xml)$ {
+        add_header Cache-Control "no-store";
+        expires    off;
+        try_files $uri $uri/ /get.php?$args;
     }
+}
 
-    location /errors/ {
-        try_files $uri =404;
-    }
+location /media/customer/ {
+    deny all;
+}
 
-    location ~ ^/errors/.*\.(xml|phtml)$ {
-        deny all;
-    }
+location /media/downloadable/ {
+    deny all;
+}
 
-    location ~ cron\.php {
-        deny all;
-    }
+location ~ /media/theme_customization/.*\.xml$ {
+    deny all;
+}
 
-    location ~ (index|get|static|report|404|503)\.php$ {
-        expires -1;
-        fastcgi_pass   fastcgi_backend;
+location /errors/ {
+    try_files $uri =404;
+}
 
-        fastcgi_param  PHP_FLAG  "session.auto_start=off \n suhosin.session.cryptua=off";
-        fastcgi_param  PHP_VALUE "memory_limit=256M \n max_execution_time=600";
-        fastcgi_read_timeout 600s;
-        fastcgi_connect_timeout 600s;
-        fastcgi_param  MAGE_MODE $MAGE_MODE;
+location ~ ^/errors/.*\.(xml|phtml)$ {
+    deny all;
+}
 
-        fastcgi_index  index.php;
-        fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
-        include        fastcgi_params;
-    }
+location ~ cron\.php {
+    deny all;
+}
+
+location ~ (index|get|static|report|404|503)\.php$ {
+    try_files $uri =404;
+    fastcgi_pass   fastcgi_backend;
+
+    fastcgi_param  PHP_FLAG  "session.auto_start=off \n suhosin.session.cryptua=off";
+    fastcgi_param  PHP_VALUE "memory_limit=256M \n max_execution_time=600";
+    fastcgi_read_timeout 600s;
+    fastcgi_connect_timeout 600s;
+    fastcgi_param  MAGE_MODE $MAGE_MODE;
+
+    fastcgi_index  index.php;
+    fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
+    include        fastcgi_params;
 }