diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php
index 4d5255c93cd4187907d0873697444b7d2203af2f..7ff6ce3773c50ef14917a85706ac5d8a0af4d02b 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php
@@ -104,7 +104,7 @@ class Datetime extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Date
         $html =
             '<div class="range" id="' . $htmlId . '_range"><div class="range-line date">' . '<input type="text" name="'
             . $this->_getHtmlName() . '[from]" id="' . $htmlId . '_from"' . ' value="' . $this->getEscapedValue('from')
-            . '" class="input-text no-changes" placeholder="' . __(
+            . '" class="input-text admin__control-text no-changes" placeholder="' . __(
                 'From'
             ) . '" ' . $this->getUiId(
                 'filter',
@@ -114,7 +114,7 @@ class Datetime extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Date
         $html .= '<div class="range-line date">' . '<input type="text" name="' . $this->_getHtmlName() . '[to]" id="'
             . $htmlId . '_to"' . ' value="' . $this->getEscapedValue(
                 'to'
-            ) . '" class="input-text no-changes" placeholder="' . __(
+            ) . '" class="input-text admin__control-text no-changes" placeholder="' . __(
                 'To'
             ) . '" ' . $this->getUiId(
                 'filter',
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml
index 78d3d2677e94c705cc86af43d9562ff37aaacc6f..e9a724fdbf857b838c893142f1cd7c88e8276af3 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-info dashboard-data" id="<?php echo $block->getId() ?>_table">
+        <table class="admin__table-primary 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/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 73d5d50ee6574c39c785bb19b5c59977faf7d54c..c1f89d31bf4b7f5373a4538aa402470328621606 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,7 +11,8 @@
 <?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 admin__fieldset composite-bundle <?php echo $block->getIsLastFieldset() ? ' last-fieldset' : '' ?>">
+<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()) : ?>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/create/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/create/items/renderer.phtml
index 6986d5ab2953413e6dc7d7ae5a3bd3c168f834f7..1179737cea667d6e059ea35b4add49db3264d4a2 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/create/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/create/items/renderer.phtml
@@ -50,8 +50,8 @@
         <?php if (!$_item->getOrderItem()->getParentItem()): ?>
         <td class="col-product">
             <div class="product-title"><?php echo $block->escapeHtml($_item->getName()) ?></div>
-            <div>
-                <strong><?php echo __('SKU') ?>:</strong>
+            <div class="product-sku-block">
+                <span><?php echo __('SKU') ?>:</span>
                 <?php echo implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))); ?>
             </div>
         </td>
@@ -67,46 +67,46 @@
         </td>
         <td class="col-ordered-qty">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <table cellspacing="0" class="qty-table">
+                <table class="data-table qty-table">
                     <tr>
-                        <td><?php echo __('Ordered') ?></td>
-                        <td><strong><?php echo $_item->getOrderItem()->getQtyOrdered()*1 ?></strong></td>
+                        <th><?php echo __('Ordered') ?></th>
+                        <td><?php echo $_item->getOrderItem()->getQtyOrdered()*1 ?></td>
                     </tr>
                     <?php if ((float) $_item->getOrderItem()->getQtyInvoiced()): ?>
                     <tr>
-                        <td><?php echo __('Invoiced') ?></td>
-                        <td><strong><?php echo $_item->getOrderItem()->getQtyInvoiced()*1 ?></strong></td>
+                        <th><?php echo __('Invoiced') ?></th>
+                        <td><?php echo $_item->getOrderItem()->getQtyInvoiced()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                     <?php if ((float) $_item->getOrderItem()->getQtyShipped() && $block->isShipmentSeparately($_item)): ?>
                     <tr>
-                        <td><?php echo __('Shipped') ?></td>
-                        <td><strong><?php echo $_item->getOrderItem()->getQtyShipped()*1 ?></strong></td>
+                        <th><?php echo __('Shipped') ?></th>
+                        <td><?php echo $_item->getOrderItem()->getQtyShipped()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                     <?php if ((float) $_item->getOrderItem()->getQtyRefunded()): ?>
                     <tr>
-                        <td><?php echo __('Refunded') ?></td>
-                        <td><strong><?php echo $_item->getOrderItem()->getQtyRefunded()*1 ?></strong></td>
+                        <th><?php echo __('Refunded') ?></th>
+                        <td><?php echo $_item->getOrderItem()->getQtyRefunded()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                     <?php if ((float) $_item->getOrderItem()->getQtyCanceled()): ?>
                     <tr>
-                        <td><?php echo __('Canceled') ?></td>
-                        <td><strong><?php echo $_item->getOrderItem()->getQtyCanceled()*1 ?></strong></td>
+                        <th><?php echo __('Canceled') ?></th>
+                        <td><?php echo $_item->getOrderItem()->getQtyCanceled()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                 </table>
             <?php elseif ($block->isShipmentSeparately($_item)): ?>
-                <table cellspacing="0" class="qty-table">
+                <table class="data-table qty-table">
                     <tr>
-                        <td><?php echo __('Ordered') ?></td>
-                        <td><strong><?php echo $_item->getOrderItem()->getQtyOrdered()*1 ?></strong></td>
+                        <th><?php echo __('Ordered') ?></th>
+                        <td><?php echo $_item->getOrderItem()->getQtyOrdered()*1 ?></td>
                     </tr>
                     <?php if ((float) $_item->getOrderItem()->getQtyShipped()): ?>
                     <tr>
-                        <td><?php echo __('Shipped') ?></td>
-                        <td><strong><?php echo $_item->getOrderItem()->getQtyShipped()*1 ?></strong></td>
+                        <th><?php echo __('Shipped') ?></th>
+                        <td><?php echo $_item->getOrderItem()->getQtyShipped()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                 </table>
@@ -118,17 +118,24 @@
         <td class="col-return-to-stock">
             <?php if ($block->canShowPriceInfo($_item)): ?>
                 <?php if ($block->canReturnItemToStock($_item)) : ?>
-                    <input type="checkbox" name="creditmemo[items][<?php echo $_item->getOrderItemId() ?>][back_to_stock]" value="1"<?php if ($_item->getBackToStock()):?> checked="checked"<?php endif;?> />
+                    <input type="checkbox"
+                           class="admin__control-checkbox"
+                           name="creditmemo[items][<?php echo $_item->getOrderItemId() ?>][back_to_stock]"
+                           value="1"<?php if ($_item->getBackToStock()):?> checked="checked"<?php endif;?> />
+                    <label class="admin__field-label"></label>
                 <?php endif; ?>
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <?php endif; ?>
-        <td class="col-refund">
+        <td class="col-refund col-qty">
             <?php if ($block->canShowPriceInfo($_item)): ?>
                 <?php if ($block->canEditQty()) : ?>
-                    <input type="text" class="input-text qty-input" name="creditmemo[items][<?php echo $_item->getOrderItemId() ?>][qty]" value="<?php echo $_item->getQty()*1 ?>" />
+                    <input type="text"
+                           class="input-text admin__control-text qty-input"
+                           name="creditmemo[items][<?php echo $_item->getOrderItemId() ?>][qty]"
+                           value="<?php echo $_item->getQty()*1 ?>" />
                 <?php else: ?>
                     <?php echo $_item->getQty()*1 ?>
                 <?php endif; ?>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/view/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/view/items/renderer.phtml
index 37b22d2d43a2b046b225e2a2b247efc230ac5663..339bc32af067a91741ffcf2945265f7696177ecd 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/view/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/view/items/renderer.phtml
@@ -48,8 +48,8 @@
         <?php if (!$_item->getOrderItem()->getParentItem()): ?>
         <td class="col-product">
             <div class="product-title"><?php echo $block->escapeHtml($_item->getName()) ?></div>
-            <div>
-                <strong><?php echo __('SKU') ?>:</strong>
+            <div class="product-sku-block">
+                <span><?php echo __('SKU') ?>:</span>
                 <?php echo implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))); ?>
             </div>
         </td>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml
index 5ad5c664845271785c65c01e01aa961591b6c333..ffabb6efc13ddf417d9fccb35aacdbec50099598 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml
@@ -49,8 +49,8 @@
         <?php if (!$_item->getOrderItem()->getParentItem()): ?>
         <td class="col-product">
             <div class="product-title"><?php echo $block->escapeHtml($_item->getName()) ?></div>
-            <div>
-                <strong><?php echo __('SKU') ?>:</strong>
+            <div class="product-sku-block">
+                <span><?php echo __('SKU') ?>:</span>
                 <?php echo implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))); ?>
             </div>
         </td>
@@ -68,46 +68,46 @@
         </td>
         <td class="col-qty">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <table cellspacing="0" class="qty-table">
+                <table class="data-table qty-table">
                     <tr>
-                        <td><?php echo __('Ordered') ?></td>
+                        <th><?php echo __('Ordered') ?></th>
                         <td><strong><?php echo $_item->getOrderItem()->getQtyOrdered()*1 ?></strong></td>
                     </tr>
                     <?php if ((float) $_item->getOrderItem()->getQtyInvoiced()): ?>
                     <tr>
-                        <td><?php echo __('Invoiced') ?></td>
-                        <td><strong><?php echo $_item->getOrderItem()->getQtyInvoiced()*1 ?></strong></td>
+                        <th><?php echo __('Invoiced') ?></th>
+                        <td><?php echo $_item->getOrderItem()->getQtyInvoiced()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                     <?php if ((float) $_item->getOrderItem()->getQtyShipped() && $block->isShipmentSeparately($_item)): ?>
                     <tr>
-                        <td><?php echo __('Shipped') ?></td>
-                        <td><strong><?php echo $_item->getOrderItem()->getQtyShipped()*1 ?></strong></td>
+                        <th><?php echo __('Shipped') ?></th>
+                        <td><?php echo $_item->getOrderItem()->getQtyShipped()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                     <?php if ((float) $_item->getOrderItem()->getQtyRefunded()): ?>
                     <tr>
-                        <td><?php echo __('Refunded') ?></td>
-                        <td><strong><?php echo $_item->getOrderItem()->getQtyRefunded()*1 ?></strong></td>
+                        <th><?php echo __('Refunded') ?></th>
+                        <td><?php echo $_item->getOrderItem()->getQtyRefunded()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                     <?php if ((float) $_item->getOrderItem()->getQtyCanceled()): ?>
                     <tr>
-                        <td><?php echo __('Canceled') ?></td>
-                        <td><strong><?php echo $_item->getOrderItem()->getQtyCanceled()*1 ?></strong></td>
+                        <th><?php echo __('Canceled') ?></th>
+                        <td><?php echo $_item->getOrderItem()->getQtyCanceled()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                 </table>
             <?php elseif ($block->isShipmentSeparately($_item)): ?>
-                <table cellspacing="0" class="qty-table">
+                <table class="data-table qty-table">
                     <tr>
-                        <td><?php echo __('Ordered') ?></td>
-                        <td><strong><?php echo $_item->getOrderItem()->getQtyOrdered()*1 ?></strong></td>
+                        <th><?php echo __('Ordered') ?></th>
+                        <td><?php echo $_item->getOrderItem()->getQtyOrdered()*1 ?></td>
                     </tr>
                     <?php if ((float) $_item->getOrderItem()->getQtyShipped()): ?>
                     <tr>
-                        <td><?php echo __('Shipped') ?></td>
-                        <td><strong><?php echo $_item->getOrderItem()->getQtyShipped()*1 ?></strong></td>
+                        <th><?php echo __('Shipped') ?></th>
+                        <td><?php echo $_item->getOrderItem()->getQtyShipped()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                 </table>
@@ -118,7 +118,10 @@
         <td class="col-qty-invoice">
             <?php if ($block->canShowPriceInfo($_item)): ?>
                 <?php if ($block->canEditQty()) : ?>
-                    <input type="text" class="input-text qty-input" name="invoice[items][<?php echo $_item->getOrderItemId() ?>]" value="<?php echo $_item->getQty()*1 ?>" />
+                    <input type="text"
+                           class="input-text admin__control-text qty-input"
+                           name="invoice[items][<?php echo $_item->getOrderItemId() ?>]"
+                           value="<?php echo $_item->getQty()*1 ?>" />
                 <?php else : ?>
                     <?php echo $_item->getQty()*1 ?>
                 <?php endif; ?>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/view/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/view/items/renderer.phtml
index 33db5d905cf3acebb353d935c8665e76c5f455fc..904d804580feace61ab761f2daaf284fc712b64c 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/view/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/view/items/renderer.phtml
@@ -48,8 +48,8 @@
         <?php if (!$_item->getOrderItem()->getParentItem()): ?>
         <td class="col-product">
             <div class="product-title"><?php echo $block->escapeHtml($_item->getName()) ?></div>
-            <div>
-                <strong><?php echo __('SKU') ?>:</strong>
+            <div class="product-sku-block">
+                <span><?php echo __('SKU') ?>:</span>
                 <?php echo implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))); ?>
             </div>
         <?php else: ?>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml
index 8c89a6e27c5cf1c22168dd930127ad3efb3d97c5..2f31655de1e2eaa36a24aeb73c80812725ba71e0 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml
@@ -53,8 +53,8 @@
             <div class="product-title" id="order_item_<?php echo $_item->getId() ?>_title">
                 <?php echo $block->escapeHtml($_item->getName()) ?>
             </div>
-            <div>
-                <strong><?php echo __('SKU') ?>:</strong>
+            <div class="product-sku-block">
+                <span><?php echo __('SKU') ?>:</span>
                 <?php echo implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))); ?>
             </div>
         </td>
@@ -86,46 +86,46 @@
         </td>
         <td class="col-ordered-qty">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <table cellspacing="0" class="qty-table">
+                <table class="data-table qty-table">
                     <tr>
-                        <td><?php echo __('Ordered') ?></td>
-                        <td><strong><?php echo $_item->getQtyOrdered()*1 ?></strong></td>
+                        <th><?php echo __('Ordered') ?></th>
+                        <td><?php echo $_item->getQtyOrdered()*1 ?></td>
                     </tr>
                     <?php if ((float) $_item->getQtyInvoiced()): ?>
                     <tr>
-                        <td><?php echo __('Invoiced') ?></td>
-                        <td><strong><?php echo $_item->getQtyInvoiced()*1 ?></strong></td>
+                        <th><?php echo __('Invoiced') ?></th>
+                        <td><?php echo $_item->getQtyInvoiced()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                     <?php if ((float) $_item->getQtyShipped() && $block->isShipmentSeparately($_item)): ?>
                     <tr>
-                        <td><?php echo __('Shipped') ?></td>
-                        <td><strong><?php echo $_item->getQtyShipped()*1 ?></strong></td>
+                        <th><?php echo __('Shipped') ?></th>
+                        <td><?php echo $_item->getQtyShipped()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                     <?php if ((float) $_item->getQtyRefunded()): ?>
                     <tr>
-                        <td><?php echo __('Refunded') ?></td>
-                        <td><strong><?php echo $_item->getQtyRefunded()*1 ?></strong></td>
+                        <th><?php echo __('Refunded') ?></th>
+                        <td><?php echo $_item->getQtyRefunded()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                     <?php if ((float) $_item->getQtyCanceled()): ?>
                     <tr>
-                        <td><?php echo __('Canceled') ?></td>
-                        <td><strong><?php echo $_item->getQtyCanceled()*1 ?></strong></td>
+                        <th><?php echo __('Canceled') ?></th>
+                        <td><?php echo $_item->getQtyCanceled()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                 </table>
             <?php elseif ($block->isShipmentSeparately($_item)): ?>
-                <table cellspacing="0" class="qty-table">
+                <table class="data-table qty-table">
                     <tr>
-                        <td><?php echo __('Ordered') ?></td>
-                        <td><strong><?php echo $_item->getQtyOrdered()*1 ?></strong></td>
+                        <th><?php echo __('Ordered') ?></th>
+                        <td><?php echo $_item->getQtyOrdered()*1 ?></td>
                     </tr>
                     <?php if ((float) $_item->getQtyShipped()): ?>
                     <tr>
-                        <td><?php echo __('Shipped') ?></td>
-                        <td><strong><?php echo $_item->getQtyShipped()*1 ?></strong></td>
+                        <th><?php echo __('Shipped') ?></th>
+                        <td><?php echo $_item->getQtyShipped()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                 </table>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/create/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/create/items/renderer.phtml
index 08ef77d9161508a2601fe4ff14fb2ae2ab093e98..f1555682244ee4ba68b1d7e6202f2d9b66f884bc 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/create/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/create/items/renderer.phtml
@@ -43,8 +43,8 @@
         <?php if (!$_item->getOrderItem()->getParentItem()): ?>
         <td class="col-product">
             <div class="product-title"><?php echo $block->escapeHtml($_item->getName()) ?></div>
-            <div>
-                <strong><?php echo __('SKU') ?>:</strong>
+            <div class="product-sku-block">
+                <span><?php echo __('SKU') ?>:</span>
                 <?php echo implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))); ?>
             </div>
         </td>
@@ -60,7 +60,10 @@
         </td>
         <td class="col-qty last">
             <?php if ($block->isShipmentSeparately($_item)): ?>
-                <input type="text" class="input-text" name="shipment[items][<?php echo $_item->getOrderItemId() ?>]" value="<?php echo $_item->getQty()*1 ?>" />
+                <input type="text"
+                       class="input-text admin__control-text"
+                       name="shipment[items][<?php echo $_item->getOrderItemId() ?>]"
+                       value="<?php echo $_item->getQty()*1 ?>" />
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/view/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/view/items/renderer.phtml
index 16c98a2522059be6648f1c36364584dca4a26ac7..e8a2d69f16530de18698e5808cc57591fb420bb2 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/view/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/view/items/renderer.phtml
@@ -43,8 +43,8 @@
         <?php if (!$_item->getParentItem()): ?>
         <td class="col-product">
             <div class="product-title"><?php echo $block->escapeHtml($_item->getName()) ?></div>
-            <div>
-                <strong><?php echo __('SKU') ?>:</strong>
+            <div class="product-sku-block">
+                <span><?php echo __('SKU') ?>:</span>
                 <?php echo implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))); ?>
             </div>
         </td>
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js b/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js
index d3c3a264b88d814fd8123aa84bc1df10d3828aa6..31e16ff05c81bd932e7250420acce9e270f46aa4 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js
@@ -60,11 +60,13 @@ define([
          * @private
          */
         _isOverflowed: function() {
-            var list = $(this.options.minicart.list);
+            var list = $(this.options.minicart.list),
+                cssOverflowClass = 'overflowed';
+
             if (this.scrollHeight > list.innerHeight()) {
-                list.parent().addClass('overflowed');
+                list.parent().addClass(cssOverflowClass);
             } else {
-                list.parent().removeClass('overflowed');
+                list.parent().removeClass(cssOverflowClass);
             }
         },
 
@@ -238,9 +240,9 @@ define([
             this.scrollHeight = 0;
             target.children().each(function() {
                 if (counter-- > 0) {
-                    height += $(this).height() - 15;
+                    height += $(this).height();
                 }
-                self.scrollHeight += $(this).height() - 15;
+                self.scrollHeight += $(this).height();
             });
 
             target.remove();
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml
index dada69c3e47a9ba4ee7732276d71affd02ea4667..8196069e692019324ad8295aaa7a6d70be207d0c 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml
@@ -39,7 +39,7 @@
     <div class="admin__field admin__field-wide">
         <div class="admin__field-control">
             <div class="admin__control-table-wrapper">
-                <table cellspacing="0" class="admin__control-table">
+                <table class="admin__control-table">
                     <thead>
                         <tr>
                             <th class="col-title _required"><span><?php echo __('Title') ?></span></th>
@@ -163,7 +163,7 @@ require([
             '</td>'+
             '<td class="col-sort"><input type="text" name="downloadable[link][<%- data.id %>][sort_order]" value="<%- data.sort_order %>" class="input-text admin__control-text sort" /></td>'+
             '<td class="col-action">'+
-                '<button id="downloadable_link_<%- data.id %>_delete_button" type="button" class="action-remove"><span><?php echo __('Delete'); ?></span></button>'+
+                '<button id="downloadable_link_<%- data.id %>_delete_button" type="button" class="action-delete"><span><?php echo __('Delete'); ?></span></button>'+
             '</td>'+
         '</tr>';
 
@@ -310,7 +310,7 @@ require([
                 }
             },
             bindRemoveButtons : function(){
-                var buttons = $$('tbody#link_items_body .action-remove');
+                var buttons = $$('tbody#link_items_body .action-delete');
                 for(var i=0;i<buttons.length;i++){
                     if(!$(buttons[i]).binded && !$(buttons[i]).hasClassName('disabled')){
                         $(buttons[i]).binded = true;
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/samples.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/samples.phtml
index 82ba490f0cf862ddce3e8a84944e889443979a62..11f7ee94465e6c143b1a6037c5b3ffebd59a21a7 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/samples.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/samples.phtml
@@ -31,7 +31,7 @@ $block->getConfigJson();
     <div class="admin__field admin__field-wide">
         <div class="admin__field-control">
             <div class="admin__control-table-wrapper">
-                <table cellspacing="0" class="admin__control-table">
+                <table class="admin__control-table">
                     <thead>
                         <tr>
                             <th class="_required col-title"><span><?php echo __('Title') ?></span></th>
@@ -102,7 +102,7 @@ require([
                             '</td>'+
                             '<td class="col-sort"><input type="text" name="downloadable[sample][<%- data.id %>][sort_order]" value="<%- data.sort_order %>" class="input-text sort admin__control-text" /></td>'+
                             '<td class="col-actions">'+
-                                '<button type="button" class="action-remove"><span>Delete</span></button>'+
+                                '<button type="button" class="action-delete"><span>Delete</span></button>'+
                             '</td>'+
                         '</tr>';
         sampleItems = {
@@ -183,7 +183,7 @@ require([
                 }
             },
             bindRemoveButtons: function() {
-                var buttons = $$('tbody#sample_items_body .action-remove');
+                var buttons = $$('tbody#sample_items_body .action-delete');
                 for(var i=0;i<buttons.length;i++){
                     if(!$(buttons[i]).binded){
                         $(buttons[i]).binded = true;
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/name.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/name.phtml
index 79f67d109af865df0a47bcb29e0003d86b152c83..aa6712c6d459d0938ff92651aa3516465aa69039 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/name.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/name.phtml
@@ -10,11 +10,14 @@
 
 <?php if ($_item = $block->getItem()): ?>
     <div class="product-title"><?php echo $_item->getName() ?></div>
-    <div><strong><?php echo __('SKU') ?>:</strong> <?php echo implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($block->getSku()))); ?></div>
+    <div class="product-sku-block">
+        <span><?php echo __('SKU') ?>:</span>
+        <?php echo implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($block->getSku()))); ?>
+    </div>
     <?php if ($block->getOrderOptions()): ?>
         <dl class="item-options">
         <?php foreach ($block->getOrderOptions() as $_option): ?>
-            <dt><?php echo $_option['label'] ?></dt>
+            <dt><?php echo $_option['label'] ?>:</dt>
             <dd>
             <?php if (isset($_option['custom_view']) && $_option['custom_view']): ?>
                 <?php echo $_option['value'];?>
@@ -39,7 +42,7 @@ require(['prototype'], function(){
     <?php endif; ?>
     <?php if ($block->getLinks()): ?>
         <dl class="item-options">
-            <dt><?php echo $block->getLinksTitle(); ?></dt>
+            <dt><?php echo $block->getLinksTitle(); ?>:</dt>
             <?php foreach ($block->getLinks()->getPurchasedItems() as $_link): ?>
                 <dd><?php echo $block->escapeHtml($_link->getLinkTitle()) ?> (<?php echo $_link->getNumberOfDownloadsUsed() . ' / ' . ($_link->getNumberOfDownloadsBought() ? $_link->getNumberOfDownloadsBought() : __('U')) ?>)</dd>
             <?php endforeach; ?>
diff --git a/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/create/giftoptions.phtml b/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/create/giftoptions.phtml
index 3b6710cb9e1450263c494d2ee40e9860b66a4a69..b810ccccd95d8f23085677614fd4b2279705688c 100644
--- a/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/create/giftoptions.phtml
+++ b/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/create/giftoptions.phtml
@@ -12,8 +12,8 @@
 <?php if ($_item): ?>
     <?php $_childHtml = trim($block->getChildHtml('', false));?>
     <?php if ($_childHtml): ?>
-        <tr class="border">
-            <td colspan="8">
+        <tr class="row-gift-options">
+            <td colspan="7">
                 <a class="action-link" href="#" id="gift_options_link_<?php echo $_item->getId() ?>"><?php echo __('Gift Options') ?></a>
                 <script>
 require([
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 0a09bcdf7488f7cc713a1a13a9f8b05e1027262d..08f14bf4c075522f0ef228743d89de74221b1b21 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 table-info grouped-items-table" id="super-product-table">
+        <table class="data-table admin__table-primary grouped-items-table" id="super-product-table">
             <thead>
                 <tr class="headings">
                     <th class="col-id"><?php echo __('ID') ?></th>
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Comments/View.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Comments/View.php
index 6dd4434c6e0ef0fc6c47735fa50d84c312ee3230..ea065d8eea7a6dc695f3c1d2c023e39af251f1a6 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Comments/View.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Comments/View.php
@@ -60,7 +60,7 @@ class View extends \Magento\Backend\Block\Template
         $this->addChild(
             'submit_button',
             'Magento\Backend\Block\Widget\Button',
-            ['id' => 'submit_comment_button', 'label' => __('Submit Comment'), 'class' => 'save']
+            ['id' => 'submit_comment_button', 'label' => __('Submit Comment'), 'class' => 'action-secondary save']
         );
         return parent::_prepareLayout();
     }
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Store.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Store.php
index 908dabf48c15cc5f7e4cdaec3eec7c08431fd7a3..cf83b3bc125c7ffd8cb391fd3ea55b687629ab5a 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Store.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Store.php
@@ -30,6 +30,6 @@ class Store extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
      */
     public function getHeaderText()
     {
-        return __('Please select a store.');
+        return __('Please select a store');
     }
 }
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/History.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/History.php
index ad82046b66ed50ea6914ed6775cb90e8b482661e..d0284f3175fdc79c07fd9938f5634fa76cab7ef9 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/History.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/History.php
@@ -54,7 +54,7 @@ class History extends \Magento\Backend\Block\Template
         $button = $this->getLayout()->createBlock(
             'Magento\Backend\Block\Widget\Button'
         )->setData(
-            ['label' => __('Submit Comment'), 'class' => 'save', 'onclick' => $onclick]
+            ['label' => __('Submit Comment'), 'class' => 'action-save action-secondary', 'onclick' => $onclick]
         );
         $this->setChild('submit_button', $button);
         return parent::_prepareLayout();
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_new.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_new.xml
index 031d2ada6a1493e0fba975ea588642a8f3a6fe8c..a4ee30150b13a4236deca813f902e2be14da5d38 100644
--- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_new.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_new.xml
@@ -1,33 +1,35 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © 2015 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
-    <update handle="sales_order_item_price"/>
-    <body>
-        <referenceContainer name="content">
-            <block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\Create" name="sales_creditmemo_create">
-                <block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\Create\Form" name="form" template="order/creditmemo/create/form.phtml">
-                    <block class="Magento\Sales\Block\Adminhtml\Order\View\Info" name="order_info" template="order/view/info.phtml"/>
-                    <block class="Magento\Sales\Block\Adminhtml\Order\Payment" name="order_payment"/>
-                    <block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\Create\Items" name="order_items" template="order/creditmemo/create/items.phtml">
-                        <block class="Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer" as="default" template="order/creditmemo/create/items/renderer/default.phtml"/>
-                        <block class="Magento\Sales\Block\Adminhtml\Items\Column\Qty" name="column_qty" template="items/column/qty.phtml" group="column"/>
-                        <block class="Magento\Sales\Block\Adminhtml\Items\Column\Name" name="column_name" template="items/column/name.phtml" group="column"/>
-                        <block class="Magento\Framework\View\Element\Text\ListText" name="order_item_extra_info"/>
-                        <block class="Magento\Sales\Block\Adminhtml\Order\Totalbar" name="order_totalbar" template="order/totalbar.phtml"/>
-                        <block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\Totals" name="creditmemo_totals" template="order/totals.phtml">
-                            <block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\Create\Adjustments" name="adjustments" template="order/creditmemo/create/totals/adjustments.phtml"/>
-                            <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Tax" name="tax" template="order/totals/tax.phtml"/>
-                        </block>
-                        <container name="submit_before" label="Submit Before"/>
-                        <container name="submit_after" label="Submit After"/>
-                    </block>
-                </block>
-            </block>
-        </referenceContainer>
-    </body>
-</page>
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
+    <update handle="sales_order_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 -->
+
+        <referenceContainer name="content">
+            <block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\Create" name="sales_creditmemo_create">
+                <block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\Create\Form" name="form" template="order/creditmemo/create/form.phtml">
+                    <block class="Magento\Sales\Block\Adminhtml\Order\View\Info" name="order_info" template="order/view/info.phtml"/>
+                    <block class="Magento\Sales\Block\Adminhtml\Order\Payment" name="order_payment"/>
+                    <block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\Create\Items" name="order_items" template="order/creditmemo/create/items.phtml">
+                        <block class="Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer" as="default" template="order/creditmemo/create/items/renderer/default.phtml"/>
+                        <block class="Magento\Sales\Block\Adminhtml\Items\Column\Qty" name="column_qty" template="items/column/qty.phtml" group="column"/>
+                        <block class="Magento\Sales\Block\Adminhtml\Items\Column\Name" name="column_name" template="items/column/name.phtml" group="column"/>
+                        <block class="Magento\Framework\View\Element\Text\ListText" name="order_item_extra_info"/>
+                        <block class="Magento\Sales\Block\Adminhtml\Order\Totalbar" name="order_totalbar" template="order/totalbar.phtml"/>
+                        <block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\Totals" name="creditmemo_totals" template="order/totals.phtml">
+                            <block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\Create\Adjustments" name="adjustments" template="order/creditmemo/create/totals/adjustments.phtml"/>
+                            <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Tax" name="tax" template="order/totals/tax.phtml"/>
+                        </block>
+                        <container name="submit_before" label="Submit Before"/>
+                        <container name="submit_after" label="Submit After"/>
+                    </block>
+                </block>
+            </block>
+        </referenceContainer>
+    </body>
+</page>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_view.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_view.xml
index 916950e7e358e286ebf34bbc762fd64024dd2074..7208039683c8dbf06f7a60bfd8db9e311aa8cfed 100644
--- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_view.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_view.xml
@@ -8,6 +8,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
     <update handle="sales_creditmemo_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 -->
         <referenceContainer name="content">
             <block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\View" name="sales_creditmemo_view">
                 <block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\View\Form" name="form" template="order/creditmemo/view/form.phtml">
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_new.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_new.xml
index 0f922d55922bd65f188dfa6840fa8db1c78915e6..f31b37ea47d0b5cbe64c8f688ba5501e1f433e5f 100644
--- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_new.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_new.xml
@@ -8,6 +8,8 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
     <update handle="sales_order_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 -->
+
         <referenceContainer name="content">
             <block class="Magento\Sales\Block\Adminhtml\Order\Invoice\Create" name="sales_invoice_create">
                 <block class="Magento\Sales\Block\Adminhtml\Order\Invoice\Create\Form" name="form" template="order/invoice/create/form.phtml">
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_view.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_view.xml
index 93552d0ec38418451df0cd93d847c94a81cc1b92..e22eaae5cd8f4092cd672c407b0c521c6b129b3c 100644
--- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_view.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_view.xml
@@ -8,6 +8,8 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
     <update handle="sales_invoice_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 -->
+
         <referenceContainer name="content">
             <block class="Magento\Sales\Block\Adminhtml\Order\Invoice\View" name="sales_invoice_view">
                 <block class="Magento\Sales\Block\Adminhtml\Order\Invoice\View\Form" name="form" template="order/invoice/view/form.phtml">
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_transactions_grid_block.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_transactions_grid_block.xml
index cbc91390fda6cd951fa9ebf480a3cd1b40e3c2b2..36e653b728b26412248d6286a1a0c936b4e59918 100644
--- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_transactions_grid_block.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_transactions_grid_block.xml
@@ -8,6 +8,8 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
     <update handle="sales_transactions_grid_block"/>
     <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="sales.transactions.grid">
             <arguments>
                 <argument name="id" xsi:type="string">order_transactions</argument>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_view.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_view.xml
index ed5a0578d7f292c37160a53a417aa5136dce7edb..19260c6cf0849dd9c89287a9291eed94c459d08a 100644
--- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_view.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_view.xml
@@ -15,6 +15,8 @@
     </head>
     <update handle="sales_order_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 -->
+
         <referenceContainer name="content">
             <block class="Magento\Sales\Block\Adminhtml\Order\View" name="sales_order_edit"/>
         </referenceContainer>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_transactions_view.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_transactions_view.xml
index aed08edb19e608d84b4a2397972d694dd6473754..0f7144004b45285aa108bfc37999b6596e48240f 100644
--- a/app/code/Magento/Sales/view/adminhtml/layout/sales_transactions_view.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_transactions_view.xml
@@ -8,6 +8,8 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
     <update handle="sales_transaction_child_block"/>
     <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 -->
+
         <referenceContainer name="content">
             <block class="Magento\Sales\Block\Adminhtml\Transactions\Detail" name="sales_transactions.detail" template="transactions/detail.phtml">
                 <block class="Magento\Sales\Block\Adminhtml\Transactions\Detail\Grid" name="sales_transactions.detail.grid" as="detail_grid"/>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/items/column/name.phtml b/app/code/Magento/Sales/view/adminhtml/templates/items/column/name.phtml
index 410e44f5977e65522e61d063142f0db15a51390e..d8e8c8eda42623412337857b7d75163a62aa8027 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/items/column/name.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/items/column/name.phtml
@@ -14,33 +14,38 @@
 ?>
 
 <?php if ($_item = $block->getItem()): ?>
-    <div id="order_item_<?php echo $_item->getId() ?>_title" class="product-title"><?php echo $block->escapeHtml($_item->getName()) ?></div>
-    <strong><?php echo __('SKU') ?>:</strong> <?php echo implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($block->getSku()))); ?>
-    <?php if ($block->getOrderOptions()): ?>
-        <dl class="item-options">
-        <?php foreach ($block->getOrderOptions() as $_option): ?>
-            <dt><?php echo $_option['label'] ?></dt>
-            <dd>
-            <?php if (isset($_option['custom_view']) && $_option['custom_view']): ?>
-                <?php echo $block->getCustomizedOptionValue($_option); ?>
-            <?php else: ?>
-                <?php $_option = $block->getFormattedOption($_option['value']); ?>
-                <?php echo $_option['value']; ?><?php if (isset($_option['remainder']) && $_option['remainder']): ?><span id="<?php echo $_dots = 'dots' . uniqid()?>"> ...</span><span id="<?php echo $_id = 'id' . uniqid()?>"><?php echo $_option['remainder'] ?></span>
-                    <script>
-require(['prototype'], function(){
+    <div id="order_item_<?php echo $_item->getId() ?>_title"
+         class="product-title">
+        <?php echo $block->escapeHtml($_item->getName()) ?>
+    </div>
 
-    $('<?php echo $_id ?>').hide();
-    $('<?php echo $_id ?>').up().observe('mouseover', function(){$('<?php echo $_id ?>').show();});
-    $('<?php echo $_id ?>').up().observe('mouseover', function(){$('<?php echo $_dots?>').hide();});
-    $('<?php echo $_id ?>').up().observe('mouseout',  function(){$('<?php echo $_id ?>').hide();});
-    $('<?php echo $_id ?>').up().observe('mouseout',  function(){$('<?php echo $_dots ?>').show();});
+    <div class="product-sku-block">
+        <span><?php echo __('SKU') ?>:</span> <?php echo implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($block->getSku()))); ?>
+    </div>
 
-});
-</script>
-                <?php endif; ?>
-            <?php endif; ?>
-            </dd>
-        <?php endforeach; ?>
+    <?php if ($block->getOrderOptions()): ?>
+        <dl class="item-options">
+            <?php foreach ($block->getOrderOptions() as $_option): ?>
+                <dt><?php echo $_option['label'] ?>:</dt>
+                <dd>
+                    <?php if (isset($_option['custom_view']) && $_option['custom_view']): ?>
+                        <?php echo $block->getCustomizedOptionValue($_option); ?>
+                    <?php else: ?>
+                        <?php $_option = $block->getFormattedOption($_option['value']); ?>
+                        <?php echo $_option['value']; ?><?php if (isset($_option['remainder']) && $_option['remainder']): ?><span id="<?php echo $_dots = 'dots' . uniqid()?>"> ...</span><span id="<?php echo $_id = 'id' . uniqid()?>"><?php echo $_option['remainder'] ?></span>
+                            <script>
+                                require(['prototype'], function() {
+                                    $('<?php echo $_id ?>').hide();
+                                    $('<?php echo $_id ?>').up().observe('mouseover', function(){$('<?php echo $_id ?>').show();});
+                                    $('<?php echo $_id ?>').up().observe('mouseover', function(){$('<?php echo $_dots?>').hide();});
+                                    $('<?php echo $_id ?>').up().observe('mouseout',  function(){$('<?php echo $_id ?>').hide();});
+                                    $('<?php echo $_id ?>').up().observe('mouseout',  function(){$('<?php echo $_dots ?>').show();});
+                                });
+                            </script>
+                        <?php endif; ?>
+                    <?php endif; ?>
+                </dd>
+            <?php endforeach; ?>
         </dl>
     <?php endif; ?>
     <?php echo $block->escapeHtml($_item->getDescription()) ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/items/column/qty.phtml b/app/code/Magento/Sales/view/adminhtml/templates/items/column/qty.phtml
index 91e20c1f3658451d6d43cfc54f6b657c69526e2d..46b39dc3a78af52bbe12142c47d4876c312e982a 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/items/column/qty.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/items/column/qty.phtml
@@ -8,34 +8,39 @@
 
 ?>
 <?php if ($_item = $block->getItem()): ?>
-<table cellspacing="0" class="qty-table">
+<table class="data-table qty-table">
     <tr>
-        <td><?php echo __('Ordered') ?></td>
-        <td><strong><?php echo $_item->getQtyOrdered()*1 ?></strong></td>
+        <th><?php echo __('Ordered') ?></th>
+        <td><?php echo $_item->getQtyOrdered()*1 ?></td>
     </tr>
+
     <?php if ((float) $_item->getQtyInvoiced()): ?>
-    <tr>
-        <td><?php echo __('Invoiced') ?></td>
-        <td><strong><?php echo $_item->getQtyInvoiced()*1 ?></strong></td>
-    </tr>
+        <tr>
+            <th><?php echo __('Invoiced') ?></th>
+            <td><?php echo $_item->getQtyInvoiced()*1 ?></td>
+        </tr>
     <?php endif; ?>
+
     <?php if ((float) $_item->getQtyShipped()): ?>
-    <tr>
-        <td><?php echo __('Shipped') ?></td>
-        <td><strong><?php echo $_item->getQtyShipped()*1 ?></strong></td>
-    </tr>
+        <tr>
+            <th><?php echo __('Shipped') ?></th>
+            <td><?php echo $_item->getQtyShipped()*1 ?></td>
+        </tr>
     <?php endif; ?>
+
     <?php if ((float) $_item->getQtyRefunded()): ?>
-    <tr>
-        <td><?php echo __('Refunded') ?></td>
-        <td><strong><?php echo $_item->getQtyRefunded()*1 ?></strong></td>
-    </tr>
+        <tr>
+            <th><?php echo __('Refunded') ?></th>
+            <td><?php echo $_item->getQtyRefunded()*1 ?></td>
+        </tr>
     <?php endif; ?>
+
     <?php if ((float) $_item->getQtyCanceled()): ?>
-    <tr>
-        <td><?php echo __('Canceled') ?></td>
-        <td><strong><?php echo $_item->getQtyCanceled()*1 ?></strong></td>
-    </tr>
+        <tr>
+            <th><?php echo __('Canceled') ?></th>
+            <td><?php echo $_item->getQtyCanceled()*1 ?></td>
+        </tr>
     <?php endif; ?>
+
 </table>
 <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/comments/view.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/comments/view.phtml
index cbe3b6f40e5b08784d20e03f978f0940d9ee0ddc..096b7098612358a568c5d5feba5022f428dfa7db 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/comments/view.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/comments/view.phtml
@@ -8,38 +8,62 @@
 
 ?>
 <?php if ($_entity = $block->getEntity()): ?>
-<div id="comments_block">
-    <div class="field-row">
-        <label class="normal" for="history_comment"><?php echo __('Comment Text') ?></label>
-        <textarea name="comment[comment]" rows="3" cols="5" id="history_comment"></textarea>
-    </div>
-    <div class="clearfix">
-        <div class="actions">
-            <?php echo $block->getChildHtml('submit_button') ?>
+<div id="comments_block" class="edit-order-comments">
+    <div class="order-history-block">
+        <div class="admin__field field-row">
+            <label class="admin__field-label"
+                   for="history_comment"><?php echo __('Comment Text') ?></label>
+            <textarea name="comment[comment]"
+                      class="admin__control-textarea"
+                      rows="3"
+                      cols="5"
+                      id="history_comment"></textarea>
         </div>
-        <div class="order-history-comments-options">
-            <?php if ($block->canSendCommentEmail()): ?>
-                <input name="comment[is_customer_notified]" type="checkbox" id="history_notify" value="1" /><label class="normal" for="history_notify"><?php echo __('Notify Customer by Email') ?></label><br />
-            <?php endif; ?>
-            <input name="comment[is_visible_on_front]" type="checkbox" id="history_visible" value="1" /><label class="normal" for="history_visible"> <?php echo __('Visible on Frontend') ?></label>
+        <div class="admin__field">
+            <div class="order-history-comments-options">
+                <?php if ($block->canSendCommentEmail()): ?>
+                    <div class="admin__field admin__field-option">
+                        <input name="comment[is_customer_notified]"
+                               type="checkbox"
+                               class="admin__control-checkbox"
+                               id="history_notify"
+                               value="1" />
+                        <label class="admin__field-label"
+                               for="history_notify"><?php echo __('Notify Customer by Email') ?></label>
+                    </div>
+                <?php endif; ?>
+                <div class="admin__field admin__field-option">
+                    <input name="comment[is_visible_on_front]"
+                           type="checkbox"
+                           id="history_visible"
+                           class="admin__control-checkbox"
+                           value="1" />
+                    <label class="admin__field-label"
+                           for="history_visible"> <?php echo __('Visible on Frontend') ?></label>
+                </div>
+            </div>
+            <div class="order-history-comments-actions">
+                <?php echo $block->getChildHtml('submit_button') ?>
+            </div>
         </div>
     </div>
+
     <ul class="note-list">
-    <?php foreach ($_entity->getCommentsCollection(true) as $_comment): ?>
-        <li>
-            <span class="note-list-date"><?php echo $block->formatDate($_comment->getCreatedAtDate(), \IntlDateFormatter::MEDIUM) ?></span>
-            <span class="note-list-time"><?php echo $block->formatTime($_comment->getCreatedAtDate(), \IntlDateFormatter::MEDIUM) ?></span>
-            <span class="note-list-customer">
-                <?php echo __('Customer') ?>
-                <?php if ($_comment->getIsCustomerNotified()): ?>
-                    <span class="note-list-customer-notified"><?php echo __('Notified') ?></span>
-                <?php else: ?>
-                    <span class="note-list-customer-not-notified"><?php echo __('Not Notified') ?></span>
-                <?php endif; ?>
-            </span>
-            <div class="note-list-comment"><?php echo $block->escapeHtml($_comment->getComment(), ['b', 'br', 'strong', 'i', 'u']) ?></div>
-        </li>
-    <?php endforeach; ?>
+        <?php foreach ($_entity->getCommentsCollection(true) as $_comment): ?>
+            <li>
+                <span class="note-list-date"><?php echo $block->formatDate($_comment->getCreatedAtDate(), \IntlDateFormatter::MEDIUM) ?></span>
+                <span class="note-list-time"><?php echo $block->formatTime($_comment->getCreatedAtDate(), \IntlDateFormatter::MEDIUM) ?></span>
+                <span class="note-list-customer">
+                    <?php echo __('Customer') ?>
+                    <?php if ($_comment->getIsCustomerNotified()): ?>
+                        <span class="note-list-customer-notified"><?php echo __('Notified') ?></span>
+                    <?php else: ?>
+                        <span class="note-list-customer-not-notified"><?php echo __('Not Notified') ?></span>
+                    <?php endif; ?>
+                </span>
+                <div class="note-list-comment"><?php echo $block->escapeHtml($_comment->getComment(), ['b', 'br', 'strong', 'i', 'u']) ?></div>
+            </li>
+        <?php endforeach; ?>
     </ul>
 </div>
 <script>
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 956ca1eedf569a14dca9e099c7ca15f98e6e6eb2..4364258410ba46e1083242b1ac611ba6f053734b 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,8 +8,8 @@
 
 ?>
 
-<div class="admin__fieldset-wrapper-title">
-    <strong><?php echo $block->getHeaderText() ?></strong>
+<div class="admin__page-section-title">
+    <span class="title"><?php echo $block->getHeaderText() ?></span>
     <?php if($block->getButtonsHtml()): ?>
         <div class="actions"><?php echo $block->getButtonsHtml() ?></div>
     <?php endif; ?>
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 d166ab4edac32983b6d5f784ede2228b21e362c1..7ba8e8a79394a26020ad406ff7b7ca287cb53b4a 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
@@ -14,82 +14,76 @@
     });
 </script>
     <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="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-additional_area" style="display: none" class="admin__page-section order-additional-area">
+            <?php echo $block->getChildHtml('additional_area') ?>
+        </div>
 
-            <div id="order-items" class="admin__fieldset-wrapper order-items" data-mage-init='{"loader": {}}'>
-                <?php echo $block->getChildHtml('items') ?>
-            </div>
+        <div id="order-search" style="display: none" class="admin__page-section order-search-items">
+            <?php echo $block->getChildHtml('search') ?>
+        </div>
 
-            <div id="order-errors" class="order-errors"><?php echo $block->getChildHtml('errors') ?></div>
+        <section id="order-items" class="admin__page-section order-items" data-mage-init='{"loader": {}}'>
+            <?php echo $block->getChildHtml('items') ?>
+        </section>
 
-            <div id="order-form_account" class="admin__fieldset-wrapper order-account-information">
-                <?php echo $block->getChildHtml('form_account') ?>
-            </div>
+        <div id="order-errors" class="order-errors"><?php echo $block->getChildHtml('errors') ?></div>
 
-            <div id="order-addresses" class="admin__fieldset-wrapper order-addresses">
-                <div class="admin__fieldset-wrapper-title">
-                    <strong class="title"><?php echo __('Address Information') ?></strong>
+        <section id="order-form_account" class="admin__page-section order-account-information">
+            <?php echo $block->getChildHtml('form_account') ?>
+        </section>
+
+        <section id="order-addresses" class="admin__page-section order-addresses">
+            <div class="admin__page-section-title">
+                <span class="title"><?php echo __('Address Information') ?></span>
+            </div>
+            <div class="admin__page-section-content">
+                <div id="order-billing_address" class="admin__page-section-item order-billing-address">
+                    <?php echo $block->getChildHtml('billing_address') ?>
                 </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 id="order-shipping_address" class="admin__page-section-item order-shipping-address">
+                    <?php echo $block->getChildHtml('shipping_address') ?>
                 </div>
             </div>
+        </section>
 
-            <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>
+        <section id="order-methods" class="admin__page-section order-methods">
+            <div class="admin__page-section-title">
+                <span class="title"><?php echo __('Payment &amp; Shipping Information') ?></span>
+            </div>
+            <div class="admin__page-section-content">
+                <div id="order-billing_method" class="admin__page-section-item order-billing-method">
+                    <?php echo $block->getChildHtml('billing_method') ?>
                 </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 id="order-shipping_method" class="admin__page-section-item order-shipping-method">
+                    <?php echo $block->getChildHtml('shipping_method') ?>
                 </div>
             </div>
+        </section>
 
-            <?php if ($block->getChildBlock('card_validation')): ?>
-                <div id="order-card_validation" class="admin__fieldset-wrapper order-card-validation">
-                    <?php echo $block->getChildHtml('card_validation') ?>
-                </div>
-            <?php endif; ?>
+        <?php if ($block->getChildBlock('card_validation')): ?>
+        <section id="order-card_validation" class="admin__page-section order-card-validation">
+            <?php echo $block->getChildHtml('card_validation') ?>
+        </section>
+        <?php endif; ?>
 
-            <?php echo $block->getChildHtml('gift_options') ?>
+        <?php echo $block->getChildHtml('gift_options') ?>
 
-            <div class="admin__fieldset-wrapper order-summary">
-                <div class="admin__fieldset-wrapper-title">
-                    <strong class="title"><?php echo __('Order Total') ?></strong>
-                </div>
-                <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>
+        <section class="admin__page-section order-summary">
+            <div class="admin__page-section-title">
+                <span class="title"><?php echo __('Order Total') ?></span>
             </div>
-
-        </div>
+            <div class="admin__page-section-content">
+                <fieldset class="admin__fieldset order-history" id="order-comment">
+                    <legend class="admin__legend"><span><?php echo __('Order History') ?></span></legend>
+                    <br>
+                    <?php echo $block->getChildHtml('comment') ?>
+                </fieldset>
+                <fieldset id="order-totals" class="admin__fieldset order-totals">
+                    <?php echo $block->getChildHtml('totals') ?>
+                </fieldset>
+            </div>
+        </section>
     </div>
 
     <?php if ($block->getCustomerId()): ?>
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 23f4f8379ceaf37ae403c6e73ac3ea205f88398e..8fa45617a3a04a5de8cd988582c19efbf43dceda 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
@@ -5,12 +5,11 @@
  */
  ?>
 
-<div class="admin__fieldset-wrapper-title <?php echo $block->getHeaderCssClass() ?>">
+<div class="admin__page-section-title <?php echo $block->getHeaderCssClass() ?>">
     <span class="title"><?php echo $block->getHeaderText() ?></span>
     <div class="actions"></div>
 </div>
-
-<div id="customer_account_fieds" class="admin__fieldset-wrapper-content">
+<div id="customer_account_fieds" class="admin__page-section-content">
     <?php echo $block->getForm()->getHtml() ?>
 </div>
 
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 e2b9bd096a03c7f5f6c414b8cc112977f852bc1f..bb7e4b3597c6ee7c9162666bc1dbf411155a7ee7 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,7 +8,7 @@
 
 ?>
 
-<div class="admin__fieldset-wrapper-title">
+<div class="admin__page-section-title">
     <strong class="title"><?php echo $block->getHeaderText() ?></strong>
     <div class="actions">
         <?php echo $block->getButtonsHtml() ?>
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 d6c4a2dd5a591b2325af448049f8087cb8653bd3..aaf605a22ce9a659942499c8081832f5b26e92d1 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 class="data-table table-info order-tables">
+        <table class="data-table admin__table-primary order-tables">
             <thead>
                 <tr class="headings">
                     <th class="col-product"><span><?php echo __('Product') ?></span></th>
@@ -40,11 +40,11 @@
 <div class="grid" id="order-items_grid">
     <div class="hor-scroll">
     <?php if (count($_items)>10): ?>
-        <div class="actions update">
-            <?php echo $block->getButtonHtml(__('Update Items and Qty\'s'), 'order.itemsUpdate()'); ?>
+        <div class="actions update actions-update">
+            <?php echo $block->getButtonHtml(__('Update Items and Qty\'s'), 'order.itemsUpdate()', 'action-secondary'); ?>
         </div>
     <?php endif; ?>
-        <table class="data-table table-info order-tables">
+        <table class="data-table admin__table-primary order-tables">
             <thead>
                 <tr class="headings">
                     <th class="col-product"><span><?php echo __('Product') ?></span></th>
@@ -75,8 +75,8 @@
                     <tr>
                         <td class="col-product">
                             <span id="order_item_<?php echo $_item->getId() ?>_title"><?php echo $block->escapeHtml($_item->getName()) ?></span>
-                            <div>
-                                <strong><?php echo __('SKU') ?>:</strong>
+                            <div class="product-sku-block">
+                                <span><?php echo __('SKU') ?>:</span>
                                 <?php echo implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))); ?>
                             </div>
                             <div class="product-configure-block">
@@ -140,7 +140,7 @@
                         </td>
                         <td class="col-actions last">
                             <select class="admin__control-select" name="item[<?php echo $_item->getId() ?>][action]">
-                                <option value=""></option>
+                                <option value=""><?php echo __('Please select') ?></option>
                                 <option value="remove"><?php echo __('Remove') ?></option>
                                 <?php if ($block->getCustomerId() && $block->getMoveToCustomerStorage()): ?>
                                     <option value="cart"><?php echo __('Move to Shopping Cart') ?></option>
@@ -170,7 +170,7 @@
                     <?php endforeach; ?>
 
                     <?php if ($hasMessageError):?>
-                        <tr class="col-messages-error">
+                        <tr class="row-messages-error">
                             <td colspan="100"> <!-- ToDo UI: remove the 100 -->
                                 <?php foreach ($_item->getMessage(false) as $message):
                                     if (empty($message)) {
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 7ccbfbb6bd3ec7da874f9ed621c5a736d1cdc132..f1e4430c69ff5937b7a0028d063594639ee27c66 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
@@ -52,7 +52,7 @@
         </dl>
     </div>
     <?php if ($_rate = $block->getActiveMethodRate()): ?>
-        <div id="order-shipping-method-info">
+        <div id="order-shipping-method-info" class="order-shipping-method-info">
             <dl class="admin__order-shipment-methods">
                 <dt class="admin__order-shipment-methods-title">
                     <?php echo $block->escapeHtml($block->getCarrierName($_rate->getCarrier())) ?>
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 c3eaf03a4c25526c7211116d86654dcb6e85a935..9ae2ac048ef6aa9e6df1ffa0b6b1f73d893fa9bc 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
@@ -9,7 +9,7 @@
 ?>
 <?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">
+    <div class="head sidebar-title-block">
         <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;">
@@ -23,7 +23,7 @@
     <div class="content">
         <div class="auto-scroll">
         <?php if ($block->getItemCount()): ?>
-        <table class="table-info">
+        <table class="admin__table-primary">
             <thead>
                 <tr>
                     <th class="col-item"><?php echo __('Item') ?></th>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/form.phtml
index b876ba145accb78c81f8140980e95b76bfb8f1e7..f13fd7a04b50b05f720db68d44501be2c189c928 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/form.phtml
@@ -13,58 +13,60 @@
 
     <?php echo $block->getChildHtml('order_info') ?>
 
-    <?php if (!$_order->getIsVirtual()): ?>
-    <div class="clearfix">
-    <?php endif; ?>
-
+    <section class="admin__page-section">
+        <div class="admin__page-section-title">
+            <span class="title"><?php echo __('Payment &amp; Shipping Method') ?></span>
+        </div>
+        <div class="admin__page-section-content">
         <?php if (!$_order->getIsVirtual()): ?>
-        <div class="order-payment-method">
+        <div class="admin__page-section-item order-payment-method">
         <?php else: ?>
-        <div class="order-payment-method order-payment-method-virtual">
+        <div class="admin__page-section-item order-payment-method order-payment-method-virtual">
         <?php endif; ?>
 
             <?php /* Billing Address */ ?>
-            <div class="fieldset-wrapper">
-                <div class="fieldset-wrapper-title">
-                    <span class="title"><?php echo __('Payment Information') ?></span>
+            <div class="admin__page-section-item-title">
+                <span class="title"><?php echo __('Payment Information') ?></span>
+            </div>
+            <div class="admin__page-section-item-content">
+                <div class="order-payment-method-title"><?php echo $block->getChildHtml('order_payment') ?></div>
+                <div class="order-payment-currency">
+                    <?php echo __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?>
+                </div>
+                <div class="order-payment-additional">
+                    <?php echo $block->getChildHtml('order_payment_additional'); ?>
                 </div>
-                <div><?php echo $block->getChildHtml('order_payment') ?></div>
-                <div class="order-payment-currency"><?php echo __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?></div>
-                <div class="order-payment-additional"><?php echo $block->getChildHtml('order_payment_additional'); ?></div>
             </div>
-
         </div>
 
         <?php if (!$_order->getIsVirtual()): ?>
-        <div class="order-shipping-address">
+        <div class="admin__page-section-item order-shipping-address">
             <?php /* Shipping Address */ ?>
-            <div class="fieldset-wrapper">
-                <div class="fieldset-wrapper-title">
-                    <span class="title"><?php echo __('Shipping Information') ?></span>
-                </div>
-                <div class="shipping-description-wrapper">
-                    <div class="shipping-description-title"><?php echo $block->escapeHtml($_order->getShippingDescription()) ?></div>
-                    <div class="shipping-description-content">
-                        <?php echo __('Total Shipping Charges'); ?>:
+            <div class="admin__page-section-item-title">
+                <span class="title"><?php echo __('Shipping Information') ?></span>
+            </div>
+            <div class="admin__page-section-item-content shipping-description-wrapper">
+                <div class="shipping-description-title"><?php echo $block->escapeHtml($_order->getShippingDescription()) ?></div>
+                <div class="shipping-description-content">
+                    <?php echo __('Total Shipping Charges'); ?>:
 
-                        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax($block->getSource()->getStoreId())): ?>
-                            <?php $_excl = $block->displayShippingPriceInclTax($_order); ?>
-                        <?php else: ?>
-                            <?php $_excl = $block->displayPriceAttribute('shipping_amount', false, ' '); ?>
-                        <?php endif; ?>
-                        <?php $_incl = $block->displayShippingPriceInclTax($_order); ?>
+                    <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax($block->getSource()->getStoreId())): ?>
+                        <?php $_excl = $block->displayShippingPriceInclTax($_order); ?>
+                    <?php else: ?>
+                        <?php $_excl = $block->displayPriceAttribute('shipping_amount', false, ' '); ?>
+                    <?php endif; ?>
+                    <?php $_incl = $block->displayShippingPriceInclTax($_order); ?>
 
-                        <?php echo $_excl; ?>
-                        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices($block->getSource()->getStoreId()) && $_incl != $_excl): ?>
-                            (<?php echo __('Incl. Tax'); ?> <?php echo $_incl; ?>)
-                        <?php endif; ?>
-                    </div>
+                    <?php echo $_excl; ?>
+                    <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices($block->getSource()->getStoreId()) && $_incl != $_excl): ?>
+                        (<?php echo __('Incl. Tax'); ?> <?php echo $_incl; ?>)
+                    <?php endif; ?>
                 </div>
             </div>
         </div>
         <?php endif; ?>
-
-    </div><?php /* opening div can be in app\code\Magento\Sales\view\adminhtml\order\view\info.phtml or above */?>
+        </div>
+    </section>
 
     <div id="creditmemo_item_container">
         <?php echo $block->getChildHtml('order_items') ?>
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 c09ee04d9435d03df15868073eb92d7e82631786..82770b4f3fa45ba239c13dfb673a1dbb8f5d1bb3 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
@@ -9,14 +9,14 @@
 ?>
 <?php $_items = $block->getCreditmemo()->getAllItems() ?>
 
-<div class="fieldset-wrapper">
-    <div class="fieldset-wrapper-title">
+<section class="admin__page-section">
+    <div class="admin__page-section-title">
         <span class="title"><?php echo __('Items to Refund') ?></span>
     </div>
 
     <?php if (count($_items)) : ?>
     <div class="grid">
-        <table cellspacing="0" class="data order-tables">
+        <table class="data-table admin__table-primary order-creditmemo-tables">
             <thead>
                 <tr class="headings">
                     <th class="col-product"><span><?php echo __('Product') ?></span></th>
@@ -61,40 +61,66 @@
         <?php echo __('No Items To Refund') ?>
     </div>
     <?php endif; ?>
-</div>
+</section>
 
 <?php $orderTotalBar = $block->getChildHtml('order_totalbar'); ?>
 
 <?php if (!empty($orderTotalBar)): ?>
-<div class="fieldset-wrapper">
+<section class="fieldset-wrapper">
     <?php echo $orderTotalBar; ?>
-</div>
+</section>
 <?php endif; ?>
 
-<div class="clearfix">
+<section class="admin__page-section">
     <input type="hidden" name="creditmemo[do_offline]" id="creditmemo_do_offline" value="0" />
-    <div class="order-comments-history">
-        <div class="fieldset-wrapper">
-            <div class="fieldset-wrapper-title"><span class="title"><?php echo __('Credit Memo Comments') ?></span></div>
-            <fieldset id="history_form">
-                <label class="normal" for="creditmemo_comment_text"><?php echo __('Credit Memo Comments') ?></label><br/>
-                <textarea id="creditmemo_comment_text" name="creditmemo[comment_text]" rows="3" cols="5"><?php echo $block->getCreditmemo()->getCommentText(); ?></textarea>
-            </fieldset>
-        </div>
+    <div class="admin__page-section-title">
+        <span class="title"><?php echo __('Order Total') ?></span>
     </div>
-    <div class="order-totals creditmemo-totals">
-        <div class="fieldset-wrapper">
-            <div class="fieldset-wrapper-title"><span class="title"><?php echo __('Refund Totals') ?></span></div>
+    <div class="admin__page-section-content">
+        <div class="admin__page-section-item order-comments-history">
+            <div class="admin__page-section-item-title">
+                <span class="title"><?php echo __('Credit Memo Comments') ?></span>
+            </div>
+            <div id="history_form" class="admin__fieldset-wrapper-content">
+                <div class="admin__field">
+                    <label class="normal admin__field-label"
+                           for="creditmemo_comment_text"><?php echo __('Comment Text') ?></label>
+                    <div class="admin__field-control">
+                        <textarea id="creditmemo_comment_text"
+                                  class="admin__control-textarea"
+                                  name="creditmemo[comment_text]"
+                                  rows="3"
+                                  cols="5"><?php echo $block->getCreditmemo()->getCommentText(); ?></textarea>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="admin__page-section-item order-totals creditmemo-totals">
+            <div class="admin__page-section-item-title">
+                <span class="title"><?php echo __('Refund Totals') ?></span>
+            </div>
             <?php echo $block->getChildHtml('creditmemo_totals') ?>
             <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 class="field choice admin__field admin__field-option field-append-comments">
+                    <input id="notify_customer"
+                           class="admin__control-checkbox"
+                           name="creditmemo[comment_customer_notify]"
+                           value="1"
+                           type="checkbox" />
+                    <label for="notify_customer" class="admin__field-label">
+                        <span><?php echo __('Append Comments') ?></span>
+                    </label>
                 </div>
                 <?php if ($block->canSendCreditmemoEmail()):?>
-                <div class="field choice field-email-copy">
-                    <input id="send_email" name="creditmemo[send_email]" value="1" type="checkbox" />
-                    <label for="send_email"><span><?php echo __('Email Copy of Credit Memo') ?></span></label>
+                <div class="field choice admin__field admin__field-option field-email-copy">
+                    <input id="send_email"
+                           class="admin__control-checkbox"
+                           name="creditmemo[send_email]"
+                           value="1"
+                           type="checkbox" />
+                    <label for="send_email" class="admin__field-label">
+                        <span><?php echo __('Email Copy of Credit Memo') ?></span>
+                    </label>
                 </div>
                 <?php endif; ?>
                 <?php echo $block->getChildHtml('submit_before') ?>
@@ -106,7 +132,7 @@
             </div>
         </div>
     </div>
-</div>
+</section>
 
 <script>
 require(['jquery', 'prototype'], function(jQuery){
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items/renderer/default.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items/renderer/default.phtml
index 76ec308d8b6696ecb466071cb290bd23d4a7fd3f..c238f2478bffae8180f6391914320fdacdee4db6 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items/renderer/default.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items/renderer/default.phtml
@@ -19,13 +19,20 @@
     <?php if ($block->canParentReturnToStock($_item)) : ?>
         <td class="col-return-to-stock">
         <?php if ($block->canReturnItemToStock($_item)) : ?>
-            <input type="checkbox" name="creditmemo[items][<?php echo $_item->getOrderItemId() ?>][back_to_stock]" value="1"<?php if ($_item->getBackToStock()):?> checked<?php endif;?>/>
+            <input type="checkbox"
+                   class="admin__control-checkbox"
+                   name="creditmemo[items][<?php echo $_item->getOrderItemId() ?>][back_to_stock]"
+                   value="1"<?php if ($_item->getBackToStock()):?> checked<?php endif;?>/>
+            <label class="admin__field-label"></label>
         <?php endif; ?>
         </td>
     <?php endif; ?>
-    <td class="col-refund">
+    <td class="col-refund col-qty">
     <?php if ($block->canEditQty()) : ?>
-        <input type="text" class="input-text qty-input" name="creditmemo[items][<?php echo $_item->getOrderItemId() ?>][qty]" value="<?php echo $_item->getQty()*1 ?>"/>
+        <input type="text"
+               class="input-text admin__control-text qty-input"
+               name="creditmemo[items][<?php echo $_item->getOrderItemId() ?>][qty]"
+               value="<?php echo $_item->getQty()*1 ?>"/>
     <?php else : ?>
         <?php echo $_item->getQty()*1 ?>
     <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/totals/adjustments.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/totals/adjustments.phtml
index 4b7f73a40590b4ae166748ce1cb2c756ab0b7467..8ae81b1a6d0c0d5046ea7ff7ea45a1bcec2b9780 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/totals/adjustments.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/totals/adjustments.phtml
@@ -11,52 +11,69 @@
 <?php if ($_source): ?>
     <tr>
         <td class="label"><?php echo $block->getShippingLabel() ?><div id="shipping_amount_adv"></div></td>
-        <td><input type="text" name="creditmemo[shipping_amount]" value="<?php echo $block->getShippingAmount()?>" class="input-text not-negative-amount" id="shipping_amount" /></td>
+        <td>
+            <input type="text"
+                   name="creditmemo[shipping_amount]"
+                   value="<?php echo $block->getShippingAmount()?>"
+                   class="input-text admin__control-text not-negative-amount"
+                   id="shipping_amount" />
+        </td>
     </tr>
     <tr>
         <td class="label"><?php echo __('Adjustment Refund') ?><div id="adjustment_positive_adv"></div></td>
-        <td><input type="text" name="creditmemo[adjustment_positive]" value="<?php echo $_source->getBaseAdjustmentFeePositive()*1 ?>" class="input-text not-negative-amount" id="adjustment_positive" /></td>
+        <td>
+            <input type="text"
+                   name="creditmemo[adjustment_positive]"
+                   value="<?php echo $_source->getBaseAdjustmentFeePositive()*1 ?>"
+                   class="input-text admin__control-text not-negative-amount"
+                   id="adjustment_positive" />
+        </td>
     </tr>
     <tr>
         <td class="label"><?php echo __('Adjustment Fee') ?><div id="adjustment_negative_adv"></div></td>
-        <td><input type="text" name="creditmemo[adjustment_negative]" value="<?php echo $_source->getBaseAdjustmentFeeNegative()*1 ?>" class="input-text not-negative-amount" id="adjustment_negative"/>
-        <script>
-require(['prototype'], function(){
+        <td>
+            <input type="text"
+                   name="creditmemo[adjustment_negative]"
+                   value="<?php echo $_source->getBaseAdjustmentFeeNegative()*1 ?>"
+                   class="input-text admin__control-text not-negative-amount"
+                   id="adjustment_negative"/>
+            <script>
+                require(['prototype'], function(){
 
-//<![CDATA[
-Validation.addAllThese([
-    ['not-negative-amount', '<?php echo __('Please enter a positive number in this field.') ?>', function(v) {
-        if(v.length)
-            return /^\s*\d+([,.]\d+)*\s*%?\s*$/.test(v);
-        else
-            return true;
-    }]
-]);
+                //<![CDATA[
+                Validation.addAllThese([
+                    ['not-negative-amount', '<?php echo __('Please enter a positive number in this field.') ?>', function(v) {
+                        if(v.length)
+                            return /^\s*\d+([,.]\d+)*\s*%?\s*$/.test(v);
+                        else
+                            return true;
+                    }]
+                ]);
 
-if ($('shipping_amount')) {
-    $('shipping_amount').advaiceContainer = $('shipping_amount_adv');
-    unblockSubmit('shipping_amount');
-}
-if ($('adjustment_positive')) {
-    $('adjustment_positive').advaiceContainer = $('adjustment_positive_adv');
-    unblockSubmit('adjustment_positive');
-}
-if ($('adjustment_negative')) {
-    $('adjustment_negative').advaiceContainer = $('adjustment_negative_adv');
-    unblockSubmit('adjustment_negative');
-}
+                if ($('shipping_amount')) {
+                    $('shipping_amount').advaiceContainer = $('shipping_amount_adv');
+                    unblockSubmit('shipping_amount');
+                }
+                if ($('adjustment_positive')) {
+                    $('adjustment_positive').advaiceContainer = $('adjustment_positive_adv');
+                    unblockSubmit('adjustment_positive');
+                }
+                if ($('adjustment_negative')) {
+                    $('adjustment_negative').advaiceContainer = $('adjustment_negative_adv');
+                    unblockSubmit('adjustment_negative');
+                }
 
-function unblockSubmit(id) {
-    $(id).observe('focus', function(event) {
-        if ($$('button[class="scalable update-button disabled"]').size() > 0) {
-            enableElements('submit-button');
-        }
-    });
-}
-//]]>
+                function unblockSubmit(id) {
+                    $(id).observe('focus', function(event) {
+                        if ($$('button[class="scalable update-button disabled"]').size() > 0) {
+                            enableElements('submit-button');
+                        }
+                    });
+                }
+                //]]>
 
-});
-</script>
+                });
+            </script>
         </td>
     </tr>
 
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/form.phtml
index df2f092e4f8aa839320ce77450ec4fceab97d5e4..ee8ec752df51752961a3b64a2bf415a4a3174ccb 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/form.phtml
@@ -9,51 +9,56 @@
 ?>
 <?php  $_order = $block->getCreditmemo()->getOrder() ?>
 <?php echo $block->getChildHtml('order_info') ?>
-<div class="clearfix">
-<?php if (!$_order->getIsVirtual()): ?>
-<div class="order-payment-method">
-<?php else: ?>
-<div class="order-payment-method order-payment-method-virtual">
-<?php endif; ?>
-    <?php /* Billing Address */?>
-    <div class="fieldset-wrapper">
-        <div class="fieldset-wrapper-title">
-            <span class="title"><?php echo __('Payment Information') ?></span>
-        </div>
-        <div><?php echo $block->getChildHtml('order_payment') ?></div>
-        <div class="order-payment-currency"><?php echo __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?></div>
-        <div class="order-payment-additional"><?php echo $block->getChildHtml('order_payment_additional'); ?></div>
+<section class="admin__page-section">
+    <div class="admin__page-section-title">
+        <span class="title"><?php echo __('Payment &amp; Shipping Method') ?></span>
     </div>
-</div>
-<?php if (!$_order->getIsVirtual()): ?>
-<div class="order-shipping-address">
-    <?php /* Shipping Address */ ?>
-    <div class="fieldset-wrapper">
-        <div class="fieldset-wrapper-title">
-            <span class="title"><?php echo __('Shipping Information') ?></span>
+    <div class="admin__page-section-content">
+
+        <?php if (!$_order->getIsVirtual()): ?>
+        <div class="admin__page-section-item order-payment-method">
+        <?php else: ?>
+        <div class="admin__page-section-item order-payment-method order-payment-method-virtual">
+        <?php endif; ?>
+            <?php /* Billing Address */?>
+            <div class="admin__page-section-item-title">
+                <span class="title"><?php echo __('Payment Information') ?></span>
+            </div>
+            <div class="admin__page-section-item-content">
+                <div><?php echo $block->getChildHtml('order_payment') ?></div>
+                <div class="order-payment-currency"><?php echo __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?></div>
+                <div class="order-payment-additional"><?php echo $block->getChildHtml('order_payment_additional'); ?></div>
+            </div>
         </div>
-        <div class="shipping-description-wrapper">
-            <div class="shipping-description-title"><?php echo $block->escapeHtml($_order->getShippingDescription()) ?></div>
-            <div class="shipping-description-content">
-                <?php echo __('Total Shipping Charges'); ?>:
 
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()): ?>
-                    <?php $_excl = $block->displayShippingPriceInclTax($_order); ?>
-                <?php else: ?>
-                    <?php $_excl = $block->displayPriceAttribute('shipping_amount', false, ' '); ?>
-                <?php endif; ?>
-                <?php $_incl = $block->displayShippingPriceInclTax($_order); ?>
+        <?php if (!$_order->getIsVirtual()): ?>
+        <div class="admin__page-section-item order-shipping-address">
+            <?php /* Shipping Address */ ?>
+            <div class="admin__page-section-item-title">
+                <span class="title"><?php echo __('Shipping Information') ?></span>
+            </div>
+            <div class="shipping-description-wrapper admin__page-section-item-content">
+                <div class="shipping-description-title"><?php echo $block->escapeHtml($_order->getShippingDescription()) ?></div>
+                <div class="shipping-description-content">
+                    <?php echo __('Total Shipping Charges'); ?>:
 
-                <?php echo $_excl; ?>
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
-                    (<?php echo __('Incl. Tax'); ?> <?php echo $_incl; ?>)
-                <?php endif; ?>
+                    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()): ?>
+                        <?php $_excl = $block->displayShippingPriceInclTax($_order); ?>
+                    <?php else: ?>
+                        <?php $_excl = $block->displayPriceAttribute('shipping_amount', false, ' '); ?>
+                    <?php endif; ?>
+                    <?php $_incl = $block->displayShippingPriceInclTax($_order); ?>
+
+                    <?php echo $_excl; ?>
+                    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
+                        (<?php echo __('Incl. Tax'); ?> <?php echo $_incl; ?>)
+                    <?php endif; ?>
+                </div>
             </div>
         </div>
+        <?php endif; ?>
     </div>
-</div>
-<?php endif; ?>
-</div>
+</section>
 <?php $_items = $block->getCreditmemo()->getAllItems() ?>
 
 <?php if (count($_items)): ?>
@@ -61,24 +66,30 @@
     <?php echo $block->getChildHtml('creditmemo_items') ?>
 </div>
 <?php else: ?>
-<div class="fieldset-wrapper">
-    <div class="fieldset-wrapper-title">
+<section class="admin__page-section">
+    <div class="admin__page-section-title">
         <span class="title"><?php echo __('Items Refunded') ?></span>
     </div>
-    <div class="no-items"><?php echo __('No Items') ?></div>
-</div>
+    <div class="no-items admin__page-section-content"><?php echo __('No Items') ?></div>
+</section>
 <?php endif; ?>
-<div class="clearfix">
-    <div class="order-comments-history">
-        <div class="fieldset-wrapper">
-            <div class="fieldset-wrapper-title"><span class="title"><?php echo __('Credit Memo History') ?></span></div>
-            <fieldset><?php echo $block->getChildHtml('order_comments') ?></fieldset>
-        </div>
+
+<section class="admin__page-section">
+    <div class="admin__page-section-title">
+        <span class="title"><?php echo __('Memo Total') ?></span>
     </div>
-    <div class="order-totals">
-        <div class="fieldset-wrapper" id="history_form">
-            <div class="fieldset-wrapper-title"><span class="title"><?php echo __('Credit Memo Totals') ?></span></div>
-            <div><?php echo $block->getChildHtml('creditmemo_totals') ?></div>
+    <div class="admin__page-section-content">
+        <div class="admin__page-section-item order-comments-history">
+            <div class="admin__page-section-item-title">
+                <span class="title"><?php echo __('Credit Memo History') ?></span>
+            </div>
+            <div class="admin__page-section-item-content"><?php echo $block->getChildHtml('order_comments') ?></div>
+        </div>
+        <div class="admin__page-section-item order-totals" id="history_form">
+            <div class="admin__page-section-item-title">
+                <span class="title"><?php echo __('Credit Memo Totals') ?></span>
+            </div>
+            <div class="admin__page-section-content"><?php echo $block->getChildHtml('creditmemo_totals') ?></div>
         </div>
     </div>
-</div>
+</section>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items.phtml
index a75e830aaacb88ff6ec19021c620544ef227bac2..3618871f0c7cac6da817fc5fe72ca8073cb97777 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items.phtml
@@ -8,12 +8,12 @@
 
 ?>
 <?php $_items = $block->getCreditmemo()->getAllItems() ?>
-<div class="fieldset-wrapper">
-    <div class="fieldset-wrapper-title">
+<div class="admin__page-section">
+    <div class="admin__page-section-title">
         <span class="title"><?php echo __('Items Refunded') ?></span>
     </div>
-    <div class="grid">
-        <table cellspacing="0" class="data">
+    <div class="admin__page-section-content">
+        <table class="data-table admin__table-primary order-creditmemo-tables">
             <thead>
                 <tr class="headings">
                     <th class="col-product"><span><?php echo __('Product') ?></span></th>
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 c837566257032cc8cd89c1c7e5be2e0a8d0d4edc..bab344f25065b2bfba1be65196fa2a28068d6044 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="admin__fieldset-wrapper order-gift-options">
-    <div class="admin__fieldset-wrapper-title"><strong class="title"><?php echo __('Gift Options') ?></strong></div>
+<section class="admin__page-section order-gift-options">
+    <div class="admin__page-section-title"><strong class="title"><?php echo __('Gift Options') ?></strong></div>
     <?php echo $block->getChildHtml() ?>
-</div>
+</section>
 <?php endif ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/form.phtml
index ce938f85d2764a1168ee9fb00d92ad9d42a2f84c..b0319ea9791f7b35afe27d1e647e6e9859448e03 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/form.phtml
@@ -7,68 +7,72 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<form id="edit_form" method="post" action="<?php echo $block->getSaveUrl() ?>">
+<form id="edit_form" class="order-invoice-edit" method="post" action="<?php echo $block->getSaveUrl() ?>">
     <?php echo $block->getBlockHtml('formkey')?>
     <?php $_order = $block->getInvoice()->getOrder() ?>
     <?php echo $block->getChildHtml('order_info') ?>
-    <?php if (!$_order->getIsVirtual()): ?>
-    <div class="clearfix">
-    <?php endif; ?>
 
-    <div class="order-payment-method<?php if ($_order->getIsVirtual()): ?> order-payment-method-virtual<?php endif; ?>">
-        <div class="fieldset-wrapper">
-            <div class="fieldset-wrapper-title">
-                <span class="title"><?php echo __('Payment Information') ?></span>
-            </div>
-            <div><?php echo $block->getChildHtml('order_payment') ?></div>
-            <div class="order-payment-currency"><?php echo __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?></div>
-            <div class="order-payment-additional"><?php echo $block->getChildHtml('order_payment_additional'); ?></div>
+    <section class="admin__page-section">
+        <div class="admin__page-section-title">
+            <span class="title"><?php echo __('Payment &amp; Shipping Method') ?></span>
         </div>
-    </div>
-    <?php if (!$_order->getIsVirtual()): ?>
-    <div class="order-shipping-address">
-        <?php /*Shipping Address */ ?>
-        <div class="fieldset-wrapper">
-            <div class="fieldset-wrapper-title">
-                <span class="title"><?php echo __('Shipping Information') ?></span>
+        <div class="admin__page-section-content">
+            <div class="admin__page-section-item order-payment-method<?php if ($_order->getIsVirtual()): ?> order-payment-method-virtual<?php endif; ?>">
+                <div class="admin__page-section-item-title">
+                    <span class="title"><?php echo __('Payment Information') ?></span>
+                </div>
+                <div class="admin__page-section-item-content">
+                    <div><?php echo $block->getChildHtml('order_payment') ?></div>
+                    <div class="order-payment-currency"><?php echo __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?></div>
+                    <div class="order-payment-additional"><?php echo $block->getChildHtml('order_payment_additional'); ?></div>
+                </div>
             </div>
-            <div class="shipping-description-wrapper">
-                <div class="shipping-description-title"><?php echo $block->escapeHtml($_order->getShippingDescription()) ?></div>
-                <div class="shipping-description-content">
-                    <?php echo __('Total Shipping Charges'); ?>:
+            <?php if (!$_order->getIsVirtual()): ?>
+            <div class="admin__page-section-item order-shipping-address">
+                <?php /*Shipping Address */ ?>
+                <div class="admin__page-section-item-title">
+                    <span class="title"><?php echo __('Shipping Information') ?></span>
+                </div>
+                <div class="admin__page-section-item-content">
+                    <div class="shipping-description-wrapper">
+                        <div class="shipping-description-title"><?php echo $block->escapeHtml($_order->getShippingDescription()) ?></div>
+                        <div class="shipping-description-content">
+                            <?php echo __('Total Shipping Charges'); ?>:
 
-                    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()): ?>
-                        <?php $_excl = $block->displayShippingPriceInclTax($_order); ?>
-                    <?php else: ?>
-                        <?php $_excl = $block->displayPriceAttribute('shipping_amount', false, ' '); ?>
-                    <?php endif; ?>
-                    <?php $_incl = $block->displayShippingPriceInclTax($_order); ?>
+                            <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()): ?>
+                                <?php $_excl = $block->displayShippingPriceInclTax($_order); ?>
+                            <?php else: ?>
+                                <?php $_excl = $block->displayPriceAttribute('shipping_amount', false, ' '); ?>
+                            <?php endif; ?>
+                            <?php $_incl = $block->displayShippingPriceInclTax($_order); ?>
 
-                    <?php echo $_excl; ?>
-                    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
-                        (<?php echo __('Incl. Tax'); ?> <?php echo $_incl; ?>)
+                            <?php echo $_excl; ?>
+                            <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
+                                (<?php echo __('Incl. Tax'); ?> <?php echo $_incl; ?>)
+                            <?php endif; ?>
+                        </div>
+                    </div>
+                    <?php if ($block->canCreateShipment() && $block->canShipPartiallyItem()): ?>
+                    <div class="admin__field admin__field-option">
+                        <input type="checkbox" name="invoice[do_shipment]" id="invoice_do_shipment" value="1"
+                               class="admin__control-checkbox" <?php echo $block->hasInvoiceShipmentTypeMismatch() ? ' disabled="disabled"' : '' ?> />
+                        <label for="invoice_do_shipment"
+                               class="admin__field-label"><span><?php echo __('Create Shipment') ?></span></label>
+                    </div>
+                    <?php if ($block->hasInvoiceShipmentTypeMismatch()): ?>
+                        <small><?php echo __('Invoice and shipment types do not match for some items on this order. You can create a shipment only after creating the invoice.') ?></small>
+                        <?php endif; ?>
                     <?php endif; ?>
+                    <div id="tracking" style="display:none;"><?php echo $block->getChildHtml('tracking', false) ?></div>
                 </div>
             </div>
-            <?php if ($block->canCreateShipment() && $block->canShipPartiallyItem()): ?>
-            <div>
-                <label for="invoice_do_shipment" class="normal"><?php echo __('Create Shipment') ?></label>
-                <input type="checkbox" name="invoice[do_shipment]" id="invoice_do_shipment" value="1" <?php echo $block->hasInvoiceShipmentTypeMismatch() ? ' disabled="disabled"' : '' ?> />
-            </div>
-            <?php if ($block->hasInvoiceShipmentTypeMismatch()): ?>
-                <small><?php echo __('Invoice and shipment types do not match for some items on this order. You can create a shipment only after creating the invoice.') ?></small>
-                <?php endif; ?>
             <?php endif; ?>
-            <div id="tracking" style="display:none;"><?php echo $block->getChildHtml('tracking', false) ?></div>
         </div>
-    </div>
-    <?php endif; ?>
-
-    </div>
+    </section>
 
-    <div id="invoice_item_container">
+    <section id="invoice_item_container">
         <?php echo $block->getChildHtml('order_items') ?>
-    </div>
+    </section>
 </form>
 <script>
 require(['prototype'], function(){
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 118eca64172985d63ab5794a01f691cd21ada117..883f04cb7f3eb528cde7db31c8254c1dc197a566 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
@@ -8,13 +8,13 @@
 
 ?>
 
-<div class="fieldset-wrapper">
-    <div class="fieldset-wrapper-title">
+<section class="admin__page-section">
+    <div class="admin__page-section-title">
         <?php $_itemsGridLabel = $block->getForcedShipmentCreate() ? 'Items to Invoice and Ship' : 'Items to Invoice'; ?>
         <span class="title"><?php echo __('%1', $_itemsGridLabel) ?></span>
     </div>
-    <div class="grid">
-        <table cellspacing="0" class="data">
+    <div class="admin__page-section-content grid">
+        <table class="data-table admin__table-primary order-invoice-tables">
             <thead>
                 <tr class="headings">
                     <th class="col-product"><span><?php echo __('Product') ?></span></th>
@@ -50,45 +50,55 @@
             <?php endforeach; ?>
         </table>
     </div>
-</div>
+</section>
 
 <?php $orderTotalBar = $block->getChildHtml('order_totalbar'); ?>
 
 <?php if (!empty($orderTotalBar)): ?>
-<div class="fieldset-wrapper">
+<section class="admin__page-section">
     <?php echo $orderTotalBar; ?>
-</div>
+</section>
 <?php endif; ?>
 
-<div class="clearfix">
-    <div class="order-comments-history">
-        <div class="fieldset-wrapper">
-            <div class="fieldset-wrapper-title">
+<section class="admin__page-section">
+    <div class="admin__page-section-title">
+        <span class="title"><?php echo __('Order Total') ?></span>
+    </div>
+    <div class="admin__page-section-content">
+        <div class="admin__page-section-item order-comments-history">
+            <div class="admin__page-section-item-title">
                 <span class="title"><?php echo __('Invoice History') ?></span>
             </div>
-            <div id="history_form" class="order-history-form">
-                <label class="normal" for="invoice_comment_text"><?php echo __('Invoice Comments') ?></label>
-                <textarea id="invoice_comment_text" name="invoice[comment_text]" rows="3" cols="5"><?php echo $block->getInvoice()->getCommentText(); ?></textarea>
+            <div id="history_form" class="admin__page-section-item-content order-history-form">
+                <div class="admin__field">
+                    <label for="invoice_comment_text" class="admin__field-label">
+                        <span><?php echo __('Invoice Comments') ?></span>
+                    </label>
+                    <div class="admin__field-control">
+                        <textarea id="invoice_comment_text" name="invoice[comment_text]" class="admin__control-textarea"
+                                  rows="3" cols="5"><?php echo $block->getInvoice()->getCommentText(); ?></textarea>
+                    </div>
+                </div>
             </div>
         </div>
-    </div>
 
-    <div class="order-totals">
-        <div class="fieldset-wrapper" id="invoice_totals">
-            <div class="fieldset-wrapper-title">
+        <div id="invoice_totals" class="admin__page-section-item order-totals">
+            <div class="admin__page-section-item-title">
                 <span class="title"><?php echo __('Invoice Totals') ?></span>
             </div>
-            <div class="order-totals-actions">
+            <div class="admin__page-section-item-content order-totals-actions">
                 <?php echo $block->getChildHtml('invoice_totals') ?>
                 <?php if ($block->isCaptureAllowed()): ?>
                 <?php if ($block->canCapture()):?>
-                    <div>
-                    <!--
-                      <label for="invoice_do_capture" class="normal"><?php echo __('Capture Amount') ?></label>
-                      <input type="checkbox" name="invoice[do_capture]" id="invoice_do_capture" value="1" checked/>
-                    -->
-                      <label for="invoice_do_capture" class="normal"><?php echo __('Amount') ?></label>
-                      <select name="invoice[capture_case]">
+                    <div class="admin__field">
+                        <?php
+                        /*
+                        <label for="invoice_do_capture" class="normal"><?php echo __('Capture Amount') ?></label>
+                        <input type="checkbox" name="invoice[do_capture]" id="invoice_do_capture" value="1" checked/>
+                        */
+                        ?>
+                      <label for="invoice_do_capture" class="admin__field-label"><?php echo __('Amount') ?></label>
+                      <select class="admin__control-select" name="invoice[capture_case]">
                           <option value="online"><?php echo __('Capture Online') ?></option>
                           <option value="offline"><?php echo __('Capture Offline') ?></option>
                           <option value="not_capture"><?php echo __('Not Capture') ?></option>
@@ -99,14 +109,16 @@
                     <div><?php echo __('The invoice will be created offline without the payment gateway.') ?></div>
                 <?php endif?>
                 <?php endif; ?>
-                <div class="field choice field-append">
-                    <input id="notify_customer" name="invoice[comment_customer_notify]" value="1" type="checkbox" />
-                    <label class="normal" for="notify_customer"><?php echo __('Append Comments') ?></label>
+                <div class="admin__field admin__field-option field-append">
+                    <input id="notify_customer" name="invoice[comment_customer_notify]" value="1" type="checkbox"
+                           class="admin__control-checkbox" />
+                    <label class="admin__field-label" for="notify_customer"><?php echo __('Append Comments') ?></label>
                 </div>
                 <?php if ($block->canSendInvoiceEmail()): ?>
-                <div class="field choice field-email">
-                    <input id="send_email" name="invoice[send_email]" value="1" type="checkbox" />
-                    <label class="normal" for="send_email"><?php echo __('Email Copy of Invoice') ?></label>
+                <div class="admin__field admin__field-option field-email">
+                    <input id="send_email" name="invoice[send_email]" value="1" type="checkbox"
+                           class="admin__control-checkbox" />
+                    <label class="admin__field-label" for="send_email"><?php echo __('Email Copy of Invoice') ?></label>
                 </div>
                 <?php endif; ?>
                 <div class="actions">
@@ -115,7 +127,7 @@
             </div>
         </div>
     </div>
-</div>
+</section>
 
 <script>
 require(['jquery', 'prototype'], function($){
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items/renderer/default.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items/renderer/default.phtml
index f416f1ba7b5983e955099a45ce5c887a23d5ae2e..45b53a6d05ea0c65132c86050ed7ab03d30dc530 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items/renderer/default.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items/renderer/default.phtml
@@ -17,7 +17,9 @@
     <td class="col-qty"><?php echo $block->getColumnHtml($_item, 'qty') ?></td>
     <td class="col-qty-invoice">
     <?php if ($block->canEditQty()) : ?>
-        <input type="text" class="input-text qty-input" name="invoice[items][<?php echo $_item->getOrderItemId() ?>]" value="<?php echo $_item->getQty()*1 ?>"/>
+        <input type="text" class="input-text admin__control-text qty-input"
+               name="invoice[items][<?php echo $_item->getOrderItemId() ?>]"
+               value="<?php echo $_item->getQty()*1 ?>"/>
     <?php else : ?>
         <?php echo $_item->getQty()*1 ?>
     <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/form.phtml
index d1a08dfeb6d6b4e2d6f654caf88e93922064cc2b..cd625596b541da95d9d24de7069c0d33c71117af 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/form.phtml
@@ -11,84 +11,87 @@
 <?php $_order = $_invoice->getOrder() ?>
 <?php echo $block->getChildHtml('order_info') ?>
 
-<?php /* opening div is in app\code\Magento\Sales\view\adminhtml\order\view\info.phtml */?>
-
-<?php if (!$_order->getIsVirtual()): ?>
-<div class="clearfix"> <?php /* if opening div from app\code\Magento\Sales\view\adminhtml\order\view\info.phtml was closed there */?>
-<?php endif; ?>
-
-    <div class="order-payment-method<?php if ($_order->getIsVirtual()): ?> order-payment-method-virtual<?php endif; ?>">
-        <?php /*Billing Address */ ?>
-        <div class="fieldset-wrapper">
-            <div class="fieldset-wrapper-title">
+<section class="admin__page-section order-view-billing-shipping">
+    <div class="admin__page-section-title">
+        <span class="title"><?php echo __('Payment &amp; Shipping Method') ?></span>
+    </div>
+    <div class="admin__page-section-content">
+        <div class="admin__page-section-item order-payment-method<?php if ($_order->getIsVirtual()): ?> order-payment-method-virtual<?php endif; ?> admin__fieldset-wrapper">
+            <?php /*Billing Address */ ?>
+            <div class="admin__page-section-item-title">
                 <span class="title"><?php echo __('Payment Information') ?></span>
             </div>
-            <div><?php echo $block->getChildHtml('order_payment') ?></div>
-            <div class="order-payment-currency"><?php echo __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?></div>
-            <div class="order-payment-additional"><?php echo $block->getChildHtml('order_payment_additional'); ?></div>
+            <div class="admin__page-section-item-content">
+                <div><?php echo $block->getChildHtml('order_payment') ?></div>
+                <div class="order-payment-currency">
+                    <?php echo __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?>
+                </div>
+                <div class="order-payment-additional"><?php echo $block->getChildHtml('order_payment_additional'); ?></div>
+            </div>
         </div>
-    </div>
 
-    <?php if (!$_order->getIsVirtual()): ?>
-    <div class="order-shipping-address">
-        <?php /*Shipping Address */ ?>
-        <div class="fieldset-wrapper">
-            <div class="fieldset-wrapper-title">
-                <span class="title"><?php echo __('Shipping Information') ?></span>
-            </div>
-            <div class="shipping-description-wrapper">
-                <div class="shipping-description-title"><?php echo $block->escapeHtml($_order->getShippingDescription()) ?></div>
-                <div class="shipping-description-content">
-                    <?php echo __('Total Shipping Charges'); ?>:
+        <?php if (!$_order->getIsVirtual()): ?>
+            <div class="admin__page-section-item order-shipping-address">
+                <?php /*Shipping Address */ ?>
+                <div class="admin__page-section-item-title">
+                    <span class="title"><?php echo __('Shipping Information') ?></span>
+                </div>
+                <div class="admin__page-section-item-content shipping-description-wrapper">
+                    <div class="shipping-description-title">
+                        <?php echo $block->escapeHtml($_order->getShippingDescription()) ?>
+                    </div>
+                    <div class="shipping-description-content">
+                        <?php echo __('Total Shipping Charges'); ?>:
 
-                    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()): ?>
-                        <?php $_excl = $block->displayShippingPriceInclTax($_order); ?>
-                    <?php else: ?>
-                        <?php $_excl = $block->displayPriceAttribute('shipping_amount', false, ' '); ?>
-                    <?php endif; ?>
-                    <?php $_incl = $block->displayShippingPriceInclTax($_order); ?>
+                        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()): ?>
+                            <?php $_excl = $block->displayShippingPriceInclTax($_order); ?>
+                        <?php else: ?>
+                            <?php $_excl = $block->displayPriceAttribute('shipping_amount', false, ' '); ?>
+                        <?php endif; ?>
+                        <?php $_incl = $block->displayShippingPriceInclTax($_order); ?>
 
-                    <?php echo $_excl; ?>
-                    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
-                        (<?php echo __('Incl. Tax'); ?> <?php echo $_incl; ?>)
-                    <?php endif; ?>
-                    <div><?php echo $block->getChildHtml('shipment_tracking') ?></div>
+                        <?php echo $_excl; ?>
+                        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
+                            (<?php echo __('Incl. Tax'); ?> <?php echo $_incl; ?>)
+                        <?php endif; ?>
+                        <div><?php echo $block->getChildHtml('shipment_tracking') ?></div>
+                    </div>
                 </div>
             </div>
-        </div>
-    </div>
-    <?php endif; ?>
+        <?php endif; ?>
 
-</div>
+    </div>
+</section>
 
-<div class="fieldset-wrapper">
-    <div class="fieldset-wrapper-title">
+<section class="admin__page-section">
+    <div class="admin__page-section-title">
         <span class="title"><?php echo __('Items Invoiced') ?></span>
     </div>
 
-    <div id="invoice_item_container">
+    <div id="invoice_item_container" class="admin__page-section-content">
         <?php echo $block->getChildHtml('invoice_items') ?>
     </div>
-</div>
+</section>
 
-<div class="clearfix">
-    <div class="order-comments-history">
-        <div class="fieldset-wrapper">
-            <div class="fieldset-wrapper-title">
+<section class="admin__page-section">
+    <div class="admin__page-section-title">
+        <span class="title"><?php echo __('Order Total') ?></span>
+    </div>
+    <div class="admin__page-section-content">
+        <div class="admin__page-section-item order-comments-history">
+            <div class="admin__page-section-item-title">
                 <span class="title"><?php echo __('Invoice History') ?></span>
             </div>
-            <fieldset>
+            <div class="admin__page-section-item-content">
                 <?php echo $block->getChildHtml('order_comments') ?>
-            </fieldset>
+            </div>
         </div>
-    </div>
 
-    <div class="order-totals">
-        <div class="fieldset-wrapper" id="history_form">
-            <div class="fieldset-wrapper-title">
+        <div id="history_form" class="admin__page-section-item order-totals">
+            <div class="admin__page-section-item-title">
                 <span class="title"><?php echo __('Invoice Totals') ?></span>
             </div>
             <?php echo $block->getChildHtml('invoice_totals') ?>
         </div>
     </div>
-</div>
+</section>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items.phtml
index 2dd825764ac916f3940e749d2a81798dea4ae633..9298795db0b62507f426147a6d643a0eefca8d03 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 class="data order-tables">
+    <table class="data-table admin__table-primary order-invoice-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 06b1e692a036a4ff9d9659e835b81fe4142ca137..45b816084520bbe14c11af4050b0cf5d533156e2 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals.phtml
@@ -15,53 +15,56 @@
     <?php echo $block->getChildHtml('footer'); ?>
 </table>
 <?php endif;*/ ?>
-<table class="data-table table-info order-subtotal">
+<table class="data-table admin__table-secondary order-subtotal-table">
     <?php $_totals = $block->getTotals('footer')?>
+
     <?php if ($_totals):?>
-    <tfoot>
-    <?php foreach ($block->getTotals('footer') as $_code => $_total): ?>
-        <?php if ($_total->getBlockName()): ?>
-            <?php echo $block->getChildHtml($_total->getBlockName(), false); ?>
-        <?php else:?>
-        <tr class="col-<?php echo $_code?>">
-            <td <?php echo $block->getLabelProperties()?> class="label">
-                <strong><?php echo $block->escapeHtml($_total->getLabel()); ?></strong>
-            </td>
-            <td <?php echo $block->getValueProperties()?>>
-                <strong><?php echo $block->formatValue($_total) ?></strong>
-            </td>
-        </tr>
-        <?php endif?>
-    <?php endforeach?>
-    </tfoot>
+        <tfoot>
+            <?php foreach ($block->getTotals('footer') as $_code => $_total): ?>
+                <?php if ($_total->getBlockName()): ?>
+                    <?php echo $block->getChildHtml($_total->getBlockName(), false); ?>
+                <?php else:?>
+                <tr class="col-<?php echo $_code?>">
+                    <td <?php echo $block->getLabelProperties()?> class="label">
+                        <strong><?php echo $block->escapeHtml($_total->getLabel()); ?></strong>
+                    </td>
+                    <td <?php echo $block->getValueProperties()?>>
+                        <strong><?php echo $block->formatValue($_total) ?></strong>
+                    </td>
+                </tr>
+                <?php endif?>
+            <?php endforeach?>
+        </tfoot>
     <?php endif?>
 
     <?php $_totals = $block->getTotals('')?>
     <?php if ($_totals):?>
-    <tbody>
-    <?php foreach ($_totals as $_code => $_total): ?>
-        <?php if ($_total->getBlockName()): ?>
-            <?php echo $block->getChildHtml($_total->getBlockName(), false); ?>
-        <?php else:?>
-        <tr class="col-<?php echo $_code?>">
-            <td <?php echo $block->getLabelProperties()?> class="label">
-                <?php if ($_total->getStrong()):?>
-                <strong><?php echo $block->escapeHtml($_total->getLabel()); ?></strong>
+        <tbody>
+            <?php foreach ($_totals as $_code => $_total): ?>
+                <?php if ($_total->getBlockName()): ?>
+                    <?php echo $block->getChildHtml($_total->getBlockName(), false); ?>
                 <?php else:?>
-                <?php echo $block->escapeHtml($_total->getLabel()); ?>
+                    <tr class="col-<?php echo $_code?>">
+                        <td <?php echo $block->getLabelProperties()?> class="label">
+                            <?php if ($_total->getStrong()):?>
+                            <strong><?php echo $block->escapeHtml($_total->getLabel()); ?></strong>
+                            <?php else:?>
+                            <?php echo $block->escapeHtml($_total->getLabel()); ?>
+                            <?php endif?>
+                        </td>
+
+                        <?php if ($_total->getStrong()):?>
+                            <td <?php echo $block->getValueProperties()?>>
+                                <strong><?php echo $block->formatValue($_total) ?></strong>
+                            </td>
+                        <?php else:?>
+                            <td <?php echo $block->getValueProperties()?>>
+                                <span><?php echo $block->formatValue($_total) ?></span>
+                            </td>
+                        <?php endif?>
+                    </tr>
                 <?php endif?>
-            </td>
-            <?php if ($_total->getStrong()):?>
-            <td <?php echo $block->getValueProperties()?>>
-                <strong><?php echo $block->formatValue($_total) ?></strong>
-            <?php else:?>
-            <td <?php echo $block->getValueProperties()?>>
-                <?php echo $block->formatValue($_total) ?>
-            <?php endif?>
-            </td>
-        </tr>
-        <?php endif?>
-    <?php endforeach?>
-    </tbody>
+            <?php endforeach?>
+        </tbody>
     <?php endif?>
 </table>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/form.phtml
index 2ccc60117a6ea662ff928690563244c684be7252..ea8956727f637d25ca32d23a10a3aa34648fda2e 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/form.phtml
@@ -4,4 +4,4 @@
  * See COPYING.txt for license details.
  */
 ?>
-<div class="entry-edit" id="sales_order_view"></div>
+<div class="entry-edit order-view" id="sales_order_view"></div>
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 a7d7d1552fcb732eda9bf4b0887c83e55ae7e854..9fa3eda8f0d7a93ae165b39bbd96653c44e56ea6 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
@@ -9,32 +9,50 @@
 ?>
 <?php if ($block->canDisplayGiftmessage()): ?>
 <?php $_required = $block->getMessage()->getMessage() != ''?>
-<div id="<?php echo $block->getHtmlId() ?>" class="box-left giftmessage-whole-order-container">
+<div id="<?php echo $block->getHtmlId() ?>" class="admin__page-section-content giftmessage-whole-order-container">
     <form class="entry-edit form-inline" id="<?php echo $block->getFieldId('form') ?>" action="<?php echo $block->getSaveUrl() ?>">
-        <fieldset>
+        <fieldset class="admin__fieldset">
             <legend class="admin__legend"><span><?php echo __('Gift Message for the Entire Order'); ?></span></legend>
-            <br>
+            <br/>
 
-            <input type="hidden" id="<?php echo $block->getFieldId('type'); ?>" name="<?php echo $block->getFieldName('type'); ?>" value="order" />
+            <input type="hidden" id="<?php echo $block->getFieldId('type'); ?>"
+                   name="<?php echo $block->getFieldName('type'); ?>"
+                   value="order"/>
 
-            <div class="field field-from-name <?php echo $_required ? 'required' : ''; ?>">
-                <label class="label" for="<?php echo $block->getFieldId('sender'); ?>"><span><?php echo __('From Name'); ?></span></label>
-                <div class="control">
-                    <input class="input-text <?php echo $_required ? 'required-entry' : ''; ?>" type="text" id="<?php echo $block->getFieldId('sender'); ?>" name="<?php echo $block->getFieldName('sender'); ?>" value="<?php echo $block->escapeHtml($block->getMessage()->getSender()); ?>" />
+            <div class="admin__field field-from-name<?php echo $_required ? ' required' : ''; ?>">
+                <label class="admin__field-label"
+                       for="<?php echo $block->getFieldId('sender'); ?>"><span><?php echo __('From Name'); ?></span></label>
+
+                <div class="admin__field-control">
+                    <input class="admin__control-text <?php echo $_required ? 'required-entry' : ''; ?>" type="text"
+                           id="<?php echo $block->getFieldId('sender'); ?>"
+                           name="<?php echo $block->getFieldName('sender'); ?>"
+                           value="<?php echo $block->escapeHtml($block->getMessage()->getSender()); ?>"/>
                 </div>
             </div>
 
-            <div class="field field-to-name <?php echo $_required ? 'required' : ''; ?>">
-                <label class="label" for="<?php echo $block->getFieldId('recipient'); ?>"><span><?php echo __('To Name'); ?></span></label>
-                <div class="control">
-                    <input class="input-text <?php echo $_required ? 'required-entry' : ''; ?>" type="text" id="<?php echo $block->getFieldId('recipient'); ?>" name="<?php echo $block->getFieldName('recipient'); ?>"  value="<?php echo $block->escapeHtml($block->getMessage()->getRecipient()); ?>" />
+            <div class="admin__field field-to-name<?php echo $_required ? ' required' : ''; ?>">
+                <label class="admin__field-label"
+                       for="<?php echo $block->getFieldId('recipient'); ?>"><span><?php echo __('To Name'); ?></span></label>
+
+                <div class="admin__field-control">
+                    <input class="admin__control-text <?php echo $_required ? 'required-entry' : ''; ?>" type="text"
+                           id="<?php echo $block->getFieldId('recipient'); ?>"
+                           name="<?php echo $block->getFieldName('recipient'); ?>"
+                           value="<?php echo $block->escapeHtml($block->getMessage()->getRecipient()); ?>"/>
                 </div>
             </div>
 
-            <div class="field field-gift-message">
-                <label class="label" for="<?php echo $block->getFieldId('message'); ?>"><span><?php echo __('Gift Message'); ?></span></label>
-                <div class="control">
-                    <textarea id="<?php echo $block->getFieldId('message'); ?>" name="<?php echo $block->getFieldName('message') ?>" rows="2" cols="15"><?php echo $block->escapeHtml($block->getMessage()->getMessage()); ?></textarea>
+            <div class="admin__field field-gift-message">
+                <label class="admin__field-label"
+                       for="<?php echo $block->getFieldId('message'); ?>"><span><?php echo __('Gift Message'); ?></span></label>
+
+                <div class="admin__field-control">
+                    <textarea id="<?php echo $block->getFieldId('message'); ?>"
+                              name="<?php echo $block->getFieldName('message') ?>"
+                              class="admin__control-textarea"
+                              rows="2"
+                              cols="15"><?php echo $block->escapeHtml($block->getMessage()->getMessage()); ?></textarea>
                 </div>
             </div>
 
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/history.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/history.phtml
index a202b3aa0dcee89d76652153dadcd23cb3e2476a..b1c4121b92fc36055dce194757c944a5486fbab3 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/history.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/history.phtml
@@ -7,38 +7,71 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<div id="order_history_block">
+<div id="order_history_block" class="edit-order-comments">
     <?php if ($block->canAddComment()):?>
-    <div id="history_form">
-        <div><?php echo __('Add Order Comments') ?></div>
-        <div>
-            <label for="history_status"><?php echo __('Status') ?></label>
-            <select name="history[status]" id="history_status">
-            <?php foreach ($block->getStatuses() as $_code => $_label): ?>
-                <option value="<?php echo $_code ?>"<?php if ($_code == $block->getOrder()->getStatus()): ?> selected="selected"<?php endif; ?>><?php echo $_label ?></option>
-            <?php endforeach; ?>
-            </select>
-        </div>
-        <div>
-            <label for="history_comment"><?php echo __('Comment') ?></label>
-            <textarea name="history[comment]" rows="3" cols="5" id="history_comment"></textarea>
-        </div>
-        <div class="clearfix">
-            <div class="order-history-comments-options">
-                <?php if ($block->canSendCommentEmail()): ?>
-                <input name="history[is_customer_notified]" type="checkbox" id="history_notify" value="1" /><label for="history_notify"> <?php echo __('Notify Customer by Email') ?></label><br />
-                <?php endif; ?>
-                <input name="history[is_visible_on_front]" type="checkbox" id="history_visible" value="1" /><label for="history_visible"> <?php echo __('Visible on Frontend') ?></label>
+        <div class="order-history-block" id="history_form">
+
+            <div class="admin__field">
+                <label for="history_status" class="admin__field-label"><?php echo __('Status') ?></label>
+                <div class="admin__field-control">
+                    <select name="history[status]" id="history_status" class="admin__control-select">
+                        <?php foreach ($block->getStatuses() as $_code => $_label): ?>
+                            <option value="<?php echo $_code ?>"<?php if ($_code == $block->getOrder()->getStatus()): ?> selected="selected"<?php endif; ?>><?php echo $_label ?></option>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+            </div>
+
+            <div class="admin__field">
+                <label for="history_comment" class="admin__field-label">
+                    <?php echo __('Comment') ?>
+                </label>
+                <div class="admin__field-control">
+                    <textarea name="history[comment]"
+                              rows="3"
+                              cols="5"
+                              id="history_comment"
+                              class="admin__control-textarea"></textarea>
+                </div>
             </div>
-            <div class="actions">
-                <?php echo $block->getChildHtml('submit_button') ?>
+
+            <div class="admin__field">
+                <div class="order-history-comments-options">
+                    <div class="admin__field admin__field-option">
+                        <?php if ($block->canSendCommentEmail()): ?>
+                            <input name="history[is_customer_notified]"
+                                   type="checkbox"
+                                   id="history_notify"
+                                   class="admin__control-checkbox"
+                                   value="1" />
+                            <label class="admin__field-label" for="history_notify">
+                                <?php echo __('Notify Customer by Email') ?>
+                            </label>
+                        <?php endif; ?>
+                    </div>
+
+                    <div class="admin__field admin__field-option">
+                        <input name="history[is_visible_on_front]"
+                               type="checkbox"
+                               id="history_visible"
+                               class="admin__control-checkbox"
+                               value="1" />
+                        <label class="admin__field-label" for="history_visible">
+                            <?php echo __('Visible on Frontend') ?>
+                        </label>
+                    </div>
+                </div>
+
+                <div class="order-history-comments-actions">
+                    <?php echo $block->getChildHtml('submit_button') ?>
+                </div>
             </div>
         </div>
-    </div>
     <?php endif;?>
+
     <ul class="note-list">
     <?php foreach ($block->getOrder()->getStatusHistoryCollection(true) as $_item): ?>
-        <li>
+        <li class="note-list-item">
             <span class="note-list-date"><?php echo $block->formatDate($_item->getCreatedAtDate(), \IntlDateFormatter::MEDIUM) ?></span>
             <span class="note-list-time"><?php echo $block->formatTime($_item->getCreatedAtDate(), \IntlDateFormatter::MEDIUM) ?></span>
             <span class="note-list-status"><?php echo $_item->getStatusLabel() ?></span>
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 62900a6f6bb0bb355529cb2b2414e02e5b9ad889..afd5fc24ba3e939735a13492154775d93265827b 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
@@ -22,165 +22,158 @@ $orderStoreDate = $block->formatDate(
 );
 ?>
 
-<?php /* the opening and closing divs of these two clearfixes are in app\code\core\Mage\Adminhtml\view\adminhtml\sales\order\invoice\create\form.phtml */?>
-
-<div class="clearfix">
-
-    <div class="order-information">
-        <?php /* Order Information */?>
-        <div class="fieldset-wrapper">
+<section class="admin__page-section order-view-account-information">
+    <div class="admin__page-section-title">
+        <span class="title"><?php echo __('Order & Account Information') ?></span>
+    </div>
+    <div class="admin__page-section-content">
+        <div class="admin__page-section-item order-information">
+            <?php /* Order Information */?>
             <?php if ($_order->getEmailSent()):
                 $_email = __('the order confirmation email was sent');
             else:
                 $_email = __('the order confirmation email is not sent');
             endif; ?>
-            <div class="fieldset-wrapper-title">
+            <div class="admin__page-section-item-title">
                 <span class="title">
                     <?php if ($block->getNoUseOrderLink()): ?>
-                    <?php echo __('Order # %1', $_order->getRealOrderId()) ?> (<span><?php echo $_email ?></span>)
+                        <?php echo __('Order # %1', $_order->getRealOrderId()) ?> (<span><?php echo $_email ?></span>)
                     <?php else: ?>
-                    <a href="<?php echo $block->getViewUrl($_order->getId()) ?>"><?php echo __('Order # %1', $_order->getRealOrderId()) ?></a>
-                    <span>(<?php echo $_email ?>)</span>
+                        <a href="<?php echo $block->getViewUrl($_order->getId()) ?>"><?php echo __('Order # %1', $_order->getRealOrderId()) ?></a>
+                        <span>(<?php echo $_email ?>)</span>
                     <?php endif; ?>
                 </span>
             </div>
-            <table class="data-table table-info">
+            <div class="admin__page-section-item-content">
+                <table class="data-table admin__table-secondary order-information-table">
                 <tr>
                     <th><?php echo __('Order Date') ?></th>
                     <td><?php echo $orderAdminDate ?></td>
                 </tr>
                 <?php if ($orderAdminDate != $orderStoreDate):?>
-                <tr>
-                    <th><?php echo __(
-                            'Order Date (%1)',
-                            $block->getCreatedAtStoreDate(
-                                $_order->getStore(),
-                                $_order->getCreatedAt()
-                            )->getTimezone()->getName()
-                        ) ?></th>
-                    <td><?php echo $orderStoreDate ?></td>
-                </tr>
+                    <tr>
+                        <th><?php echo __(
+                                'Order Date (%1)',
+                                $block->getCreatedAtStoreDate(
+                                    $_order->getStore(),
+                                    $_order->getCreatedAt()
+                                )->getTimezone()->getName()
+                            ) ?></th>
+                        <td><?php echo $orderStoreDate ?></td>
+                    </tr>
                 <?php endif;?>
                 <tr>
                     <th><?php echo __('Order Status') ?></th>
                     <td><span id="order_status"><?php echo $_order->getStatusLabel() ?></span></td>
                 </tr>
                 <?php if ($block->isSingleStoreMode() == false):?>
-                <tr>
-                    <th><?php echo __('Purchased From') ?></th>
-                    <td><?php echo $block->getOrderStoreName() ?></td>
-                </tr>
+                    <tr>
+                        <th><?php echo __('Purchased From') ?></th>
+                        <td><?php echo $block->getOrderStoreName() ?></td>
+                    </tr>
                 <?php endif; ?>
                 <?php if ($_order->getRelationChildId()): ?>
-                <tr>
-                    <th><?php echo __('Link to the New Order') ?></th>
-                    <td><a href="<?php echo $block->getViewUrl($_order->getRelationChildId()) ?>">
-                        <?php echo $_order->getRelationChildRealId() ?>
-                    </a></td>
-                </tr>
+                    <tr>
+                        <th><?php echo __('Link to the New Order') ?></th>
+                        <td><a href="<?php echo $block->getViewUrl($_order->getRelationChildId()) ?>">
+                                <?php echo $_order->getRelationChildRealId() ?>
+                            </a></td>
+                    </tr>
                 <?php endif; ?>
                 <?php if ($_order->getRelationParentId()): ?>
-                <tr>
-                    <th><?php echo __('Link to the Previous Order') ?></th>
-                    <td><a href="<?php echo $block->getViewUrl($_order->getRelationParentId()) ?>">
-                        <?php echo $_order->getRelationParentRealId() ?>
-                    </a></td>
-                </tr>
+                    <tr>
+                        <th><?php echo __('Link to the Previous Order') ?></th>
+                        <td><a href="<?php echo $block->getViewUrl($_order->getRelationParentId()) ?>">
+                                <?php echo $_order->getRelationParentRealId() ?>
+                            </a></td>
+                    </tr>
                 <?php endif; ?>
                 <?php if ($_order->getRemoteIp() && $block->shouldDisplayCustomerIp()): ?>
-                <tr>
-                    <th><?php echo __('Placed from IP') ?></th>
-                    <td><?php echo $_order->getRemoteIp(); echo($_order->getXForwardedFor()) ? ' (' . $block->escapeHtml($_order->getXForwardedFor()) . ')' : ''; ?></td>
-                </tr>
+                    <tr>
+                        <th><?php echo __('Placed from IP') ?></th>
+                        <td><?php echo $_order->getRemoteIp(); echo($_order->getXForwardedFor()) ? ' (' . $block->escapeHtml($_order->getXForwardedFor()) . ')' : ''; ?></td>
+                    </tr>
                 <?php endif; ?>
                 <?php if ($_order->getGlobalCurrencyCode() != $_order->getBaseCurrencyCode()): ?>
-                <tr>
-                    <th><?php echo __('%1 / %2 rate:', $_order->getGlobalCurrencyCode(), $_order->getBaseCurrencyCode()) ?></th>
-                    <td><?php echo $_order->getBaseToGlobalRate() ?></td>
-                </tr>
+                    <tr>
+                        <th><?php echo __('%1 / %2 rate:', $_order->getGlobalCurrencyCode(), $_order->getBaseCurrencyCode()) ?></th>
+                        <td><?php echo $_order->getBaseToGlobalRate() ?></td>
+                    </tr>
                 <?php endif; ?>
                 <?php if ($_order->getBaseCurrencyCode() != $_order->getOrderCurrencyCode()): ?>
-                <tr>
-                    <th><?php echo __('%1 / %2 rate:', $_order->getOrderCurrencyCode(), $_order->getBaseCurrencyCode()) ?></th>
-                    <th><?php echo $_order->getBaseToOrderRate() ?></th>
-                </tr>
+                    <tr>
+                        <th><?php echo __('%1 / %2 rate:', $_order->getOrderCurrencyCode(), $_order->getBaseCurrencyCode()) ?></th>
+                        <th><?php echo $_order->getBaseToOrderRate() ?></th>
+                    </tr>
                 <?php endif; ?>
             </table>
+            </div>
         </div>
-    </div>
 
-    <div class="order-account-information">
-        <?php /* Account Information */?>
-        <div class="admin__fieldset-wrapper">
-            <div class="admin__fieldset-wrapper-title">
+        <div class="admin__page-section-item order-account-information">
+            <?php /* Account Information */?>
+            <div class="admin__page-section-item-title">
+                <span class="title"><?php echo __('Account Information') ?></span>
                 <div class="actions"><?php echo $block->getAccountEditLink()?></div>
-                <strong class="title"><?php echo __('Account Information') ?></strong>
             </div>
-            <table class="data-table table-info">
-                <tr>
-                    <th><?php echo __('Customer Name') ?></th>
-                    <td>
-                    <?php if ($_customerUrl = $block->getCustomerViewUrl()) : ?>
-                        <a href="<?php echo $_customerUrl ?>" target="_blank"><strong><?php echo $block->escapeHtml($_order->getCustomerName()) ?></strong></a>
-                    <?php else: ?>
-                        <?php echo $block->escapeHtml($_order->getCustomerName()) ?>
+            <div class="admin__page-section-item-content">
+                <table class="data-table admin__table-secondary order-account-information-table">
+                    <tr>
+                        <th><?php echo __('Customer Name') ?></th>
+                        <td>
+                            <?php if ($_customerUrl = $block->getCustomerViewUrl()) : ?>
+                                <a href="<?php echo $_customerUrl ?>" target="_blank">
+                                    <span><?php echo $block->escapeHtml($_order->getCustomerName()) ?></span>
+                                </a>
+                            <?php else: ?>
+                                <?php echo $block->escapeHtml($_order->getCustomerName()) ?>
+                            <?php endif; ?>
+                        </td>
+                    </tr>
+                    <tr>
+                        <th><?php echo __('Email') ?></th>
+                        <td><a href="mailto:<?php echo $_order->getCustomerEmail() ?>"><?php echo $_order->getCustomerEmail() ?></a></td>
+                    </tr>
+                    <?php if ($_groupName = $block->getCustomerGroupName()) : ?>
+                        <tr>
+                            <th><?php echo __('Customer Group') ?></th>
+                            <td><?php echo $_groupName ?></td>
+                        </tr>
                     <?php endif; ?>
-                    </td>
-                </tr>
-                <tr>
-                    <th><?php echo __('Email') ?></th>
-                    <td><a href="mailto:<?php echo $_order->getCustomerEmail() ?>"><?php echo $_order->getCustomerEmail() ?></a></td>
-                </tr>
-                <?php if ($_groupName = $block->getCustomerGroupName()) : ?>
-                <tr>
-                    <th><?php echo __('Customer Group') ?></th>
-                    <td><?php echo $_groupName ?></td>
-                </tr>
-                <?php endif; ?>
-                <?php foreach ($block->getCustomerAccountData() as $data):?>
-                <tr>
-                    <th><?php echo $data['label'] ?></th>
-                    <td><?php echo $data['value'] ?></td>
-                </tr>
-                <?php endforeach;?>
-            </table>
+                    <?php foreach ($block->getCustomerAccountData() as $data):?>
+                        <tr>
+                            <th><?php echo $data['label'] ?></th>
+                            <td><?php echo $data['value'] ?></td>
+                        </tr>
+                    <?php endforeach;?>
+                </table>
+            </div>
         </div>
     </div>
+</section>
 
-</div>
-
-<div class="clearfix">
-
-    <div class="order-billing-address">
-        <?php /* Billing Address */?>
-        <div class="fieldset-wrapper">
-            <div class="fieldset-wrapper-title">
-                <div class="actions"><?php echo $block->getAddressEditLink($_order->getBillingAddress()); ?></div>
+<section class="admin__page-section order-addresses">
+    <div class="admin__page-section-title">
+        <span class="title"><?php echo __('Address Information') ?></span>
+    </div>
+    <div class="admin__page-section-content">
+        <div class="admin__page-section-item order-billing-address">
+            <?php /* Billing Address */?>
+            <div class="admin__page-section-item-title">
                 <span class="title"><?php echo __('Billing Address') ?></span>
+                <div class="actions"><?php echo $block->getAddressEditLink($_order->getBillingAddress()); ?></div>
             </div>
-            <address><?php echo $block->getFormattedAddress($_order->getBillingAddress()); ?></address>
+            <address class="admin__page-section-item-content"><?php echo $block->getFormattedAddress($_order->getBillingAddress()); ?></address>
         </div>
-    </div>
-
-    <?php if (!$block->getOrder()->getIsVirtual()): ?>
-    <div class="order-shipping-address">
-        <?php /* Shipping Address */ ?>
-        <div class="fieldset-wrapper">
-            <div class="fieldset-wrapper-title">
-                <div class="actions"><?php echo $block->getAddressEditLink($_order->getShippingAddress()); ?></div>
-                <span class="title"><?php echo __('Shipping Address') ?></span>
+        <?php if (!$block->getOrder()->getIsVirtual()): ?>
+            <div class="admin__page-section-item order-shipping-address">
+                <?php /* Shipping Address */ ?>
+                <div class="admin__page-section-item-title">
+                    <span class="title"><?php echo __('Shipping Address') ?></span>
+                    <div class="actions"><?php echo $block->getAddressEditLink($_order->getShippingAddress()); ?></div>
+                </div>
+                <address class="admin__page-section-item-content"><?php echo $block->getFormattedAddress($_order->getShippingAddress()); ?></address>
             </div>
-            <address><?php echo $block->getFormattedAddress($_order->getShippingAddress()); ?></address>
-        </div>
+        <?php endif; ?>
     </div>
-</div>
-    <?php endif; ?>
-
-<?php
-/*
-    closing div of this opening div are in
-    app\code\Magento\Sales\view\adminhtml\order\invoice\view\form.phtml
-    or
-    app\code\Magento\Sales\view\adminhtml\order\view\tab\info.phtml
-*/
-?>
+</section>
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 cb1c7006dd7518fb2a0531d62990980526fecfb9..7fc02861eff16e157e3a8842a84ec731e5ea43dc 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 class="data-table table-info">
+    <table class="data-table admin__table-primary edit-order-table">
         <thead>
             <tr class="headings">
                 <th class="col-product"><span><?php echo __('Product') ?></span></th>
@@ -25,13 +25,13 @@
                 <th class="col-total last"><span><?php echo __('Row Total') ?></span></th>
             </tr>
         </thead>
-        <?php $_items = $block->getItemsCollection() ?>
+        <?php $_items = $block->getItemsCollection();?>
         <?php $i = 0; foreach ($_items as $_item):?>
             <?php if ($_item->getParentItem()) {
-    continue;
-} else {
-    $i++;
-}?>
+                continue;
+            } else {
+                $i++;
+            }?>
             <tbody class="<?php echo $i%2 ? 'even' : 'odd' ?>">
                 <?php echo $block->getItemHtml($_item) ?>
                 <?php echo $block->getItemExtraInfoHtml($_item) ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/history.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/history.phtml
index 7d9c3acc586e381767ded7f39b09af062bc4b1db..2e8eae106e6a9d0132978547405bb4c31cc787ac 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/history.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/history.phtml
@@ -7,10 +7,10 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<div class="fieldset-wrapper">
+<section class="admin__page-section edit-order-comments">
     <ul class="note-list">
     <?php foreach ($block->getFullHistory() as $_item): ?>
-        <li>
+        <li class="note-list-item">
             <span class="note-list-date"><?php echo $block->getItemCreatedAt($_item) ?></span>
             <span class="note-list-time"><?php echo $block->getItemCreatedAt($_item, 'time') ?></span>
             <span class="note-list-status"><?php echo $block->getItemTitle($_item) ?></span>
@@ -26,10 +26,26 @@
                     <?php endif; ?>
                 </span>
             <?php endif; ?>
-            <?php if ($_comment = $block->getItemComment($_item)): ?>
-                <div class="note-list-comment"><?php echo $_comment ?></div>
-            <?php endif; ?>
         </li>
     <?php endforeach; ?>
     </ul>
-</div>
+    <div class="edit-order-comments-block">
+        <div class="edit-order-comments-block-title">
+            <?php echo __('Notes for this Order') ?>
+        </div>
+        <?php foreach ($block->getFullHistory() as $_item): ?>
+            <?php if ($_comment = $block->getItemComment($_item)): ?>
+                <div class="comments-block-item">
+                    <div class="comments-block-item-comment">
+                        <?php echo $_comment ?>
+                    </div>
+                    <span class="comments-block-item-date-time">
+                        <?php echo __('Comment added') ?>
+                        <?php echo $block->getItemCreatedAt($_item) ?>
+                        <?php echo $block->getItemCreatedAt($_item, 'time') ?>
+                    </span>
+                </div>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    </div>
+</section>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/info.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/info.phtml
index a939192eba8c671d8e654beb40aa9495a7016cc8..b315a0053976c6dac80fba6dcb579ee1782cea58 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/info.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/info.phtml
@@ -17,60 +17,55 @@
 <?php echo $block->getChildHtml('order_info') ?>
 <input type="hidden" name="order_id" value="<?php echo $_order->getId() ?>"/>
 
-<?php if (!$_order->getIsVirtual()): ?>
-<div class="clearfix">
-<?php endif; ?>
-
-    <div class="order-payment-method<?php if ($_order->getIsVirtual()): ?> order-payment-method-virtual<?php endif; ?>">
-        <?php /* Payment Method */ ?>
-        <div class="fieldset-wrapper">
-            <div class="fieldset-wrapper-title">
+<section class="admin__page-section order-view-billing-shipping">
+    <div class="admin__page-section-title">
+        <span class="title"><?php echo __('Payment &amp; Shipping Method') ?></span>
+    </div>
+    <div class="admin__page-section-content">
+        <div class="admin__page-section-item order-payment-method<?php if ($_order->getIsVirtual()): ?> order-payment-method-virtual<?php endif; ?>">
+            <?php /* Payment Method */ ?>
+            <div class="admin__page-section-item-title">
                 <span class="title"><?php echo __('Payment Information') ?></span>
             </div>
-            <div><?php echo $block->getPaymentHtml() ?></div>
-            <div class="order-payment-currency"><?php echo __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?></div>
-            <div class="order-payment-additional"><?php echo $block->getChildHtml('order_payment_additional'); ?></div>
+            <div class="admin__page-section-item-content">
+                <div><?php echo $block->getPaymentHtml() ?></div>
+                <div class="order-payment-currency"><?php echo __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?></div>
+                <div class="order-payment-additional"><?php echo $block->getChildHtml('order_payment_additional'); ?></div>
+            </div>
         </div>
+        <?php echo $block->getChildHtml('order_shipping_view') ?>
     </div>
-
-<?php if ($_order->getIsVirtual()): ?>
-</div><?php /* opening div is in app\code\Magento\Sales\view\adminhtml\order\view\info.phtml */ ?>
-<?php endif; ?>
-
-<?php echo $block->getChildHtml('order_shipping_view') ?>
-
-<?php if (!$_order->getIsVirtual()): ?>
-</div>
-<?php endif; ?>
+</section>
 
 <?php echo $block->getGiftOptionsHtml() ?>
 
-<div class="fieldset-wrapper">
-    <div class="fieldset-wrapper-title">
+<section class="admin__page-section">
+    <div class="admin__page-section-title">
         <span class="title"><?php echo __('Items Ordered') ?></span>
     </div>
     <?php echo $block->getItemsHtml() ?>
-</div>
+</section>
 
-<div class="clearfix">
-    <div class="order-comments-history">
-        <div class="fieldset-wrapper">
-            <div class="fieldset-wrapper-title">
-                <span class="title"><?php echo __('Comments History') ?></span>
+<section class="admin__page-section">
+    <div class="admin__page-section-title">
+        <span class="title"><?php echo __('Order Total') ?></span>
+    </div>
+    <div class="admin__page-section-content">
+        <div class="admin__page-section-item order-comments-history">
+            <div class="admin__page-section-item-title">
+                <span class="title"><?php echo __('Notes for this Order') ?></span>
             </div>
-            <fieldset><?php echo $block->getChildHtml('order_history') ?></fieldset>
+            <?php echo $block->getChildHtml('order_history') ?>
         </div>
-    </div>
 
-    <div class="order-totals">
-        <div class="fieldset-wrapper">
-            <div class="fieldset-wrapper-title">
+        <div class="admin__page-section-item order-totals">
+            <div class="admin__page-section-item-title">
                 <span class="title"><?php echo __('Order Totals') ?></span>
             </div>
             <?php echo $block->getChildHtml('order_totals') ?>
         </div>
     </div>
-</div>
+</section>
 
 <?php echo $block->getChildHtml('popup_window');?>
 
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 701a7c73a192f9f068b04129bac001f4e001f551..26d231c994314ff2524fe898bebc05817341829a 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/transactions/detail.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/transactions/detail.phtml
@@ -8,12 +8,12 @@
 
 ?>
 <div data-mage-init='{"floatingHeader": {}}' class="page-actions"><?php echo $block->getButtonsHtml() ?></div>
-<div class="fieldset-wrapper">
-    <div class="fieldset-wrapper-title">
+<section class="admin__page-section">
+    <div class="admin__page-section-title">
         <span class="title"><?php echo __('Transaction Data'); ?></span>
     </div>
-    <div id="log_details_fieldset" class="log-details">
-        <table class="log-info data-table table-info">
+    <div id="log_details_fieldset" class="admin__page-section-content log-details">
+        <table class="log-info data-table admin__table-secondary">
             <tbody>
             <tr>
                 <th><?php echo __('Transaction ID'); ?></th>
@@ -54,22 +54,22 @@
             </tbody>
         </table>
     </div>
-</div>
+</section>
 
-<div class="fieldset-wrapper">
-    <div class="fieldset-wrapper-title">
+<section class="admin__page-section">
+    <div class="admin__page-section-title">
         <span class="title""><?php echo __('Child Transactions'); ?></span>
     </div>
-    <div class="log-details-grid">
+    <div class="admin__page-section-content log-details-grid">
         <?php echo $block->getChildHtml('child_grid') ?>
     </div>
-</div>
+</section>
 
-<div class="fieldset-wrapper">
-    <div class="fieldset-wrapper-title">
+<section class="admin__page-section">
+    <div class="admin__page-section-title">
         <span class="title"><?php echo __('Transaction Details'); ?></span>
     </div>
-    <div class="log-details-grid">
+    <div class="admin__page-section-content log-details-grid">
         <?php echo $block->getChildHtml('detail_grid') ?>
     </div>
-</div>
+</section>
diff --git a/app/code/Magento/Shipping/Block/Adminhtml/View/Form.php b/app/code/Magento/Shipping/Block/Adminhtml/View/Form.php
index 2f848e0a150c139f624847ddbdab1d9a89abd174..fa0d8aa70c9e118540e4532bb248db275bb2513c 100644
--- a/app/code/Magento/Shipping/Block/Adminhtml/View/Form.php
+++ b/app/code/Magento/Shipping/Block/Adminhtml/View/Form.php
@@ -79,7 +79,11 @@ class Form extends \Magento\Sales\Block\Adminhtml\Order\AbstractOrder
         return $this->getLayout()->createBlock(
             'Magento\Backend\Block\Widget\Button'
         )->setData(
-            ['label' => __('Create Shipping Label...'), 'onclick' => 'packaging.showWindow();']
+            [
+                'label' => __('Create Shipping Label...'),
+                'onclick' => 'packaging.showWindow();',
+                'class' => 'action-create-label'
+            ]
         )->toHtml();
     }
 
diff --git a/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_new.xml b/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_new.xml
index 1c2aa23262486fb96b9eb05098cdb5e392596e24..de964564823074cc85563a2d677dd519eb1ff7f7 100644
--- a/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_new.xml
+++ b/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_new.xml
@@ -7,6 +7,7 @@
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
     <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 -->
         <referenceContainer name="content">
             <block class="Magento\Shipping\Block\Adminhtml\Create" name="sales_shipment_create">
                 <block class="Magento\Shipping\Block\Adminhtml\Create\Form" name="form" template="create/form.phtml">
diff --git a/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_view.xml b/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_view.xml
index 8cdc5f8be0c8b547dd0b606358fb9b8ccb6ac2da..049654bf03a97ff760d1b1f2b80ac9fd48a05512 100644
--- a/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_view.xml
+++ b/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_view.xml
@@ -7,6 +7,7 @@
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
     <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 -->
         <referenceContainer name="content">
             <block class="Magento\Shipping\Block\Adminhtml\View" name="sales_shipment_view">
                 <block class="Magento\Shipping\Block\Adminhtml\View\Form" name="form" template="view/form.phtml">
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/create/form.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/create/form.phtml
index 28693ed0e0b947dccd7e43c878597d93d9ff29e0..46b4ab5ed56f691d3f7b0421d9e023ef3afaa9e0 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/create/form.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/create/form.phtml
@@ -11,24 +11,27 @@
     <?php echo $block->getBlockHtml('formkey')?>
     <?php  $_order = $block->getShipment()->getOrder() ?>
     <?php echo $block->getChildHtml('order_info') ?>
-    <div class="clearfix">
-        <div class="order-payment-method">
-            <!--Billing Address-->
-            <div class="fieldset-wrapper">
-                <div class="fieldset-wrapper-title">
+    <div class="admin__page-section">
+        <div class="admin__page-section-title">
+            <span class="title"><?php echo __('Payment &amp; Shipping Method') ?></span>
+        </div>
+        <div class="admin__page-section-content">
+            <div class="admin__page-section-item order-payment-method">
+                <?php /* Billing Address */ ?>
+                <div class="admin__page-section-item-title">
                     <span class="title"><?php echo __('Payment Information') ?></span>
                 </div>
-                <div><?php echo $block->getPaymentHtml() ?></div>
-                <div class="order-payment-currency"><?php echo __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?></div>
+                <div class="admin__page-section-item-content">
+                    <div><?php echo $block->getPaymentHtml() ?></div>
+                    <div class="order-payment-currency"><?php echo __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?></div>
+                </div>
             </div>
-        </div>
-        <div class="order-shipping-address">
-            <!--Shipping Address-->
-            <div class="fieldset-wrapper">
-                <div class="fieldset-wrapper-title">
+            <div class="admin__page-section-item order-shipping-address">
+                <?php /* Shipping Address */ ?>
+                <div class="admin__page-section-item-title">
                     <span class="title"><?php echo __('Shipping Information') ?></span>
                 </div>
-                <div class="shipping-description-wrapper">
+                <div class="admin__page-section-item-content shipping-description-wrapper">
                     <div class="shipping-description-title"><?php echo $block->escapeHtml($_order->getShippingDescription()) ?></div>
                     <div class="shipping-description-content">
                         <?php echo __('Total Shipping Charges'); ?>:
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml
index b1544ff93ea9a2d15080bbea545aca5896c4ffcf..b2001f9ac88a4b9e8b47ccaa7b53f6b02ea4e128 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml
@@ -7,12 +7,13 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<div class="fieldset-wrapper">
-    <div class="fieldset-wrapper-title">
+
+<section class="admin__page-section">
+    <div class="admin__page-section-title">
         <span class="title"><?php echo __('Items to Ship') ?></span>
     </div>
     <div class="grid">
-        <table cellspacing="0" class="data order-tables">
+        <table class="data-table admin__table-primary order-shipment-table">
             <thead>
                 <tr class="headings">
                     <th class="col-product"><span><?php echo __('Product') ?></span></th>
@@ -34,44 +35,75 @@
             <?php endforeach; ?>
         </table>
     </div>
-</div>
-<div class="clearfix">
-    <div class="order-comments-history">
-        <div class="fieldset-wrapper">
-            <div class="fieldset-wrapper-title"><span class="title"><?php echo __('Shipment Comments') ?></span></div>
-            <fieldset>
-                <div id="order-history_form">
-                    <label class="normal" for="shipment_comment_text"><?php echo __('Shipment Comments') ?></label>
-                    <textarea id="shipment_comment_text" name="shipment[comment_text]" rows="3" cols="5"><?php echo $block->getShipment()->getCommentText(); ?></textarea>
+</section>
+
+<section class="admin__page-section">
+    <div class="admin__page-section-title">
+        <span class="title"><?php echo __('Shipment Total') ?></span>
+    </div>
+    <div class="admin__page-section-content order-comments-history">
+        <div class="admin__page-section-item">
+            <div class="admin__page-section-item-title">
+                <span class="title"><?php echo __('Shipment Comments') ?></span>
+            </div>
+            <div class="admin__page-section-item-content">
+                <div id="order-history_form" class="admin__field">
+                    <label class="admin__field-label"
+                           for="shipment_comment_text">
+                        <span><?php echo __('Comment Text') ?></span></label>
+                    <textarea id="shipment_comment_text"
+                              class="admin__control-textarea"
+                              name="shipment[comment_text]"
+                              rows="3"
+                              cols="5"><?php echo $block->getShipment()->getCommentText(); ?></textarea>
                 </div>
-            </fieldset>
+            </div>
         </div>
     </div>
-    <div class="order-totals">
-        <div class="fieldset-wrapper">
-            <?php if ($block->canCreateShippingLabel()): ?>
-                <div class="field choice field-create">
-                    <input id="create_shipping_label" name="shipment[create_shipping_label]" value="1" type="checkbox"
-                           onclick="toggleCreateLabelCheckbox();"/>
-                    <label class="normal" for="create_shipping_label"><?php echo __('Create Shipping Label') ?></label>
-                </div>
-            <?php endif ?>
-            <div class="field choice field-append">
-                <input id="notify_customer" name="shipment[comment_customer_notify]" value="1" type="checkbox"/>
-                <label class="normal" for="notify_customer"><?php echo __('Append Comments') ?></label>
+    <div class="admin__page-section-item order-totals">
+        <?php if ($block->canCreateShippingLabel()): ?>
+            <div class="field choice admin__field admin__field-option field-create">
+                <input id="create_shipping_label"
+                       class="admin__control-checkbox"
+                       name="shipment[create_shipping_label]"
+                       value="1"
+                       type="checkbox"
+                       onclick="toggleCreateLabelCheckbox();"/>
+                <label class="admin__field-label"
+                       for="create_shipping_label">
+                    <span><?php echo __('Create Shipping Label') ?></span></label>
             </div>
-            <?php if ($block->canSendShipmentEmail()): ?>
-                <div class="field choice field-email">
-                    <input id="send_email" name="shipment[send_email]" value="1" type="checkbox"/>
-                    <label class="normal" for="send_email"><?php echo __('Email Copy of Shipment') ?></label>
-                </div>
-            <?php endif; ?>
-            <div class="actions">
-                <?php echo $block->getChildHtml('submit_button') ?>
+        <?php endif ?>
+
+        <div class="field choice admin__field admin__field-option field-append">
+            <input id="notify_customer"
+                   class="admin__control-checkbox"
+                   name="shipment[comment_customer_notify]"
+                   value="1"
+                   type="checkbox"/>
+            <label class="admin__field-label"
+                   for="notify_customer">
+                <span><?php echo __('Append Comments') ?></span></label>
+        </div>
+
+        <?php if ($block->canSendShipmentEmail()): ?>
+            <div class="field choice admin__field admin__field-option field-email">
+                <input id="send_email"
+                       class="admin__control-checkbox"
+                       name="shipment[send_email]"
+                       value="1"
+                       type="checkbox"/>
+                <label class="admin__field-label"
+                       for="send_email">
+                    <span><?php echo __('Email Copy of Shipment') ?></span></label>
             </div>
+        <?php endif; ?>
+
+        <div class="order-history-comments-actions actions">
+            <?php echo $block->getChildHtml('submit_button') ?>
         </div>
     </div>
-</div>
+</section>
 <script>
 require([
     "jquery",
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/create/items/renderer/default.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/create/items/renderer/default.phtml
index 1acdd870909d1f38bb2f9783a6e5937e56d729c9..136612ef50ba971ede1a74e9123cc17845d02998 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/create/items/renderer/default.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/create/items/renderer/default.phtml
@@ -13,7 +13,10 @@
     <td class="col-ordered-qty"><?php echo $block->getColumnHtml($_item, 'qty') ?></td>
     <td class="col-qty <?php if ($block->isShipmentRegular()): ?>last<?php endif; ?>">
         <?php if ($block->canShipPartiallyItem()): ?>
-            <input type="text" class="input-text qty-item" name="shipment[items][<?php echo $_item->getOrderItemId() ?>]" value="<?php echo $_item->getQty()*1 ?>" />
+            <input type="text"
+                   class="input-text admin__control-text qty-item"
+                   name="shipment[items][<?php echo $_item->getOrderItemId() ?>]"
+                   value="<?php echo $_item->getQty()*1 ?>" />
         <?php else: ?>
             <?php echo $_item->getQty()*1 ?>
         <?php endif; ?>
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/Tracking/view.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/Tracking/view.phtml
index 74a836156b05475a9b361d888800b3061f17e72a..1497b994f9acbc27c31272b23b45895a4f4a09cc 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/order/Tracking/view.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/Tracking/view.phtml
@@ -8,49 +8,66 @@
 
 ?>
 <?php /** @var $block Magento\Shipping\Block\Adminhtml\Order\Tracking\View */ ?>
-<table cellspacing="0" class="data-table" id="shipment_tracking_info">
-    <thead>
-        <tr class="headings">
-            <th class="col-carrier"><?php echo __('Carrier') ?></th>
-            <th class="col-title"><?php echo __('Title') ?></th>
-            <th class="col-number"><?php echo __('Number') ?></th>
-            <th class="col-delete last"><?php echo __('Action') ?></th>
-        </tr>
-    </thead>
-    <tfoot>
-        <tr>
-            <td class="col-carrier">
-                <select name="carrier" class="select" onchange="selectCarrier(this)">
-                    <?php foreach ($block->getCarriers() as $_code => $_name): ?>
-                    <option value="<?php echo $_code ?>"><?php echo $block->escapeHtml($_name) ?></option>
-                    <?php endforeach; ?>
-                </select>
-            </td>
-            <td class="col-title"><input class="input-text" type="text" id="tracking_title" name="title" value="" /></td>
-            <td class="col-number"><input class="input-text" type="text" id="tracking_number" name="number" value="" /></td>
-            <td class="col-delete last"><?php echo $block->getSaveButtonHtml() ?></td>
-        </tr>
-    </tfoot>
-<?php if ($_tracks = $block->getShipment()->getAllTracks()): ?>
-    <tbody>
-    <?php $i = 0; foreach ($_tracks as $_track):$i++ ?>
-        <tr class="<?php echo($i%2 == 0) ? 'even' : 'odd' ?>">
-            <td class="col-carrier"><?php echo $block->escapeHtml($block->getCarrierTitle($_track->getCarrierCode())) ?></td>
-            <td class="col-title"><?php echo $block->escapeHtml($_track->getTitle()) ?></td>
-            <td class="col-number">
-                <?php if ($_track->isCustom()): ?>
-                <?php echo $block->escapeHtml($_track->getNumber()) ?>
-                <?php else: ?>
-                <a href="#" onclick="popWin('<?php echo $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($_track) ?>','trackorder','width=800,height=600,resizable=yes,scrollbars=yes')"><?php echo $block->escapeHtml($_track->getNumber()) ?></a>
-                <div id="shipment_tracking_info_response_<?php echo $_track->getId() ?>"></div>
-                <?php endif; ?>
-            </td>
-            <td class="col-delete last"><a class="action- delete" href="#" onclick="deleteTrackingNumber('<?php echo $block->getRemoveUrl($_track) ?>'); return false;"><span><?php echo __('Delete') ?></span></a></td>
-        </tr>
-    <?php endforeach; ?>
-    </tbody>
-<?php endif; ?>
-</table>
+<div class="admin__control-table-wrapper">
+    <table class="data-table admin__control-table" id="shipment_tracking_info">
+        <thead>
+            <tr class="headings">
+                <th class="col-carrier"><?php echo __('Carrier') ?></th>
+                <th class="col-title"><?php echo __('Title') ?></th>
+                <th class="col-number"><?php echo __('Number') ?></th>
+                <th class="col-delete last"><?php echo __('Action') ?></th>
+            </tr>
+        </thead>
+        <tfoot>
+            <tr>
+                <td class="col-carrier">
+                    <select name="carrier"
+                            class="select admin__control-select"
+                            onchange="selectCarrier(this)">
+                        <?php foreach ($block->getCarriers() as $_code => $_name): ?>
+                        <option value="<?php echo $_code ?>"><?php echo $block->escapeHtml($_name) ?></option>
+                        <?php endforeach; ?>
+                    </select>
+                </td>
+                <td class="col-title">
+                    <input class="input-text admin__control-text"
+                           type="text"
+                           id="tracking_title"
+                           name="title"
+                           value="" />
+                </td>
+                <td class="col-number">
+                    <input class="input-text admin__control-text"
+                           type="text"
+                           id="tracking_number"
+                           name="number"
+                           value="" />
+                </td>
+                <td class="col-delete last"><?php echo $block->getSaveButtonHtml() ?></td>
+            </tr>
+        </tfoot>
+    <?php if ($_tracks = $block->getShipment()->getAllTracks()): ?>
+        <tbody>
+        <?php $i = 0; foreach ($_tracks as $_track):$i++ ?>
+            <tr class="<?php echo($i%2 == 0) ? 'even' : 'odd' ?>">
+                <td class="col-carrier"><?php echo $block->escapeHtml($block->getCarrierTitle($_track->getCarrierCode())) ?></td>
+                <td class="col-title"><?php echo $block->escapeHtml($_track->getTitle()) ?></td>
+                <td class="col-number">
+                    <?php if ($_track->isCustom()): ?>
+                    <?php echo $block->escapeHtml($_track->getNumber()) ?>
+                    <?php else: ?>
+                    <a href="#" onclick="popWin('<?php echo $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($_track) ?>','trackorder','width=800,height=600,resizable=yes,scrollbars=yes')"><?php echo $block->escapeHtml($_track->getNumber()) ?></a>
+                    <div id="shipment_tracking_info_response_<?php echo $_track->getId() ?>"></div>
+                    <?php endif; ?>
+                </td>
+                <td class="col-delete last"><a class="action-delete" href="#" onclick="deleteTrackingNumber('<?php echo $block->getRemoveUrl($_track) ?>'); return false;"><span><?php echo __('Delete') ?></span></a></td>
+            </tr>
+        <?php endforeach; ?>
+        </tbody>
+    <?php endif; ?>
+    </table>
+</div>
+
 <script>
 require(['prototype'], function(){
 
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/grid.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/grid.phtml
index aa8645eb6238e23547dc15df5e96c2fc388c9dcf..f696adb536c16ca453fb8090930cf2fe5e67f27f 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/grid.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/grid.phtml
@@ -8,65 +8,88 @@
 
 ?>
 <div class="grid">
-    <table cellspacing="0" class="data-table">
-        <thead>
-        <tr>
-            <th class="col-product no-link"><?php echo __('Product Name') ?></th>
-            <th class="col-weight no-link"><?php echo __('Weight') ?></th>
-            <th class="col-custom no-link" <?php echo $block->displayCustomsValue() ? '' : 'style="display: none;"' ?>>
-                <?php echo __('Customs Value') ?>
-            </th>
-            <th class="col-select no-link">
-                <input type="checkbox" name="" onclick="packaging.checkAllItems(this);" class="checkbox" title="<?php echo __('Select All') ?>">
-            </th>
-            <th class="col-qty no-link"><?php echo __('Qty Ordered') ?></th>
-            <th class="col-qty-edit no-link last"><?php echo __('Qty') ?></th>
-        </tr>
-        </thead>
+    <div class="hor-scroll">
+        <table class="data-table admin__table-primary">
+            <thead>
+            <tr>
+                <th class="col-product no-link"><?php echo __('Product Name') ?></th>
+                <th class="col-weight no-link"><?php echo __('Weight') ?></th>
+                <th class="col-custom no-link" <?php echo $block->displayCustomsValue() ? '' : 'style="display: none;"' ?>>
+                    <?php echo __('Customs Value') ?>
+                </th>
+                <th class="col-select no-link">
+                    <div class="admin__field admin__field-option">
+                        <input type="checkbox"
+                               name=""
+                               onclick="packaging.checkAllItems(this);"
+                               class="checkbox admin__control-checkbox"
+                               title="<?php echo __('Select All') ?>">
+                        <label class="admin__field-label"></label>
+                    </div>
+                </th>
+                <th class="col-qty no-link"><?php echo __('Qty Ordered') ?></th>
+                <th class="col-qty-edit no-link last"><?php echo __('Qty') ?></th>
+            </tr>
+            </thead>
 
-        <tbody>
-        <?php foreach ($block->getCollection() as $item): ?>
-            <?php $_order = $block->getShipment()->getOrder() ?>
-            <?php $_orderItem = $_order->getItemById($item->getOrderItemId()); ?>
-            <?php if ($item->getIsVirtual()
-                || ($_orderItem->isShipSeparately() && !($_orderItem->getParentItemId() || $_orderItem->getParentItem()))
-                || (!$_orderItem->isShipSeparately() && ($_orderItem->getParentItemId() || $_orderItem->getParentItem()))): ?>
-                <?php continue; ?>
+            <tbody>
+            <?php foreach ($block->getCollection() as $item): ?>
+                <?php $_order = $block->getShipment()->getOrder() ?>
+                <?php $_orderItem = $_order->getItemById($item->getOrderItemId()); ?>
+                <?php if ($item->getIsVirtual()
+                    || ($_orderItem->isShipSeparately() && !($_orderItem->getParentItemId() || $_orderItem->getParentItem()))
+                    || (!$_orderItem->isShipSeparately() && ($_orderItem->getParentItemId() || $_orderItem->getParentItem()))): ?>
+                    <?php continue; ?>
                 <?php endif; ?>
-        <tr title="#" id="" class="">
-            <td class="col-product name">
-                <?php echo $item->getName(); ?>
-            </td>
-            <td class="col-weight weight ">
-                <?php echo $item->getWeight(); ?>
-            </td>
-            <?php
-            if ($block->displayCustomsValue()) {
-                $customsValueDisplay = '';
-                $customsValueValidation = ' validate-zero-or-greater ';
-            } else {
-                $customsValueDisplay = ' style="display: none;" ';
-                $customsValueValidation = '';
-            }
-            ?>
-            <td <?php echo $customsValueDisplay ?>>
-                <input type="text" name="customs_value" class="input-text <?php echo $customsValueValidation ?>" value="<?php echo $block->formatPrice($item->getPrice()); ?>" size="10" onblur="packaging.recalcContainerWeightAndCustomsValue(this);">
-            </td>
-            <td class="col-select">
-                <input type="checkbox" name="" value="<?php echo $item->getId() ? $item->getId() : $item->getOrderItemId(); ?>" class="checkbox">
-            </td>
-            <td class="col-qty">
-                <?php echo $item->getOrderItem()->getQtyOrdered()*1; ?>
-            </td>
-            <td class="col-qty-edit last">
-                <input type="hidden" name="price" value="<?php echo $item->getPrice(); ?>">
-                <input type="text" name="qty" value="<?php echo $item->getQty()*1; ?>" class="input-text qty<?php if ($item->getOrderItem()->getIsQtyDecimal()): ?> qty-decimal<?php endif ?>">&nbsp;
-                <button type="button" class="action- delete icon-btn" onclick="packaging.deleteItem(this);" style="display:none;">
-                    <span><?php echo __('Delete') ?></span>
-                </button>
-            </td>
-        </tr>
+                <tr title="#" id="" class="">
+                    <td class="col-product name">
+                        <?php echo $item->getName(); ?>
+                    </td>
+                    <td class="col-weight weight ">
+                        <?php echo $item->getWeight(); ?>
+                    </td>
+                    <?php
+                    if ($block->displayCustomsValue()) {
+                        $customsValueDisplay = '';
+                        $customsValueValidation = ' validate-zero-or-greater ';
+                    } else {
+                        $customsValueDisplay = ' style="display: none;" ';
+                        $customsValueValidation = '';
+                    }
+                    ?>
+                    <td <?php echo $customsValueDisplay ?>>
+                        <input type="text"
+                               name="customs_value"
+                               class="input-text admin__control-text <?php echo $customsValueValidation ?>"
+                               value="<?php echo $block->formatPrice($item->getPrice()); ?>"
+                               size="10"
+                               onblur="packaging.recalcContainerWeightAndCustomsValue(this);">
+                    </td>
+                    <td class="col-select">
+                        <div class="admin__field admin__field-option">
+                            <input type="checkbox"
+                                   name=""
+                                   value="<?php echo $item->getId() ? $item->getId() : $item->getOrderItemId(); ?>"
+                                   class="checkbox admin__control-checkbox">
+                            <label class="admin__field-label"></label>
+                        </div>
+                    </td>
+                    <td class="col-qty">
+                        <?php echo $item->getOrderItem()->getQtyOrdered()*1; ?>
+                    </td>
+                    <td class="col-qty-edit last">
+                        <input type="hidden" name="price" value="<?php echo $item->getPrice(); ?>">
+                        <input type="text"
+                               name="qty"
+                               value="<?php echo $item->getQty()*1; ?>"
+                               class="input-text admin__control-text qty<?php if ($item->getOrderItem()->getIsQtyDecimal()): ?> qty-decimal<?php endif ?>">&nbsp;
+                        <button type="button" class="action-delete delete icon-btn" onclick="packaging.deleteItem(this);" style="display:none;">
+                            <span><?php echo __('Delete') ?></span>
+                        </button>
+                    </td>
+                </tr>
             <?php endforeach; ?>
-        </tbody>
-    </table>
+            </tbody>
+        </table>
+    </div>
 </div>
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup.phtml
index 7876d0ae1b8754efad94938cd984a7e90169f560..359dde8e59b198aa5be1907d9839c31b64166d20 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup.phtml
@@ -53,149 +53,186 @@ require([
     <div class="popup-window-wrapper">
         <div class="popup-window-title">
             <div class="actions">
-                <button type="button" class="action-add AddPackageBtn" onclick="packaging.newPackage();">
+                <button type="button" class="action-add action-secondary AddPackageBtn" onclick="packaging.newPackage();">
                     <span><?php echo __('Add Package') ?></span>
                 </button>
             </div>
             <span class="title"><?php echo __('Create Packages') ?></span>
         </div>
         <div class="packaging-content popup-window-content">
-            <div class="messages" style="display:none;"></div>
+            <div class="message message-warning" style="display: none"></div>
             <div id="package_template" style="display:none;">
                 <div class="package-number popup-fieldset-title">
-                    <div class="title"><?php echo __('Package') ?><span></span></div>
+                    <div class="title">
+                        <?php echo __('Package') ?>
+                        <span></span>
+                    </div>
+                </div>
+                <div class="admin__control-table-wrapper">
+                    <table class="data-table admin__control-table">
+                        <thead>
+                            <th class="col-type"><?php echo __('Type') ?></th>
+                            <?php if ($girthEnabled == 1): ?>
+                            <th class="col-size"><?php echo __('Size') ?></th>
+                            <th class="col-girth"><?php echo __('Girth') ?></th>
+                            <th>&nbsp;</th>
+                                <?php endif; ?>
+                            <th class="col-custom" <?php echo $block->displayCustomsValue() ? '' : 'style="display: none;"' ?>>
+                                <?php echo __('Customs Value') ?>
+                            </th>
+                            <th class="col-total-weight"><?php echo __('Total Weight') ?></th>
+                            <th class="col-length"><?php echo __('Length') ?></th>
+                            <th class="col-width"><?php echo __('Width') ?></th>
+                            <th class="col-height"><?php echo __('Height') ?></th>
+                            <th>&nbsp;</th>
+                            <?php if ($block->getDeliveryConfirmationTypes()): ?>
+                            <th class="col-signature"><?php echo __('Signature Confirmation') ?></th>
+                                <?php endif; ?>
+                            <th class="col-actions">&nbsp;</th>
+                        </thead>
+                        <tbody>
+                            <td class="col-type">
+                                <?php $containers = $block->getContainers(); ?>
+                                <select name="package_container"
+                                        onchange="packaging.changeContainerType(this);packaging.checkSizeAndGirthParameter(this, <?php echo  $girthEnabled ?>);"
+                                        <?php if (empty($containers)):?>
+                                            title="<?php echo __('USPS domestic shipments don\'t use package types.') ?>"
+                                            disabled=""
+                                            class="admin__control-select disabled"
+                                        <?php else: ?>
+                                            class="admin__control-select"
+                                        <?php endif; ?>>
+                                    <?php foreach ($block->getContainers() as $key => $value): ?>
+                                        <option value="<?php echo $key ?>" >
+                                            <?php echo $value ?>
+                                        </option>
+                                    <?php endforeach; ?>
+                                </select>
+                            </td>
+                            <?php if ($girthEnabled == 1 && !empty($sizeSource)): ?>
+                            <td>
+                                <select name="package_size"
+                                        class="admin__control-select"
+                                        onchange="packaging.checkSizeAndGirthParameter(this, <?php echo  $girthEnabled ?>);">
+                                    <?php foreach ($sizeSource as $key => $value): ?>
+                                    <option value="<?php echo $sizeSource[$key]['value'] ?>">
+                                        <?php echo $sizeSource[$key]['label'] ?>
+                                    </option>
+                                    <?php endforeach; ?>
+                                </select>
+                            </td>
+                            <td>
+                                <input type="text"
+                                       class="input-text admin__control-text validate-greater-than-zero"
+                                       name="container_girth" />
+                            </td>
+                            <td>
+                                <select name="container_girth_dimension_units"
+                                        class="options-units-dimensions measures admin__control-select"
+                                        onchange="packaging.changeMeasures(this);">
+                                    <option value="<?php echo Zend_Measure_Length::INCH ?>" selected="selected" ><?php echo __('in') ?></option>
+                                    <option value="<?php echo Zend_Measure_Length::CENTIMETER ?>" ><?php echo __('cm') ?></option>
+                                </select>
+                            </td>
+                                <?php endif; ?>
+                            <?php
+                            if ($block->displayCustomsValue()) {
+                                $customsValueDisplay = '';
+                                $customsValueValidation = ' validate-zero-or-greater ';
+                            } else {
+                                $customsValueDisplay = ' style="display: none;" ';
+                                $customsValueValidation = '';
+                            }
+                            ?>
+                            <td class="col-custom" <?php echo $customsValueDisplay ?>>
+                                <input type="text"
+                                       class="customs-value input-text admin__control-text <?php echo $customsValueValidation ?>"
+                                       name="package_customs_value" />
+                                <span class="customs-value-currency">[<?php echo $block->getCustomValueCurrencyCode(); ?>]</span>
+                            </td>
+                            <td class="col-total-weight">
+                                <input type="text"
+                                       class="options-weight input-text admin__control-text required-entry validate-greater-than-zero"
+                                       name="container_weight" />
+                                <select name="container_weight_units"
+                                        class="options-units-weight measures admin__control-select"
+                                        onchange="packaging.changeMeasures(this);">
+                                    <option value="<?php echo Zend_Measure_Weight::POUND ?>" selected="selected"  ><?php echo __('lb') ?></option>
+                                    <option value="<?php echo Zend_Measure_Weight::KILOGRAM ?>" ><?php echo __('kg') ?></option>
+                                </select>
+                            </td>
+                            <td class="col-length">
+                                <input type="text"
+                                       class="input-text admin__control-text validate-greater-than-zero"
+                                       name="container_length" />
+                            </td>
+                            <td class="col-width">
+                                <input type="text"
+                                       class="input-text admin__control-text validate-greater-than-zero"
+                                       name="container_width" />
+                            </td>
+                            <td class="col-height">
+                                <input type="text"
+                                       class="input-text admin__control-text validate-greater-than-zero"
+                                       name="container_height" />
+                            </td>
+                            <td class="col-measure">
+                                <select name="container_dimension_units"
+                                        class="options-units-dimensions measures admin__control-select"
+                                        onchange="packaging.changeMeasures(this);">
+                                    <option value="<?php echo Zend_Measure_Length::INCH ?>" selected="selected" ><?php echo __('in') ?></option>
+                                    <option value="<?php echo Zend_Measure_Length::CENTIMETER ?>" ><?php echo __('cm') ?></option>
+                                </select>
+                            </td>
+                            <?php if ($block->getDeliveryConfirmationTypes()): ?>
+                            <td>
+                                <select name="delivery_confirmation_types" class="admin__control-select">
+                                    <?php foreach ($block->getDeliveryConfirmationTypes() as $key => $value): ?>
+                                    <option value="<?php echo $key ?>" >
+                                        <?php echo $value ?>
+                                    </option>
+                                    <?php endforeach; ?>
+                                </select>
+                            </td>
+                                <?php endif; ?>
+                            <td class="col-actions">
+                                <button type="button" class="action-add AddItemsBtn" onclick="packaging.getItemsForPack(this);">
+                                    <span><?php echo __('Add') ?></span>
+                                </button>
+                                <button type="button" class="action-delete DeletePackageBtn" onclick="packaging.deletePackage(this);">
+                                    <span><?php echo __('Delete Package') ?></span>
+                                </button>
+                            </td>
+                        </tbody>
+                    </table>
                 </div>
-                <table class="data-table" cellspacing="0">
-                    <thead>
-                        <th class="col-type"><?php echo __('Type') ?></th>
-                        <?php if ($girthEnabled == 1): ?>
-                        <th class="col-size"><?php echo __('Size') ?></th>
-                        <th class="col-girth"><?php echo __('Girth') ?></th>
-                        <th>&nbsp;</th>
-                            <?php endif; ?>
-                        <th class="col-custom" <?php echo $block->displayCustomsValue() ? '' : 'style="display: none;"' ?>>
-                            <?php echo __('Customs Value') ?>
-                        </th>
-                        <th class="col-total-weight"><?php echo __('Total Weight') ?></th>
-                        <th class="col-length"><?php echo __('Length') ?></th>
-                        <th class="col-width"><?php echo __('Width') ?></th>
-                        <th class="col-height"><?php echo __('Height') ?></th>
-                        <th>&nbsp;</th>
-                        <?php if ($block->getDeliveryConfirmationTypes()): ?>
-                        <th class="col-signature"><?php echo __('Signature Confirmation') ?></th>
-                            <?php endif; ?>
-                        <th class="col-actions">&nbsp;</th>
-                    </thead>
-                    <tbody>
-                        <td class="col-type">
-                            <?php $containers = $block->getContainers(); ?>
-                            <select name="package_container" onchange="packaging.changeContainerType(this);packaging.checkSizeAndGirthParameter(this, <?php echo  $girthEnabled ?>);"<?php if (empty($containers)):?>
-                                    title="<?php echo __('USPS domestic shipments don\'t use package types.') ?>"
-                                    disabled="" class="disabled"
-                                <?php endif; ?>>
-                                <?php foreach ($block->getContainers() as $key => $value): ?>
-                                <option value="<?php echo $key ?>" >
-                                    <?php echo $value ?>
-                                </option>
-                                <?php endforeach; ?>
-                            </select>
-                        </td>
-                        <?php if ($girthEnabled == 1 && !empty($sizeSource)): ?>
-                        <td>
-                            <select name="package_size" onchange="packaging.checkSizeAndGirthParameter(this, <?php echo  $girthEnabled ?>);">
-                                <?php foreach ($sizeSource as $key => $value): ?>
-                                <option value="<?php echo $sizeSource[$key]['value'] ?>">
-                                    <?php echo $sizeSource[$key]['label'] ?>
-                                </option>
-                                <?php endforeach; ?>
-                            </select>
-                        </td>
-                        <td><input type="text" class="input-text validate-greater-than-zero" name="container_girth" /></td>
-                        <td>
-                            <select name="container_girth_dimension_units" class="options-units-dimensions measures" onchange="packaging.changeMeasures(this);">
-                                <option value="<?php echo Zend_Measure_Length::INCH ?>" selected="selected" ><?php echo __('in') ?></option>
-                                <option value="<?php echo Zend_Measure_Length::CENTIMETER ?>" ><?php echo __('cm') ?></option>
-                            </select>
-                        </td>
-                            <?php endif; ?>
-                        <?php
-                        if ($block->displayCustomsValue()) {
-                            $customsValueDisplay = '';
-                            $customsValueValidation = ' validate-zero-or-greater ';
-                        } else {
-                            $customsValueDisplay = ' style="display: none;" ';
-                            $customsValueValidation = '';
-                        }
-                        ?>
-                        <td class="col-custom" <?php echo $customsValueDisplay ?>>
-                            <input type="text" class="customs-value input-text <?php echo $customsValueValidation ?>" name="package_customs_value" />
-                            <span class="customs-value-currency">[<?php echo $block->getCustomValueCurrencyCode(); ?>]</span>
-                        </td>
-                        <td class="col-total-weight">
-                            <input type="text" class="options-weight input-text required-entry validate-greater-than-zero" name="container_weight" />
-                            <select name="container_weight_units" class="options-units-weight measures" onchange="packaging.changeMeasures(this);">
-                                <option value="<?php echo Zend_Measure_Weight::POUND ?>" selected="selected"  ><?php echo __('lb') ?></option>
-                                <option value="<?php echo Zend_Measure_Weight::KILOGRAM ?>" ><?php echo __('kg') ?></option>
-                            </select>
-                        </td>
-                        <td class="col-length">
-                            <input type="text" class="input-text validate-greater-than-zero" name="container_length" />
-                        </td>
-                        <td class="col-width">
-                            <input type="text" class="input-text validate-greater-than-zero" name="container_width" />
-                        </td>
-                        <td class="col-height">
-                            <input type="text" class="input-text validate-greater-than-zero" name="container_height" />
-                        </td>
-                        <td class="col-measure">
-                            <select name="container_dimension_units" class="options-units-dimensions measures" onchange="packaging.changeMeasures(this);">
-                                <option value="<?php echo Zend_Measure_Length::INCH ?>" selected="selected" ><?php echo __('in') ?></option>
-                                <option value="<?php echo Zend_Measure_Length::CENTIMETER ?>" ><?php echo __('cm') ?></option>
-                            </select>
-                        </td>
-                        <?php if ($block->getDeliveryConfirmationTypes()): ?>
-                        <td>
-                            <select name="delivery_confirmation_types">
-                                <?php foreach ($block->getDeliveryConfirmationTypes() as $key => $value): ?>
-                                <option value="<?php echo $key ?>" >
-                                    <?php echo $value ?>
-                                </option>
-                                <?php endforeach; ?>
-                            </select>
-                        </td>
-                            <?php endif; ?>
-                        <td class="col-actions">
-                            <button type="button" class="action-add AddItemsBtn" onclick="packaging.getItemsForPack(this);">
-                                <span><?php echo __('Add Products') ?></span>
-                            </button>
-                            <button type="button" class="action-delete DeletePackageBtn" onclick="packaging.deletePackage(this);">
-                                <span><?php echo __('Delete Package') ?></span>
-                            </button>
-                        </td>
-                    </tbody>
-                </table>
 
                 <?php if ($block->getContentTypes()): ?>
-                <table class="package-options package-options-contents data-table" cellspacing="0">
-                    <thead>
-                        <th><?php echo __('Contents') ?></th>
-                        <th><?php echo __('Explanation') ?></th>
-                    </thead>
-                    <tbody>
-                        <td>
-                            <select name="content_type" onchange="packaging.changeContentTypes(this);">
-                                <?php foreach ($block->getContentTypes() as $key => $value): ?>
-                                <option value="<?php echo $key ?>" >
-                                    <?php echo $value ?>
-                                </option>
-                                <?php endforeach; ?>
-                            </select>
-                        </td>
-                        <td>
-                            <input name="content_type_other" type="text" class="input-text options-content-type disabled" disabled="disabled" />
-                        </td>
-                    </tbody>
-                </table>
+                    <table class="package-options package-options-contents data-table" cellspacing="0">
+                        <thead>
+                            <th><?php echo __('Contents') ?></th>
+                            <th><?php echo __('Explanation') ?></th>
+                        </thead>
+                        <tbody>
+                            <td>
+                                <select name="content_type"
+                                        class="admin__control-select"
+                                        onchange="packaging.changeContentTypes(this);">
+                                    <?php foreach ($block->getContentTypes() as $key => $value): ?>
+                                    <option value="<?php echo $key ?>" >
+                                        <?php echo $value ?>
+                                    </option>
+                                    <?php endforeach; ?>
+                                </select>
+                            </td>
+                            <td>
+                                <input name="content_type_other"
+                                       type="text"
+                                       class="input-text admin__control-text options-content-type disabled"
+                                       disabled="disabled" />
+                            </td>
+                        </tbody>
+                    </table>
                 <?php endif; ?>
                 <div class="package-add-products">
                     <div class="package_prapare" style="display:none">
@@ -214,7 +251,11 @@ require([
             <div id="packages_content"></div>
         </div>
         <div class="popup-window-buttons-set">
-            <button type="button" class="action-ok disabled SavePackagesBtn" disabled="disabled" onclick="packaging.confirmPackaging();" title="<?php echo __('Products should be added to package(s)')?>">
+            <button type="button"
+                    class="action-save action-secondary disabled SavePackagesBtn"
+                    disabled="disabled"
+                    onclick="packaging.confirmPackaging();"
+                    title="<?php echo __('Products should be added to package(s)')?>">
                 <span><?php echo __('OK') ?></span>
             </button>
             <button type="button" class="action-close" onclick="packaging.cancelPackaging();">
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/tracking.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/tracking.phtml
index bf0b417d2bd8adcde2c95cb38c2db26c8be01a5d..cb8d042a65f47a3d149ac8c99efc87c4ab6d1872 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/order/tracking.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/tracking.phtml
@@ -64,34 +64,40 @@ require(['prototype'], function(){
 <script id="track_row_template" type="text/x-magento-template">
     <tr>
         <td class="col-carrier">
-            <select name="tracking[<%- data.index %>][carrier_code]" id="trackingC<%- data.index %>" class="select carrier" disabled="disabled">
+            <select name="tracking[<%- data.index %>][carrier_code]"
+                    id="trackingC<%- data.index %>"
+                    class="select admin__control-select carrier"
+                    disabled="disabled">
                 <?php foreach ($block->getCarriers() as $_code => $_name): ?>
                     <option value="<?php echo $_code ?>"><?php echo $block->escapeHtml($_name) ?></option>
                 <?php endforeach; ?>
             </select>
         </td>
-        <td class="col-title"><input class="input-text number-title" type="text" name="tracking[<%- data.index %>][title]" id="trackingT<%- data.index %>" value="" disabled="disabled" /></td>
-        <td class="col-number"><input class="input-text required-entry" type="text" name="tracking[<%- data.index %>][number]" id="trackingN<%- data.index %>" value="" disabled="disabled" /></td>
-        <td class="col-delete last"><a href="#" class="action- delete" onclick="trackingControl.deleteRow(event);return false"><span><?php echo __('Delete') ?></span></a></td>
+        <td class="col-title"><input class="input-text admin__control-text number-title" type="text" name="tracking[<%- data.index %>][title]" id="trackingT<%- data.index %>" value="" disabled="disabled" /></td>
+        <td class="col-number"><input class="input-text admin__control-text required-entry" type="text" name="tracking[<%- data.index %>][number]" id="trackingN<%- data.index %>" value="" disabled="disabled" /></td>
+        <td class="col-delete"><a href="#" class="action-delete" onclick="trackingControl.deleteRow(event);return false"><span><?php echo __('Delete') ?></span></a></td>
     </tr>
 </script>
-<table cellspacing="0" class="data-table" id="tracking_numbers_table">
-    <thead>
-    <tr class="headings">
-        <th class="col-carrier"><?php echo __('Carrier') ?></th>
-        <th class="col-title"><?php echo __('Title') ?></th>
-        <th class="col-number"><?php echo __('Number') ?></th>
-        <th class="col-delete last"><?php echo __('Action') ?></th>
-    </tr>
-    </thead>
-    <tfoot>
-    <tr>
-        <td colspan="4" class="last col-actions-add"><?php echo $block->getChildHtml('add_button') ?></td>
-    </tr>
-    </tfoot>
-    <tbody id="track_row_container">
-    </tbody>
-</table>
+
+<div class="admin__control-table-wrapper">
+    <table class="data-table admin__control-table" id="tracking_numbers_table">
+        <thead>
+        <tr class="headings">
+            <th class="col-carrier"><?php echo __('Carrier') ?></th>
+            <th class="col-title"><?php echo __('Title') ?></th>
+            <th class="col-number"><?php echo __('Number') ?></th>
+            <th class="col-delete"><?php echo __('Action') ?></th>
+        </tr>
+        </thead>
+        <tfoot>
+        <tr>
+            <td colspan="4" class="col-actions-add"><?php echo $block->getChildHtml('add_button') ?></td>
+        </tr>
+        </tfoot>
+        <tbody id="track_row_container">
+        </tbody>
+    </table>
+</div>
 <script>
 require([
     'mage/template',
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/view/info.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/view/info.phtml
index e527501f2e5414cfb1001445b8b43d9cfbe3f544..53ce09410322557fa80728cfe384be1d82f958ef 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/order/view/info.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/view/info.phtml
@@ -10,33 +10,32 @@
 <?php /** @var $block \Magento\Shipping\Block\Adminhtml\View */ ?>
 <?php $order = $block->getOrder() ?>
 <?php if ($order->getIsVirtual()) : return '';endif; ?>
-<div class="order-shipping-method">
-    <!--Shipping Method-->
-    <div class="fieldset-wrapper">
-        <div class="fieldset-wrapper-title">
-            <span class="title"><?php echo __('Shipping &amp; Handling Information') ?></span>
-        </div>
-        <div class="shipping-description-wrapper">
-            <?php  if ($order->getTracksCollection()->count()) : ?>
-                <p><a href="#" id="linkId" onclick="popWin('<?php echo $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($order) ?>','trackorder','width=800,height=600,resizable=yes,scrollbars=yes')" title="<?php echo __('Track Order') ?>"><?php echo __('Track Order') ?></a></p>
-            <?php endif; ?>
-            <?php if ($order->getShippingDescription()): ?>
-                <strong><?php echo $block->escapeHtml($order->getShippingDescription()) ?></strong>
 
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()): ?>
-                    <?php $_excl = $block->displayShippingPriceInclTax($order); ?>
-                <?php else: ?>
-                    <?php $_excl = $block->displayPriceAttribute('shipping_amount', false, ' '); ?>
-                <?php endif; ?>
-                <?php $_incl = $block->displayShippingPriceInclTax($order); ?>
+<?php /* Shipping Method */ ?>
+<div class="admin__page-section-item order-shipping-method">
+    <div class="admin__page-section-item-title">
+        <span class="title"><?php echo __('Shipping &amp; Handling Information') ?></span>
+    </div>
+    <div class="admin__page-section-item-content">
+        <?php  if ($order->getTracksCollection()->count()) : ?>
+            <p><a href="#" id="linkId" onclick="popWin('<?php echo $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($order) ?>','trackorder','width=800,height=600,resizable=yes,scrollbars=yes')" title="<?php echo __('Track Order') ?>"><?php echo __('Track Order') ?></a></p>
+        <?php endif; ?>
+        <?php if ($order->getShippingDescription()): ?>
+            <strong><?php echo $block->escapeHtml($order->getShippingDescription()) ?></strong>
 
-                <?php echo $_excl; ?>
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
-                    (<?php echo __('Incl. Tax'); ?> <?php echo $_incl; ?>)
-                <?php endif; ?>
+            <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()): ?>
+                <?php $_excl = $block->displayShippingPriceInclTax($order); ?>
             <?php else: ?>
-                <?php echo __('No shipping information available'); ?>
+                <?php $_excl = $block->displayPriceAttribute('shipping_amount', false, ' '); ?>
+            <?php endif; ?>
+            <?php $_incl = $block->displayShippingPriceInclTax($order); ?>
+
+            <?php echo $_excl; ?>
+            <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
+                (<?php echo __('Incl. Tax'); ?> <?php echo $_incl; ?>)
             <?php endif; ?>
-        </div>
+        <?php else: ?>
+            <?php echo __('No shipping information available'); ?>
+        <?php endif; ?>
     </div>
 </div>
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/view/form.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/view/form.phtml
index 7a777c90d468a360a1279cdbccc9f333e8d4d4f4..16dc0556a52a2bdad4ad53a86293f6e842737f38 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/view/form.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/view/form.phtml
@@ -9,94 +9,110 @@
 ?>
 <?php  $_order = $block->getShipment()->getOrder() ?>
 <?php echo $block->getChildHtml('order_info') ?>
-<div class="clearfix">
-    <div class="order-payment-method">
+<section class="admin__page-section order-shipment-billing-shipping">
+    <div class="admin__page-section-title">
+        <span class="title"><?php echo __('Payment &amp; Shipping Method') ?></span>
+    </div>
+    <div class="admin__page-section-content">
+
         <?php /* Billing Address */ ?>
-        <div class="fieldset-wrapper">
-            <div class="fieldset-wrapper-title">
+        <div class="admin__page-section-item order-payment-method">
+            <div class="admin__page-section-item-title">
                 <span class="title"><?php echo __('Payment Information') ?></span>
             </div>
-            <div><?php echo $block->getChildHtml('order_payment') ?></div>
-            <div class="order-payment-currency"><?php echo __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?></div>
+            <div class="admin__page-section-item-content">
+                <div><?php echo $block->getChildHtml('order_payment') ?></div>
+                <div class="order-payment-currency"><?php echo __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?></div>
+            </div>
         </div>
-    </div>
-    <div class="order-shipping-address">
+
         <?php /* Shipping Address */ ?>
-        <div class="fieldset-wrapper">
-            <div class="fieldset-wrapper-title">
+        <div class="admin__page-section-item order-shipping-address">
+            <div class="admin__page-section-item-title">
                 <span class="title"><?php echo __('Shipping and Tracking Information') ?></span>
             </div>
-            <div class="shipping-description-wrapper">
-                <?php if ($block->getShipment()->getTracksCollection()->count()): ?>
-                <p>
-                    <a href="#" id="linkId" onclick="popWin('<?php echo $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($block->getShipment()) ?>','trackshipment','width=800,height=600,resizable=yes,scrollbars=yes')" title="<?php echo __('Track this shipment') ?>"><?php echo __('Track this shipment') ?></a>
-                </p>
-                <?php endif; ?>
-                <div class="shipping-description-title"><?php echo $block->escapeHtml($_order->getShippingDescription()) ?></div>
-                <?php echo __('Total Shipping Charges'); ?>:
+            <div class="admin__page-section-item-content">
+                <div class="shipping-description-wrapper">
+                    <?php if ($block->getShipment()->getTracksCollection()->count()): ?>
+                        <p>
+                            <a href="#" id="linkId" onclick="popWin('<?php echo $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($block->getShipment()) ?>','trackshipment','width=800,height=600,resizable=yes,scrollbars=yes')" title="<?php echo __('Track this shipment') ?>"><?php echo __('Track this shipment') ?></a>
+                        </p>
+                    <?php endif; ?>
+                    <div class="shipping-description-title">
+                        <?php echo $block->escapeHtml($_order->getShippingDescription()) ?>
+                    </div>
 
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()): ?>
-                    <?php $_excl = $block->displayShippingPriceInclTax($_order); ?>
-                <?php else: ?>
-                    <?php $_excl = $block->displayPriceAttribute('shipping_amount', false, ' '); ?>
-                <?php endif; ?>
-                <?php $_incl = $block->displayShippingPriceInclTax($_order); ?>
+                    <?php echo __('Total Shipping Charges'); ?>:
 
-                <?php echo $_excl; ?>
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
-                    (<?php echo __('Incl. Tax'); ?> <?php echo $_incl; ?>)
-                <?php endif; ?>
-            </div>
-            <?php if ($block->canCreateShippingLabel()): ?>
-            <p>
-                <?php echo $block->getCreateLabelButton()?>
-                <?php if ($block->getShipment()->getShippingLabel()): ?>
-                    <?php echo $block->getPrintLabelButton() ?>
-                <?php endif ?>
-                <?php if ($block->getShipment()->getPackages()): ?>
-                    <?php echo $block->getShowPackagesButton() ?>
+                    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()): ?>
+                        <?php $_excl = $block->displayShippingPriceInclTax($_order); ?>
+                    <?php else: ?>
+                        <?php $_excl = $block->displayPriceAttribute('shipping_amount', false, ' '); ?>
+                    <?php endif; ?>
+                    <?php $_incl = $block->displayShippingPriceInclTax($_order); ?>
+
+                    <?php echo $_excl; ?>
+                    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
+                        (<?php echo __('Incl. Tax'); ?> <?php echo $_incl; ?>)
+                    <?php endif; ?>
+                </div>
+                <?php if ($block->canCreateShippingLabel()): ?>
+                <p>
+                    <?php echo $block->getCreateLabelButton()?>
+                    <?php if ($block->getShipment()->getShippingLabel()): ?>
+                        <?php echo $block->getPrintLabelButton() ?>
+                    <?php endif ?>
+                    <?php if ($block->getShipment()->getPackages()): ?>
+                        <?php echo $block->getShowPackagesButton() ?>
+                    <?php endif ?>
+                </p>
                 <?php endif ?>
-            </p>
-            <?php endif ?>
-            <div><?php echo $block->getChildHtml('shipment_tracking') ?></div>
-        <?php echo $block->getChildHtml('shipment_packaging') ?>
-        <script>
-require([
-    'prototype'
-], function(){
+                <?php echo $block->getChildHtml('shipment_tracking') ?>
 
-    setTimeout(function(){
-        packaging.setConfirmPackagingCallback(function(){
-            packaging.sendCreateLabelRequest();
-        });
-        packaging.setLabelCreatedCallback(function(response){
-            setLocation("<?php echo $block->getUrl(
-                'adminhtml/order_shipment/view',
-                ['shipment_id' => $block->getShipment()->getId()]
-            ); ?>");
-        });
-    }, 500);
+                <?php echo $block->getChildHtml('shipment_packaging') ?>
+<script>
+    require([
+        'prototype'
+    ], function () {
 
-});
+        setTimeout(function () {
+            packaging.setConfirmPackagingCallback(function () {
+                packaging.sendCreateLabelRequest();
+            });
+            packaging.setLabelCreatedCallback(function (response) {
+                setLocation("<?php echo $block->getUrl(
+'adminhtml/order_shipment/view',
+['shipment_id' => $block->getShipment()->getId()]
+); ?>");
+            });
+        }, 500);
+
+    });
 </script>
+            </div>
         </div>
     </div>
-</div>
+</section>
 
-<div class="fieldset-wrapper">
-    <div class="fieldset-wrapper-title">
+<section class="admin__page-section">
+    <div class="admin__page-section-title">
         <span class="title"><?php echo __('Items Shipped') ?></span>
     </div>
     <?php echo $block->getChildHtml('shipment_items') ?>
-</div>
+</section>
 
-<div class="clearfix">
-    <?php echo $block->getChildHtml('shipment_packed') ?>
+<section class="admin__page-section">
+    <div class="admin__page-section-title">
+        <span class="title"><?php echo __('Order Total') ?></span>
+    </div>
+    <div class="admin__page-section-content">
+        <?php echo $block->getChildHtml('shipment_packed') ?>
 
-    <div class="order-comments-history">
-        <div class="fieldset-wrapper">
-            <div class="fieldset-wrapper-title"><span class="title"><?php echo __('Shipment History') ?></span></div>
-            <fieldset><?php echo $block->getChildHtml('order_comments') ?></fieldset>
+        <div class="admin__page-section-item order-comments-history">
+            <div class="admin__page-section-item-title">
+                <span class="title"><?php echo __('Shipment History') ?></span>
+            </div>
+            <div class="admin__page-section-item-content"><?php echo $block->getChildHtml('order_comments') ?></div>
         </div>
     </div>
-</div>
+</section>
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/view/items.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/view/items.phtml
index 4b1d0f39d52bc9a77a7d69ed882368aa6fcdc7dd..1ebeae21eb75e8c9201b4a1c91df6c3d5eb09d6c 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/view/items.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/view/items.phtml
@@ -8,7 +8,7 @@
 
 ?>
 <div class="grid">
-    <table cellspacing="0" class="data">
+    <table class="data-table admin__table-primary order-shipment-table">
         <thead>
             <tr class="headings">
                 <th class="col-product"><span><?php echo __('Product') ?></span></th>
diff --git a/app/code/Magento/Shipping/view/adminhtml/web/order/packaging.js b/app/code/Magento/Shipping/view/adminhtml/web/order/packaging.js
index 566b01dc6e894f41d5521a2c958e05e4b0356c41..fca9b0553afa7a9de06030524a0259bdc4bca504 100644
--- a/app/code/Magento/Shipping/view/adminhtml/web/order/packaging.js
+++ b/app/code/Magento/Shipping/view/adminhtml/web/order/packaging.js
@@ -18,7 +18,7 @@ Packaging.prototype = {
         this.errorQtyOverLimit = params.errorQtyOverLimit;
         this.titleDisabledSaveBtn = params.titleDisabledSaveBtn;
         this.window = $('packaging_window');
-        this.messages = this.window.select('.messages')[0];
+        this.messages = this.window.select('.message-warning')[0];
         this.packagesContent = $('packages_content');
         this.template = $('package_template');
         this.paramsCreateLabelRequest = {};
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 0101fe2439257f2c88766365f6bdf0b407fd8c46..28387dfa85d71e68b74c0ccc508c7b9e03e63ab4 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
@@ -73,16 +73,18 @@
         position: relative;
         text-align: center;
         z-index: @menu__z-index;
-        &:focus {
-            background-color: @menu-item__active__background-color;
-            box-shadow: none;
-            + .admin__menu {
-                .level-0 {
-                    &:first-child {
-                        > a {
-                            background-color: @menu__background-color;
-                            &:after {
-                                display: none;
+        ._keyfocus & {
+            &:focus {
+                background-color: @menu-item__active__background-color;
+                box-shadow: none;
+                + .admin__menu {
+                    .level-0 {
+                        &:first-child {
+                            > a {
+                                background-color: @menu__background-color;
+                                &:after {
+                                    display: 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 09319136bec92e3efe47253d810c21eba1eacd4b..0071951108a8b8bd2be488be74e487b25762675d 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: @indent__base 4rem @indent__base 1rem;
+@admin__page-nav-link__padding: @indent__base 4rem @indent__base @indent__s;
 @admin__page-nav-link__hover__color: @color-very-dark-gray-black;
 @admin__page-nav-link__changed__color: @color-very-dark-gray;
 
@@ -133,7 +133,7 @@
 .admin__page-nav-items {
     list-style-type: none;
     margin: 0;
-    padding: 0;
+    padding: @indent__s 0 @admin__page-nav-item__margin-vertical 0;
 }
 
 .admin__page-nav-item {
@@ -180,10 +180,6 @@
             display: inline-block;
         }
     }
-
-    &:last-child {
-        margin-bottom: @admin__page-nav-item__margin-vertical;
-    }
 }
 
 
@@ -276,7 +272,7 @@
         box-shadow: @admin__page-nav-tooltip__box-shadow;
         display: none;
         font-weight: @font-weight__regular;
-        left: -1rem;
+        left: -@indent__s;
         line-height: @line-height__base;
         padding: 2rem;
         position: absolute;
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 8155f8e461eabf82cc8007f13c086edcbf402ebf..bb55d0e0722cdbb18b1b315f8ce82703ebeea40c 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-info {
+    &.admin__table-primary {
         th {
             border-top: 0;
         }
@@ -91,6 +91,9 @@
         background: @dashboard-tabs__background-color;
         font-size: @dashboard__font-size__base;
     }
+    .ui-tabs-panel {
+        border-top: 1px solid @color-gray68;
+    }
 }
 
 //
diff --git a/app/design/adminhtml/Magento/backend/Magento_Downloadable/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_Downloadable/web/css/source/_module.less
index af531ff02ac2067b0fc1d51bab40c460070df5a3..3411169b6c0028f8e28a2493f6d1ee1f07b13de0 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Downloadable/web/css/source/_module.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Downloadable/web/css/source/_module.less
@@ -59,19 +59,6 @@
         }
 
     }
-    .action-remove {
-        .button-reset();
-        .icon-font(
-            @icon-delete__content,
-            @icons-admin__font-name,
-            @_icon-font-size: 1.8rem,
-            @_icon-font-line-height: 16px,
-            @_icon-font-text-hide: true,
-            @_icon-font-position: after,
-            @_icon-font-color: @color-brown-darkie
-        );
-        margin-top: .5rem;
-    }
 }
 
 @-moz-document url-prefix() { // Firefox fieldset overflow bug fix
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
index 910cec4be04dfc70580ab6632d24ba2627acb519..b27606f18db19606eebfad18a29e4792deee9b15 100644
--- 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
@@ -3,10 +3,5 @@
 //  * See COPYING.txt for license details.
 //  */
 
-//
-//  Pages
-//  _____________________________________________
-
-@import 'module/_order-create.less';
-@import 'module/_order-create-sidebar.less';
-@import 'module/_order-create-table.less';
+@import 'module/_order.less';
+@import 'module/_edit-order.less';
diff --git a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_edit-order.less b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_edit-order.less
new file mode 100644
index 0000000000000000000000000000000000000000..860f0f37660ee8ba416d59dd615c7ed5489561dd
--- /dev/null
+++ b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_edit-order.less
@@ -0,0 +1,91 @@
+// /**
+//  * Copyright © 2015 Magento. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+//
+//  Variables
+//  ---------------------------------------------
+
+@edit-order-comment-notes__border-color: @color-gray65;
+@edit-order-comment-notes__font-size: @font-size__s;
+
+//
+//  Table secondary for edit order
+//  ---------------------------------------------
+
+.abs-admin__table-secondary-edit-order {
+    th {
+        font-weight: @font-weight__regular;
+        text-align: left;
+        vertical-align: top;
+    }
+    td {
+        text-align: right;
+    }
+    tr {
+        &:last-child {
+            td {
+                border: none;
+            }
+        }
+    }
+}
+
+//
+//  Order information
+//  ---------------------------------------------
+
+.order-information-table {
+    &:extend(.abs-admin__table-secondary-edit-order all);
+}
+
+//
+//  Order account information
+//  ---------------------------------------------
+
+.order-account-information-table {
+    &:extend(.abs-admin__table-secondary-edit-order all);
+}
+
+//
+//  Edit order tables
+//  ---------------------------------------------
+
+.edit-order-table {
+    &:extend(.abs-order-tables all);
+    &:extend(.abs-order-tbody-border all);
+    margin-bottom: 5rem;
+    tfoot {
+        &._hide {
+            display: none;
+        }
+        td {
+            padding-top: @order-create-sidebar__margin__m;
+        }
+        .col-total {
+            text-align: right;
+        }
+    }
+    .edit-total-price-block {
+        padding-left: 3rem;
+    }
+}
+
+.order-subtotal-table {
+    tr {
+        td {
+            &:last-child {
+                text-align: right;
+            }
+        }
+    }
+}
+
+.order-history-block {
+    margin: 0 0 5rem;
+}
+
+.order-history-comments-actions {
+    margin-top: @order-create-sidebar__margin__reqular;
+}
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
deleted file mode 100644
index a9594b130c1e82a0256b9a09f12e11ada61dfca9..0000000000000000000000000000000000000000
--- a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order-create-table.less
+++ /dev/null
@@ -1,174 +0,0 @@
-// /**
-//  * 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
deleted file mode 100644
index 5ff4e9228ffd85bce65c88fbb894378729b318db..0000000000000000000000000000000000000000
--- a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order-create.less
+++ /dev/null
@@ -1,416 +0,0 @@
-// /**
-//  * 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/Magento_Sales/web/css/source/module/_order.less b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order.less
new file mode 100644
index 0000000000000000000000000000000000000000..2b4e2e6093170ca6345db320f4240256e67fa8ac
--- /dev/null
+++ b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order.less
@@ -0,0 +1,267 @@
+// /**
+//  * Copyright © 2015 Magento. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+//
+//  Page components
+//  ---------------------------------------------
+
+@import 'order/_address.less';
+@import 'order/_discounts.less';
+@import 'order/_gift-options.less';
+@import 'order/_items.less';
+@import 'order/_order-account.less';
+@import 'order/_payment-shipping.less';
+@import 'order/_sidebar.less';
+@import 'order/_sku.less';
+@import 'order/_total.less';
+@import 'order/_order-comments.less';
+
+//
+//  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;
+
+//
+//  Crosspage components
+//  _____________________________________________
+
+//
+//  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,
+    .order-information,
+    .order-payment-method,
+    .order-comments-history {
+        float: left;
+        #mix-grid .width(6,12);
+    }
+
+    .order-shipping-address,
+    .order-shipping-method,
+    .order-totals,
+    .order-view-account-information .order-account-information {
+        float: right;
+        #mix-grid .width(6,12);
+    }
+}
+
+.order-view {
+    > .ui-tabs-panel {
+        border: 0;
+        margin: 0;
+        padding: 0;
+    }
+}
+
+//
+//  Page sections
+//  ---------------------------------------------
+
+.admin__page-section {
+    margin-bottom: 5rem;
+
+    .admin__legend {
+        &:extend(.abs-fieldset-legend all);
+    }
+
+    .admin__field {
+        &:extend(.abs-field-rows all);
+    }
+
+    .admin__control-table-wrapper {
+        margin-top: @indent__base;
+    }
+
+    address {
+        font-style: normal;
+    }
+
+    .admin__table-secondary {
+        .admin__control-text {
+            width: 5.4rem;
+        }
+    }
+}
+
+.admin__page-section-title {
+    &:extend(.abs-clearfix all);
+    border-bottom: 1px solid @color-gray80;
+    margin-bottom: 1.7rem;
+    padding: 1.4rem 0 .5rem;
+    strong,
+    .title {
+        &:extend(h2);
+        float: left;
+        margin: 0;
+    }
+    .actions {
+        display: inline-block;
+        margin-left: @indent__xs;
+    }
+}
+
+.admin__page-section-content {
+    &:extend(.abs-clearfix all);
+}
+
+.admin__page-section-item-title,
+.admin__page-section-content .admin__page-section-title {
+    border-bottom: 0;
+    margin-bottom: 1.5rem;
+    padding: 0;
+    .title {
+        &:extend(.abs-fieldset-legend all);
+        margin: 0;
+    }
+    .actions {
+        display: inline-block;
+        margin-left: @indent__xs;
+    }
+}
+
+//
+//  Select Customer
+//  ---------------------------------------------
+
+.order-customer-selector {
+    .admin__page-section-title {
+        .title {
+            margin: 0 0 2rem;
+        }
+        .actions {
+            float: right;
+            margin-top: -.5rem;
+        }
+    }
+}
+
+//
+//  Select Store Scope
+//  ---------------------------------------------
+
+.tree-store-scope {
+    max-width: 50rem;
+    .admin__field {
+        margin: 0 0 1rem;
+    }
+}
+
+//
+//  Order Errors
+//  ---------------------------------------------
+
+.order-errors {
+    .col-qty {
+        .admin__control-text {
+            &:extend(.abs-control-qty all);
+        }
+    }
+}
+
+//
+//  Order Invoice
+//  ---------------------------------------------
+
+.order-invoice-tables {
+    &:extend(.abs-order-tables all);
+    &:extend(.abs-order-tbody-border all);
+}
+
+.abs-qty-table {
+    th,
+    td {
+        border: none;
+        font-weight: @font-weight__regular;
+        padding: 0 @order-create-sidebar__margin__s @order-create-sidebar__margin__s 0;
+    }
+}
+
+.abs-order-tbody-border {
+    tbody {
+        border-bottom: 1px solid @table-td__border-color;
+        &:last-of-type {
+            border-bottom: none;
+        }
+    }
+}
+
+
+//
+//  Product configure popup
+//  ---------------------------------------------
+
+.product-configure-popup {
+    .weee {
+        .price-excluding-tax,
+        .price-including-tax {
+            display: block;
+            font-size: 1.3rem;
+            &:before {
+                content: attr(data-label) ": ";
+            }
+        }
+    }
+}
+
+//  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/Magento_Sales/web/css/source/module/order/_address.less b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_address.less
new file mode 100644
index 0000000000000000000000000000000000000000..0fdcfc2df388f9ca7c25a9d9ee78f1715a5dba1d
--- /dev/null
+++ b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_address.less
@@ -0,0 +1,49 @@
+// /**
+//  * Copyright © 2015 Magento. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+//
+//  Order Address Information
+//  ---------------------------------------------
+
+.order-details {
+    .order-search-items {
+        .col-qty {
+            .admin__control-text {
+                &:extend(.abs-control-qty);
+            }
+        }
+    }
+
+    .order-items,
+    .order-search-items,
+    .order-additional-area {
+        .admin__page-section-title {
+            .actions {
+                float: right;
+                margin-bottom: @order-create-sidebar__margin__reqular;
+                margin-top: -.3rem;
+            }
+            .action-secondary {
+                margin-left: @indent__base;
+            }
+        }
+    }
+
+    .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;
+    }
+}
diff --git a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_discounts.less b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_discounts.less
new file mode 100644
index 0000000000000000000000000000000000000000..64b80e77823dc8ce8ea8931cc8a587b4d88e5266
--- /dev/null
+++ b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_discounts.less
@@ -0,0 +1,67 @@
+// /**
+//  * Copyright © 2015 Magento. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+//
+//  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);
+            position: absolute;
+            right: 0;
+            top: 7px;
+            > 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;
+        }
+    }
+}
diff --git a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_gift-options.less b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_gift-options.less
new file mode 100644
index 0000000000000000000000000000000000000000..4b88d1f0e57e1074965c264f8a80e69aa6c1ce23
--- /dev/null
+++ b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_gift-options.less
@@ -0,0 +1,58 @@
+// /**
+//  * Copyright © 2015 Magento. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+//
+//  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);
+    }
+
+    .admin__field {
+        &._required[class] {
+            &:not(.admin__field-option) {
+                > .admin__field-label span {
+                    &:after {
+                        margin-left: 0;
+                    }
+                }
+            }
+        }
+    }
+}
+
+.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;
+        }
+    }
+}
+
+.gift-options-tooltip {
+    &:extend(.abs-admin__field-tooltip-content all);
+}
diff --git a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_items.less b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_items.less
new file mode 100644
index 0000000000000000000000000000000000000000..0f621df99f43c72b37991106eaab7880ac6868a7
--- /dev/null
+++ b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_items.less
@@ -0,0 +1,124 @@
+// /**
+//  * 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 {
+    &:extend(.abs-order-tables all);
+    &:extend(.abs-order-tbody-border all);
+}
+
+.order-items {
+    > .admin__page-section-title {
+        margin: 0;
+    }
+    .actions-update {
+        margin: @indent__base 0;
+        text-align: right;
+    }
+}
+
+.order-search-items {
+    .grid {
+        .action-configure {
+            float: right;
+        }
+        .col-id,
+        .col-price,
+        .col-in_products {
+            width: 10rem;
+        }
+    }
+}
+
+.abs-order-tables {
+    margin: 0 0 @order-create-sidebar__margin__reqular;
+    width: 100%;
+    th {
+        border-top: 0;
+        font-size: 1.3rem;
+    }
+    td {
+        border-bottom: none;
+    }
+    tbody {
+        tr {
+            &.row-messages-error,
+            &.row-gift-options {
+                td {
+                    padding-top: 0;
+                }
+            }
+        }
+    }
+    tfoot {
+        td {
+            border-bottom: 1px solid @order-create-table__border-color;
+            border-top: none;
+        }
+    }
+    .col-qty,
+    .col-qty-invoice {
+        .admin__control-text {
+            &:extend(.abs-control-qty all);
+        }
+    }
+    .qty-table {
+        &:extend(.abs-qty-table all);
+    }
+    .col-actions {
+        .admin__control-select {
+            width: 13rem;
+        }
+    }
+    .price {
+        display: inline-block;
+        margin: 0 0 @order-create-sidebar__margin__s;
+    }
+    .item-options {
+        &:extend(.abs-clearfix all);
+        margin: @order-create-sidebar__margin__m 0 0;
+        dt {
+            clear: left;
+            float: left;
+            margin: 0 @order-create-sidebar__margin__s @order-create-sidebar__margin__s 0;
+        }
+        dd {
+            display: inline-block;
+            float: left;
+            margin: 0 0 @order-create-sidebar__margin__s;
+        }
+    }
+    .custom-price-block {
+        font-size: @order-create-sidebar__font-size__xs;
+        margin: 0 0 @order-create-sidebar__margin__s;
+        + .admin__control-text {
+            &:extend(.abs-control-price);
+        }
+    }
+    .discount-price-block {
+        font-size: @order-create-sidebar__font-size__xs;
+    }
+    .product-configure-block {
+        margin: @indent__s 0 0;
+        .disabled {
+            display: none;
+        }
+    }
+    .product-sku-block {
+        margin: @indent__s 0 0;
+    }
+}
diff --git a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_order-account.less b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_order-account.less
new file mode 100644
index 0000000000000000000000000000000000000000..a0cf2a04230c41c2028b05acffb070e3f6f3dd1e
--- /dev/null
+++ b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_order-account.less
@@ -0,0 +1,24 @@
+// /**
+//  * Copyright © 2015 Magento. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+//
+//  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;
+    }
+}
diff --git a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_order-comments.less b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_order-comments.less
new file mode 100644
index 0000000000000000000000000000000000000000..675a02272c8cf1199ab008e1e454ce58cfa3e144
--- /dev/null
+++ b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_order-comments.less
@@ -0,0 +1,58 @@
+// /**
+//  * Copyright © 2015 Magento. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+//
+//  Edit Order comments
+//  ---------------------------------------------
+
+.edit-order-comments {
+    .note-list {
+        font-size: @edit-order-comment-notes__font-size;
+        list-style: none;
+        margin: 0 0 @order-create-sidebar__margin;
+    }
+    .note-list-item {
+        margin: 0 0 @order-create-sidebar__margin__s;
+    }
+    .note-list-date,
+    .note-list-time {
+        padding: 0 @order-create-sidebar__margin__m 0 0;
+    }
+    .note-list-status,
+    .note-list-customer {
+        border-left: 1px solid @edit-order-comment-notes__border-color;
+        padding: 0 @order-create-sidebar__margin__m;
+    }
+    .note-list-customer-notapplicable,
+    .note-list-customer-not-notified,
+    .note-list-customer-notified {
+        font-weight: @font-weight__bold;
+        padding: 0 @order-create-sidebar__margin__m 0 0;
+    }
+    .note-list-comment {
+        margin: 0 0 @order-create-sidebar__margin__reqular;
+    }
+    .comments-block-item {
+        margin: 0 0 @order-create-sidebar__margin;
+    }
+    .comments-block-item-comment {
+        margin: 0 0 @order-create-sidebar__margin__s;
+    }
+    .comments-block-item-date-time {
+        font-size: @font-size__tiny;
+    }
+}
+
+.edit-order-comments-block-title {
+    margin: 0 0 @order-create-sidebar__margin;
+    .typography(
+    @_font-size: 1.9rem,
+    @_color: @color-brown-darkie,
+    @_font-weight: @font-weight__semibold,
+    @_line-height: @line-height__s,
+    @_font-family: false,
+    @_font-style: false
+    );
+}
diff --git a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_payment-shipping.less b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_payment-shipping.less
new file mode 100644
index 0000000000000000000000000000000000000000..fe3ebac483461cb7bd0f7899d679e2808a5dfb5b
--- /dev/null
+++ b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_payment-shipping.less
@@ -0,0 +1,91 @@
+// /**
+//  * Copyright © 2015 Magento. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+//
+//  Order Payment & Shipping Information
+//  ---------------------------------------------
+
+.admin__payment-method-wapper {
+    margin: 0;
+    .admin__field {
+        margin-left: -4rem;
+        &:first-child {
+            margin-top: 1.5rem;
+        }
+    }
+    .admin__payment-methods {
+        margin: 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-info {
+    .action-default {
+        &:extend(.action-tertiary all);
+        font-weight: @font-weight__regular;
+        padding: 0;
+    }
+}
+
+.order-methods-overlay {
+    background-color: rgba(255, 255, 255, .5);
+    bottom: 0;
+    left: 0;
+    position: absolute;
+    right: 0;
+    top: 0;
+    span {
+        background-color: @color-white;
+        display: block;
+        font-weight: @font-weight__bold;
+        left: 0;
+        padding: @indent__xs 0;
+        position: absolute;
+        top: 43px;
+    }
+    .order-shipping-address & {
+        span {
+            top: 22px;
+        }
+    }
+}
+
+.shipping-description-wrapper {
+    .price {
+        font-weight: @font-weight__bold;
+    }
+}
+
+.order-payment-method-title,
+.shipping-description-title {
+    font-weight: @font-weight__bold;
+}
+
+.action-create-label {
+    margin: @indent__s 0;
+}
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/_sidebar.less
similarity index 88%
rename from app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order-create-sidebar.less
rename to app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_sidebar.less
index 6bdd17f7f4d18eae84eba64d3fe9e1b5cdbcfb20..8ef7ff03c7c529c3e4ad388073672207a1917107 100644
--- 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/_sidebar.less
@@ -8,19 +8,17 @@
 //  ---------------------------------------------
 
 @order-create-sidebar__font-size: 1.5rem;
-@order-create-sidebar__font-size-xs: 1.1rem;
+@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__margin__s: .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
 //  ---------------------------------------------
@@ -47,7 +45,7 @@
         padding: 0 0 @order-create-sidebar__margin;
     }
     .admin__control-select {
-        margin: 0 0 @order-create-sidebar__margin-small;
+        margin: 0 0 @order-create-sidebar__margin__s;
         width: 100%;
     }
     .order-sidebar-block {
@@ -55,7 +53,7 @@
         margin: 0 0 @order-create-sidebar__margin;
         padding: 0 0 @order-create-sidebar__margin;
     }
-    .table-info {
+    .admin__table-primary {
         color: @order-create-sidebar__color;
         width: 100%;
         th,
@@ -102,7 +100,7 @@
             text-align: right;
             .icon-configure,
             .icon-add {
-                margin-right: @order-create-sidebar__margin-m;
+                margin-right: @order-create-sidebar__margin__m;
             }
         }
     }
@@ -110,7 +108,7 @@
         &:extend(.abs-icon all);
         display: table-cell;
         font-size: @order-create-icon-refresh__font-size;
-        padding-right: @order-create-sidebar__margin-m;
+        padding-right: @order-create-sidebar__margin__m;
         vertical-align: middle;
         &:after {
             color: @order-create-icon-refresh__color;
@@ -127,16 +125,16 @@
         }
     }
     .create-order-sidebar-block {
-        .head {
+        .sidebar-title-block {
             margin: 0 0 @order-create-sidebar__margin;
         }
         .auto-scroll {
-            margin: 0 -@order-create-sidebar__padding @order-create-sidebar__margin-small;
+            margin: 0 -@order-create-sidebar__padding @order-create-sidebar__margin__s;
             max-height: @order-create-sidebar-scroll__height;
             overflow: auto;
             position: relative;
             + .action-default {
-                margin-top: @order-create-sidebar__margin-reqular;
+                margin-top: @order-create-sidebar__margin__reqular;
             }
             .no-items {
                 padding-left: @order-create-sidebar__padding;
@@ -153,7 +151,7 @@
         margin: 0;
         vertical-align: middle;
         + .admin__control-select {
-            margin-top: @order-create-sidebar__margin-reqular;
+            margin-top: @order-create-sidebar__margin__reqular;
         }
     }
     .actions {
diff --git a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_sku.less b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_sku.less
new file mode 100644
index 0000000000000000000000000000000000000000..68b25e5aa12ae0ad94526499174c2418ed3a5413
--- /dev/null
+++ b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_sku.less
@@ -0,0 +1,45 @@
+// /**
+//  * Copyright © 2015 Magento. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+//
+//  Add by SKU
+//  ---------------------------------------------
+
+.add-by-sku-wrapper {
+    .add-by-sku {
+        margin: 0 0 @indent__base;
+    }
+    .admin__field-note {
+        margin: 1.4rem 0;
+    }
+    .action-reset {
+        &:extend(.abs-action-reset all);
+        &:extend(.abs-icon all);
+        display: inline-block;
+        font-size: 1.6rem;
+        margin: -.4rem 0 0;
+        opacity: .5;
+        vertical-align: middle;
+        &:after {
+            color: @order-create-icon-reset__content;
+            content: @order-create-icon-reset__content;
+        }
+        &:hover {
+            opacity: 1;
+            &:after {
+                color: @order-create-icon-plus__hover__color;
+            }
+        }
+        > span {
+            &:extend(.abs-visually-hidden all);
+        }
+    }
+    .col-qty {
+        width: 8rem;
+        .admin__control-text {
+            &:extend(.abs-control-qty all);
+        }
+    }
+}
diff --git a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_total.less b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_total.less
new file mode 100644
index 0000000000000000000000000000000000000000..699576bde84c70e2645fbe07475fbe915afca647
--- /dev/null
+++ b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_total.less
@@ -0,0 +1,19 @@
+// /**
+//  * Copyright © 2015 Magento. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+//
+//  Totals
+//  ---------------------------------------------
+
+.order-totals-actions {
+    margin-top: @indent__s;
+    .actions {
+        margin-top: @indent__l;
+        text-align: right;
+    }
+    .action-default {
+        &:extend(.abs-action-l all);
+    }
+}
diff --git a/app/design/adminhtml/Magento/backend/Magento_Shipping/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_Shipping/web/css/source/_module.less
new file mode 100644
index 0000000000000000000000000000000000000000..c1ff50783ee7816d1751695366462a40901c383a
--- /dev/null
+++ b/app/design/adminhtml/Magento/backend/Magento_Shipping/web/css/source/_module.less
@@ -0,0 +1,114 @@
+// /**
+//  * Copyright © 2015 Magento. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+//
+//  Order Shipment
+//  ---------------------------------------------
+
+.order-shipment-table {
+    &:extend(.abs-order-tables all);
+    &:extend(.abs-order-tbody-border all);
+}
+
+//
+//  Packaging for Shipping Popup
+// --------------------------------------
+
+//  ToDo UI: refactor the popup to jQuery UI, edit the styles
+.packaging-window {
+    background: @color-white;
+    box-shadow: 0 3px 6px rgba(0, 0, 0, .4);
+    left: 50%;
+    margin: -20rem 0 0 -47rem;
+    position: fixed;
+    top: 50%;
+    width: 100rem;
+    z-index: 1000;
+    .message-warning {
+        margin: 0 0 @indent__s;
+    }
+    .admin__control-select {
+        width: 13rem;
+        &.measures {
+            width: 9rem;
+        }
+    }
+    .packaging-content {
+        height: auto !important;
+        max-height: 40rem;
+        overflow-x: hidden;
+        overflow: auto;
+        padding: @indent__base @indent__base 0;
+        position: relative;
+        .options-weight {
+            vertical-align: top;
+        }
+    }
+    .popup-window-title {
+        &:extend(.abs-clearfix all);
+        padding: @indent__base;
+        .title {
+            font-size: 1.9rem;
+            display: block;
+        }
+        .actions {
+            float: right;
+        }
+    }
+    .popup-fieldset-title {
+        &:extend(.abs-clearfix all);
+        .title {
+            display: block;
+            font-weight: 700;
+            padding-top: @indent__s;
+        }
+        .actions {
+            float: right;
+        }
+        margin: 0 0 @indent__base;
+    }
+    .popup-window-buttons-set {
+        padding: @indent__base;
+        text-align: right;
+    }
+    .package-add-products {
+        margin: @indent__base 0 0;
+        .grid {
+            padding: 0;
+            button {
+                vertical-align: middle;
+            }
+        }
+    }
+    .col-total-weight {
+        .admin__control-text {
+            margin: 0 0 .5rem;
+        }
+    }
+    .col-qty-edit {
+        .admin__control-text {
+            &:extend(.abs-control-qty all);
+        }
+    }
+    .col-actions {
+        width: 13rem;
+        .action-delete {
+            padding-top: 0;
+        }
+    }
+    .admin__table-primary {
+        .action-delete {
+            margin-top: -.7rem;
+            padding: 0;
+            &:extend(.abs-action-delete all);
+        }
+    }
+    .action-secondary {
+        float: right;
+    }
+    .action-close {
+        &:extend(.abs-action-tertiary all);
+    }
+}
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/_actions.less b/app/design/adminhtml/Magento/backend/web/css/source/_actions.less
index 7a3f017a0a5b58b1841e07680b58341e1e00a9f6..e9b6e173f1df976ffec6b1317f9153200343edc7 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/_actions.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/_actions.less
@@ -97,6 +97,29 @@
     padding-top: @button__padding-vertical__l;
 }
 
+.abs-action-delete {
+    &:extend(.abs-action-reset all);
+    &:extend(.abs-icon all);
+    display: inline-block;
+    font-size: 1.6rem;
+    margin-left: 1.2rem;
+    padding-top: .7rem;
+    text-decoration: none;
+    vertical-align: middle;
+    &:after {
+        color: @color-very-dark-gray;
+        content: @icon-delete__content;
+    }
+    &:hover {
+        &:after {
+            color: @color-very-dark-gray-black2;
+        }
+    }
+    > span {
+        &:extend(.abs-visually-hidden all);
+    }
+}
+
 .abs-action-default {
     .action-default();
 }
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 bf591fe9921f70066c979e51f23d908baf851669..c72dda688951972b6e6b5b74851f0c8355c12727 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/_tables.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/_tables.less
@@ -16,29 +16,48 @@
 
 @table-tfoot__background-color: @color-white-fog;
 
-@table-info__font-size: 1.3rem;
-@table-info__padding-vertical: 1rem;
-@table-info__padding-horizontal: 1.5rem;
+@admin__table-primary__font-size: 1.3rem;
+@admin__table-primary__padding-vertical: 1rem;
+@admin__table-primary__padding-horizontal: 1.5rem;
+
+@admin__table-secondary__padding-vertical: @admin__table-primary__padding-vertical;
+@admin__table-secondary__padding-horizontal: 1rem;
+@admin__table-secondary-caption__font-size: 1.8rem;
+@admin__table-secondary-cell__odd__color: @color-white-fog2;
+@admin__table-secondary-th__color: @color-brownie-light;
 
 //
 //  Tables
 //  _____________________________________________
 
-//
-//  Utilities
-//  ---------------------------------------------
+table {
+    background-color: transparent;
+    color: @table__color;
+    > caption {
+        margin-bottom: .5em;
+    }
+}
+
+.admin__table-primary,
+.admin__table-secondary {
+    width: 100%;
+}
 
-.table-info {
-    font-size: @table-info__font-size;
+.admin__table-primary {
+    font-size: @admin__table-primary__font-size;
     th,
     td {
-        padding: @table-info__padding-vertical @table-info__padding-horizontal;
+        padding: @admin__table-primary__padding-vertical @admin__table-primary__padding-horizontal;
         text-align: left;
+        &:first-child {
+            padding-left: 0;
+        }
     }
     th {
         border-bottom: 1px solid @table-th__border-color;
         border-top: 1px solid @table-th__border-color;
         font-weight: @font-weight__bold;
+        vertical-align: bottom;
     }
     td {
         border-bottom: 1px solid @table-td__border-color;
@@ -55,15 +74,59 @@
     }
     tfoot {
         background: @table-tfoot__background-color;
+        font-weight: @font-weight__semibold;
+        th,
+        td {
+            &:first-child {
+                padding-left: @admin__table-primary__padding-horizontal;
+            }
+        }
     }
 }
 
-//
-
-table {
-    background-color: transparent;
-    color: @table__color;
-    > caption {
-        margin-bottom: .5em;
+.admin__table-secondary {
+    caption {
+        font-size: @admin__table-secondary-caption__font-size;
+        font-weight: @font-weight__bold;
+        margin-bottom: .75em;
+        text-align: left;
+    }
+    tbody {
+        th {
+            vertical-align: top;
+        }
+    }
+    tr {
+        &:nth-child(odd) {
+            th,
+            td {
+                background-color: @admin__table-secondary-cell__odd__color;
+            }
+        }
+    }
+    th,
+    td {
+        padding: @admin__table-secondary__padding-horizontal @admin__table-secondary__padding-vertical;
+        text-align: left;
+    }
+    th {
+        color: @admin__table-secondary-th__color;
+        font-weight: @font-weight__regular;
+    }
+    tfoot {
+        tr {
+            &:nth-child(odd) {
+                th,
+                td {
+                    background-color: @color-white;
+                }
+            }
+            &:first-child {
+                border-top: 1px solid @table-td__border-color;
+            }
+        }
+    }
+    .admin__total-amount {
+        text-align: right;
     }
 }
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/_tabs.less b/app/design/adminhtml/Magento/backend/web/css/source/_tabs.less
index fa113a59c52acb0e46b2968e09eab6d0c9f33f49..1728f1f08b5e655e4f61a43b9efd443f266c5c5e 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/_tabs.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/_tabs.less
@@ -57,7 +57,6 @@
 
 //  Tabs content
 .ui-tabs-panel {
-    border-top: 1px solid @color-gray68;
     margin-top: -1px;
     padding: 2rem;
 }
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
index 7098e076357d147d068e180c487cf75a98da5530..2dded4e6efea6ea68ca2f2f0b9474c187b94d7c0 100644
--- 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
@@ -42,6 +42,9 @@
 //  ---------------------------------------------
 
 .grid {
+    .hor-scroll {
+        overflow-x: auto;
+    }
     table {
         &:not(.data-table) {
             border: none;
@@ -111,7 +114,7 @@
                 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;;
+                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;
@@ -184,6 +187,9 @@
                             margin-left: .5rem;
                             width: 3.5rem;
                         }
+                        &:after {
+                            display: none;
+                        }
                     }
                 }
             }
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 abac708dc0eb592a27fde7f4d2ca8e198ab276fa..918ce1cec2d1c6fd8c740c21eab8c342d573ba99 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
@@ -26,6 +26,8 @@
 
 @popup-overlay__background-color: rgba(0, 0, 0, .35);
 
+@popup-fieldset__margin-left: 34%;
+
 //
 //  Jquery UI popup window
 //  _____________________________________________
@@ -322,14 +324,13 @@
         > .admin__legend {
             float: none;
             font-size: 1.8rem;
-            margin: 0 0 2rem 34%;
+            margin: 0 0 @indent__base @popup-fieldset__margin-left;
             width: auto;
         }
-    }
-    .gift_options-popup {
-        .admin__fieldset {
-            > .admin__legend {
-                margin-left: 0;
+        .product-options {
+            margin-left: @popup-fieldset__margin-left;
+            .admin__field-control {
+                margin-bottom: @indent__base;
             }
         }
     }
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_control-table.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/_control-table.less
index 0a5bda543853f0f2734bcf8fbb3934469ac02eb2..4d4875471506fe522edf4ccb64282899c82a240d 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/forms/_control-table.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/_control-table.less
@@ -52,4 +52,7 @@
             }
         }
     }
+    .action-delete {
+        &:extend(.abs-action-delete all);
+    }
 }
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_tooltip.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/_tooltip.less
index dbb52ffa5d3b74aec7574b566ef5ff1e3858536d..67fb5f3926aac1a7e8ee4790987f2a951641a250 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/forms/_tooltip.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/_tooltip.less
@@ -44,24 +44,16 @@
         display: block;
     }
     .admin__field-tooltip-content {
-        @_shadow: 0 2px 8px 0 rgba(0, 0, 0, .3);
-        .css(box-shadow, @_shadow);
-        background: @field-tooltip-content__background-color;
-        border-radius: 1px;
-        border: 1px solid @field-tooltip-content__border-color;
+        &:extend(.abs-admin__field-tooltip-content all);
         bottom: 42px;
         display: none;
-        padding: 15px 25px;
-        position: absolute;
         right: -70px;
-        width: 320px;
-        z-index: 1;
         &:after,
         &:before {
             .arrow(
-                @_position: down,
-                @_size: 16px,
-                @_color: @field-tooltip-content__border-color
+            @_position: down,
+            @_size: 16px,
+            @_color: @field-tooltip-content__border-color
             );
             content: "";
             display: block;
@@ -77,3 +69,15 @@
         }
     }
 }
+
+.abs-admin__field-tooltip-content {
+    @_shadow: 0 2px 8px 0 rgba(0, 0, 0, .3);
+    .css(box-shadow, @_shadow);
+    background: @field-tooltip-content__background-color;
+    border-radius: 1px;
+    border: 1px solid @field-tooltip-content__border-color;
+    padding: 15px 25px;
+    position: absolute;
+    width: 320px;
+    z-index: 1;
+}
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 fa70769896ebb837737830e6ab90f4a4c4ada786..95422456d853c3239a80cf9bdbd14df5bdd0485e 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
@@ -17,6 +17,7 @@
 @font-size__l: 1.6rem;
 @font-size__base: 1.4rem;
 @font-size__s: 1.2rem;
+@font-size__tiny: 1.1rem;
 @font-size__xs: 1rem;
 
 @line-height__base: 1.4;
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 f6b0cff9e7c8de6cddad3de71d5e7484d8d2aa14..55ff2a07a82998541813d953643dbdbe4414b600 100644
--- a/app/design/adminhtml/Magento/backend/web/css/styles-old.less
+++ b/app/design/adminhtml/Magento/backend/web/css/styles-old.less
@@ -3167,8 +3167,7 @@ input.no-display,
         border-radius: 5px;
     }
 
-    .adminhtml-rma-new .order-totals,
-    .order-comments-history .order-comments-history {
+    .adminhtml-rma-new .order-totals {
         float: none;
         width: 100%;
     }
@@ -3312,40 +3311,6 @@ input.no-display,
         }
     }
 
-    //
-    //  Order view
-    // --------------------------------------
-
-    .order-comments-history fieldset {
-        border: 0;
-        margin: 0;
-        padding: 0;
-    }
-
-    .order-comments-history textarea,
-    .rma-history-form textarea {
-        height: 6em;
-        margin: 5px 0 10px;
-        resize: vertical;
-        width: 100%;
-    }
-
-    .order-comments-history input[type="checkbox"] {
-        margin-right: 5px;
-    }
-
-    .order-history-comments-options {
-        float: left;
-    }
-
-    .order-comments-history .actions {
-        float: right;
-    }
-
-    [class*="-order-"] .fieldset-wrapper address {
-        overflow: auto;
-    }
-
     //
     //  Orders comments
     //--------------------------------------
@@ -4077,6 +4042,12 @@ input.no-display,
         display: none;
     }
 
+    .section-config > .config {
+        &.collapseable {
+            display: none;
+        }
+    }
+
     .accordion > dt.open,
     .section-config.active > .collapseable,
     .accordion .collapseable.open {
@@ -4797,7 +4768,6 @@ input.no-display,
     .page-layout-admin-1column .page-columns,
     .catalog-product-edit,
     .catalog-product-new,
-    .sales-order-view,
     .catalog-category-edit {
         table.data {
             table-layout: fixed;
@@ -4822,7 +4792,6 @@ input.no-display,
     .custom-options .data-table,
     .ui-dialog .data,
     .page-layout-admin-1column .page-columns .data,
-    .sales-order-view .data,
     .catalog-category-edit .data {
         word-wrap: break-word;
         table-layout: fixed;
@@ -5074,8 +5043,6 @@ input.no-display,
     }
 }
 
-[class*="-order-"] .admin__scope-old .order-history,
-[class*="-order-"] .admin__scope-old .order-comments-history,
 [class*="-order-"] .admin__scope-old .order-information,
 [class*="-order-"] .admin__scope-old .order-billing-address,
 [class*="-order-"] .admin__scope-old .order-payment-method,
@@ -5302,19 +5269,6 @@ input.no-display,
     }
 }
 
-.sales-order-view {
-    .admin__scope-old {
-        .grid  {
-            .col-name {
-                &:extend(.col-150-max all);
-            }
-            .col-period {
-                &:extend(.col-70-max all);
-            }
-        }
-    }
-}
-
 .sales-order-index {
     .admin__scope-old {
         .grid .col-name {
@@ -5377,15 +5331,6 @@ input.no-display,
     }
 }
 
-//  Sales -> View order
-[class^=' sales-order-view'] {
-    .admin__scope-old {
-        .grid .col-customer_name {
-            &:extend(.col-110-max all);
-        }
-    }
-}
-
 //  Sales -> Return
 [class^=' adminhtml-rma-'] {
     .admin__scope-old {
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 55d1128d73b7506a05226dcfbb6c9c5c44424bbc..22032decb2c9868ecfab36e87e49684a33dc0416 100644
--- a/app/design/adminhtml/Magento/backend/web/mui/styles/table.less
+++ b/app/design/adminhtml/Magento/backend/web/mui/styles/table.less
@@ -85,11 +85,9 @@ table {
 //    Table Filters
 //--------------------------------------
 .filter {
-    select {
-        width: 99%;
-    }
     input.input-text {
         width: 99%;
+        margin-right: 0;
         &::-webkit-input-placeholder {
             color: @grid-filters-placeholder-color !important;
             text-transform: lowercase;
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_minicart.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_minicart.less
index d8d0b25cb90f10fa092cc096fec35d72c733fce6..486f1232621403da649c372f7f5237908cbd5e5a 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_minicart.less
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_minicart.less
@@ -197,9 +197,6 @@
         &:first-child {
             padding-top: 0;
         }
-        &:last-child {
-            padding-bottom: 0;
-        }
         > .product {
             &:extend(.abs-add-clearfix all);
         }
@@ -242,6 +239,9 @@
                 @_icon-font-margin: -3px 0 0 7px,
                 @_icon-font-position: after
             );
+            .details {
+                display: none;
+            }
         }
     }
     .details-qty,
diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_minicart.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_minicart.less
index 3a65f3be3f3055aca8770b2ec9b94145206a63fc..365f03d8f28a56c51d26d921cb5168a0daa74983 100644
--- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_minicart.less
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_minicart.less
@@ -205,9 +205,6 @@
         &:first-child {
             padding-top: 0;
         }
-        &:last-child {
-            padding-bottom: 0;
-        }
         > .product {
             &:extend(.abs-add-clearfix all);
         }
@@ -273,6 +270,9 @@
                     @_icon-font-position: after
                 );
             }
+            .details {
+                display: none;
+            }
         }
     }
     .details-qty,
diff --git a/package.json b/package.json
index eaee4e18e2484b09731ec9a8e2a165eef83ae29c..69657eb7702c63f3d94d50a5d2f613ae6643f33e 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "grunt-contrib-watch": "^0.6.1",
     "grunt-exec": "^0.4.6",
     "grunt-styledocco": "^0.1.4",
-    "grunt-template-jasmine-requirejs": "^0.2.0",
+    "grunt-template-jasmine-requirejs": "^0.2.3",
     "grunt-text-replace": "^0.4.0",
     "imagemin-svgo": "^4.0.1",
     "load-grunt-config": "^0.16.0",