diff --git a/app/code/Magento/Backend/view/adminhtml/web/images/draggable-handle-bg.png b/app/code/Magento/Backend/view/adminhtml/web/images/draggable-handle-bg.png
index a0e6f2545f8c1..0526b51bba886 100644
Binary files a/app/code/Magento/Backend/view/adminhtml/web/images/draggable-handle-bg.png and b/app/code/Magento/Backend/view/adminhtml/web/images/draggable-handle-bg.png differ
diff --git a/app/code/Magento/Backend/view/adminhtml/web/images/draggable-handle-vertical.png b/app/code/Magento/Backend/view/adminhtml/web/images/draggable-handle-vertical.png
index ec7a8d1f175a1..2515d1fac7476 100644
Binary files a/app/code/Magento/Backend/view/adminhtml/web/images/draggable-handle-vertical.png and b/app/code/Magento/Backend/view/adminhtml/web/images/draggable-handle-vertical.png differ
diff --git a/app/code/Magento/Backend/view/adminhtml/web/images/gallery-image-base-label.png b/app/code/Magento/Backend/view/adminhtml/web/images/gallery-image-base-label.png
index 8e1c5ab204d65..9d49743ba9366 100644
Binary files a/app/code/Magento/Backend/view/adminhtml/web/images/gallery-image-base-label.png and b/app/code/Magento/Backend/view/adminhtml/web/images/gallery-image-base-label.png differ
diff --git a/app/code/Magento/Backend/view/adminhtml/web/images/gallery-image-panel-corner.png b/app/code/Magento/Backend/view/adminhtml/web/images/gallery-image-panel-corner.png
index 47b94524838b7..da77893131127 100644
Binary files a/app/code/Magento/Backend/view/adminhtml/web/images/gallery-image-panel-corner.png and b/app/code/Magento/Backend/view/adminhtml/web/images/gallery-image-panel-corner.png differ
diff --git a/app/code/Magento/Backend/view/adminhtml/web/images/image-placeholder.png b/app/code/Magento/Backend/view/adminhtml/web/images/image-placeholder.png
index 23f218fa5981f..423285d18731c 100644
Binary files a/app/code/Magento/Backend/view/adminhtml/web/images/image-placeholder.png and b/app/code/Magento/Backend/view/adminhtml/web/images/image-placeholder.png differ
diff --git a/app/code/Magento/Braintree/Model/AvsEmsCodeMapper.php b/app/code/Magento/Braintree/Model/AvsEmsCodeMapper.php
new file mode 100644
index 0000000000000..5832e5bf0a35b
--- /dev/null
+++ b/app/code/Magento/Braintree/Model/AvsEmsCodeMapper.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Model;
+
+use Magento\Braintree\Model\Ui\ConfigProvider;
+use Magento\Braintree\Gateway\Response\PaymentDetailsHandler;
+use Magento\Payment\Api\PaymentVerificationInterface;
+use Magento\Sales\Api\Data\OrderPaymentInterface;
+
+/**
+ * Processes AVS codes mapping from Braintree transaction to
+ * electronic merchant systems standard.
+ *
+ * @see https://developers.braintreepayments.com/reference/response/transaction
+ * @see http://www.emsecommerce.net/avs_cvv2_response_codes.htm
+ */
+class AvsEmsCodeMapper implements PaymentVerificationInterface
+{
+    /**
+     * Default code for mismatching mapping.
+     *
+     * @var string
+     */
+    private static $unavailableCode = 'U';
+
+    /**
+     * List of mapping AVS codes
+     *
+     * @var array
+     */
+    private static $avsMap = [
+        'MM' => 'Y',
+        'NM' => 'A',
+        'MN' => 'Z',
+        'NN' => 'N',
+        'UU' => 'U',
+        'II' => 'U',
+        'AA' => 'E'
+    ];
+
+    /**
+     * Gets payment AVS verification code.
+     *
+     * @param OrderPaymentInterface $orderPayment
+     * @return string
+     * @throws \InvalidArgumentException If specified order payment has different payment method code.
+     */
+    public function getCode(OrderPaymentInterface $orderPayment)
+    {
+        if ($orderPayment->getMethod() !== ConfigProvider::CODE) {
+            throw new \InvalidArgumentException(
+                'The "' . $orderPayment->getMethod() . '" does not supported by Braintree AVS mapper.'
+            );
+        }
+
+        $additionalInfo = $orderPayment->getAdditionalInformation();
+        if (empty($additionalInfo[PaymentDetailsHandler::AVS_POSTAL_RESPONSE_CODE]) ||
+            empty($additionalInfo[PaymentDetailsHandler::AVS_STREET_ADDRESS_RESPONSE_CODE])
+        ) {
+            return self::$unavailableCode;
+        }
+
+        $streetCode = $additionalInfo[PaymentDetailsHandler::AVS_STREET_ADDRESS_RESPONSE_CODE];
+        $zipCode = $additionalInfo[PaymentDetailsHandler::AVS_POSTAL_RESPONSE_CODE];
+        $key = $zipCode . $streetCode;
+        return isset(self::$avsMap[$key]) ? self::$avsMap[$key] : self::$unavailableCode;
+    }
+}
diff --git a/app/code/Magento/Braintree/Model/CvvEmsCodeMapper.php b/app/code/Magento/Braintree/Model/CvvEmsCodeMapper.php
new file mode 100644
index 0000000000000..5accc222c1fe5
--- /dev/null
+++ b/app/code/Magento/Braintree/Model/CvvEmsCodeMapper.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Model;
+
+use Magento\Braintree\Gateway\Response\PaymentDetailsHandler;
+use Magento\Braintree\Model\Ui\ConfigProvider;
+use Magento\Payment\Api\PaymentVerificationInterface;
+use Magento\Sales\Api\Data\OrderPaymentInterface;
+
+/**
+ * Processes CVV codes mapping from Braintree transaction to
+ * electronic merchant systems standard.
+ *
+ * @see https://developers.braintreepayments.com/reference/response/transaction
+ * @see http://www.emsecommerce.net/avs_cvv2_response_codes.htm
+ */
+class CvvEmsCodeMapper implements PaymentVerificationInterface
+{
+    /**
+     * Default code for mismatch mapping
+     *
+     * @var string
+     */
+    private static $notProvidedCode = 'P';
+
+    /**
+     * List of mapping CVV codes
+     *
+     * @var array
+     */
+    private static $cvvMap = [
+        'M' => 'M',
+        'N' => 'N',
+        'U' => 'P',
+        'I' => 'P',
+        'S' => 'S',
+        'A' => ''
+    ];
+
+    /**
+     * Gets payment CVV verification code.
+     *
+     * @param OrderPaymentInterface $orderPayment
+     * @return string
+     * @throws \InvalidArgumentException If specified order payment has different payment method code.
+     */
+    public function getCode(OrderPaymentInterface $orderPayment)
+    {
+        if ($orderPayment->getMethod() !== ConfigProvider::CODE) {
+            throw new \InvalidArgumentException(
+                'The "' . $orderPayment->getMethod() . '" does not supported by Braintree CVV mapper.'
+            );
+        }
+
+        $additionalInfo = $orderPayment->getAdditionalInformation();
+        if (empty($additionalInfo[PaymentDetailsHandler::CVV_RESPONSE_CODE])) {
+            return self::$notProvidedCode;
+        }
+
+        $cvv = $additionalInfo[PaymentDetailsHandler::CVV_RESPONSE_CODE];
+        return isset(self::$cvvMap[$cvv]) ? self::$cvvMap[$cvv] : self::$notProvidedCode;
+    }
+}
diff --git a/app/code/Magento/Braintree/Test/Unit/Model/AvsEmsCodeMapperTest.php b/app/code/Magento/Braintree/Test/Unit/Model/AvsEmsCodeMapperTest.php
new file mode 100644
index 0000000000000..586a60fe91f3b
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Unit/Model/AvsEmsCodeMapperTest.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Test\Unit\Model;
+
+use Magento\Braintree\Model\AvsEmsCodeMapper;
+use Magento\Braintree\Model\Ui\ConfigProvider;
+use Magento\Sales\Api\Data\OrderPaymentInterface;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+class AvsEmsCodeMapperTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var AvsEmsCodeMapper
+     */
+    private $mapper;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->mapper = new AvsEmsCodeMapper();
+    }
+
+    /**
+     * Checks different variations for AVS codes mapping.
+     *
+     * @covers \Magento\Braintree\Model\AvsEmsCodeMapper::getCode
+     * @param string $avsZip
+     * @param string $avsStreet
+     * @param string $expected
+     * @dataProvider getCodeDataProvider
+     */
+    public function testGetCode($avsZip, $avsStreet, $expected)
+    {
+        /** @var OrderPaymentInterface|MockObject $orderPayment */
+        $orderPayment = $this->getMockBuilder(OrderPaymentInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $orderPayment->expects(self::once())
+            ->method('getMethod')
+            ->willReturn(ConfigProvider::CODE);
+
+        $orderPayment->expects(self::once())
+            ->method('getAdditionalInformation')
+            ->willReturn([
+                'avsPostalCodeResponseCode' => $avsZip,
+                'avsStreetAddressResponseCode' => $avsStreet
+            ]);
+
+        self::assertEquals($expected, $this->mapper->getCode($orderPayment));
+    }
+
+    /**
+     * Checks a test case, when payment order is not Braintree payment method.
+     *
+     * @covers \Magento\Braintree\Model\AvsEmsCodeMapper::getCode
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage The "some_payment" does not supported by Braintree AVS mapper.
+     */
+    public function testGetCodeWithException()
+    {
+        /** @var OrderPaymentInterface|MockObject $orderPayment */
+        $orderPayment = $this->getMockBuilder(OrderPaymentInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $orderPayment->expects(self::exactly(2))
+            ->method('getMethod')
+            ->willReturn('some_payment');
+
+        $this->mapper->getCode($orderPayment);
+    }
+
+    /**
+     * Gets list of AVS codes.
+     *
+     * @return array
+     */
+    public function getCodeDataProvider()
+    {
+        return [
+            ['avsZip' => null, 'avsStreet' => null, 'expected' => 'U'],
+            ['avsZip' => null, 'avsStreet' => 'M', 'expected' => 'U'],
+            ['avsZip' => 'M', 'avsStreet' => null, 'expected' => 'U'],
+            ['avsZip' => 'M', 'avsStreet' => 'Unknown', 'expected' => 'U'],
+            ['avsZip' => 'I', 'avsStreet' => 'A', 'expected' => 'U'],
+            ['avsZip' => 'M', 'avsStreet' => 'M', 'expected' => 'Y'],
+            ['avsZip' => 'N', 'avsStreet' => 'M', 'expected' => 'A'],
+            ['avsZip' => 'M', 'avsStreet' => 'N', 'expected' => 'Z'],
+            ['avsZip' => 'N', 'avsStreet' => 'N', 'expected' => 'N'],
+            ['avsZip' => 'U', 'avsStreet' => 'U', 'expected' => 'U'],
+            ['avsZip' => 'I', 'avsStreet' => 'I', 'expected' => 'U'],
+            ['avsZip' => 'A', 'avsStreet' => 'A', 'expected' => 'E'],
+        ];
+    }
+}
diff --git a/app/code/Magento/Braintree/Test/Unit/Model/CvvEmsCodeMapperTest.php b/app/code/Magento/Braintree/Test/Unit/Model/CvvEmsCodeMapperTest.php
new file mode 100644
index 0000000000000..fd54f9e751012
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Unit/Model/CvvEmsCodeMapperTest.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Test\Unit\Model;
+
+use Magento\Braintree\Model\CvvEmsCodeMapper;
+use Magento\Braintree\Model\Ui\ConfigProvider;
+use Magento\Sales\Api\Data\OrderPaymentInterface;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+class CvvEmsCodeMapperTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var CvvEmsCodeMapper
+     */
+    private $mapper;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->mapper = new CvvEmsCodeMapper();
+    }
+
+    /**
+     * Checks different variations for cvv codes mapping.
+     *
+     * @covers \Magento\Braintree\Model\CvvEmsCodeMapper::getCode
+     * @param string $cvvCode
+     * @param string $expected
+     * @dataProvider getCodeDataProvider
+     */
+    public function testGetCode($cvvCode, $expected)
+    {
+        /** @var OrderPaymentInterface|MockObject $orderPayment */
+        $orderPayment = $this->getMockBuilder(OrderPaymentInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $orderPayment->expects(self::once())
+            ->method('getMethod')
+            ->willReturn(ConfigProvider::CODE);
+
+        $orderPayment->expects(self::once())
+            ->method('getAdditionalInformation')
+            ->willReturn(['cvvResponseCode' => $cvvCode]);
+
+        self::assertEquals($expected, $this->mapper->getCode($orderPayment));
+    }
+
+    /**
+     * Checks a test case, when payment order is not Braintree payment method.
+     *
+     * @covers \Magento\Braintree\Model\CvvEmsCodeMapper::getCode
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage The "some_payment" does not supported by Braintree CVV mapper.
+     */
+    public function testGetCodeWithException()
+    {
+        /** @var OrderPaymentInterface|MockObject $orderPayment */
+        $orderPayment = $this->getMockBuilder(OrderPaymentInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $orderPayment->expects(self::exactly(2))
+            ->method('getMethod')
+            ->willReturn('some_payment');
+
+        $this->mapper->getCode($orderPayment);
+    }
+
+    /**
+     * Gets variations of cvv codes and expected mapping result.
+     *
+     * @return array
+     */
+    public function getCodeDataProvider()
+    {
+        return [
+            ['cvvCode' => '', 'expected' => 'P'],
+            ['cvvCode' => null, 'expected' => 'P'],
+            ['cvvCode' => 'Unknown', 'expected' => 'P'],
+            ['cvvCode' => 'M', 'expected' => 'M'],
+            ['cvvCode' => 'N', 'expected' => 'N'],
+            ['cvvCode' => 'U', 'expected' => 'P'],
+            ['cvvCode' => 'I', 'expected' => 'P'],
+            ['cvvCode' => 'S', 'expected' => 'S'],
+            ['cvvCode' => 'A', 'expected' => ''],
+        ];
+    }
+}
diff --git a/app/code/Magento/Braintree/etc/config.xml b/app/code/Magento/Braintree/etc/config.xml
index eaa233da109ce..43328406e2012 100644
--- a/app/code/Magento/Braintree/etc/config.xml
+++ b/app/code/Magento/Braintree/etc/config.xml
@@ -40,6 +40,8 @@
                 <masked_fields>cvv,number</masked_fields>
                 <privateInfoKeys>avsPostalCodeResponseCode,avsStreetAddressResponseCode,cvvResponseCode,processorAuthorizationCode,processorResponseCode,processorResponseText,liabilityShifted,liabilityShiftPossible,riskDataId,riskDataDecision</privateInfoKeys>
                 <paymentInfoKeys>cc_type,cc_number,avsPostalCodeResponseCode,avsStreetAddressResponseCode,cvvResponseCode,processorAuthorizationCode,processorResponseCode,processorResponseText,liabilityShifted,liabilityShiftPossible,riskDataId,riskDataDecision</paymentInfoKeys>
+                <avs_ems_adapter>Magento\Braintree\Model\AvsEmsCodeMapper</avs_ems_adapter>
+                <cvv_ems_adapter>Magento\Braintree\Model\CvvEmsCodeMapper</cvv_ems_adapter>
             </braintree>
             <braintree_paypal>
                 <model>BraintreePayPalFacade</model>
diff --git a/app/code/Magento/Braintree/view/adminhtml/web/images/braintree_allinone.png b/app/code/Magento/Braintree/view/adminhtml/web/images/braintree_allinone.png
index 675c94581921e..377490cc51123 100644
Binary files a/app/code/Magento/Braintree/view/adminhtml/web/images/braintree_allinone.png and b/app/code/Magento/Braintree/view/adminhtml/web/images/braintree_allinone.png differ
diff --git a/app/code/Magento/Braintree/view/adminhtml/web/images/braintree_logo.png b/app/code/Magento/Braintree/view/adminhtml/web/images/braintree_logo.png
index 0267a8c8881f5..791fe3f3391c0 100644
Binary files a/app/code/Magento/Braintree/view/adminhtml/web/images/braintree_logo.png and b/app/code/Magento/Braintree/view/adminhtml/web/images/braintree_logo.png differ
diff --git a/app/code/Magento/Braintree/view/base/web/images/paypal-small.png b/app/code/Magento/Braintree/view/base/web/images/paypal-small.png
index 92d5c63bca442..912cd1fb20cb1 100644
Binary files a/app/code/Magento/Braintree/view/base/web/images/paypal-small.png and b/app/code/Magento/Braintree/view/base/web/images/paypal-small.png differ
diff --git a/app/code/Magento/Braintree/view/base/web/images/paypal.png b/app/code/Magento/Braintree/view/base/web/images/paypal.png
index 291693037814a..2da695608d4b7 100644
Binary files a/app/code/Magento/Braintree/view/base/web/images/paypal.png and b/app/code/Magento/Braintree/view/base/web/images/paypal.png differ
diff --git a/app/code/Magento/CacheInvalidate/Model/PurgeCache.php b/app/code/Magento/CacheInvalidate/Model/PurgeCache.php
index 859e039acd094..2e1d7964b7480 100644
--- a/app/code/Magento/CacheInvalidate/Model/PurgeCache.php
+++ b/app/code/Magento/CacheInvalidate/Model/PurgeCache.php
@@ -67,6 +67,7 @@ public function sendPurgeRequest($tagsPattern)
                     '1.1',
                     $headers
                 );
+                $socketAdapter->read();
                 $socketAdapter->close();
             } catch (\Exception $e) {
                 $this->logger->critical($e->getMessage(), compact('server', 'tagsPattern'));
diff --git a/app/code/Magento/CacheInvalidate/Test/Unit/Model/PurgeCacheTest.php b/app/code/Magento/CacheInvalidate/Test/Unit/Model/PurgeCacheTest.php
index fead947d85e4a..9fe34acd1ae86 100644
--- a/app/code/Magento/CacheInvalidate/Test/Unit/Model/PurgeCacheTest.php
+++ b/app/code/Magento/CacheInvalidate/Test/Unit/Model/PurgeCacheTest.php
@@ -71,6 +71,8 @@ public function testSendPurgeRequest($hosts)
             $this->socketAdapterMock->expects($this->at($i++))
                 ->method('write')
                 ->with('PURGE', $uri, '1.1', ['X-Magento-Tags-Pattern' => 'tags', 'Host' => $uri->getHost()]);
+            $this->socketAdapterMock->expects($this->at($i++))
+                ->method('read');
             $i++;
         }
         $this->socketAdapterMock->expects($this->exactly(count($uris)))
diff --git a/app/code/Magento/Captcha/view/adminhtml/web/reload.png b/app/code/Magento/Captcha/view/adminhtml/web/reload.png
index 0ad46c613ccbc..68d4bffe4ecb8 100644
Binary files a/app/code/Magento/Captcha/view/adminhtml/web/reload.png and b/app/code/Magento/Captcha/view/adminhtml/web/reload.png differ
diff --git a/app/code/Magento/Catalog/Test/Unit/_files/catalog/product/somefile.png b/app/code/Magento/Catalog/Test/Unit/_files/catalog/product/somefile.png
index 551553888c745..fa9f1ea4d0554 100644
Binary files a/app/code/Magento/Catalog/Test/Unit/_files/catalog/product/somefile.png and b/app/code/Magento/Catalog/Test/Unit/_files/catalog/product/somefile.png differ
diff --git a/app/code/Magento/Catalog/Test/Unit/_files/catalog/product/watermark/somefile.png b/app/code/Magento/Catalog/Test/Unit/_files/catalog/product/watermark/somefile.png
index 551553888c745..fa9f1ea4d0554 100644
Binary files a/app/code/Magento/Catalog/Test/Unit/_files/catalog/product/watermark/somefile.png and b/app/code/Magento/Catalog/Test/Unit/_files/catalog/product/watermark/somefile.png differ
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/catalog/images/select2.png b/app/code/Magento/Catalog/view/adminhtml/web/catalog/images/select2.png
index 1d804ffb99699..4e62ed8b5a8fe 100644
Binary files a/app/code/Magento/Catalog/view/adminhtml/web/catalog/images/select2.png and b/app/code/Magento/Catalog/view/adminhtml/web/catalog/images/select2.png differ
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/catalog/images/select2x2.png b/app/code/Magento/Catalog/view/adminhtml/web/catalog/images/select2x2.png
index da0790f1fada9..76047cd5f85a0 100644
Binary files a/app/code/Magento/Catalog/view/adminhtml/web/catalog/images/select2x2.png and b/app/code/Magento/Catalog/view/adminhtml/web/catalog/images/select2x2.png differ
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/catalog/images/spinner.gif b/app/code/Magento/Catalog/view/adminhtml/web/catalog/images/spinner.gif
index 82d06cc97f0b9..d44cf73a17680 100644
Binary files a/app/code/Magento/Catalog/view/adminhtml/web/catalog/images/spinner.gif and b/app/code/Magento/Catalog/view/adminhtml/web/catalog/images/spinner.gif differ
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/images/ajax-loader-big.gif b/app/code/Magento/Catalog/view/adminhtml/web/images/ajax-loader-big.gif
index 1612bcee36660..460734dfdadec 100644
Binary files a/app/code/Magento/Catalog/view/adminhtml/web/images/ajax-loader-big.gif and b/app/code/Magento/Catalog/view/adminhtml/web/images/ajax-loader-big.gif differ
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/images/category_widget_link.png b/app/code/Magento/Catalog/view/adminhtml/web/images/category_widget_link.png
index 4b15458182559..2093479a00430 100644
Binary files a/app/code/Magento/Catalog/view/adminhtml/web/images/category_widget_link.png and b/app/code/Magento/Catalog/view/adminhtml/web/images/category_widget_link.png differ
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/images/product_widget_link.png b/app/code/Magento/Catalog/view/adminhtml/web/images/product_widget_link.png
index 614ddd3632eb0..b754992728921 100644
Binary files a/app/code/Magento/Catalog/view/adminhtml/web/images/product_widget_link.png and b/app/code/Magento/Catalog/view/adminhtml/web/images/product_widget_link.png differ
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/images/product_widget_new.png b/app/code/Magento/Catalog/view/adminhtml/web/images/product_widget_new.png
index c2573967031e1..1367e88e17875 100644
Binary files a/app/code/Magento/Catalog/view/adminhtml/web/images/product_widget_new.png and b/app/code/Magento/Catalog/view/adminhtml/web/images/product_widget_new.png differ
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-bg_diagonals-thick_18_b81900_40x40.png b/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-bg_diagonals-thick_18_b81900_40x40.png
index c243bfa4f619f..c079ee1dddd28 100644
Binary files a/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-bg_diagonals-thick_18_b81900_40x40.png and b/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-bg_diagonals-thick_18_b81900_40x40.png differ
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-bg_diagonals-thick_20_666666_40x40.png b/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-bg_diagonals-thick_20_666666_40x40.png
index 9e24b2eeeaed9..fc796d43b3930 100644
Binary files a/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-bg_diagonals-thick_20_666666_40x40.png and b/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-bg_diagonals-thick_20_666666_40x40.png differ
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-bg_flat_10_000000_40x100.png b/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-bg_flat_10_000000_40x100.png
index b10f59cd34249..cdddc6df6821b 100644
Binary files a/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-bg_flat_10_000000_40x100.png and b/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-bg_flat_10_000000_40x100.png differ
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-bg_glass_100_f6f6f6_1x400.png b/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-bg_glass_100_f6f6f6_1x400.png
index 9b383f4d2eab0..06a4b479d91f6 100644
Binary files a/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-bg_glass_100_f6f6f6_1x400.png and b/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-bg_glass_100_f6f6f6_1x400.png differ
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-bg_glass_100_fdf5ce_1x400.png b/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-bg_glass_100_fdf5ce_1x400.png
index a23baad25b1d1..8f1e5feab0f2b 100644
Binary files a/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-bg_glass_100_fdf5ce_1x400.png and b/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-bg_glass_100_fdf5ce_1x400.png differ
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-bg_glass_65_ffffff_1x400.png b/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-bg_glass_65_ffffff_1x400.png
index 8569c1bc9f4bf..80b2b05bbaa99 100644
Binary files a/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-bg_glass_65_ffffff_1x400.png and b/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-bg_glass_65_ffffff_1x400.png differ
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-bg_gloss-wave_35_f67028_500x100.png b/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-bg_gloss-wave_35_f67028_500x100.png
index 734cb2c3c99e7..2538b68fd3dfe 100644
Binary files a/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-bg_gloss-wave_35_f67028_500x100.png and b/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-bg_gloss-wave_35_f67028_500x100.png differ
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-bg_highlight-soft_100_eeeeee_1x100.png b/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
index f1273672d2532..9e62f3b67683d 100644
Binary files a/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-bg_highlight-soft_100_eeeeee_1x100.png and b/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-bg_highlight-soft_100_eeeeee_1x100.png differ
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-bg_highlight-soft_75_ffe45c_1x100.png b/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
index 359397acffdd8..398d9409630d3 100644
Binary files a/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-bg_highlight-soft_75_ffe45c_1x100.png and b/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-bg_highlight-soft_75_ffe45c_1x100.png differ
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-icons_222222_256x240.png b/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-icons_222222_256x240.png
index 362f289fce3a2..82643e291f7ce 100644
Binary files a/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-icons_222222_256x240.png and b/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-icons_222222_256x240.png differ
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-icons_228ef1_256x240.png b/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-icons_228ef1_256x240.png
index 7b3d2e9353cbb..75c5e56b461a7 100644
Binary files a/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-icons_228ef1_256x240.png and b/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-icons_228ef1_256x240.png differ
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-icons_ef8c08_256x240.png b/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-icons_ef8c08_256x240.png
index 65d8d914c23b8..5b55fd57fd7c1 100644
Binary files a/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-icons_ef8c08_256x240.png and b/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-icons_ef8c08_256x240.png differ
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-icons_ffd27a_256x240.png b/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-icons_ffd27a_256x240.png
index 599fb0044dd47..8d5d75366bcea 100644
Binary files a/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-icons_ffd27a_256x240.png and b/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-icons_ffd27a_256x240.png differ
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-icons_ffffff_256x240.png b/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-icons_ffffff_256x240.png
index e921df9b5929d..4d4639569acb9 100644
Binary files a/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-icons_ffffff_256x240.png and b/app/code/Magento/Catalog/view/adminhtml/web/product/images/ui-icons_ffffff_256x240.png differ
diff --git a/app/code/Magento/Catalog/view/base/web/images/product/placeholder/image.jpg b/app/code/Magento/Catalog/view/base/web/images/product/placeholder/image.jpg
index b8baef2dfe036..3526efa91f55a 100644
Binary files a/app/code/Magento/Catalog/view/base/web/images/product/placeholder/image.jpg and b/app/code/Magento/Catalog/view/base/web/images/product/placeholder/image.jpg differ
diff --git a/app/code/Magento/Catalog/view/base/web/images/product/placeholder/small_image.jpg b/app/code/Magento/Catalog/view/base/web/images/product/placeholder/small_image.jpg
index b8611cfdab5ca..aeda35c364bd8 100644
Binary files a/app/code/Magento/Catalog/view/base/web/images/product/placeholder/small_image.jpg and b/app/code/Magento/Catalog/view/base/web/images/product/placeholder/small_image.jpg differ
diff --git a/app/code/Magento/Catalog/view/base/web/images/product/placeholder/thumbnail.jpg b/app/code/Magento/Catalog/view/base/web/images/product/placeholder/thumbnail.jpg
index b8fc9043f6f84..0d5ef7e1bd412 100644
Binary files a/app/code/Magento/Catalog/view/base/web/images/product/placeholder/thumbnail.jpg and b/app/code/Magento/Catalog/view/base/web/images/product/placeholder/thumbnail.jpg differ
diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml
index 640ad1c3d8d3d..4917490240949 100644
--- a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml
+++ b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml
@@ -94,7 +94,7 @@
                         <argument name="at_call" xsi:type="string">getShortDescription</argument>
                         <argument name="at_code" xsi:type="string">short_description</argument>
                         <argument name="css_class" xsi:type="string">overview</argument>
-                        <argument name="at_label" translate="true" xsi:type="string">none</argument>
+                        <argument name="at_label" xsi:type="string">none</argument>
                         <argument name="title" translate="true" xsi:type="string">Overview</argument>
                         <argument name="add_attribute" xsi:type="string">itemprop="description"</argument>
                     </arguments>
diff --git a/app/code/Magento/CatalogWidget/view/adminhtml/web/images/products_list.png b/app/code/Magento/CatalogWidget/view/adminhtml/web/images/products_list.png
index 3a33a55a7df00..9f7c71829cb5c 100644
Binary files a/app/code/Magento/CatalogWidget/view/adminhtml/web/images/products_list.png and b/app/code/Magento/CatalogWidget/view/adminhtml/web/images/products_list.png differ
diff --git a/app/code/Magento/Checkout/view/frontend/web/cvv.png b/app/code/Magento/Checkout/view/frontend/web/cvv.png
index 59911fd45bdf1..f7a1af77d39f8 100644
Binary files a/app/code/Magento/Checkout/view/frontend/web/cvv.png and b/app/code/Magento/Checkout/view/frontend/web/cvv.png differ
diff --git a/app/code/Magento/Cms/view/adminhtml/web/images/placeholder_thumbnail.jpg b/app/code/Magento/Cms/view/adminhtml/web/images/placeholder_thumbnail.jpg
index 2486ce6fc3064..d9d78b5d2e34d 100644
Binary files a/app/code/Magento/Cms/view/adminhtml/web/images/placeholder_thumbnail.jpg and b/app/code/Magento/Cms/view/adminhtml/web/images/placeholder_thumbnail.jpg differ
diff --git a/app/code/Magento/Cms/view/adminhtml/web/images/widget_block.png b/app/code/Magento/Cms/view/adminhtml/web/images/widget_block.png
index 05ce742bbc8b8..97c41cb9ff571 100644
Binary files a/app/code/Magento/Cms/view/adminhtml/web/images/widget_block.png and b/app/code/Magento/Cms/view/adminhtml/web/images/widget_block.png differ
diff --git a/app/code/Magento/Cms/view/adminhtml/web/images/widget_page_link.png b/app/code/Magento/Cms/view/adminhtml/web/images/widget_page_link.png
index c05065e92ef7e..adafab804e6c1 100644
Binary files a/app/code/Magento/Cms/view/adminhtml/web/images/widget_page_link.png and b/app/code/Magento/Cms/view/adminhtml/web/images/widget_page_link.png differ
diff --git a/app/code/Magento/Cms/view/adminhtml/web/images/wysiwyg_skin_image.png b/app/code/Magento/Cms/view/adminhtml/web/images/wysiwyg_skin_image.png
index 0b22d2f629176..e72f28e8b03fd 100644
Binary files a/app/code/Magento/Cms/view/adminhtml/web/images/wysiwyg_skin_image.png and b/app/code/Magento/Cms/view/adminhtml/web/images/wysiwyg_skin_image.png differ
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Price.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Price.php
index 9c7efd803fba7..69cfac839198a 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Price.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Price.php
@@ -39,10 +39,15 @@ public function getFinalPrice($qty, $product)
      */
     public function getPrice($product)
     {
-        if ($product->getCustomOption('simple_product')) {
-            return $product->getCustomOption('simple_product')->getProduct()->getPrice();
-        } else {
-            return 0;
+        if (!empty($product)) {
+            $simpleProductOption = $product->getCustomOption('simple_product');
+            if (!empty($simpleProductOption)) {
+                $simpleProduct = $simpleProductOption->getProduct();
+                if (!empty($simpleProduct)) {
+                    return $simpleProduct->getPrice();
+                }
+            }
         }
+        return 0;
     }
 }
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/_files/logo.gif b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/_files/logo.gif
index b404af6133629..237dc9d0a060e 100644
Binary files a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/_files/logo.gif and b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/_files/logo.gif differ
diff --git a/app/code/Magento/Dhl/view/adminhtml/web/logo.jpg b/app/code/Magento/Dhl/view/adminhtml/web/logo.jpg
index 4f80976c6a2c6..70c6ce22df739 100644
Binary files a/app/code/Magento/Dhl/view/adminhtml/web/logo.jpg and b/app/code/Magento/Dhl/view/adminhtml/web/logo.jpg differ
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/_files/image.jpg b/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/_files/image.jpg
index f8e1802e54465..d49c3bf70319a 100644
Binary files a/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/_files/image.jpg and b/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/_files/image.jpg differ
diff --git a/app/code/Magento/Email/view/frontend/web/logo_email.png b/app/code/Magento/Email/view/frontend/web/logo_email.png
index 4031893124b15..d01b530456e81 100644
Binary files a/app/code/Magento/Email/view/frontend/web/logo_email.png and b/app/code/Magento/Email/view/frontend/web/logo_email.png differ
diff --git a/app/code/Magento/Fedex/Model/Carrier.php b/app/code/Magento/Fedex/Model/Carrier.php
index f00b4e3164cfb..1d2f7d773c76f 100644
--- a/app/code/Magento/Fedex/Model/Carrier.php
+++ b/app/code/Magento/Fedex/Model/Carrier.php
@@ -1570,9 +1570,9 @@ private function processTrackingDetails(\stdClass $trackInfo)
             'progressdetail' => [],
         ];
 
-        if (!empty($trackInfo->ShipTimestamp)) {
-            $datetime = \DateTime::createFromFormat(\DateTime::ISO8601, $trackInfo->ShipTimestamp);
-            $result['shippeddate'] = $datetime->format('Y-m-d');
+        $datetime = $this->parseDate(!empty($trackInfo->ShipTimestamp) ? $trackInfo->ShipTimestamp : null);
+        if ($datetime) {
+            $result['shippeddate'] = gmdate('Y-m-d', $datetime->getTimestamp());
         }
 
         $result['signedby'] = !empty($trackInfo->DeliverySignatureName) ?
@@ -1588,8 +1588,8 @@ private function processTrackingDetails(\stdClass $trackInfo)
 
         $datetime = $this->getDeliveryDateTime($trackInfo);
         if ($datetime) {
-            $result['deliverydate'] = $datetime->format('Y-m-d');
-            $result['deliverytime'] = $datetime->format('H:i:s');
+            $result['deliverydate'] = gmdate('Y-m-d', $datetime->getTimestamp());
+            $result['deliverytime'] = gmdate('H:i:s', $datetime->getTimestamp());
         }
 
         $address = null;
@@ -1636,7 +1636,7 @@ private function getDeliveryDateTime(\stdClass $trackInfo)
             $timestamp = $trackInfo->ActualDeliveryTimestamp;
         }
 
-        return $timestamp ? \DateTime::createFromFormat(\DateTime::ISO8601, $timestamp) : null;
+        return $timestamp ? $this->parseDate($timestamp) : null;
     }
 
     /**
@@ -1685,10 +1685,10 @@ private function processTrackDetailsEvents(array $events)
                 'deliverylocation' => null
             ];
 
-            if (!empty($event->Timestamp)) {
-                $datetime = \DateTime::createFromFormat(\DateTime::ISO8601, $event->Timestamp);
-                $item['deliverydate'] = $datetime->format('Y-m-d');
-                $item['deliverytime'] = $datetime->format('H:i:s');
+            $datetime = $this->parseDate(!empty($event->Timestamp) ? $event->Timestamp : null);
+            if ($datetime) {
+                $item['deliverydate'] = gmdate('Y-m-d', $datetime->getTimestamp());
+                $item['deliverytime'] = gmdate('H:i:s', $datetime->getTimestamp());
             }
 
             if (!empty($event->Address)) {
@@ -1716,4 +1716,30 @@ private function appendTrackingError($trackingValue, $errorMessage)
         $result = $this->getResult();
         $result->append($error);
     }
+
+    /**
+     * Parses datetime string from FedEx response.
+     * According to FedEx API, datetime string should be in \DateTime::ATOM format, but
+     * sometimes FedEx returns datetime without timezone and in that case timezone will be set as UTC.
+     *
+     * @param string $timestamp
+     * @return bool|\DateTime
+     */
+    private function parseDate($timestamp)
+    {
+        if ($timestamp === null) {
+            return false;
+        }
+        $formats = [\DateTime::ATOM, 'Y-m-d\TH:i:s'];
+        foreach ($formats as $format) {
+            // set UTC timezone for a case if timestamp does not contain any timezone
+            $utcTimezone = new \DateTimeZone('UTC');
+            $dateTime = \DateTime::createFromFormat($format, $timestamp, $utcTimezone);
+            if ($dateTime !== false) {
+                return $dateTime;
+            }
+        }
+
+        return false;
+    }
 }
diff --git a/app/code/Magento/Fedex/Test/Unit/Model/CarrierTest.php b/app/code/Magento/Fedex/Test/Unit/Model/CarrierTest.php
index 04d4ce7ea24b2..abcad0bcf9c85 100644
--- a/app/code/Magento/Fedex/Test/Unit/Model/CarrierTest.php
+++ b/app/code/Magento/Fedex/Test/Unit/Model/CarrierTest.php
@@ -393,8 +393,12 @@ public function testGetTrackingErrorResponse()
 
     /**
      * @covers \Magento\Fedex\Model\Carrier::getTracking
+     * @param string $shipTimeStamp
+     * @param string $expectedDate
+     * @param string $expectedTime
+     * @dataProvider shipDateDataProvider
      */
-    public function testGetTracking()
+    public function testGetTracking($shipTimeStamp, $expectedDate, $expectedTime)
     {
         $tracking = '123456789012';
 
@@ -404,7 +408,7 @@ public function testGetTracking()
         $response->CompletedTrackDetails = new \stdClass();
 
         $trackDetails = new \stdClass();
-        $trackDetails->ShipTimestamp = '2016-08-05T14:06:35+00:00';
+        $trackDetails->ShipTimestamp = $shipTimeStamp;
         $trackDetails->DeliverySignatureName = 'signature';
 
         $trackDetails->StatusDetail = new \stdClass();
@@ -412,7 +416,7 @@ public function testGetTracking()
 
         $trackDetails->Service = new \stdClass();
         $trackDetails->Service->Description = 'ground';
-        $trackDetails->EstimatedDeliveryTimestamp = '2016-08-10T10:20:26+00:00';
+        $trackDetails->EstimatedDeliveryTimestamp = $shipTimeStamp;
 
         $trackDetails->EstimatedDeliveryAddress = new \stdClass();
         $trackDetails->EstimatedDeliveryAddress->City = 'Culver City';
@@ -444,9 +448,6 @@ public function testGetTracking()
             'signedby',
             'status',
             'service',
-            'shippeddate',
-            'deliverydate',
-            'deliverytime',
             'deliverylocation',
             'weight',
         ];
@@ -454,15 +455,37 @@ public function testGetTracking()
             static::assertNotEmpty($current[$field]);
         });
 
-        static::assertEquals('2016-08-10', $current['deliverydate']);
-        static::assertEquals('10:20:26', $current['deliverytime']);
-        static::assertEquals('2016-08-05', $current['shippeddate']);
+        static::assertEquals($expectedDate, $current['deliverydate']);
+        static::assertEquals($expectedTime, $current['deliverytime']);
+        static::assertEquals($expectedDate, $current['shippeddate']);
+    }
+
+    /**
+     * Gets list of variations for testing ship date.
+     *
+     * @return array
+     */
+    public function shipDateDataProvider()
+    {
+        return [
+            ['shipTimestamp' => '2016-08-05T14:06:35+01:00', 'expectedDate' => '2016-08-05', '13:06:35'],
+            ['shipTimestamp' => '2016-08-05T02:06:35+03:00', 'expectedDate' => '2016-08-04', '23:06:35'],
+            ['shipTimestamp' => '2016-08-05T14:06:35', 'expectedDate' => '2016-08-05', '14:06:35'],
+            ['shipTimestamp' => '2016-08-05 14:06:35', 'expectedDate' => null, null],
+            ['shipTimestamp' => '2016-08-05 14:06:35+00:00', 'expectedDate' => null, null],
+            ['shipTimestamp' => '2016-08-05', 'expectedDate' => null, null],
+            ['shipTimestamp' => '2016/08/05', 'expectedDate' => null, null],
+        ];
     }
 
     /**
      * @covers \Magento\Fedex\Model\Carrier::getTracking
+     * @param string $shipTimeStamp
+     * @param string $expectedDate
+     * @param string $expectedTime
+     * @dataProvider shipDateDataProvider
      */
-    public function testGetTrackingWithEvents()
+    public function testGetTrackingWithEvents($shipTimeStamp, $expectedDate, $expectedTime)
     {
         $tracking = '123456789012';
 
@@ -473,7 +496,7 @@ public function testGetTrackingWithEvents()
 
         $event = new \stdClass();
         $event->EventDescription = 'Test';
-        $event->Timestamp = '2016-08-05T19:14:53+00:00';
+        $event->Timestamp = $shipTimeStamp;
         $event->Address = new \stdClass();
 
         $event->Address->City = 'Culver City';
@@ -504,12 +527,12 @@ public function testGetTrackingWithEvents()
         static::assertEquals(1, count($current['progressdetail']));
 
         $event = $current['progressdetail'][0];
-        $fields = ['activity', 'deliverydate', 'deliverytime', 'deliverylocation'];
+        $fields = ['activity', 'deliverylocation'];
         array_walk($fields, function ($field) use ($event) {
             static::assertNotEmpty($event[$field]);
         });
-        static::assertEquals('2016-08-05', $event['deliverydate']);
-        static::assertEquals('19:14:53', $event['deliverytime']);
+        static::assertEquals($expectedDate, $event['deliverydate']);
+        static::assertEquals($expectedTime, $event['deliverytime']);
     }
 
     /**
diff --git a/app/code/Magento/Marketplace/view/adminhtml/web/partners/images/magento-connect.png b/app/code/Magento/Marketplace/view/adminhtml/web/partners/images/magento-connect.png
index 594b5b49d163c..575563f341b35 100644
Binary files a/app/code/Magento/Marketplace/view/adminhtml/web/partners/images/magento-connect.png and b/app/code/Magento/Marketplace/view/adminhtml/web/partners/images/magento-connect.png differ
diff --git a/app/code/Magento/Payment/Api/PaymentVerificationInterface.php b/app/code/Magento/Payment/Api/PaymentVerificationInterface.php
new file mode 100644
index 0000000000000..f5c05080cfe9c
--- /dev/null
+++ b/app/code/Magento/Payment/Api/PaymentVerificationInterface.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Payment\Api;
+
+use Magento\Sales\Api\Data\OrderPaymentInterface;
+
+/**
+ * Payment provider codes verification interface.
+ *
+ * Custom payment methods might implement this interface to provide
+ * specific mapping for payment methods, like AVS or CVV verification.
+ * The payment methods can map payment method info from internal sources,
+ * like additional information, to specific international codes.
+ *
+ * There are no default implementation of this interface, because code verification
+ * depends on payment method integration specifics.
+ *
+ * @api
+ */
+interface PaymentVerificationInterface
+{
+    /**
+     * Gets payment provider verification code.
+     * Throws an exception if provided payment method is different to verification implementation.
+     *
+     * @param OrderPaymentInterface $orderPayment
+     * @return string
+     * @throws \InvalidArgumentException
+     */
+    public function getCode(OrderPaymentInterface $orderPayment);
+}
diff --git a/app/code/Magento/Payment/view/base/web/images/cc/ae.png b/app/code/Magento/Payment/view/base/web/images/cc/ae.png
index 9bc4b0933694d..6c3274a8a5288 100644
Binary files a/app/code/Magento/Payment/view/base/web/images/cc/ae.png and b/app/code/Magento/Payment/view/base/web/images/cc/ae.png differ
diff --git a/app/code/Magento/Payment/view/base/web/images/cc/di.png b/app/code/Magento/Payment/view/base/web/images/cc/di.png
index df56152d57eb8..ddb2ee8f7fe01 100644
Binary files a/app/code/Magento/Payment/view/base/web/images/cc/di.png and b/app/code/Magento/Payment/view/base/web/images/cc/di.png differ
diff --git a/app/code/Magento/Payment/view/base/web/images/cc/dn.png b/app/code/Magento/Payment/view/base/web/images/cc/dn.png
index 7819c25a804d3..af16856a68be0 100644
Binary files a/app/code/Magento/Payment/view/base/web/images/cc/dn.png and b/app/code/Magento/Payment/view/base/web/images/cc/dn.png differ
diff --git a/app/code/Magento/Payment/view/base/web/images/cc/jcb.png b/app/code/Magento/Payment/view/base/web/images/cc/jcb.png
index 22c599e58b037..8bfe3b02b166d 100644
Binary files a/app/code/Magento/Payment/view/base/web/images/cc/jcb.png and b/app/code/Magento/Payment/view/base/web/images/cc/jcb.png differ
diff --git a/app/code/Magento/Payment/view/base/web/images/cc/mc.png b/app/code/Magento/Payment/view/base/web/images/cc/mc.png
index bba7f42b6369b..f33653868c7a6 100644
Binary files a/app/code/Magento/Payment/view/base/web/images/cc/mc.png and b/app/code/Magento/Payment/view/base/web/images/cc/mc.png differ
diff --git a/app/code/Magento/Payment/view/base/web/images/cc/md.png b/app/code/Magento/Payment/view/base/web/images/cc/md.png
index 2ae9cfdb616b2..512a11390ccc2 100644
Binary files a/app/code/Magento/Payment/view/base/web/images/cc/md.png and b/app/code/Magento/Payment/view/base/web/images/cc/md.png differ
diff --git a/app/code/Magento/Payment/view/base/web/images/cc/mi.png b/app/code/Magento/Payment/view/base/web/images/cc/mi.png
index 2ae9cfdb616b2..512a11390ccc2 100644
Binary files a/app/code/Magento/Payment/view/base/web/images/cc/mi.png and b/app/code/Magento/Payment/view/base/web/images/cc/mi.png differ
diff --git a/app/code/Magento/Payment/view/base/web/images/cc/sm.png b/app/code/Magento/Payment/view/base/web/images/cc/sm.png
index d8e26a7723526..0b798024dba8c 100644
Binary files a/app/code/Magento/Payment/view/base/web/images/cc/sm.png and b/app/code/Magento/Payment/view/base/web/images/cc/sm.png differ
diff --git a/app/code/Magento/Payment/view/base/web/images/cc/so.png b/app/code/Magento/Payment/view/base/web/images/cc/so.png
index fc5673b823ff5..3285aa6d6282d 100644
Binary files a/app/code/Magento/Payment/view/base/web/images/cc/so.png and b/app/code/Magento/Payment/view/base/web/images/cc/so.png differ
diff --git a/app/code/Magento/Payment/view/base/web/images/cc/un.png b/app/code/Magento/Payment/view/base/web/images/cc/un.png
index eebd413158903..d28f62d24a1ae 100644
Binary files a/app/code/Magento/Payment/view/base/web/images/cc/un.png and b/app/code/Magento/Payment/view/base/web/images/cc/un.png differ
diff --git a/app/code/Magento/Payment/view/base/web/images/cc/vi.png b/app/code/Magento/Payment/view/base/web/images/cc/vi.png
index 120f37788745f..19764855654a4 100644
Binary files a/app/code/Magento/Payment/view/base/web/images/cc/vi.png and b/app/code/Magento/Payment/view/base/web/images/cc/vi.png differ
diff --git a/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/validator.js b/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/validator.js
index 38b94be3b3cc2..289735ec71be4 100644
--- a/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/validator.js
+++ b/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/validator.js
@@ -19,7 +19,7 @@
     } else {
         factory(jQuery);
     }
-}(function ($, cvvValidator, creditCardNumberValidator, expirationDateValidator, monthValidator, creditCardData) {
+}(function ($, cvvValidator, creditCardNumberValidator, yearValidator, monthValidator, creditCardData) {
     'use strict';
 
     $.each({
@@ -49,6 +49,7 @@
 
             /**
              * Validate credit card number based on mod 10
+             *
              * @param {*} number - credit card number
              * @return {Boolean}
              */
@@ -60,8 +61,9 @@
         'validate-card-date': [
 
             /**
-             * Validate credit card number based on mod 10
-             * @param {*} date - month
+             * Validate credit card expiration month
+             *
+             * @param {String} date - month
              * @return {Boolean}
              */
             function (date) {
@@ -72,8 +74,9 @@
         'validate-card-cvv': [
 
             /**
-             * Validate credit card number based on mod 10
-             * @param {*} cvv - month
+             * Validate cvv
+             *
+             * @param {String} cvv - card verification value
              * @return {Boolean}
              */
             function (cvv) {
@@ -86,12 +89,13 @@
         'validate-card-year': [
 
             /**
-             * Validate credit card number based on mod 10
-             * @param {*} date - month
+             * Validate credit card expiration year
+             *
+             * @param {String} date - year
              * @return {Boolean}
              */
             function (date) {
-                return monthValidator(date).isValid;
+                return yearValidator(date).isValid;
             },
             $.mage.__('Incorrect credit card expiration year.')
         ]
diff --git a/app/code/Magento/Paypal/Model/Payflow/AvsEmsCodeMapper.php b/app/code/Magento/Paypal/Model/Payflow/AvsEmsCodeMapper.php
new file mode 100644
index 0000000000000..7075deb5c0931
--- /dev/null
+++ b/app/code/Magento/Paypal/Model/Payflow/AvsEmsCodeMapper.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Paypal\Model\Payflow;
+
+use Magento\Paypal\Model\Config;
+use Magento\Paypal\Model\Info;
+use Magento\Payment\Api\PaymentVerificationInterface;
+use Magento\Sales\Api\Data\OrderPaymentInterface;
+
+/**
+ * Processes AVS codes mapping from PayPal Payflow transaction to
+ * electronic merchant systems standard.
+ *
+ * @see https://developer.paypal.com/docs/classic/payflow/integration-guide/#credit-card-transaction-responses
+ * @see http://www.emsecommerce.net/avs_cvv2_response_codes.htm
+ */
+class AvsEmsCodeMapper implements PaymentVerificationInterface
+{
+    /**
+     * Default code for mismatching mapping.
+     *
+     * @var string
+     */
+    private static $unavailableCode = 'U';
+
+    /**
+     * List of mapping AVS codes
+     *
+     * @var array
+     */
+    private static $avsMap = [
+        'YY' => 'Y',
+        'NY' => 'A',
+        'YN' => 'Z',
+        'NN' => 'N'
+    ];
+
+    /**
+     * Gets payment AVS verification code.
+     *
+     * @param OrderPaymentInterface $orderPayment
+     * @return string
+     * @throws \InvalidArgumentException If specified order payment has different payment method code.
+     */
+    public function getCode(OrderPaymentInterface $orderPayment)
+    {
+        if ($orderPayment->getMethod() !== Config::METHOD_PAYFLOWPRO) {
+            throw new \InvalidArgumentException(
+                'The "' . $orderPayment->getMethod() . '" does not supported by Payflow AVS mapper.'
+            );
+        }
+
+        $additionalInfo = $orderPayment->getAdditionalInformation();
+        if (empty($additionalInfo[Info::PAYPAL_AVSADDR]) ||
+            empty($additionalInfo[Info::PAYPAL_AVSZIP])
+        ) {
+            return self::$unavailableCode;
+        }
+
+        $streetCode = $additionalInfo[Info::PAYPAL_AVSADDR];
+        $zipCode = $additionalInfo[Info::PAYPAL_AVSZIP];
+        $key = $zipCode . $streetCode;
+
+        return isset(self::$avsMap[$key]) ? self::$avsMap[$key] : self::$unavailableCode;
+    }
+}
diff --git a/app/code/Magento/Paypal/Model/Payflow/CvvEmsCodeMapper.php b/app/code/Magento/Paypal/Model/Payflow/CvvEmsCodeMapper.php
new file mode 100644
index 0000000000000..214881504b4c3
--- /dev/null
+++ b/app/code/Magento/Paypal/Model/Payflow/CvvEmsCodeMapper.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Paypal\Model\Payflow;
+
+use Magento\Paypal\Model\Config;
+use Magento\Paypal\Model\Info;
+use Magento\Payment\Api\PaymentVerificationInterface;
+use Magento\Sales\Api\Data\OrderPaymentInterface;
+
+/**
+ * Processes CVV codes mapping from PayPal Payflow transaction to
+ * electronic merchant systems standard.
+ *
+ * @see https://developer.paypal.com/docs/classic/payflow/integration-guide/#credit-card-transaction-responses
+ * @see http://www.emsecommerce.net/avs_cvv2_response_codes.htm
+ */
+class CvvEmsCodeMapper implements PaymentVerificationInterface
+{
+    /**
+     * Default code for mismatch mapping
+     *
+     * @var string
+     */
+    private static $notProvidedCode = 'P';
+
+    /**
+     * List of mapping CVV codes
+     *
+     * @var array
+     */
+    private static $cvvMap = [
+        'Y' => 'M',
+        'N' => 'N'
+    ];
+
+    /**
+     * Gets payment CVV verification code.
+     *
+     * @param OrderPaymentInterface $orderPayment
+     * @return string
+     * @throws \InvalidArgumentException If specified order payment has different payment method code.
+     */
+    public function getCode(OrderPaymentInterface $orderPayment)
+    {
+        if ($orderPayment->getMethod() !== Config::METHOD_PAYFLOWPRO) {
+            throw new \InvalidArgumentException(
+                'The "' . $orderPayment->getMethod() . '" does not supported by Payflow CVV mapper.'
+            );
+        }
+
+        $additionalInfo = $orderPayment->getAdditionalInformation();
+        if (empty($additionalInfo[Info::PAYPAL_CVV2MATCH])) {
+            return self::$notProvidedCode;
+        }
+
+        $cvv = $additionalInfo[Info::PAYPAL_CVV2MATCH];
+
+        return isset(self::$cvvMap[$cvv]) ? self::$cvvMap[$cvv] : self::$notProvidedCode;
+    }
+}
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/AvsEmsCodeMapperTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/AvsEmsCodeMapperTest.php
new file mode 100644
index 0000000000000..7051903150ba7
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/AvsEmsCodeMapperTest.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Paypal\Test\Unit\Model\Payflow;
+
+use Magento\Paypal\Model\Payflow\AvsEmsCodeMapper;
+use Magento\Paypal\Model\Config;
+use Magento\Paypal\Model\Info;
+use Magento\Sales\Api\Data\OrderPaymentInterface;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+class AvsEmsCodeMapperTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var AvsEmsCodeMapper
+     */
+    private $mapper;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->mapper = new AvsEmsCodeMapper();
+    }
+
+    /**
+     * Checks different variations for AVS codes mapping.
+     *
+     * @covers \Magento\Paypal\Model\Payflow\AvsEmsCodeMapper::getCode
+     * @param string $avsZip
+     * @param string $avsStreet
+     * @param string $expected
+     * @dataProvider getCodeDataProvider
+     */
+    public function testGetCode($avsZip, $avsStreet, $expected)
+    {
+        /** @var OrderPaymentInterface|MockObject $orderPayment */
+        $orderPayment = $this->getMockBuilder(OrderPaymentInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $orderPayment->expects(self::once())
+            ->method('getMethod')
+            ->willReturn(Config::METHOD_PAYFLOWPRO);
+
+        $orderPayment->expects(self::once())
+            ->method('getAdditionalInformation')
+            ->willReturn([
+                Info::PAYPAL_AVSZIP => $avsZip,
+                Info::PAYPAL_AVSADDR => $avsStreet
+            ]);
+
+        self::assertEquals($expected, $this->mapper->getCode($orderPayment));
+    }
+
+    /**
+     * Checks a test case, when payment order is not Payflow payment method.
+     *
+     * @covers \Magento\Paypal\Model\Payflow\AvsEmsCodeMapper::getCode
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage The "some_payment" does not supported by Payflow AVS mapper.
+     */
+    public function testGetCodeWithException()
+    {
+        /** @var OrderPaymentInterface|MockObject $orderPayment */
+        $orderPayment = $this->getMockBuilder(OrderPaymentInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $orderPayment->expects(self::exactly(2))
+            ->method('getMethod')
+            ->willReturn('some_payment');
+
+        $this->mapper->getCode($orderPayment);
+    }
+
+    /**
+     * Gets list of AVS codes.
+     *
+     * @return array
+     */
+    public function getCodeDataProvider()
+    {
+        return [
+            ['avsZip' => null, 'avsStreet' => null, 'expected' => 'U'],
+            ['avsZip' => null, 'avsStreet' => 'Y', 'expected' => 'U'],
+            ['avsZip' => 'Y', 'avsStreet' => null, 'expected' => 'U'],
+            ['avsZip' => 'Y', 'avsStreet' => 'Y', 'expected' => 'Y'],
+            ['avsZip' => 'N', 'avsStreet' => 'Y', 'expected' => 'A'],
+            ['avsZip' => 'Y', 'avsStreet' => 'N', 'expected' => 'Z'],
+            ['avsZip' => 'N', 'avsStreet' => 'N', 'expected' => 'N'],
+            ['avsZip' => 'X', 'avsStreet' => 'Y', 'expected' => 'U'],
+            ['avsZip' => 'N', 'avsStreet' => 'X', 'expected' => 'U'],
+            ['avsZip' => '', 'avsStreet' => 'Y', 'expected' => 'U'],
+            ['avsZip' => 'N', 'avsStreet' => '', 'expected' => 'U']
+        ];
+    }
+}
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/CvvEmsCodeMapperTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/CvvEmsCodeMapperTest.php
new file mode 100644
index 0000000000000..b07c6b4e3f936
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/CvvEmsCodeMapperTest.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Paypal\Test\Unit\Model\Payflow;
+
+use Magento\Paypal\Model\Payflow\CvvEmsCodeMapper;
+use Magento\Paypal\Model\Config;
+use Magento\Paypal\Model\Info;
+use Magento\Sales\Api\Data\OrderPaymentInterface;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+class CvvEmsCodeMapperTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var CvvEmsCodeMapper
+     */
+    private $mapper;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->mapper = new CvvEmsCodeMapper();
+    }
+
+    /**
+     * Checks different variations for cvv codes mapping.
+     *
+     * @covers \Magento\Paypal\Model\Payflow\CvvEmsCodeMapper::getCode
+     * @param string $cvvCode
+     * @param string $expected
+     * @dataProvider getCodeDataProvider
+     */
+    public function testGetCode($cvvCode, $expected)
+    {
+        /** @var OrderPaymentInterface|MockObject $orderPayment */
+        $orderPayment = $this->getMockBuilder(OrderPaymentInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $orderPayment->expects(self::once())
+            ->method('getMethod')
+            ->willReturn(Config::METHOD_PAYFLOWPRO);
+
+        $orderPayment->expects(self::once())
+            ->method('getAdditionalInformation')
+            ->willReturn([Info::PAYPAL_CVV2MATCH => $cvvCode]);
+
+        self::assertEquals($expected, $this->mapper->getCode($orderPayment));
+    }
+
+    /**
+     * Checks a test case, when payment order is not Payflow payment method.
+     *
+     * @covers \Magento\Paypal\Model\Payflow\CvvEmsCodeMapper::getCode
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage The "some_payment" does not supported by Payflow CVV mapper.
+     */
+    public function testGetCodeWithException()
+    {
+        /** @var OrderPaymentInterface|MockObject $orderPayment */
+        $orderPayment = $this->getMockBuilder(OrderPaymentInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $orderPayment->expects(self::exactly(2))
+            ->method('getMethod')
+            ->willReturn('some_payment');
+
+        $this->mapper->getCode($orderPayment);
+    }
+
+    /**
+     * Gets variations of cvv codes and expected mapping result.
+     *
+     * @return array
+     */
+    public function getCodeDataProvider()
+    {
+        return [
+            ['cvvCode' => '', 'expected' => 'P'],
+            ['cvvCode' => null, 'expected' => 'P'],
+            ['cvvCode' => 'Y', 'expected' => 'M'],
+            ['cvvCode' => 'N', 'expected' => 'N'],
+            ['cvvCode' => 'X', 'expected' => 'P']
+        ];
+    }
+}
diff --git a/app/code/Magento/Paypal/etc/config.xml b/app/code/Magento/Paypal/etc/config.xml
index f72b9324beeb5..442c87ad840ca 100644
--- a/app/code/Magento/Paypal/etc/config.xml
+++ b/app/code/Magento/Paypal/etc/config.xml
@@ -91,6 +91,8 @@
                 <cc_year_length>2</cc_year_length>
                 <can_authorize_vault>1</can_authorize_vault>
                 <can_capture_vault>1</can_capture_vault>
+                <avs_ems_adapter>Magento\Paypal\Model\Payflow\AvsEmsCodeMapper</avs_ems_adapter>
+                <cvv_ems_adapter>Magento\Paypal\Model\Payflow\CvvEmsCodeMapper</cvv_ems_adapter>
             </payflowpro>
             <payflowpro_cc_vault>
                <model>PayflowProCreditCardVaultFacade</model>
diff --git a/app/code/Magento/Paypal/view/adminhtml/web/images/AM_mc_vs_dc_ae.jpg b/app/code/Magento/Paypal/view/adminhtml/web/images/AM_mc_vs_dc_ae.jpg
index 962e7d36b6c16..26298ac099d0f 100644
Binary files a/app/code/Magento/Paypal/view/adminhtml/web/images/AM_mc_vs_dc_ae.jpg and b/app/code/Magento/Paypal/view/adminhtml/web/images/AM_mc_vs_dc_ae.jpg differ
diff --git a/app/code/Magento/Paypal/view/adminhtml/web/images/logo-paypal.png b/app/code/Magento/Paypal/view/adminhtml/web/images/logo-paypal.png
index ec4ef3de7eaaf..fdd5a9c9eb28f 100644
Binary files a/app/code/Magento/Paypal/view/adminhtml/web/images/logo-paypal.png and b/app/code/Magento/Paypal/view/adminhtml/web/images/logo-paypal.png differ
diff --git a/app/code/Magento/Paypal/view/adminhtml/web/images/paypal-logo.png b/app/code/Magento/Paypal/view/adminhtml/web/images/paypal-logo.png
index ca7bfd5e5558b..b59dc2e1ea6bc 100644
Binary files a/app/code/Magento/Paypal/view/adminhtml/web/images/paypal-logo.png and b/app/code/Magento/Paypal/view/adminhtml/web/images/paypal-logo.png differ
diff --git a/app/code/Magento/Paypal/view/adminhtml/web/images/pp-allinone.png b/app/code/Magento/Paypal/view/adminhtml/web/images/pp-allinone.png
index 2c62225329223..fa0b2661e9495 100644
Binary files a/app/code/Magento/Paypal/view/adminhtml/web/images/pp-allinone.png and b/app/code/Magento/Paypal/view/adminhtml/web/images/pp-allinone.png differ
diff --git a/app/code/Magento/Paypal/view/adminhtml/web/images/pp-alt.png b/app/code/Magento/Paypal/view/adminhtml/web/images/pp-alt.png
index 0451af060daf3..a8305fa760ff7 100644
Binary files a/app/code/Magento/Paypal/view/adminhtml/web/images/pp-alt.png and b/app/code/Magento/Paypal/view/adminhtml/web/images/pp-alt.png differ
diff --git a/app/code/Magento/Paypal/view/adminhtml/web/images/pp-gateways.png b/app/code/Magento/Paypal/view/adminhtml/web/images/pp-gateways.png
index 5b76c7b390672..d8a1512e6a054 100644
Binary files a/app/code/Magento/Paypal/view/adminhtml/web/images/pp-gateways.png and b/app/code/Magento/Paypal/view/adminhtml/web/images/pp-gateways.png differ
diff --git a/app/code/Magento/Paypal/view/adminhtml/web/images/pp-logo-200px.png b/app/code/Magento/Paypal/view/adminhtml/web/images/pp-logo-200px.png
index 780c84f6c563d..e801ed9b61f27 100644
Binary files a/app/code/Magento/Paypal/view/adminhtml/web/images/pp-logo-200px.png and b/app/code/Magento/Paypal/view/adminhtml/web/images/pp-logo-200px.png differ
diff --git a/app/code/Magento/Paypal/view/adminhtml/web/images/pp-payflow-mark.png b/app/code/Magento/Paypal/view/adminhtml/web/images/pp-payflow-mark.png
index 040f73c6c1dc2..5aef38ba52f51 100644
Binary files a/app/code/Magento/Paypal/view/adminhtml/web/images/pp-payflow-mark.png and b/app/code/Magento/Paypal/view/adminhtml/web/images/pp-payflow-mark.png differ
diff --git a/app/code/Magento/Paypal/view/adminhtml/web/images/pp-uk.png b/app/code/Magento/Paypal/view/adminhtml/web/images/pp-uk.png
index cbed8f986ab1b..41041277e91b3 100644
Binary files a/app/code/Magento/Paypal/view/adminhtml/web/images/pp-uk.png and b/app/code/Magento/Paypal/view/adminhtml/web/images/pp-uk.png differ
diff --git a/app/code/Magento/Paypal/view/adminhtml/web/section.png b/app/code/Magento/Paypal/view/adminhtml/web/section.png
index ec4ef3de7eaaf..fdd5a9c9eb28f 100644
Binary files a/app/code/Magento/Paypal/view/adminhtml/web/section.png and b/app/code/Magento/Paypal/view/adminhtml/web/section.png differ
diff --git a/app/code/Magento/ProductVideo/view/adminhtml/web/images/camera.png b/app/code/Magento/ProductVideo/view/adminhtml/web/images/camera.png
index 468f922ecb12d..bee824192cda9 100644
Binary files a/app/code/Magento/ProductVideo/view/adminhtml/web/images/camera.png and b/app/code/Magento/ProductVideo/view/adminhtml/web/images/camera.png differ
diff --git a/app/code/Magento/ProductVideo/view/adminhtml/web/images/gallery-sprite.png b/app/code/Magento/ProductVideo/view/adminhtml/web/images/gallery-sprite.png
index c2a8a9a2a76e7..7aa6877b626cb 100644
Binary files a/app/code/Magento/ProductVideo/view/adminhtml/web/images/gallery-sprite.png and b/app/code/Magento/ProductVideo/view/adminhtml/web/images/gallery-sprite.png differ
diff --git a/app/code/Magento/ProductVideo/view/frontend/web/img/gallery-sprite.png b/app/code/Magento/ProductVideo/view/frontend/web/img/gallery-sprite.png
index c2a8a9a2a76e7..7aa6877b626cb 100644
Binary files a/app/code/Magento/ProductVideo/view/frontend/web/img/gallery-sprite.png and b/app/code/Magento/ProductVideo/view/frontend/web/img/gallery-sprite.png differ
diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote.php b/app/code/Magento/Quote/Model/ResourceModel/Quote.php
index f9d12628fa0be..e88b57f90826b 100644
--- a/app/code/Magento/Quote/Model/ResourceModel/Quote.php
+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote.php
@@ -242,6 +242,9 @@ public function substractProductFromQuotes($product)
         }
         $connection = $this->getConnection();
         $subSelect = $connection->select();
+        $conditionCheck = $connection->quoteIdentifier('q.items_count') . " > 0";
+        $conditionTrue = $connection->quoteIdentifier('q.items_count') . ' - 1';
+        $ifSql = "IF (" . $conditionCheck . "," . $conditionTrue . ", 0)";
 
         $subSelect->from(
             false,
@@ -249,7 +252,7 @@ public function substractProductFromQuotes($product)
                 'items_qty' => new \Zend_Db_Expr(
                     $connection->quoteIdentifier('q.items_qty') . ' - ' . $connection->quoteIdentifier('qi.qty')
                 ),
-                'items_count' => new \Zend_Db_Expr($connection->quoteIdentifier('q.items_count') . ' - 1')
+                'items_count' => new \Zend_Db_Expr($ifSql)
             ]
         )->join(
             ['qi' => $this->getTable('quote_item')],
diff --git a/app/code/Magento/Sales/Model/ResourceModel/AbstractGrid.php b/app/code/Magento/Sales/Model/ResourceModel/AbstractGrid.php
index 10cbb175c70bc..9da95269ca418 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/AbstractGrid.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/AbstractGrid.php
@@ -67,6 +67,7 @@ public function getGridTable()
     {
         return $this->getTable($this->gridTableName);
     }
+
     /**
      * Purge grid row
      *
@@ -89,6 +90,9 @@ public function purge($value, $field = null)
      *
      * @param string $default
      * @return string
+     * @deprecated this method is not used in abstract model but only in single child so
+     * this deprecation is a part of cleaning abstract classes.
+     * @see \Magento\Sales\Model\ResourceModel\Provider\UpdatedIdListProvider
      */
     protected function getLastUpdatedAtValue($default = '0000-00-00 00:00:00')
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Grid.php b/app/code/Magento/Sales/Model/ResourceModel/Grid.php
index ba3419d0cd96e..f537074ad66f1 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Grid.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Grid.php
@@ -5,9 +5,10 @@
  */
 namespace Magento\Sales\Model\ResourceModel;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DB\Adapter\AdapterInterface;
-use Magento\Sales\Model\ResourceModel\AbstractGrid;
 use Magento\Framework\Model\ResourceModel\Db\Context;
+use Magento\Sales\Model\ResourceModel\Provider\NotSyncedDataProviderInterface;
 
 /**
  * Class Grid
@@ -39,6 +40,11 @@ class Grid extends AbstractGrid
      */
     protected $columns;
 
+    /**
+     * @var NotSyncedDataProviderInterface
+     */
+    private $notSyncedDataProvider;
+
     /**
      * @param Context $context
      * @param string $mainTableName
@@ -47,6 +53,7 @@ class Grid extends AbstractGrid
      * @param array $joins
      * @param array $columns
      * @param string $connectionName
+     * @param NotSyncedDataProviderInterface $notSyncedDataProvider
      */
     public function __construct(
         Context $context,
@@ -55,13 +62,16 @@ public function __construct(
         $orderIdField,
         array $joins = [],
         array $columns = [],
-        $connectionName = null
+        $connectionName = null,
+        NotSyncedDataProviderInterface $notSyncedDataProvider = null
     ) {
         $this->mainTableName = $mainTableName;
         $this->gridTableName = $gridTableName;
         $this->orderIdField = $orderIdField;
         $this->joins = $joins;
         $this->columns = $columns;
+        $this->notSyncedDataProvider =
+            $notSyncedDataProvider ?: ObjectManager::getInstance()->get(NotSyncedDataProviderInterface::class);
         parent::__construct($context, $connectionName);
     }
 
@@ -99,7 +109,10 @@ public function refresh($value, $field = null)
     public function refreshBySchedule()
     {
         $select = $this->getGridOriginSelect()
-            ->where($this->mainTableName . '.updated_at >= ?', $this->getLastUpdatedAtValue());
+            ->where(
+                $this->mainTableName . '.entity_id IN (?)',
+                $this->notSyncedDataProvider->getIds($this->mainTableName, $this->gridTableName)
+            );
 
         return $this->getConnection()->query(
             $this->getConnection()
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Provider/NotSyncedDataProvider.php b/app/code/Magento/Sales/Model/ResourceModel/Provider/NotSyncedDataProvider.php
new file mode 100644
index 0000000000000..8215eaaf0ad2e
--- /dev/null
+++ b/app/code/Magento/Sales/Model/ResourceModel/Provider/NotSyncedDataProvider.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sales\Model\ResourceModel\Provider;
+
+use Magento\Framework\ObjectManager\TMapFactory;
+
+/**
+ * Implements NotSyncedDataProviderInterface as composite
+ */
+class NotSyncedDataProvider implements NotSyncedDataProviderInterface
+{
+    /**
+     * @var NotSyncedDataProviderInterface[]
+     */
+    private $providers;
+
+    /**
+     * @param TMapFactory $tmapFactory
+     * @param array $providers
+     */
+    public function __construct(
+        TMapFactory $tmapFactory,
+        array $providers = []
+    ) {
+        $this->providers = $tmapFactory->create(
+            [
+                'array' => $providers,
+                'type' => NotSyncedDataProviderInterface::class
+            ]
+        );
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getIds($mainTableName, $gridTableName)
+    {
+        $result = [];
+        foreach ($this->providers as $provider) {
+            $result = array_merge($result, $provider->getIds($mainTableName, $gridTableName));
+        }
+
+        return array_unique($result);
+    }
+}
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Provider/NotSyncedDataProviderInterface.php b/app/code/Magento/Sales/Model/ResourceModel/Provider/NotSyncedDataProviderInterface.php
new file mode 100644
index 0000000000000..489e771d968b5
--- /dev/null
+++ b/app/code/Magento/Sales/Model/ResourceModel/Provider/NotSyncedDataProviderInterface.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sales\Model\ResourceModel\Provider;
+
+/**
+ * Interface provides entities id list that should be updated in grid
+ */
+interface NotSyncedDataProviderInterface
+{
+    /**
+     * Returns id list of entities for adding or updating in grid.
+     *
+     * @param string $mainTableName source table name
+     * @param string $gridTableName grid table name
+     * @return array
+     */
+    public function getIds($mainTableName, $gridTableName);
+}
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Provider/UpdatedIdListProvider.php b/app/code/Magento/Sales/Model/ResourceModel/Provider/UpdatedIdListProvider.php
new file mode 100644
index 0000000000000..dd589ef9316cd
--- /dev/null
+++ b/app/code/Magento/Sales/Model/ResourceModel/Provider/UpdatedIdListProvider.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sales\Model\ResourceModel\Provider;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+
+/**
+ * Provides latest updated entities ids list
+ */
+class UpdatedIdListProvider implements NotSyncedDataProviderInterface
+{
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var AdapterInterface
+     */
+    private $connection;
+
+    /**
+     * NotSyncedDataProvider constructor.
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(
+        ResourceConnection $resourceConnection
+    ) {
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getIds($mainTableName, $gridTableName)
+    {
+        $select = $this->getConnection()->select()
+            ->from($this->getConnection()->getTableName($mainTableName), [$mainTableName.'.entity_id'])
+            ->joinLeft(
+                [$gridTableName => $this->getConnection()->getTableName($gridTableName)],
+                sprintf(
+                    '%s.%s = %s.%s',
+                    $mainTableName,
+                    'entity_id',
+                    $gridTableName,
+                    'entity_id'
+                ),
+                []
+            )
+            ->where($gridTableName.'.entity_id IS NULL');
+
+        return $this->getConnection()->fetchAll($select, [], \Zend_Db::FETCH_COLUMN);
+    }
+
+    /**
+     * Returns connection.
+     *
+     * @return AdapterInterface
+     */
+    private function getConnection()
+    {
+        if (!$this->connection) {
+            $this->connection = $this->resourceConnection->getConnection('sales');
+        }
+
+        return $this->connection;
+    }
+}
diff --git a/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Provider/NotSyncedDataProviderTest.php b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Provider/NotSyncedDataProviderTest.php
new file mode 100644
index 0000000000000..92a40e2638fe8
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Provider/NotSyncedDataProviderTest.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sales\Test\Unit\Model\ResourceModel\Provider;
+
+use Magento\Framework\ObjectManager\TMap;
+use Magento\Framework\ObjectManager\TMapFactory;
+use Magento\Sales\Model\ResourceModel\Provider\NotSyncedDataProvider;
+use Magento\Sales\Model\ResourceModel\Provider\NotSyncedDataProviderInterface;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * Class NotSyncedDataProviderTest
+ */
+class NotSyncedDataProviderTest extends \PHPUnit_Framework_TestCase
+{
+    public function testGetIdsEmpty()
+    {
+        /** @var TMapFactory|MockObject $tMapFactory */
+        $tMapFactory = $this->getMockBuilder(TMapFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $tMap = $this->getMockBuilder(TMap::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $tMapFactory->expects(static::once())
+            ->method('create')
+            ->with(
+                [
+                    'array' => [],
+                    'type' => NotSyncedDataProviderInterface::class
+                ]
+            )
+            ->willReturn($tMap);
+        $tMap->expects(static::once())
+            ->method('getIterator')
+            ->willReturn(new \ArrayIterator([]));
+
+        $provider = new NotSyncedDataProvider($tMapFactory, []);
+        static::assertEquals([], $provider->getIds('main_table', 'grid_table'));
+    }
+
+    /**
+     * @covers \Magento\Sales\Model\ResourceModel\Provider\NotSyncedDataProvider::getIds
+     */
+    public function testGetIds()
+    {
+        /** @var TMapFactory|MockObject $tMapFactory */
+        $tMapFactory = $this->getMockBuilder(TMapFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $tMap = $this->getMockBuilder(TMap::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $provider1 = $this->getMockBuilder(NotSyncedDataProviderInterface::class)
+            ->getMockForAbstractClass();
+        $provider1->expects(static::once())
+            ->method('getIds')
+            ->willReturn([1, 2]);
+
+        $provider2 = $this->getMockBuilder(NotSyncedDataProviderInterface::class)
+            ->getMockForAbstractClass();
+        $provider2->expects(static::once())
+            ->method('getIds')
+            ->willReturn([2, 3, 4]);
+
+        $tMapFactory->expects(static::once())
+            ->method('create')
+            ->with(
+                [
+                    'array' => [
+                        'provider1' => NotSyncedDataProviderInterface::class,
+                        'provider2' => NotSyncedDataProviderInterface::class
+                    ],
+                    'type' => NotSyncedDataProviderInterface::class
+                ]
+            )
+            ->willReturn($tMap);
+        $tMap->expects(static::once())
+            ->method('getIterator')
+            ->willReturn(new \ArrayIterator([$provider1, $provider2]));
+
+        $provider = new NotSyncedDataProvider(
+            $tMapFactory,
+            [
+                'provider1' => NotSyncedDataProviderInterface::class,
+                'provider2' => NotSyncedDataProviderInterface::class,
+            ]
+        );
+
+        static::assertEquals([1, 2, 3, 4], array_values($provider->getIds('main_table', 'grid_table')));
+    }
+}
diff --git a/app/code/Magento/Sales/etc/di.xml b/app/code/Magento/Sales/etc/di.xml
index 91e5f07e7f61a..0f14946c89a42 100644
--- a/app/code/Magento/Sales/etc/di.xml
+++ b/app/code/Magento/Sales/etc/di.xml
@@ -114,6 +114,14 @@
     <preference for="Magento\Sales\Model\Order\Creditmemo\NotifierInterface" type="Magento\Sales\Model\Order\Creditmemo\Notifier"/>
     <preference for="Magento\Sales\Api\RefundOrderInterface" type="Magento\Sales\Model\RefundOrder"/>
     <preference for="Magento\Sales\Api\RefundInvoiceInterface" type="Magento\Sales\Model\RefundInvoice"/>
+    <preference for="Magento\Sales\Model\ResourceModel\Provider\NotSyncedDataProviderInterface" type="Magento\Sales\Model\ResourceModel\Provider\NotSyncedDataProvider" />
+    <type name="Magento\Sales\Model\ResourceModel\Provider\NotSyncedDataProvider">
+        <arguments>
+            <argument name="providers" xsi:type="array">
+                <item name="default" xsi:type="string">Magento\Sales\Model\ResourceModel\Provider\UpdatedIdListProvider</item>
+            </argument>
+        </arguments>
+    </type>
     <type name="Magento\Sales\Model\ResourceModel\Report" shared="false"/>
     <type name="Magento\Sales\Model\Order\Pdf\Config\Reader">
         <arguments>
diff --git a/app/code/Magento/Shipping/view/frontend/templates/tracking/details.phtml b/app/code/Magento/Shipping/view/frontend/templates/tracking/details.phtml
index 533235f6f20fa..1f7a344b15acf 100644
--- a/app/code/Magento/Shipping/view/frontend/templates/tracking/details.phtml
+++ b/app/code/Magento/Shipping/view/frontend/templates/tracking/details.phtml
@@ -8,6 +8,7 @@
 
 /** @var $block \Magento\Framework\View\Element\Template */
 
+$parentBlock = $block->getParentBlock();
 $track = $block->getData('track');
 $email = $block->getData('storeSupportEmail');
 $fields = [
@@ -18,14 +19,15 @@ $fields = [
     'Service Type' => 'getService',
     'Weight' => 'getWeight',
 ];
+$number = is_object($track) ? $track->getTracking() : $track['number'];
 ?>
-<table class="data table order tracking" id="tracking-table-popup-<?php /* @noEscape */ echo $track->getTracking(); ?>">
+<table class="data table order tracking" id="tracking-table-popup-<?php /* @noEscape */ echo $number; ?>">
     <caption class="table-caption"><?php echo $block->escapeHtml(__('Order tracking')); ?></caption>
     <tbody>
     <?php if (is_object($track)): ?>
         <tr>
             <th class="col label" scope="row"><?php echo $block->escapeHtml(__('Tracking Number:')); ?></th>
-            <td class="col value"><?php echo $block->escapeHtml($track->getTracking()); ?></td>
+            <td class="col value"><?php echo $block->escapeHtml($number); ?></td>
         </tr>
         <?php if ($track->getCarrierTitle()): ?>
             <tr>
@@ -38,8 +40,8 @@ $fields = [
                 <th class="col label" scope="row"><?php echo $block->escapeHtml(__('Error:')); ?></th>
                 <td class="col error">
                     <?php echo $block->escapeHtml(__('Tracking information is currently not available. Please ')); ?>
-                    <?php if ($block->getContactUsEnabled()) : ?>
-                        <a href="<?php echo $block->escapeUrl($block->getContactUs()); ?>" target="_blank"
+                    <?php if ($parentBlock->getContactUsEnabled()) : ?>
+                        <a href="<?php echo $block->escapeUrl($parentBlock->getContactUs()); ?>" target="_blank"
                            title="<?php echo $block->escapeHtml(__('contact us')); ?>">
                             <?php echo $block->escapeHtml(__('contact us')); ?>
                         </a>
@@ -77,7 +79,7 @@ $fields = [
                 <tr>
                     <th class="col label" scope="row"><?php echo $block->escapeHtml(__('Delivered on:')); ?></th>
                     <td class="col value">
-                        <?php /* @noEscape */ echo $block->formatDeliveryDateTime($track->getDeliverydate(), $track->getDeliverytime()); ?>
+                        <?php /* @noEscape */ echo $parentBlock->formatDeliveryDateTime($track->getDeliverydate(), $track->getDeliverytime()); ?>
                     </td>
                 </tr>
             <?php endif; ?>
diff --git a/app/code/Magento/Shipping/view/frontend/templates/tracking/popup.phtml b/app/code/Magento/Shipping/view/frontend/templates/tracking/popup.phtml
index b695f024cde47..fb17a79b7c22b 100644
--- a/app/code/Magento/Shipping/view/frontend/templates/tracking/popup.phtml
+++ b/app/code/Magento/Shipping/view/frontend/templates/tracking/popup.phtml
@@ -31,7 +31,7 @@ $results = $block->getTrackingInfo();
                         ?>
                         <?php /* @noEscape */ echo $block->getChildHtml('shipping.tracking.details.' . $counter); ?>
                     </div>
-                    <?php if (!empty($track->getProgressdetail())): ?>
+                    <?php if (is_object($track) && !empty($track->getProgressdetail())): ?>
                         <?php
                             $block->addChild('shipping.tracking.progress.'. $counter, Template::class, [
                                 'track' => $track,
diff --git a/app/code/Magento/Shipping/view/frontend/templates/tracking/progress.phtml b/app/code/Magento/Shipping/view/frontend/templates/tracking/progress.phtml
index 9022a5815824b..54dbfb5377e88 100644
--- a/app/code/Magento/Shipping/view/frontend/templates/tracking/progress.phtml
+++ b/app/code/Magento/Shipping/view/frontend/templates/tracking/progress.phtml
@@ -7,6 +7,7 @@
 // @codingStandardsIgnoreFile
 
 /** @var $block \Magento\Framework\View\Element\Template */
+$parentBlock = $block->getParentBlock();
 $track = $block->getData('track');
 ?>
 <div class="table-wrapper">
@@ -22,8 +23,8 @@ $track = $block->getData('track');
         </thead>
         <tbody>
         <?php foreach ($track->getProgressdetail() as $detail): ?>
-            <?php $detailDate = (!empty($detail['deliverydate']) ? $block->formatDeliveryDate($detail['deliverydate']) : ''); ?>
-            <?php $detailTime = (!empty($detail['deliverytime']) ? $block->formatDeliveryTime($detail['deliverytime'], $detail['deliverydate']) : ''); ?>
+            <?php $detailDate = (!empty($detail['deliverydate']) ? $parentBlock->formatDeliveryDate($detail['deliverydate']) : ''); ?>
+            <?php $detailTime = (!empty($detail['deliverytime']) ? $parentBlock->formatDeliveryTime($detail['deliverytime'], $detail['deliverydate']) : ''); ?>
             <tr>
                 <td data-th="<?php echo $block->escapeHtml(__('Location')); ?>" class="col location">
                     <?php echo(!empty($detail['deliverylocation']) ? $block->escapeHtml($detail['deliverylocation']) : ''); ?>
diff --git a/app/code/Magento/Swagger/view/frontend/templates/swagger-ui/index.phtml b/app/code/Magento/Swagger/view/frontend/templates/swagger-ui/index.phtml
index 059fdb7fb2a8d..567e983cf3466 100644
--- a/app/code/Magento/Swagger/view/frontend/templates/swagger-ui/index.phtml
+++ b/app/code/Magento/Swagger/view/frontend/templates/swagger-ui/index.phtml
@@ -9,12 +9,12 @@
  *
  * The original name of this file, as part of the swagger-ui package, was dist/index.html.
  *
- * Modified by Magento, Modifications Copyright © 2016 Magento.
+ * Modified by Magento, Modifications Copyright © 2013-2017 Magento.
  */
 
 /** @var \Magento\Framework\View\Element\Template $block */
 
-$schemaUrl = rtrim($block->getBaseUrl(), '/') . '/rest/default/schema?services=all';
+$schemaUrl = rtrim($block->getBaseUrl(), '/') . '/rest/all/schema?services=all';
 ?>
 
 <div id='header'>
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/explorer_icons.png b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/explorer_icons.png
index ed9d2fffb64a2..137a9782e8c25 100644
Binary files a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/explorer_icons.png and b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/explorer_icons.png differ
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/favicon-16x16.png b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/favicon-16x16.png
index 66b1a5bfb9ead..bccf3ce87d25f 100755
Binary files a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/favicon-16x16.png and b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/favicon-16x16.png differ
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/favicon-32x32.png b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/favicon-32x32.png
index 32f319f89bd07..ed6f12af1b392 100755
Binary files a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/favicon-32x32.png and b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/favicon-32x32.png differ
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/logo_small.png b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/logo_small.png
index 5496a65579ae9..9d87c622b9b7f 100644
Binary files a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/logo_small.png and b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/logo_small.png differ
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/pet_store_api.png b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/pet_store_api.png
index f9f9cd4aeb35a..c1e90ff0efd42 100644
Binary files a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/pet_store_api.png and b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/pet_store_api.png differ
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/throbber.gif b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/throbber.gif
index 06393889242fb..b75ed2b735d92 100644
Binary files a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/throbber.gif and b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/throbber.gif differ
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/wordnik_api.png b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/wordnik_api.png
index dca4f1455ac45..962d2a12674d0 100644
Binary files a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/wordnik_api.png and b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/wordnik_api.png differ
diff --git a/app/code/Magento/Theme/view/adminhtml/web/calendar.png b/app/code/Magento/Theme/view/adminhtml/web/calendar.png
index 40bc9bbb41da2..20dbe6d1a3b8c 100644
Binary files a/app/code/Magento/Theme/view/adminhtml/web/calendar.png and b/app/code/Magento/Theme/view/adminhtml/web/calendar.png differ
diff --git a/app/code/Magento/Theme/view/adminhtml/web/fam_book_open.png b/app/code/Magento/Theme/view/adminhtml/web/fam_book_open.png
index 5b4b38154b37f..79508bf9e47c6 100644
Binary files a/app/code/Magento/Theme/view/adminhtml/web/fam_book_open.png and b/app/code/Magento/Theme/view/adminhtml/web/fam_book_open.png differ
diff --git a/app/code/Magento/Theme/view/adminhtml/web/images/bkg_movable-arrows.png b/app/code/Magento/Theme/view/adminhtml/web/images/bkg_movable-arrows.png
index 1d350acbaabd1..84cd4e6182551 100644
Binary files a/app/code/Magento/Theme/view/adminhtml/web/images/bkg_movable-arrows.png and b/app/code/Magento/Theme/view/adminhtml/web/images/bkg_movable-arrows.png differ
diff --git a/app/code/Magento/Theme/view/adminhtml/web/theme/default_preview.jpg b/app/code/Magento/Theme/view/adminhtml/web/theme/default_preview.jpg
index cbb5fb103470f..9b6996dba43cb 100644
Binary files a/app/code/Magento/Theme/view/adminhtml/web/theme/default_preview.jpg and b/app/code/Magento/Theme/view/adminhtml/web/theme/default_preview.jpg differ
diff --git a/app/code/Magento/Theme/view/frontend/web/calendar.png b/app/code/Magento/Theme/view/frontend/web/calendar.png
index 40bc9bbb41da2..20dbe6d1a3b8c 100644
Binary files a/app/code/Magento/Theme/view/frontend/web/calendar.png and b/app/code/Magento/Theme/view/frontend/web/calendar.png differ
diff --git a/app/code/Magento/Theme/view/frontend/web/fam_book_open.png b/app/code/Magento/Theme/view/frontend/web/fam_book_open.png
index 5b4b38154b37f..79508bf9e47c6 100644
Binary files a/app/code/Magento/Theme/view/frontend/web/fam_book_open.png and b/app/code/Magento/Theme/view/frontend/web/fam_book_open.png differ
diff --git a/app/code/Magento/Theme/view/frontend/web/images/validation_advice_bg.gif b/app/code/Magento/Theme/view/frontend/web/images/validation_advice_bg.gif
index 078a87b3e62ef..c528619c3aaec 100644
Binary files a/app/code/Magento/Theme/view/frontend/web/images/validation_advice_bg.gif and b/app/code/Magento/Theme/view/frontend/web/images/validation_advice_bg.gif differ
diff --git a/app/code/Magento/Translation/view/frontend/web/translate_edit_icon.png b/app/code/Magento/Translation/view/frontend/web/translate_edit_icon.png
index 1f4fde9627244..c0eabf47000c9 100644
Binary files a/app/code/Magento/Translation/view/frontend/web/translate_edit_icon.png and b/app/code/Magento/Translation/view/frontend/web/translate_edit_icon.png differ
diff --git a/app/code/Magento/Translation/view/frontend/web/translate_edit_icon_hover.png b/app/code/Magento/Translation/view/frontend/web/translate_edit_icon_hover.png
index 9361ec4f80040..0c36815e6caee 100644
Binary files a/app/code/Magento/Translation/view/frontend/web/translate_edit_icon_hover.png and b/app/code/Magento/Translation/view/frontend/web/translate_edit_icon_hover.png differ
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Options.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Options.php
index 61270b4219e8c..13231cddbc64b 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Options.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Options.php
@@ -163,6 +163,8 @@ protected function _addField($parameter)
             }
         }
 
+        $data['value'] = html_entity_decode($data['value']);
+
         // prepare element dropdown values
         if ($values = $parameter->getValues()) {
             // dropdown options are specified in configuration
diff --git a/app/code/Magento/Widget/view/adminhtml/web/placeholder.gif b/app/code/Magento/Widget/view/adminhtml/web/placeholder.gif
index 7151648527652..e750b2676e1a6 100644
Binary files a/app/code/Magento/Widget/view/adminhtml/web/placeholder.gif and b/app/code/Magento/Widget/view/adminhtml/web/placeholder.gif differ
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/images/logo-magento.png b/app/design/adminhtml/Magento/backend/Magento_Backend/web/images/logo-magento.png
index 24640e7e37e3d..d9395c938cbff 100644
Binary files a/app/design/adminhtml/Magento/backend/Magento_Backend/web/images/logo-magento.png and b/app/design/adminhtml/Magento/backend/Magento_Backend/web/images/logo-magento.png differ
diff --git a/app/design/adminhtml/Magento/backend/Magento_Signifyd/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_Signifyd/web/css/source/_module.less
index 7449dce5e2ebb..994a26c12095c 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Signifyd/web/css/source/_module.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Signifyd/web/css/source/_module.less
@@ -11,3 +11,13 @@
   &:extend(.abs-order-tables all);
   &:extend(.abs-order-tbody-border all);
 }
+
+//
+//  Layout
+//  ---------------------------------------------
+.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
+  .case-information {
+    float: left;
+    #mix-grid .width(6,12);
+  }
+}
diff --git a/app/design/adminhtml/Magento/backend/Magento_Ui/web/images/choice_bkg.png b/app/design/adminhtml/Magento/backend/Magento_Ui/web/images/choice_bkg.png
index ee23e18adf886..068f308101c88 100644
Binary files a/app/design/adminhtml/Magento/backend/Magento_Ui/web/images/choice_bkg.png and b/app/design/adminhtml/Magento/backend/Magento_Ui/web/images/choice_bkg.png differ
diff --git a/app/design/adminhtml/Magento/backend/web/images/ajax-loader-small.gif b/app/design/adminhtml/Magento/backend/web/images/ajax-loader-small.gif
index 82d06cc97f0b9..0fa9f5af614c5 100644
Binary files a/app/design/adminhtml/Magento/backend/web/images/ajax-loader-small.gif and b/app/design/adminhtml/Magento/backend/web/images/ajax-loader-small.gif differ
diff --git a/app/design/adminhtml/Magento/backend/web/images/ajax-loader-tr.gif b/app/design/adminhtml/Magento/backend/web/images/ajax-loader-tr.gif
index 6f7e682717516..eb5c0f77d7c49 100644
Binary files a/app/design/adminhtml/Magento/backend/web/images/ajax-loader-tr.gif and b/app/design/adminhtml/Magento/backend/web/images/ajax-loader-tr.gif differ
diff --git a/app/design/adminhtml/Magento/backend/web/images/ajax-loader.gif b/app/design/adminhtml/Magento/backend/web/images/ajax-loader.gif
index 900778fc70475..00ff400dd27fa 100644
Binary files a/app/design/adminhtml/Magento/backend/web/images/ajax-loader.gif and b/app/design/adminhtml/Magento/backend/web/images/ajax-loader.gif differ
diff --git a/app/design/adminhtml/Magento/backend/web/images/fam_application_form_delete.png b/app/design/adminhtml/Magento/backend/web/images/fam_application_form_delete.png
index 99a573e57aae1..eb7049d2b031f 100644
Binary files a/app/design/adminhtml/Magento/backend/web/images/fam_application_form_delete.png and b/app/design/adminhtml/Magento/backend/web/images/fam_application_form_delete.png differ
diff --git a/app/design/adminhtml/Magento/backend/web/images/fam_leaf.png b/app/design/adminhtml/Magento/backend/web/images/fam_leaf.png
index e36df9a71cfb3..76ee6a1269a69 100644
Binary files a/app/design/adminhtml/Magento/backend/web/images/fam_leaf.png and b/app/design/adminhtml/Magento/backend/web/images/fam_leaf.png differ
diff --git a/app/design/adminhtml/Magento/backend/web/images/grouped_to_order_icon.png b/app/design/adminhtml/Magento/backend/web/images/grouped_to_order_icon.png
index bc4b39d552b9f..09d3a07ef66f6 100644
Binary files a/app/design/adminhtml/Magento/backend/web/images/grouped_to_order_icon.png and b/app/design/adminhtml/Magento/backend/web/images/grouped_to_order_icon.png differ
diff --git a/app/design/adminhtml/Magento/backend/web/images/process_spinner.gif b/app/design/adminhtml/Magento/backend/web/images/process_spinner.gif
index 678f35d268af5..510ee3d0aab9d 100644
Binary files a/app/design/adminhtml/Magento/backend/web/images/process_spinner.gif and b/app/design/adminhtml/Magento/backend/web/images/process_spinner.gif differ
diff --git a/app/design/adminhtml/Magento/backend/web/images/rating-bg.png b/app/design/adminhtml/Magento/backend/web/images/rating-bg.png
index 73aed78e30151..0c8744f4bdb88 100644
Binary files a/app/design/adminhtml/Magento/backend/web/images/rating-bg.png and b/app/design/adminhtml/Magento/backend/web/images/rating-bg.png differ
diff --git a/app/design/adminhtml/Magento/backend/web/images/rule_component_add.gif b/app/design/adminhtml/Magento/backend/web/images/rule_component_add.gif
index d44e6e745014d..9ca93ee43d453 100644
Binary files a/app/design/adminhtml/Magento/backend/web/images/rule_component_add.gif and b/app/design/adminhtml/Magento/backend/web/images/rule_component_add.gif differ
diff --git a/app/design/adminhtml/Magento/backend/web/images/subconfig-bg.png b/app/design/adminhtml/Magento/backend/web/images/subconfig-bg.png
index 753b23a6e6c5d..ab09ef4b274fc 100644
Binary files a/app/design/adminhtml/Magento/backend/web/images/subconfig-bg.png and b/app/design/adminhtml/Magento/backend/web/images/subconfig-bg.png differ
diff --git a/app/design/adminhtml/Magento/backend/web/images/switcher.png b/app/design/adminhtml/Magento/backend/web/images/switcher.png
index 1488d105783c0..f2b59c5cde567 100644
Binary files a/app/design/adminhtml/Magento/backend/web/images/switcher.png and b/app/design/adminhtml/Magento/backend/web/images/switcher.png differ
diff --git a/app/design/adminhtml/Magento/backend/web/mui/images/ajax-loader-big.gif b/app/design/adminhtml/Magento/backend/web/mui/images/ajax-loader-big.gif
index 1612bcee36660..460734dfdadec 100644
Binary files a/app/design/adminhtml/Magento/backend/web/mui/images/ajax-loader-big.gif and b/app/design/adminhtml/Magento/backend/web/mui/images/ajax-loader-big.gif differ
diff --git a/app/design/adminhtml/Magento/backend/web/mui/images/ajax-loader-small.gif b/app/design/adminhtml/Magento/backend/web/mui/images/ajax-loader-small.gif
index 82d06cc97f0b9..0fa9f5af614c5 100644
Binary files a/app/design/adminhtml/Magento/backend/web/mui/images/ajax-loader-small.gif and b/app/design/adminhtml/Magento/backend/web/mui/images/ajax-loader-small.gif differ
diff --git a/app/design/adminhtml/Magento/backend/web/mui/images/ajax-loader-white.gif b/app/design/adminhtml/Magento/backend/web/mui/images/ajax-loader-white.gif
index 0b13e560655bc..2db577143f0cf 100644
Binary files a/app/design/adminhtml/Magento/backend/web/mui/images/ajax-loader-white.gif and b/app/design/adminhtml/Magento/backend/web/mui/images/ajax-loader-white.gif differ
diff --git a/app/design/adminhtml/Magento/backend/web/mui/images/ajax-loader.gif b/app/design/adminhtml/Magento/backend/web/mui/images/ajax-loader.gif
index 579f187dc0341..0ee1521cfd3d4 100644
Binary files a/app/design/adminhtml/Magento/backend/web/mui/images/ajax-loader.gif and b/app/design/adminhtml/Magento/backend/web/mui/images/ajax-loader.gif differ
diff --git a/app/design/adminhtml/Magento/backend/web/mui/images/pagination-arrows-bg.png b/app/design/adminhtml/Magento/backend/web/mui/images/pagination-arrows-bg.png
index c587f1731c53f..26aec64fd5238 100644
Binary files a/app/design/adminhtml/Magento/backend/web/mui/images/pagination-arrows-bg.png and b/app/design/adminhtml/Magento/backend/web/mui/images/pagination-arrows-bg.png differ
diff --git a/app/design/adminhtml/Magento/backend/web/mui/images/sorter-bg.png b/app/design/adminhtml/Magento/backend/web/mui/images/sorter-bg.png
index 45a0b8d86f3b9..54de63fa5350e 100644
Binary files a/app/design/adminhtml/Magento/backend/web/mui/images/sorter-bg.png and b/app/design/adminhtml/Magento/backend/web/mui/images/sorter-bg.png differ
diff --git a/app/design/adminhtml/Magento/backend/web/mui/images/view-mode-bg.png b/app/design/adminhtml/Magento/backend/web/mui/images/view-mode-bg.png
index e857c6f99e85d..9137d15b862a3 100644
Binary files a/app/design/adminhtml/Magento/backend/web/mui/images/view-mode-bg.png and b/app/design/adminhtml/Magento/backend/web/mui/images/view-mode-bg.png differ
diff --git a/app/design/frontend/Magento/blank/media/preview.jpg b/app/design/frontend/Magento/blank/media/preview.jpg
index 517c41a290881..61be74876a1e9 100644
Binary files a/app/design/frontend/Magento/blank/media/preview.jpg and b/app/design/frontend/Magento/blank/media/preview.jpg differ
diff --git a/app/design/frontend/Magento/luma/Magento_Customer/web/images/icn_checkout.png b/app/design/frontend/Magento/luma/Magento_Customer/web/images/icn_checkout.png
index 123d62c69c59c..3083c5e383a38 100644
Binary files a/app/design/frontend/Magento/luma/Magento_Customer/web/images/icn_checkout.png and b/app/design/frontend/Magento/luma/Magento_Customer/web/images/icn_checkout.png differ
diff --git a/app/design/frontend/Magento/luma/media/preview.jpg b/app/design/frontend/Magento/luma/media/preview.jpg
index f8cbe92056149..feeda8840e562 100644
Binary files a/app/design/frontend/Magento/luma/media/preview.jpg and b/app/design/frontend/Magento/luma/media/preview.jpg differ
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/test_image.jpg b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/test_image.jpg
index ed6e4decf1509..5fbf7dbc09e3d 100644
Binary files a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/test_image.jpg and b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/test_image.jpg differ
diff --git a/dev/tests/api-functional/testsuite/Magento/Customer/Api/_files/buttons.png b/dev/tests/api-functional/testsuite/Magento/Customer/Api/_files/buttons.png
index 1e53560e0aa7b..6e385e152444f 100644
Binary files a/dev/tests/api-functional/testsuite/Magento/Customer/Api/_files/buttons.png and b/dev/tests/api-functional/testsuite/Magento/Customer/Api/_files/buttons.png differ
diff --git a/dev/tests/api-functional/testsuite/Magento/Customer/Api/_files/test_image.jpg b/dev/tests/api-functional/testsuite/Magento/Customer/Api/_files/test_image.jpg
index ed6e4decf1509..5fbf7dbc09e3d 100644
Binary files a/dev/tests/api-functional/testsuite/Magento/Customer/Api/_files/test_image.jpg and b/dev/tests/api-functional/testsuite/Magento/Customer/Api/_files/test_image.jpg differ
diff --git a/dev/tests/api-functional/testsuite/Magento/Downloadable/Api/_files/test_image.jpg b/dev/tests/api-functional/testsuite/Magento/Downloadable/Api/_files/test_image.jpg
index ed6e4decf1509..5fbf7dbc09e3d 100644
Binary files a/dev/tests/api-functional/testsuite/Magento/Downloadable/Api/_files/test_image.jpg and b/dev/tests/api-functional/testsuite/Magento/Downloadable/Api/_files/test_image.jpg differ
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/Block/Form/ContactUs.php b/dev/tests/functional/tests/app/Magento/Captcha/Test/Block/Form/ContactUs.php
new file mode 100644
index 0000000000000..7b5cf1a6d7d91
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Captcha/Test/Block/Form/ContactUs.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Captcha\Test\Block\Form;
+
+use Magento\Mtf\Client\Locator;
+use Magento\Contact\Test\Block\Form\ContactUs as ContactForm;
+
+/**
+ * Form for "Contact Us" page with captcha.
+ */
+class ContactUs extends ContactForm
+{
+    /**
+     * Captcha image selector.
+     *
+     * @var string
+     */
+    private $captchaImage = '.captcha-img';
+
+    /**
+     * Captcha reload button selector.
+     *
+     * @var string
+     */
+    private $captchaReload = '.captcha-reload';
+
+    /**
+     * Get captcha element visibility.
+     *
+     * @return bool
+     */
+    public function isVisibleCaptcha()
+    {
+        return $this->_rootElement->find($this->captchaImage, Locator::SELECTOR_CSS)->isVisible();
+    }
+
+    /**
+     * Get captcha reload button element visibility.
+     *
+     * @return bool
+     */
+    public function isVisibleCaptchaReloadButton()
+    {
+        return $this->_rootElement->find($this->captchaReload, Locator::SELECTOR_CSS)->isVisible();
+    }
+
+    /**
+     * Click captcha reload button element.
+     *
+     * @return void
+     */
+    public function reloadCaptcha()
+    {
+        $this->_rootElement->find($this->captchaReload, Locator::SELECTOR_CSS)->click();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/Block/Form/ContactUs.xml b/dev/tests/functional/tests/app/Magento/Captcha/Test/Block/Form/ContactUs.xml
new file mode 100644
index 0000000000000..5b71732032b27
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Captcha/Test/Block/Form/ContactUs.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" ?>
+<!--
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<mapping strict="0">
+    <fields>
+        <captcha>
+            <selector>[name='captcha[contact_us]']</selector>
+        </captcha>
+    </fields>
+</mapping>
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/Block/Form/LoginWithCaptcha.php b/dev/tests/functional/tests/app/Magento/Captcha/Test/Block/Form/LoginWithCaptcha.php
index 931cab3120e12..efb2ba29bd0f9 100644
--- a/dev/tests/functional/tests/app/Magento/Captcha/Test/Block/Form/LoginWithCaptcha.php
+++ b/dev/tests/functional/tests/app/Magento/Captcha/Test/Block/Form/LoginWithCaptcha.php
@@ -8,7 +8,6 @@
 
 use Magento\Mtf\Client\Locator;
 use Magento\Customer\Test\Block\Form\Login;
-use Magento\Mtf\Client\ElementInterface;
 
 /**
  * Form for storefront login with captcha.
@@ -54,7 +53,7 @@ public function isVisibleCaptchaReloadButton()
      *
      * @return void
      */
-    public function clickReloadCaptchaButton()
+    public function reloadCaptcha()
     {
         $this->_rootElement->find($this->captchaReload, Locator::SELECTOR_CSS)->click();
     }
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/Block/Form/Register.php b/dev/tests/functional/tests/app/Magento/Captcha/Test/Block/Form/Register.php
new file mode 100644
index 0000000000000..7a1f0daa36bee
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Captcha/Test/Block/Form/Register.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Captcha\Test\Block\Form;
+
+use Magento\Mtf\Client\Locator;
+use Magento\Customer\Test\Block\Form\Register as CustomerRegister;
+
+/**
+ * Form for storefront register customer with captcha.
+ */
+class Register extends CustomerRegister
+{
+    /**
+     * Captcha image selector.
+     *
+     * @var string
+     */
+    private $captchaImage = '.captcha-img';
+
+    /**
+     * Captcha reload button selector.
+     *
+     * @var string
+     */
+    private $captchaReload = '.captcha-reload';
+
+    /**
+     * Get captcha element visibility.
+     *
+     * @return bool
+     */
+    public function isVisibleCaptcha()
+    {
+        return $this->_rootElement->find($this->captchaImage, Locator::SELECTOR_CSS)->isVisible();
+    }
+
+    /**
+     * Get captcha reload button element visibility.
+     *
+     * @return bool
+     */
+    public function isVisibleCaptchaReloadButton()
+    {
+        return $this->_rootElement->find($this->captchaReload, Locator::SELECTOR_CSS)->isVisible();
+    }
+
+    /**
+     * Click on captcha reload button.
+     *
+     * @return void
+     */
+    public function reloadCaptcha()
+    {
+        $this->_rootElement->find($this->captchaReload, Locator::SELECTOR_CSS)->click();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/Block/Form/Register.xml b/dev/tests/functional/tests/app/Magento/Captcha/Test/Block/Form/Register.xml
new file mode 100644
index 0000000000000..4394fe069d768
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Captcha/Test/Block/Form/Register.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" ?>
+<!--
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<mapping strict="0">
+    <fields>
+        <captcha>
+            <selector>[name='captcha[user_create]']</selector>
+        </captcha>
+    </fields>
+</mapping>
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/Constraint/AssertCaptchaFieldOnContactUsForm.php b/dev/tests/functional/tests/app/Magento/Captcha/Test/Constraint/AssertCaptchaFieldOnContactUsForm.php
new file mode 100644
index 0000000000000..6410d39c1b699
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Captcha/Test/Constraint/AssertCaptchaFieldOnContactUsForm.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Captcha\Test\Constraint;
+
+use Magento\Contact\Test\Page\ContactIndex;
+use Magento\Mtf\Constraint\AbstractConstraint;
+
+/**
+ * Assert captcha on the Contact Us page.
+ */
+class AssertCaptchaFieldOnContactUsForm extends AbstractConstraint
+{
+    /**
+     * Assert captcha on the Contact Us page.
+     *
+     * @param ContactIndex $contactIndex
+     * @return void
+     */
+    public function processAssertRegisterForm(ContactIndex $contactIndex)
+    {
+        \PHPUnit_Framework_Assert::assertTrue(
+            $contactIndex->getContactUs()->isVisibleCaptcha(),
+            'Captcha image is not displayed on the Contact Us page.'
+        );
+
+        \PHPUnit_Framework_Assert::assertTrue(
+            $contactIndex->getContactUs()->isVisibleCaptchaReloadButton(),
+            'Captcha reload button is not displayed on the Contact Us page.'
+        );
+    }
+
+    /**
+     * Returns a string representation of the object.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Captcha and reload button are present on the Contact Us page.';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/Constraint/AssertCaptchaFieldOnRegisterForm.php b/dev/tests/functional/tests/app/Magento/Captcha/Test/Constraint/AssertCaptchaFieldOnRegisterForm.php
new file mode 100644
index 0000000000000..26f3f9cded894
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Captcha/Test/Constraint/AssertCaptchaFieldOnRegisterForm.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Captcha\Test\Constraint;
+
+use Magento\Customer\Test\Page\CustomerAccountCreate;
+use Magento\Mtf\Constraint\AbstractConstraint;
+
+/**
+ * Assert captcha on storefront account register page.
+ */
+class AssertCaptchaFieldOnRegisterForm extends AbstractConstraint
+{
+    /**
+     * Assert captcha and reload button are visible on storefront account register page.
+     *
+     * @param CustomerAccountCreate $createAccountPage
+     * @return void
+     */
+    public function processAssertRegisterForm(CustomerAccountCreate $createAccountPage)
+    {
+        \PHPUnit_Framework_Assert::assertTrue(
+            $createAccountPage->getRegisterForm()->isVisibleCaptcha(),
+            'Captcha image is not displayed on the storefront account register page.'
+        );
+
+        \PHPUnit_Framework_Assert::assertTrue(
+            $createAccountPage->getRegisterForm()->isVisibleCaptchaReloadButton(),
+            'Captcha reload button is not displayed on the storefront account register page.'
+        );
+    }
+
+    /**
+     * Returns a string representation of the object.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Captcha and reload button are displayed on the storefront account register page.';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/Fixture/Comment.xml b/dev/tests/functional/tests/app/Magento/Captcha/Test/Fixture/Comment.xml
new file mode 100644
index 0000000000000..803e0bea58645
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Captcha/Test/Fixture/Comment.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
+    <fixture name="comment">
+        <field name="captcha" is_required="0" />
+    </fixture>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/Page/ContactIndex.xml b/dev/tests/functional/tests/app/Magento/Captcha/Test/Page/ContactIndex.xml
new file mode 100644
index 0000000000000..3f4bafe021a94
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Captcha/Test/Page/ContactIndex.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/pages.xsd">
+    <page name="ContactIndex" mca="contact/index/index" module="Magento_Contact">
+        <block name="contactUs" class="Magento\Captcha\Test\Block\Form\ContactUs" locator="#contact-form" strategy="css selector" />
+    </page>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/Page/CustomerAccountCreate.xml b/dev/tests/functional/tests/app/Magento/Captcha/Test/Page/CustomerAccountCreate.xml
new file mode 100644
index 0000000000000..2f4e8066a309d
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Captcha/Test/Page/CustomerAccountCreate.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/pages.xsd">
+    <page name="CustomerAccountCreate" mca="customer/account/create">
+        <block name="registerForm" class="Magento\Captcha\Test\Block\Form\Register" locator="#form-validate[novalidate='novalidate']" strategy="css selector" />
+    </page>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/Page/CustomerAccountLogin.xml b/dev/tests/functional/tests/app/Magento/Captcha/Test/Page/CustomerAccountLogin.xml
index 846bc758ed275..ecfdbdd4059b7 100644
--- a/dev/tests/functional/tests/app/Magento/Captcha/Test/Page/CustomerAccountLogin.xml
+++ b/dev/tests/functional/tests/app/Magento/Captcha/Test/Page/CustomerAccountLogin.xml
@@ -6,7 +6,7 @@
  */
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/pages.xsd">
-    <page name="CustomerAccountLogin">
+    <page name="CustomerAccountLogin" mca="customer/account/login">
         <block name="loginBlockWithCaptcha" class="Magento\Captcha\Test\Block\Form\LoginWithCaptcha" locator="#login-form" strategy="css selector"/>
     </page>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Captcha/Test/Repository/ConfigData.xml
index 0bcf56e1bbe0e..891e82c1db6de 100644
--- a/dev/tests/functional/tests/app/Magento/Captcha/Test/Repository/ConfigData.xml
+++ b/dev/tests/functional/tests/app/Magento/Captcha/Test/Repository/ConfigData.xml
@@ -7,37 +7,37 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd">
     <repository class="Magento\Config\Test\Repository\ConfigData">
-        <dataset name="captcha_backend_login">
-            <field name="admin/captcha/enable" xsi:type="array">
+        <dataset name="captcha_storefront_login">
+            <field name="customer/captcha/enable" xsi:type="array">
                 <item name="scope_id" xsi:type="number">0</item>
                 <item name="label" xsi:type="string">Yes</item>
                 <item name="value" xsi:type="number">1</item>
             </field>
-            <field name="admin/captcha/forms" xsi:type="array">
+            <field name="customer/captcha/forms" xsi:type="array">
                 <item name="scope_id" xsi:type="number">0</item>
-                <item name="label" xsi:type="string">Admin Login</item>
-                <item name="value" xsi:type="string">backend_login</item>
+                <item name="label" xsi:type="string">Login</item>
+                <item name="value" xsi:type="string">user_login</item>
             </field>
-            <field name="admin/captcha/mode" xsi:type="array">
+            <field name="customer/captcha/mode" xsi:type="array">
                 <item name="scope_id" xsi:type="number">0</item>
                 <item name="label" xsi:type="string">Always</item>
                 <item name="value" xsi:type="string">always</item>
             </field>
-            <field name="admin/captcha/length" xsi:type="array">
+            <field name="customer/captcha/length" xsi:type="array">
                 <item name="scope" xsi:type="string">admin</item>
                 <item name="scope_id" xsi:type="number">1</item>
                 <item name="label" xsi:type="string"/>
                 <item name="value" xsi:type="number">3</item>
             </field>
-            <field name="admin/captcha/symbols" xsi:type="array">
+            <field name="customer/captcha/symbols" xsi:type="array">
                 <item name="scope" xsi:type="string">admin</item>
                 <item name="scope_id" xsi:type="number">1</item>
                 <item name="label" xsi:type="string"/>
                 <item name="value" xsi:type="number">1</item>
             </field>
         </dataset>
-        <dataset name="captcha_backend_login_rollback">
-            <field name="admin/captcha/enable" xsi:type="array">
+        <dataset name="captcha_storefront_login_rollback">
+            <field name="customer/captcha/enable" xsi:type="array">
                 <item name="scope" xsi:type="string">default</item>
                 <item name="scope_id" xsi:type="number">1</item>
                 <item name="label" xsi:type="string">No</item>
@@ -45,7 +45,7 @@
             </field>
         </dataset>
 
-        <dataset name="captcha_storefront_login">
+        <dataset name="captcha_storefront_register">
             <field name="customer/captcha/enable" xsi:type="array">
                 <item name="scope_id" xsi:type="number">0</item>
                 <item name="label" xsi:type="string">Yes</item>
@@ -53,8 +53,8 @@
             </field>
             <field name="customer/captcha/forms" xsi:type="array">
                 <item name="scope_id" xsi:type="number">0</item>
-                <item name="label" xsi:type="string">Login</item>
-                <item name="value" xsi:type="string">user_login</item>
+                <item name="label" xsi:type="string">Create user</item>
+                <item name="value" xsi:type="string">user_create</item>
             </field>
             <field name="customer/captcha/mode" xsi:type="array">
                 <item name="scope_id" xsi:type="number">0</item>
@@ -74,8 +74,128 @@
                 <item name="value" xsi:type="number">1</item>
             </field>
         </dataset>
-        <dataset name="captcha_storefront_login_rollback">
+        <dataset name="captcha_storefront_register_rollback">
+            <field name="customer/captcha/enable" xsi:type="array">
+                <item name="scope" xsi:type="string">default</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+        </dataset>
+
+        <dataset name="captcha_storefront_contact_us">
+            <field name="customer/captcha/enable" xsi:type="array">
+                <item name="scope_id" xsi:type="number">0</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="customer/captcha/forms" xsi:type="array">
+                <item name="scope_id" xsi:type="number">0</item>
+                <item name="label" xsi:type="string">Contact Us</item>
+                <item name="value" xsi:type="string">contact_us</item>
+            </field>
+            <field name="customer/captcha/mode" xsi:type="array">
+                <item name="scope_id" xsi:type="number">0</item>
+                <item name="label" xsi:type="string">Always</item>
+                <item name="value" xsi:type="string">always</item>
+            </field>
+            <field name="customer/captcha/length" xsi:type="array">
+                <item name="scope" xsi:type="string">admin</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="number">3</item>
+            </field>
+            <field name="customer/captcha/symbols" xsi:type="array">
+                <item name="scope" xsi:type="string">admin</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+        </dataset>
+        <dataset name="captcha_storefront_contact_us_rollback">
+            <field name="customer/captcha/enable" xsi:type="array">
+                <item name="scope" xsi:type="string">default</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+        </dataset>
+
+        <dataset name="captcha_storefront_login_failures_number">
             <field name="customer/captcha/enable" xsi:type="array">
+                <item name="scope_id" xsi:type="number">0</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="customer/captcha/forms" xsi:type="array">
+                <item name="scope_id" xsi:type="number">0</item>
+                <item name="label" xsi:type="string">Login</item>
+                <item name="value" xsi:type="string">user_login</item>
+            </field>
+            <field name="customer/captcha/mode" xsi:type="array">
+                <item name="scope_id" xsi:type="number">0</item>
+                <item name="label" xsi:type="string">After number of attempts to login</item>
+                <item name="value" xsi:type="string">after_fail</item>
+            </field>
+            <field name="customer/captcha/failed_attempts_login" xsi:type="array">
+                <item name="scope" xsi:type="string">customer</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="string">3</item>
+            </field>
+            <field name="customer/captcha/length" xsi:type="array">
+                <item name="scope" xsi:type="string">customer</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="number">3</item>
+            </field>
+            <field name="customer/captcha/symbols" xsi:type="array">
+                <item name="scope" xsi:type="string">customer</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+        </dataset>
+        <dataset name="captcha_storefront_login_failures_number_rollback">
+            <field name="customer/captcha/enable" xsi:type="array">
+                <item name="scope" xsi:type="string">default</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+        </dataset>
+
+        <dataset name="captcha_backend_login">
+            <field name="admin/captcha/enable" xsi:type="array">
+                <item name="scope_id" xsi:type="number">0</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="admin/captcha/forms" xsi:type="array">
+                <item name="scope_id" xsi:type="number">0</item>
+                <item name="label" xsi:type="string">Admin Login</item>
+                <item name="value" xsi:type="string">backend_login</item>
+            </field>
+            <field name="admin/captcha/mode" xsi:type="array">
+                <item name="scope_id" xsi:type="number">0</item>
+                <item name="label" xsi:type="string">Always</item>
+                <item name="value" xsi:type="string">always</item>
+            </field>
+            <field name="admin/captcha/length" xsi:type="array">
+                <item name="scope" xsi:type="string">admin</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="number">3</item>
+            </field>
+            <field name="admin/captcha/symbols" xsi:type="array">
+                <item name="scope" xsi:type="string">admin</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+        </dataset>
+        <dataset name="captcha_backend_login_rollback">
+            <field name="admin/captcha/enable" xsi:type="array">
                 <item name="scope" xsi:type="string">default</item>
                 <item name="scope_id" xsi:type="number">1</item>
                 <item name="label" xsi:type="string">No</item>
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaLockoutCustomerTest.php b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaLockoutCustomerTest.php
new file mode 100644
index 0000000000000..aa439c511a987
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaLockoutCustomerTest.php
@@ -0,0 +1,175 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Captcha\Test\TestCase;
+
+use Magento\Customer\Test\Block\Form\Login;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\TestCase\Injectable;
+use Magento\Mtf\TestStep\TestStepFactory;
+use Magento\Customer\Test\Fixture\Customer;
+use Magento\Customer\Test\Page\CustomerAccountLogin;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Customer\Test\Page\Adminhtml\CustomerIndexEdit;
+
+/**
+ * Preconditions:
+ * 1. Enable CAPTCHA for customer.
+ * 2. Set Maximum Login Failures.
+ * 3. Create customer.
+ *
+ * Test Flow:
+ * 1. Open storefront login form.
+ * 2. Log in customer with incorrect password 3 or more times.
+ * 3. Log in customer with captcha and incorrect password 3 or more times.
+ * 4. Log in customer with captcha and correct password.
+ * 5. Perform asserts.
+ *
+ * @group Captcha
+ * @ZephyrId MAGETWO-49048
+ */
+class CaptchaLockoutCustomerTest extends Injectable
+{
+    /**
+     * Step factory.
+     *
+     * @var TestStepFactory
+     */
+    private $stepFactory;
+
+    /**
+     * Fixture factory.
+     *
+     * @var FixtureFactory
+     */
+    private $fixtureFactory;
+
+    /**
+     * CustomerAccountLogin page.
+     *
+     * @var CustomerAccountLogin
+     */
+    private $customerAccountLogin;
+
+    /**
+     * CustomerIndexEdit page.
+     *
+     * @var CustomerIndexEdit
+     */
+    private $customerIndexEdit;
+
+    /**
+     * Configuration setting.
+     *
+     * @var string
+     */
+    private $configData;
+
+    /**
+     * Injection data.
+     *
+     * @param TestStepFactory $stepFactory
+     * @param FixtureFactory $fixtureFactory
+     * @param CustomerAccountLogin $customerAccountLogin
+     * @param CustomerIndexEdit $customerIndexEdit
+     * @return void
+     */
+    public function __inject(
+        TestStepFactory $stepFactory,
+        FixtureFactory $fixtureFactory,
+        CustomerAccountLogin $customerAccountLogin,
+        CustomerIndexEdit $customerIndexEdit
+    ) {
+        $this->stepFactory = $stepFactory;
+        $this->fixtureFactory = $fixtureFactory;
+        $this->customerAccountLogin = $customerAccountLogin;
+        $this->customerIndexEdit = $customerIndexEdit;
+    }
+
+    /**
+     * Test creation for customer login with captcha on storefront.
+     *
+     * @param Customer $customer
+     * @param string $configData
+     * @param string $captcha
+     * @param string $incorrectPassword
+     * @param int $attempts
+     * @return void
+     */
+    public function test(
+        Customer $customer,
+        $configData,
+        $captcha,
+        $incorrectPassword,
+        $attempts
+    ) {
+        $this->configData = $configData;
+
+        // Preconditions
+        $this->stepFactory->create(
+            \Magento\Config\Test\TestStep\SetupConfigurationStep::class,
+            ['configData' => $this->configData]
+        )->run();
+        $customer->persist();
+
+        $correctData = $customer->getData();
+        $correctData['captcha'] = $captcha;
+        $correctData['group_id'] = [
+            'customerGroup' => $customer->getDataFieldConfig('group_id')['source']->getCustomerGroup()
+        ];
+
+        $newData = $customer->getData();
+        $newData['captcha'] = $captcha;
+        $newData['group_id'] = [
+            'customerGroup' => $customer->getDataFieldConfig('group_id')['source']->getCustomerGroup()
+        ];
+        $newData['password'] = $incorrectPassword;
+
+        $incorrectCustomer = $this->fixtureFactory->createByCode('customer', ['data' => $newData]);
+
+        // Steps
+        $this->customerAccountLogin->open();
+
+        // Fill incorrect password $attempts times.
+        $this->customerLogin($incorrectCustomer, $this->customerAccountLogin->getLoginBlock(), $attempts);
+
+        // Fill correct captcha and incorrect password $attempts times.
+        $this->customerLogin($incorrectCustomer, $this->customerAccountLogin->getLoginBlockWithCaptcha(), $attempts);
+
+        // Log in customer with correct captcha and correct password.
+        $customer = $this->fixtureFactory->createByCode('customer', ['data' => $correctData]);
+        $this->customerLogin($customer, $this->customerAccountLogin->getLoginBlockWithCaptcha(), 1);
+    }
+
+    /**
+     * Log in customer $attempts times.
+     *
+     * @param FixtureInterface $customer
+     * @param Login $loginForm
+     * @param int $attempts
+     * @return void
+     */
+    private function customerLogin(FixtureInterface $customer, Login $loginForm, $attempts)
+    {
+        for ($i = 0; $i < $attempts; $i++) {
+            $loginForm->fill($customer);
+            $loginForm->submit();
+        }
+    }
+
+    /**
+     * Set default configuration.
+     *
+     * @return void
+     */
+    public function tearDown()
+    {
+        $this->stepFactory->create(
+            \Magento\Config\Test\TestStep\SetupConfigurationStep::class,
+            ['configData' => $this->configData, 'rollback' => true]
+        )->run();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaLockoutCustomerTest.xml b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaLockoutCustomerTest.xml
new file mode 100644
index 0000000000000..d18de7cced21c
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaLockoutCustomerTest.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
+    <testCase name="Magento\Captcha\Test\TestCase\CaptchaLockoutCustomerTest" summary="Captcha and Lockout for Storefront Login Page" ticketId="MAGETWO-49048">
+        <variation name="CaptchaLockoutCustomerTestVariation1">
+            <data name="customer/dataset" xsi:type="string">default</data>
+            <data name="incorrectPassword" xsi:type="string">incorrect password</data>
+            <data name="attempts" xsi:type="number">3</data>
+            <data name="captcha" xsi:type="string">111</data>
+            <data name="configData" xsi:type="string">captcha_storefront_login_failures_number, customer_max_login_failures_number</data>
+            <constraint name="Magento\Customer\Test\Constraint\AssertCustomerIsLockedOnBackend" />
+        </variation>
+    </testCase>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnContactUsTest.php b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnContactUsTest.php
new file mode 100644
index 0000000000000..a1e5566d3b0ec
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnContactUsTest.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Captcha\Test\TestCase;
+
+use Magento\Mtf\TestCase\Injectable;
+use Magento\Mtf\TestStep\TestStepFactory;
+use Magento\Captcha\Test\Constraint\AssertCaptchaFieldOnContactUsForm;
+use Magento\Contact\Test\Page\ContactIndex;
+use Magento\Contact\Test\Fixture\Comment;
+
+/**
+ * Preconditions:
+ * 1. Enable captcha for customer.
+ *
+ * Test Flow:
+ * 1. Open contact us page.
+ * 2. Send comment using captcha.
+ *
+ * @group Captcha
+ * @ZephyrId MAGETWO-43609
+ */
+class CaptchaOnContactUsTest extends Injectable
+{
+    /**
+     * Step factory.
+     *
+     * @var TestStepFactory
+     */
+    private $stepFactory;
+
+    /**
+     * Assert captcha on "Contact Us" page.
+     *
+     * @var AssertCaptchaFieldOnContactUsForm
+     */
+    private $assertCaptcha;
+
+    /**
+     * ContactIndex page.
+     *
+     * @var ContactIndex
+     */
+    private $contactIndex;
+
+    /**
+     * Configuration setting.
+     *
+     * @var string
+     */
+    private $configData;
+
+    /**
+     * Injection data.
+     *
+     * @param TestStepFactory $stepFactory
+     * @param AssertCaptchaFieldOnContactUsForm $assertCaptcha
+     * @param ContactIndex $contactIndex
+     * @return void
+     */
+    public function __inject(
+        TestStepFactory $stepFactory,
+        AssertCaptchaFieldOnContactUsForm $assertCaptcha,
+        ContactIndex $contactIndex
+    ) {
+        $this->stepFactory = $stepFactory;
+        $this->assertCaptcha = $assertCaptcha;
+        $this->contactIndex = $contactIndex;
+    }
+
+    /**
+     * Test creation for send comment using the contact us form with captcha.
+     *
+     * @param Comment $comment
+     * @param string $configData
+     * @return void
+     */
+    public function test(
+        Comment $comment,
+        $configData
+    ) {
+        $this->configData = $configData;
+
+        // Preconditions
+        $this->stepFactory->create(
+            \Magento\Config\Test\TestStep\SetupConfigurationStep::class,
+            ['configData' => $this->configData]
+        )->run();
+
+        $this->contactIndex->open();
+        $this->assertCaptcha->processAssertRegisterForm($this->contactIndex);
+        $this->contactIndex->getContactUs()->fill($comment);
+        $this->contactIndex->getContactUs()->reloadCaptcha();
+        $this->contactIndex->getContactUs()->sendComment();
+    }
+
+    /**
+     * Set default configuration.
+     *
+     * @return void
+     */
+    public function tearDown()
+    {
+        $this->stepFactory->create(
+            \Magento\Config\Test\TestStep\SetupConfigurationStep::class,
+            ['configData' => $this->configData, 'rollback' => true]
+        )->run();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnContactUsTest.xml b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnContactUsTest.xml
new file mode 100644
index 0000000000000..58056809902f8
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnContactUsTest.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
+    <testCase name="Magento\Captcha\Test\TestCase\CaptchaOnContactUsTest" summary="Check CAPTCHA on Contact Us Page" ticketId="MAGETWO-43609">
+        <variation name="CaptchaOnContactUsTestVariation1">
+            <data name="comment/data/comment" xsi:type="string">some comment</data>
+            <data name="comment/data/captcha" xsi:type="string">111</data>
+            <data name="comment/data/customer/dataset" xsi:type="string">default</data>
+            <data name="configData" xsi:type="string">captcha_storefront_contact_us</data>
+            <constraint name="Magento\Contact\Test\Constraint\AssertContactUsSuccessMessage" />
+        </variation>
+    </testCase>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnStoreFrontLoginTest.php b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnStoreFrontLoginTest.php
index 4134599889d4b..c4c8e2e401a99 100644
--- a/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnStoreFrontLoginTest.php
+++ b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnStoreFrontLoginTest.php
@@ -116,7 +116,7 @@ public function test(
 
         $this->customerAccountLogin->open();
         $this->assertCaptcha->processAssert($this->customerAccountLogin);
-        $this->customerAccountLogin->getLoginBlockWithCaptcha()->clickReloadCaptchaButton();
+        $this->customerAccountLogin->getLoginBlockWithCaptcha()->reloadCaptcha();
         $this->customerAccountLogin->getLoginBlockWithCaptcha()->login($customer);
     }
 
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnStoreFrontRegisterTest.php b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnStoreFrontRegisterTest.php
new file mode 100644
index 0000000000000..d3ec38328242a
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnStoreFrontRegisterTest.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Captcha\Test\TestCase;
+
+use Magento\Mtf\TestCase\Injectable;
+use Magento\Mtf\TestStep\TestStepFactory;
+use Magento\Captcha\Test\Constraint\AssertCaptchaFieldOnRegisterForm;
+use Magento\Customer\Test\Fixture\Customer;
+use Magento\Customer\Test\Page\CustomerAccountCreate;
+
+/**
+ * Preconditions:
+ * 1. Enable captcha for customer.
+ *
+ * Test Flow:
+ * 1. Open storefront account register form.
+ * 2. Register customer using captcha.
+ *
+ * @group Captcha
+ * @ZephyrId MAGETWO-43602
+ */
+class CaptchaOnStoreFrontRegisterTest extends Injectable
+{
+    /**
+     * Step factory.
+     *
+     * @var TestStepFactory
+     */
+    private $stepFactory;
+
+    /**
+     * Assert captcha on storefront account register page.
+     *
+     * @var AssertCaptchaFieldOnRegisterForm
+     */
+    private $assertCaptcha;
+
+    /**
+     * CustomerAccountCreate page.
+     *
+     * @var CustomerAccountCreate
+     */
+    private $customerAccountCreate;
+
+    /**
+     * Configuration setting.
+     *
+     * @var string
+     */
+    private $configData;
+
+    /**
+     * Injection data.
+     *
+     * @param TestStepFactory $stepFactory
+     * @param AssertCaptchaFieldOnRegisterForm $assertCaptcha
+     * @param CustomerAccountCreate $customerAccount
+     * @return void
+     */
+    public function __inject(
+        TestStepFactory $stepFactory,
+        AssertCaptchaFieldOnRegisterForm $assertCaptcha,
+        CustomerAccountCreate $customerAccount
+    ) {
+        $this->stepFactory = $stepFactory;
+        $this->assertCaptcha = $assertCaptcha;
+        $this->customerAccountCreate = $customerAccount;
+    }
+
+    /**
+     * Test creation for customer register with captcha on storefront.
+     *
+     * @param Customer $customer
+     * @param string $configData
+     * @return void
+     */
+    public function test(
+        Customer $customer,
+        $configData
+    ) {
+        $this->configData = $configData;
+
+        // Preconditions
+        $this->stepFactory->create(
+            \Magento\Config\Test\TestStep\SetupConfigurationStep::class,
+            ['configData' => $this->configData]
+        )->run();
+
+        $this->customerAccountCreate->open();
+        $this->assertCaptcha->processAssertRegisterForm($this->customerAccountCreate);
+        $this->customerAccountCreate->getRegisterForm()->reloadCaptcha();
+        $this->customerAccountCreate->getRegisterForm()->registerCustomer($customer);
+    }
+
+    /**
+     * Set default configuration.
+     *
+     * @return void
+     */
+    public function tearDown()
+    {
+        $this->stepFactory->create(
+            \Magento\Config\Test\TestStep\SetupConfigurationStep::class,
+            ['configData' => $this->configData, 'rollback' => true]
+        )->run();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnStoreFrontRegisterTest.xml b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnStoreFrontRegisterTest.xml
new file mode 100644
index 0000000000000..d57d4ec2301cd
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnStoreFrontRegisterTest.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
+    <testCase name="Magento\Captcha\Test\TestCase\CaptchaOnStoreFrontRegisterTest" summary="Check CAPTCHA on StoreFront Register Page" ticketId="MAGETWO-43602">
+        <variation name="CaptchaOnStoreFrontRegisterTestVariation1">
+            <data name="customer/dataset" xsi:type="string">register_customer</data>
+            <data name="customer/data/captcha" xsi:type="string">111</data>
+            <data name="configData" xsi:type="string">captcha_storefront_register</data>
+            <constraint name="Magento\Customer\Test\Constraint\AssertCustomerSuccessRegisterMessage" />
+        </variation>
+    </testCase>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php
index 16a56647d9e1f..31ea8d5e7071c 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php
@@ -65,7 +65,7 @@ class Tree extends Block
      *
      * @var string
      */
-    protected $categoryInTree = '//*[@class="x-tree-node-ct"]/li/div/a/span[contains(text(), "%s")]/..';
+    private $categoryInTree = '//ul//li//span[contains(text(), "%s")]';
 
     /**
      * Get backend abstract block.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php
index 11df2d0e0fef6..26586b5cae406 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php
@@ -15,6 +15,7 @@
 /**
  * Class CustomOptions
  * Form of custom options product
+ * @SuppressWarnings(PHPMD.TooManyFields)
  */
 class CustomOptions extends Form
 {
@@ -109,6 +110,27 @@ class CustomOptions extends Form
      */
     protected $optionByName = '//*[label[contains(.,"%s")] or legend[contains(.,"%s")]]';
 
+    /**
+     * Locator for custom option field.
+     *
+     * @var string
+     */
+    private $customOptionField = './/div[contains(@class, "field")';
+
+    /**
+     * Locator for required custom option title.
+     *
+     * @var string
+     */
+    private $requiredOption = 'and contains(@class, "required") and contains(.//span, "%s")]';
+
+    /**
+     * Locator for validation error message after option.
+     *
+     * @var string
+     */
+    private $validationErrorMessage = '//div[@class="mage-error"][contains(text(), "required field")]';
+
     /**
      * Get product options
      *
@@ -148,6 +170,16 @@ public function getOptions(FixtureInterface $product)
         return ['custom_options' => $result];
     }
 
+    /**
+     * Wait for error message.
+     *
+     * @return bool
+     */
+    public function waitValidationErrorMessage()
+    {
+        return $this->waitForElementVisible($this->validationErrorMessage, Locator::SELECTOR_XPATH);
+    }
+
     /**
      * Get list custom options
      *
@@ -166,6 +198,20 @@ protected function getListOptions()
         return $customOptions;
     }
 
+    /**
+     * Check option's validation message is visible or not.
+     *
+     * @param string $customOptionTitle
+     * @return bool
+     */
+    public function isJsMessageVisible($customOptionTitle)
+    {
+        $optionSelector = $this->customOptionField . $this->requiredOption . $this->validationErrorMessage;
+        $title = sprintf($optionSelector, $customOptionTitle);
+
+        return $this->_rootElement->find($title, Locator::SELECTOR_XPATH)->isVisible();
+    }
+
     /**
      * Get data of "Field" custom option
      *
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryBreadcrumbs.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryBreadcrumbs.php
index b19dbf615a171..6617ed22ae34a 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryBreadcrumbs.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryBreadcrumbs.php
@@ -42,12 +42,13 @@ public function processAssert(
         CatalogCategoryView $catalogCategoryView
     ) {
         $this->browser = $browser;
+
         $this->openCategory($category);
 
         $breadcrumbs = $this->getBreadcrumbs($category);
         \PHPUnit_Framework_Assert::assertNotEmpty(
             $breadcrumbs,
-            'No breadcrumbs on category \''. $category->getName() . '\' page.'
+            'No breadcrumbs on category \'' . $category->getName() . '\' page.'
         );
         $pageBreadcrumbs = $catalogCategoryView->getBreadcrumbs()->getText();
         \PHPUnit_Framework_Assert::assertEquals(
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryNavigationMenu.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryNavigationMenu.php
new file mode 100644
index 0000000000000..5c1bbb0accbbd
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryNavigationMenu.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Test\Constraint;
+
+use Magento\Cms\Test\Page\CmsIndex;
+use Magento\Catalog\Test\Fixture\Category;
+use Magento\Mtf\Constraint\AbstractConstraint;
+
+/**
+ * Assert that relations of categories in navigation menu are correct.
+ */
+class AssertCategoryNavigationMenu extends AbstractConstraint
+{
+    /**
+     * Default category name.
+     */
+    const DEFAULT_CATEGORY_NAME = 'Default Category';
+
+    /**
+     * Assert that relations of categories in navigation menu are correct.
+     *
+     * @param CmsIndex $cmsIndex
+     * @param Category $category
+     * @return void
+     */
+    public function processAssert(
+        CmsIndex $cmsIndex,
+        Category $category
+    ) {
+        do {
+            $categoriesNames[] = $category->getName();
+            $category = $category->getDataFieldConfig('parent_id')['source']->getParentCategory();
+        } while ($category->getName() != self::DEFAULT_CATEGORY_NAME);
+
+        $cmsIndex->open();
+
+        foreach (array_reverse($categoriesNames) as $category) {
+            \PHPUnit_Framework_Assert::assertTrue(
+                $cmsIndex->getTopmenu()->isCategoryVisible($category),
+                'Category ' . $category . ' is not visible in top menu.'
+            );
+            $cmsIndex->getTopMenu()->hoverCategoryByName($category);
+        }
+    }
+
+    /**
+     * Returns a string representation of the object.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Topmenu contains correct tree of categories.';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCustomOptionsErrors.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCustomOptionsErrors.php
new file mode 100644
index 0000000000000..d91715451c8ea
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCustomOptionsErrors.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Test\Constraint;
+
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Catalog\Test\Page\Product\CatalogProductView;
+
+/**
+ * Assert that every required product's Custom Option contains JS validation error.
+ */
+class AssertProductCustomOptionsErrors extends AbstractConstraint
+{
+    /**
+     * Assert that every required product's Custom Option contains JS validation error.
+     *
+     * @param CatalogProductView $catalogProductView
+     * @param array $products
+     * @return void
+     */
+    public function processAssert(
+        CatalogProductView $catalogProductView,
+        array $products
+    ) {
+        foreach ($products as $product) {
+            foreach ($product->getData('custom_options') as $option) {
+                \PHPUnit_Framework_Assert::assertTrue(
+                    $catalogProductView->getCustomOptionsBlock()->isJsMessageVisible($option['title']),
+                    'Required Custom Option ' . $option['title'] . " doesn't contain JS validation error."
+                );
+            }
+        }
+    }
+
+    /**
+     * Assert success message that every required product's Custom Option contains JS validation error.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return "Every required product's Custom Option contains JS validation error.";
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml
index d114ff1d9f07d..9c2dd677fa678 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml
@@ -985,6 +985,27 @@
             </field>
         </dataset>
 
+        <dataset name="with_all_required_custom_option">
+            <field name="attribute_set_id" xsi:type="array">
+                <item name="dataset" xsi:type="string">default</item>
+            </field>
+            <field name="name" xsi:type="string">Simple Product With Custom Option %isolation%</field>
+            <field name="sku" xsi:type="string">sku_simple_product_%isolation%</field>
+            <field name="price" xsi:type="array">
+                <item name="value" xsi:type="string">300</item>
+            </field>
+            <field name="product_has_weight" xsi:type="string">This item has weight</field>
+            <field name="weight" xsi:type="string">1</field>
+            <field name="quantity_and_stock_status" xsi:type="array">
+                <item name="qty" xsi:type="string">953</item>
+                <item name="is_in_stock" xsi:type="string">In Stock</item>
+            </field>
+            <field name="url_key" xsi:type="string">simple-product-%isolation%</field>
+            <field name="custom_options" xsi:type="array">
+                <item name="dataset" xsi:type="string">all_types_options_required</item>
+            </field>
+        </dataset>
+
         <dataset name="low_stock_product">
             <field name="sku" xsi:type="string">low_stock_product%isolation%</field>
             <field name="name" xsi:type="string">low_stock_product%isolation%</field>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Category.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Category.xml
index 2a5f07378bc4a..7e12e7eb1a971 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Category.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Category.xml
@@ -65,6 +65,17 @@
             <field name="include_in_menu" xsi:type="string">Yes</field>
         </dataset>
 
+        <dataset name="default_anchor_subcategory_with_anchored_parent">
+            <field name="name" xsi:type="string">DefaultSubcategory%isolation%</field>
+            <field name="url_key" xsi:type="string">default-subcategory-%isolation%</field>
+            <field name="parent_id" xsi:type="array">
+                <item name="dataset" xsi:type="string">default_anchor_subcategory</item>
+            </field>
+            <field name="is_active" xsi:type="string">Yes</field>
+            <field name="is_anchor" xsi:type="string">Yes</field>
+            <field name="include_in_menu" xsi:type="string">Yes</field>
+        </dataset>
+
         <dataset name="root_category">
             <field name="parent_id" xsi:type="string">%id%</field>
             <field name="name" xsi:type="string">RootCategory%isolation%</field>
@@ -134,5 +145,29 @@
                 <item name="dataset" xsi:type="string">catalogProductSimple::default</item>
             </field>
         </dataset>
+
+        <dataset name="default_anchored_category">
+            <field name="name" xsi:type="string">Category%isolation%</field>
+            <field name="url_key" xsi:type="string">category%isolation%</field>
+            <field name="is_active" xsi:type="string">Yes</field>
+            <field name="include_in_menu" xsi:type="string">Yes</field>
+            <field name="is_anchor" xsi:type="string">Yes</field>
+            <field name="parent_id" xsi:type="array">
+                <item name="dataset" xsi:type="string">default_category</item>
+            </field>
+        </dataset>
+
+        <dataset name="default_subcategory_with_anchored_parent">
+            <field name="name" xsi:type="string">DefaultSubcategory%isolation%</field>
+            <field name="url_key" xsi:type="string">default-subcategory-%isolation%</field>
+            <field name="parent_id" xsi:type="array">
+                <item name="dataset" xsi:type="string">default_anchored_category</item>
+            </field>
+            <field name="is_active" xsi:type="string">Yes</field>
+            <field name="include_in_menu" xsi:type="string">Yes</field>
+            <field name="category_products" xsi:type="array">
+                <item name="dataset" xsi:type="string">catalogProductSimple::default</item>
+            </field>
+        </dataset>
     </repository>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Product/CustomOptions.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Product/CustomOptions.xml
index 69e0cbcd9b30b..196309d47e13f 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Product/CustomOptions.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Product/CustomOptions.xml
@@ -359,6 +359,154 @@
             </field>
         </dataset>
 
+        <dataset name="all_types_options_required">
+            <field name="0" xsi:type="array">
+                <item name="title" xsi:type="string">custom option field %isolation%</item>
+                <item name="is_require" xsi:type="string">Yes</item>
+                <item name="type" xsi:type="string">Text/Field</item>
+                <item name="options" xsi:type="array">
+                    <item name="0" xsi:type="array">
+                        <item name="price" xsi:type="string">10</item>
+                        <item name="price_type" xsi:type="string">Fixed</item>
+                        <item name="sku" xsi:type="string">sku_field_option_%isolation%</item>
+                        <item name="max_characters" xsi:type="string">1024</item>
+                    </item>
+                </item>
+            </field>
+            <field name="1" xsi:type="array">
+                <item name="title" xsi:type="string">custom option Area %isolation%</item>
+                <item name="is_require" xsi:type="string">Yes</item>
+                <item name="type" xsi:type="string">Text/Area</item>
+                <item name="options" xsi:type="array">
+                    <item name="0" xsi:type="array">
+                        <item name="price" xsi:type="string">10</item>
+                        <item name="price_type" xsi:type="string">Fixed</item>
+                        <item name="sku" xsi:type="string">sku_area_row_%isolation%</item>
+                        <item name="max_characters" xsi:type="string">100</item>
+                    </item>
+                </item>
+            </field>
+            <field name="2" xsi:type="array">
+                <item name="title" xsi:type="string">custom option File %isolation%</item>
+                <item name="is_require" xsi:type="string">Yes</item>
+                <item name="type" xsi:type="string">File/File</item>
+                <item name="options" xsi:type="array">
+                    <item name="0" xsi:type="array">
+                        <item name="price" xsi:type="string">10</item>
+                        <item name="price_type" xsi:type="string">Fixed</item>
+                        <item name="sku" xsi:type="string">sku_file_row_%isolation%</item>
+                        <item name="file_extension" xsi:type="string">jpg</item>
+                        <item name="image_size_x" xsi:type="string">100</item>
+                        <item name="image_size_y" xsi:type="string">100</item>
+                    </item>
+                </item>
+            </field>
+            <field name="3" xsi:type="array">
+                <item name="title" xsi:type="string">custom option drop down %isolation%</item>
+                <item name="is_require" xsi:type="string">Yes</item>
+                <item name="type" xsi:type="string">Select/Drop-down</item>
+                <item name="options" xsi:type="array">
+                    <item name="0" xsi:type="array">
+                        <item name="title" xsi:type="string">10 percent</item>
+                        <item name="price" xsi:type="string">10</item>
+                        <item name="price_type" xsi:type="string">Percent</item>
+                        <item name="sku" xsi:type="string">sku_drop_down_row_1_%isolation%</item>
+                        <item name="sort_order" xsi:type="string">0</item>
+                    </item>
+                    <item name="1" xsi:type="array">
+                        <item name="title" xsi:type="string">20 percent</item>
+                        <item name="price" xsi:type="string">20</item>
+                        <item name="price_type" xsi:type="string">Percent</item>
+                        <item name="sku" xsi:type="string">sku_drop_down_row_2_%isolation%</item>
+                        <item name="sort_order" xsi:type="string">1</item>
+                    </item>
+                    <item name="2" xsi:type="array">
+                        <item name="title" xsi:type="string">30 fixed</item>
+                        <item name="price" xsi:type="string">30</item>
+                        <item name="price_type" xsi:type="string">Fixed</item>
+                        <item name="sku" xsi:type="string">sku_drop_down_row_3_%isolation%</item>
+                        <item name="sort_order" xsi:type="string">2</item>
+                    </item>
+                </item>
+            </field>
+            <field name="4" xsi:type="array">
+                <item name="title" xsi:type="string">custom option Radio Buttons %isolation%</item>
+                <item name="is_require" xsi:type="string">Yes</item>
+                <item name="type" xsi:type="string">Select/Radio Buttons</item>
+                <item name="options" xsi:type="array">
+                    <item name="0" xsi:type="array">
+                        <item name="title" xsi:type="string">20 fixed</item>
+                        <item name="price" xsi:type="string">20</item>
+                        <item name="price_type" xsi:type="string">Fixed</item>
+                        <item name="sku" xsi:type="string">sku_radio_buttons_row%isolation%</item>
+                    </item>
+                </item>
+            </field>
+            <field name="5" xsi:type="array">
+                <item name="title" xsi:type="string">custom option Checkbox %isolation%</item>
+                <item name="is_require" xsi:type="string">Yes</item>
+                <item name="type" xsi:type="string">Select/Checkbox</item>
+                <item name="options" xsi:type="array">
+                    <item name="0" xsi:type="array">
+                        <item name="title" xsi:type="string">20 fixed</item>
+                        <item name="price" xsi:type="string">20</item>
+                        <item name="price_type" xsi:type="string">Fixed</item>
+                        <item name="sku" xsi:type="string">sku_checkbox_row%isolation%</item>
+                    </item>
+                </item>
+            </field>
+            <field name="6" xsi:type="array">
+                <item name="title" xsi:type="string">custom option Multiple Select %isolation%</item>
+                <item name="is_require" xsi:type="string">Yes</item>
+                <item name="type" xsi:type="string">Select/Multiple Select</item>
+                <item name="options" xsi:type="array">
+                    <item name="0" xsi:type="array">
+                        <item name="title" xsi:type="string">20 fixed</item>
+                        <item name="price" xsi:type="string">20</item>
+                        <item name="price_type" xsi:type="string">Fixed</item>
+                        <item name="sku" xsi:type="string">sku_multiple_select_row%isolation%</item>
+                        <item name="sort_order" xsi:type="string">0</item>
+                    </item>
+                </item>
+            </field>
+            <field name="7" xsi:type="array">
+                <item name="title" xsi:type="string">custom option Date %isolation%</item>
+                <item name="is_require" xsi:type="string">Yes</item>
+                <item name="type" xsi:type="string">Date/Date</item>
+                <item name="options" xsi:type="array">
+                    <item name="0" xsi:type="array">
+                        <item name="price" xsi:type="string">20</item>
+                        <item name="price_type" xsi:type="string">Fixed</item>
+                        <item name="sku" xsi:type="string">sku_date_row%isolation%</item>
+                    </item>
+                </item>
+            </field>
+            <field name="8" xsi:type="array">
+                <item name="title" xsi:type="string">custom option Date &amp; Time %isolation%</item>
+                <item name="is_require" xsi:type="string">Yes</item>
+                <item name="type" xsi:type="string">Date/Date &amp; Time</item>
+                <item name="options" xsi:type="array">
+                    <item name="0" xsi:type="array">
+                        <item name="price" xsi:type="string">20</item>
+                        <item name="price_type" xsi:type="string">Fixed</item>
+                        <item name="sku" xsi:type="string">sku_date_and_time_row%isolation%</item>
+                    </item>
+                </item>
+            </field>
+            <field name="9" xsi:type="array">
+                <item name="title" xsi:type="string">custom option Time %isolation%</item>
+                <item name="is_require" xsi:type="string">Yes</item>
+                <item name="type" xsi:type="string">Date/Time</item>
+                <item name="options" xsi:type="array">
+                    <item name="0" xsi:type="array">
+                        <item name="price" xsi:type="string">20</item>
+                        <item name="price_type" xsi:type="string">Fixed</item>
+                        <item name="sku" xsi:type="string">sku_time_row%isolation%</item>
+                    </item>
+                </item>
+            </field>
+        </dataset>
+
         <dataset name="percent_and_fixed_radio_options">
             <field name="0" xsi:type="array">
                 <item name="title" xsi:type="string">custom menu</item>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/MoveCategoryEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/MoveCategoryEntityTest.php
index 1420487598f0d..58d8425d40a18 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/MoveCategoryEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/MoveCategoryEntityTest.php
@@ -9,6 +9,7 @@
 use Magento\Catalog\Test\Fixture\Category;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogCategoryEdit;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogCategoryIndex;
+use Magento\Mtf\Fixture\FixtureFactory;
 use Magento\Mtf\TestCase\Injectable;
 
 /**
@@ -24,7 +25,7 @@
  * 6. Verify created category
  *
  * @group Category_Management
- * @ZephyrId MAGETWO-27319
+ * @ZephyrId MAGETWO-27319, MAGETWO-21202
  */
 class MoveCategoryEntityTest extends Injectable
 {
@@ -46,19 +47,29 @@ class MoveCategoryEntityTest extends Injectable
      */
     private $catalogCategoryEdit;
 
+    /**
+     * Factory for fixtures.
+     *
+     * @var FixtureFactory
+     */
+    private $fixtureFactory;
+
     /**
      * Inject page end prepare default category.
      *
      * @param CatalogCategoryIndex $catalogCategoryIndex
      * @param CatalogCategoryEdit $catalogCategoryEdit
+     * @param FixtureFactory $fixtureFactory
      * @return void
      */
     public function __inject(
         CatalogCategoryIndex $catalogCategoryIndex,
-        CatalogCategoryEdit $catalogCategoryEdit
+        CatalogCategoryEdit $catalogCategoryEdit,
+        FixtureFactory $fixtureFactory
     ) {
         $this->catalogCategoryIndex = $catalogCategoryIndex;
         $this->catalogCategoryEdit = $catalogCategoryEdit;
+        $this->fixtureFactory = $fixtureFactory;
     }
 
     /**
@@ -66,13 +77,25 @@ public function __inject(
      *
      * @param Category $childCategory
      * @param Category $parentCategory
+     * @param int|null $moveLevel
      * @return array
      */
-    public function test(Category $childCategory, Category $parentCategory)
-    {
+    public function test(
+        Category $childCategory,
+        Category $parentCategory,
+        $moveLevel = null
+    ) {
         // Preconditions:
         $parentCategory->persist();
         $childCategory->persist();
+        $resultCategory = $childCategory;
+
+        if (!empty($moveLevel)) {
+            for ($nestingIterator = 1; $nestingIterator < $moveLevel; $nestingIterator++) {
+                $childCategory = $childCategory->getDataFieldConfig('parent_id')['source']->getParentCategory();
+            }
+            $resultCategory = $this->getMovedCategoryTree($resultCategory, $parentCategory, $childCategory);
+        }
 
         // Steps:
         $this->catalogCategoryIndex->open();
@@ -84,9 +107,39 @@ public function test(Category $childCategory, Category $parentCategory)
         $this->catalogCategoryEdit->getModalBlock()->acceptWarning();
 
         return [
-            'category' => $childCategory,
+            'category' => $resultCategory,
             'parentCategory' => $parentCategory,
-            'childCategory' => $childCategory
+            'childCategory' => $childCategory,
         ];
     }
+
+    /**
+     * Get moved category tree.
+     *
+     * @param Category $movedCategory
+     * @param Category $parentCategory
+     * @param Category $childCategory
+     * @return Category
+     */
+    public function getMovedCategoryTree(Category $movedCategory, Category $parentCategory, Category $childCategory)
+    {
+        $bottomChildCategory = [];
+        while ($movedCategory->getName() != $childCategory->getName()) {
+            $bottomChildCategory[] = $movedCategory->getData();
+            $movedCategory = $movedCategory->getDataFieldConfig('parent_id')['source']->getParentCategory();
+        }
+        $bottomChildCategory[] = $movedCategory->getData();
+
+        $newCategory = $parentCategory;
+        for ($i = count($bottomChildCategory) - 1; $i >= 0; $i--) {
+            unset($bottomChildCategory[$i]['parent_id']);
+            $bottomChildCategory[$i]['parent_id']['source'] = $newCategory;
+            $newCategory = $this->fixtureFactory->createByCode(
+                'category',
+                ['data' => $bottomChildCategory[$i]]
+            );
+        }
+
+        return $newCategory;
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/MoveCategoryEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/MoveCategoryEntityTest.xml
index 28bb3799c5c2b..32d827a608221 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/MoveCategoryEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/MoveCategoryEntityTest.xml
@@ -14,5 +14,26 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryMovedMessage" />
             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteCategoryInGrid" />
         </variation>
+        <variation name="MoveCategoryEntityTestVariation2" summary="Move default subcategory with anchored parent to default subcategory" ticketId="MAGETWO-21202">
+            <data name="issue" xsi:type="string">MAGETWO-65147: Category is not present in Layered navigation block when anchor is on</data>
+            <data name="childCategory/dataset" xsi:type="string">default_subcategory_with_anchored_parent</data>
+            <data name="parentCategory/dataset" xsi:type="string">default</data>
+            <data name="moveLevel" xsi:type="number">2</data>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryMovedMessage" />
+            <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryNavigationMenu" />
+            <constraint name="Magento\LayeredNavigation\Test\Constraint\AssertCategoryLayeredNavigation" />
+            <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryBreadcrumbs" />
+        </variation>
+        <variation name="MoveCategoryEntityTestVariation3" summary="Move default anchored subcategory with anchored parent to default subcategory" ticketId="MAGETWO-21202">
+            <data name="issue" xsi:type="string">MAGETWO-65147: Category is not present in Layered navigation block when anchor is on</data>
+            <data name="childCategory/dataset" xsi:type="string">default_subcategory_with_anchored_parent</data>
+            <data name="childCategory/data/parent_id/dataset" xsi:type="string">default_anchor_subcategory_with_anchored_parent</data>
+            <data name="parentCategory/dataset" xsi:type="string">default_category</data>
+            <data name="moveLevel" xsi:type="number">2</data>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryMovedMessage" />
+            <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryNavigationMenu" />
+            <constraint name="Magento\LayeredNavigation\Test\Constraint\AssertCategoryLayeredNavigation" />
+            <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryBreadcrumbs" />
+        </variation>
     </testCase>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/NavigateMenuTest.xml
index 1e6e5d4c5cf26..3a50372df8c41 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/NavigateMenuTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/NavigateMenuTest.xml
@@ -8,12 +8,12 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest">
         <variation name="NavigateMenuTest9">
-            <data name="menuItem" xsi:type="string">Products > Catalog</data>
-            <data name="pageTitle" xsi:type="string">Catalog</data>
+            <data name="menuItem" xsi:type="string">Catalog > Products</data>
+            <data name="pageTitle" xsi:type="string">Products</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
         </variation>
         <variation name="NavigateMenuTest10">
-            <data name="menuItem" xsi:type="string">Products > Categories</data>
+            <data name="menuItem" xsi:type="string">Catalog > Categories</data>
             <data name="pageTitle" xsi:type="string">Default Category (ID: 2)</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
         </variation>
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/ApplyCatalogPriceRulesTest.xml b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/ApplyCatalogPriceRulesTest.xml
index 828a8ee956683..3fb35837faaa0 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/ApplyCatalogPriceRulesTest.xml
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/ApplyCatalogPriceRulesTest.xml
@@ -114,6 +114,7 @@
             <constraint name="Magento\CatalogRule\Test\Constraint\AssertCatalogPriceRuleAppliedShoppingCart" />
         </variation>
         <variation name="ApplyCatalogRuleForSimpleProductWithCustomOptions" summary="Apply Catalog Rule for Simple Product With Custom Options" ticketId="MAGETWO-23038">
+            <data name="tag" xsi:type="string">stable:no</data>
             <data name="products/0" xsi:type="string">catalogProductSimple::with_default_custom_option</data>
             <data name="products/1" xsi:type="string">catalogProductSimple::with_percent_and_fixed_custom_option</data>
             <data name="products/2" xsi:type="string">catalogProductSimple::with_custom_options_and_price_56_78</data>
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.php
index 167e9a65afec5..7abdb8e18a8a5 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.php
@@ -26,7 +26,7 @@
  * 4. Perform all asserts
  *
  * @group Shopping_Cart
- * @ZephyrId MAGETWO-25382, MAGETWO-42677
+ * @ZephyrId MAGETWO-25382, MAGETWO-42677, MAGETWO-45389
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class AddProductsToShoppingCartEntityTest extends Injectable
@@ -133,10 +133,16 @@ public function __prepare(
      * @param array $cart
      * @param string|null $configData [optional]
      * @param bool $flushCache [optional]
+     * @param bool $isValidationFailed
      * @return array
      */
-    public function test(array $productsData, array $cart, $configData = null, $flushCache = false)
-    {
+    public function test(
+        array $productsData,
+        array $cart,
+        $configData = null,
+        $flushCache = false,
+        $isValidationFailed = false
+    ) {
         // Preconditions
         $this->configData = $configData;
         $this->flushCache = $flushCache;
@@ -153,10 +159,13 @@ public function test(array $productsData, array $cart, $configData = null, $flus
         $products = $this->prepareProducts($productsData);
 
         // Steps
-        $this->addToCart($products);
+        $this->addToCart($products, $isValidationFailed);
 
         $cart['data']['items'] = ['products' => $products];
-        return ['cart' => $this->fixtureFactory->createByCode('cart', $cart)];
+        return [
+            'cart' => $this->fixtureFactory->createByCode('cart', $cart),
+            'products' => $products
+        ];
     }
 
     /**
@@ -180,13 +189,14 @@ protected function prepareProducts(array $productList)
      * Add products to cart.
      *
      * @param array $products
+     * @param bool $isValidationFailed
      * @return void
      */
-    protected function addToCart(array $products)
+    protected function addToCart(array $products, $isValidationFailed)
     {
         $addToCartStep = $this->testStepFactory->create(
             \Magento\Checkout\Test\TestStep\AddProductsToTheCartStep::class,
-            ['products' => $products]
+            ['products' => $products, 'isValidationFailed' => $isValidationFailed]
         );
         $addToCartStep->run();
     }
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.xml
index c48df02b9f254..6f224fc8cbf21 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.xml
@@ -252,5 +252,18 @@
             <constraint name="Magento\Checkout\Test\Constraint\AssertVisibleItemsQtyInCheckoutSummaryBlock" />
             <constraint name="Magento\Checkout\Test\Constraint\AssertLinkGoToCartPresentInSummaryBlock" />
         </variation>
+        <variation name="AddProductsToShoppingCartEntityTestVariation11" summary="Create product with all types of custom options that are required and trigger JS validation" ticketId="MAGETWO-45389">
+            <data name="productsData/0" xsi:type="string">catalogProductSimple::with_all_required_custom_option</data>
+            <data name="cart/data/subtotal" xsi:type="string">6160.00</data>
+            <data name="isValidationFailed" xsi:type="boolean">true</data>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductCustomOptionsErrors" />
+            <constraint name="Magento\Checkout\Test\Constraint\AssertProductsAbsentInShoppingCart" />
+        </variation>
+        <variation name="AddProductsToShoppingCartEntityTestVariation12" summary="Create product with all types of custom options that are required and check that item options for product(s) display with correct information" ticketId="MAGETWO-45389">
+            <data name="productsData/0" xsi:type="string">catalogProductSimple::with_all_required_custom_option</data>
+            <data name="cart/data/subtotal" xsi:type="string">6160.00</data>
+            <data name="isValidationFailed" xsi:type="boolean">true</data>
+            <constraint name="Magento\Checkout\Test\Constraint\AssertCartItemsOptions" />
+        </variation>
     </testCase>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/AddProductsToTheCartStep.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/AddProductsToTheCartStep.php
index a2d265141a7e4..47ac1a0e33469 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/AddProductsToTheCartStep.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/AddProductsToTheCartStep.php
@@ -67,6 +67,13 @@ class AddProductsToTheCartStep implements TestStepInterface
      */
     private $loadingSelector = '.loading-mask';
 
+    /**
+     * Flag for validation result after add product to cart.
+     *
+     * @var bool
+     */
+    private $isValidationFailed;
+
     /**
      * @param CatalogProductView $catalogProductView
      * @param CheckoutCart $checkoutCart
@@ -74,6 +81,7 @@ class AddProductsToTheCartStep implements TestStepInterface
      * @param BrowserInterface $browser
      * @param FixtureFactory $fixtureFactory
      * @param array $products
+     * @param bool $isValidationFailed
      */
     public function __construct(
         CatalogProductView $catalogProductView,
@@ -81,7 +89,8 @@ public function __construct(
         CmsIndex $cmsIndex,
         BrowserInterface $browser,
         FixtureFactory $fixtureFactory,
-        array $products
+        array $products,
+        $isValidationFailed = false
     ) {
         $this->catalogProductView = $catalogProductView;
         $this->checkoutCart = $checkoutCart;
@@ -89,6 +98,7 @@ public function __construct(
         $this->browser = $browser;
         $this->fixtureFactory = $fixtureFactory;
         $this->products = $products;
+        $this->isValidationFailed = $isValidationFailed;
     }
 
     /**
@@ -105,7 +115,12 @@ public function run()
             $this->browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
             $this->catalogProductView->getViewBlock()->waitForElementNotVisible($this->loadingSelector);
             $this->catalogProductView->getViewBlock()->addToCart($product);
-            $this->catalogProductView->getMessagesBlock()->waitSuccessMessage();
+
+            if ($this->isValidationFailed) {
+                $this->catalogProductView->getCustomOptionsBlock()->waitValidationErrorMessage();
+            } else {
+                $this->catalogProductView->getMessagesBlock()->waitSuccessMessage();
+            }
         }
         $cart['data']['items'] = ['products' => $this->products];
         return ['cart' => $this->fixtureFactory->createByCode('cart', $cart)];
diff --git a/dev/tests/functional/tests/app/Magento/Contact/Test/Block/Form/ContactUs.php b/dev/tests/functional/tests/app/Magento/Contact/Test/Block/Form/ContactUs.php
new file mode 100644
index 0000000000000..84d4de9f37822
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Contact/Test/Block/Form/ContactUs.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Contact\Test\Block\Form;
+
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Locator;
+
+/**
+ * Form for "Contact Us" page with captcha.
+ */
+class ContactUs extends Form
+{
+    /**
+     * Submit form button.
+     *
+     * @var string
+     */
+    private $submit = '.action.submit';
+
+    /**
+     * Click submit button.
+     *
+     * @return void
+     */
+    public function sendComment()
+    {
+        $this->_rootElement->find($this->submit, Locator::SELECTOR_CSS)->click();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Contact/Test/Block/Form/ContactUs.xml b/dev/tests/functional/tests/app/Magento/Contact/Test/Block/Form/ContactUs.xml
new file mode 100644
index 0000000000000..c8df861ba5746
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Contact/Test/Block/Form/ContactUs.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" ?>
+<!--
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<mapping strict="0">
+    <fields>
+        <customer composite="1">
+            <firstname>
+                <selector>input[name*=name]</selector>
+            </firstname>
+            <email />
+            <telephone />
+        </customer>
+        <comment>
+            <selector>#comment</selector>
+        </comment>
+    </fields>
+</mapping>
diff --git a/dev/tests/functional/tests/app/Magento/Contact/Test/Block/Messages.php b/dev/tests/functional/tests/app/Magento/Contact/Test/Block/Messages.php
new file mode 100644
index 0000000000000..b909ad520f175
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Contact/Test/Block/Messages.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Contact\Test\Block;
+
+use Magento\Mtf\Block\Block;
+
+/**
+ * Message block on "Contact Us" page.
+ */
+class Messages extends Block
+{
+    /**
+     * Message selector.
+     *
+     * @var string
+     */
+    private $message = '[data-bind*="message.text"]';
+
+    /**
+     * Get message which is present on the "Contact Us" page.
+     *
+     * @return string
+     */
+    public function getMessage()
+    {
+        $this->waitForElementVisible($this->message);
+
+        return $this->_rootElement->find($this->message)->getText();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Contact/Test/Constraint/AssertContactUsSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Contact/Test/Constraint/AssertContactUsSuccessMessage.php
new file mode 100644
index 0000000000000..4205ff63f0122
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Contact/Test/Constraint/AssertContactUsSuccessMessage.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Contact\Test\Constraint;
+
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Contact\Test\Page\ContactIndex;
+
+/**
+ * Assert that success message is present on "Contact Us" page.
+ */
+class AssertContactUsSuccessMessage extends AbstractConstraint
+{
+    /**
+     * Success sent comment message(the first part).
+     */
+    const SUCCESS_MESSAGE_PART_1 = "Thanks for contacting us with your comments and questions. ";
+
+    /**
+     * Success sent comment message(the second part).
+     */
+    const SUCCESS_MESSAGE_PART_2 = "We'll respond to you very soon.";
+
+    /**
+     * Assert that success message is present on "Contact Us" page.
+     *
+     * @param ContactIndex $contactIndex
+     * @return void
+     */
+    public function processAssert(ContactIndex $contactIndex)
+    {
+        \PHPUnit_Framework_Assert::assertEquals(
+            self::SUCCESS_MESSAGE_PART_1 . self::SUCCESS_MESSAGE_PART_2,
+            $contactIndex->getMessagesBlock()->getMessage(),
+            'Wrong message is displayed.'
+        );
+    }
+
+    /**
+     * Returns a string representation of the object.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Success message is present on contact us page.';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Contact/Test/Fixture/Comment.xml b/dev/tests/functional/tests/app/Magento/Contact/Test/Fixture/Comment.xml
new file mode 100644
index 0000000000000..af31dd6861445
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Contact/Test/Fixture/Comment.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
+    <fixture name="comment"
+             module="Magento_Contact"
+             repository_class="Magento\Contact\Test\Repository\Comment"
+             class="Magento\Contact\Test\Fixture\Comment">
+        <field name="comment" is_required="0" />
+        <field name="customer" is_required="0" source="Magento\Contact\Test\Fixture\Comment\Customer" />
+    </fixture>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Contact/Test/Fixture/Comment/Customer.php b/dev/tests/functional/tests/app/Magento/Contact/Test/Fixture/Comment/Customer.php
new file mode 100644
index 0000000000000..188809f4a8650
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Contact/Test/Fixture/Comment/Customer.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Contact\Test\Fixture\Comment;
+
+use Magento\Mtf\Fixture\DataSource;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Customer\Test\Fixture\Customer as CustomerFixture;
+
+/**
+ * Customer comment on contact page.
+ */
+class Customer extends DataSource
+{
+    /**
+     * Customer Fixture.
+     *
+     * @var CustomerFixture
+     */
+    private $customer;
+
+    /**
+     * Fixture Factory instance.
+     *
+     * @var FixtureFactory
+     */
+    private $fixtureFactory;
+
+    /**
+     * @param FixtureFactory $fixtureFactory
+     * @param array $params
+     * @param array|int $data
+     */
+    public function __construct(
+        FixtureFactory $fixtureFactory,
+        array $params,
+        $data = []
+    ) {
+        $this->fixtureFactory = $fixtureFactory;
+        $this->params = $params;
+        $this->data = $data;
+    }
+
+    /**
+     * Return prepared data set.
+     *
+     * @param string $key [optional]
+     * @return mixed
+     * @throws \Exception
+     */
+    public function getData($key = null)
+    {
+        if (empty($this->data)) {
+            throw new \Exception("Data must be set");
+        }
+
+        if (isset($this->data['dataset']) && !$this->customer) {
+            /** @var CustomerFixture $customer */
+            $customer = $this->fixtureFactory->createByCode('customer', $this->data);
+
+            if (!$customer->getId()) {
+                $customer->persist();
+            }
+
+            $this->customer = $customer;
+            $this->data = [
+                'firstname' => $customer->getFirstname(),
+                'email' => $customer->getEmail(),
+            ];
+
+            if ($customer->hasData('telephone')) {
+                $this->data['telephone'] = $customer->getData('telephone');
+            }
+        }
+
+        return parent::getData($key);
+    }
+
+    /**
+     * Return customer.
+     *
+     * @return CustomerFixture
+     */
+    public function getCustomer()
+    {
+        return $this->customer;
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Contact/Test/Page/ContactIndex.xml b/dev/tests/functional/tests/app/Magento/Contact/Test/Page/ContactIndex.xml
new file mode 100644
index 0000000000000..bcdf194e33c83
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Contact/Test/Page/ContactIndex.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/pages.xsd">
+    <page name="ContactIndex" mca="contact/index/index" module="Magento_Contact">
+        <block name="messagesBlock" class="Magento\Contact\Test\Block\Messages" locator=".messages" strategy="css selector" />
+        <block name="contactUs" class="Magento\Contact\Test\Block\Form\ContactUs" locator="#contact-form" strategy="css selector" />
+    </page>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.php
index 9f36c33c5d296..3f2dcc28c8d6b 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.php
@@ -7,6 +7,7 @@
 namespace Magento\Customer\Test\Block\Adminhtml\Edit;
 
 use Magento\Backend\Test\Block\Widget\FormTabs;
+use Magento\Mtf\Client\Locator;
 use Magento\Mtf\Fixture\FixtureInterface;
 use Magento\Mtf\Fixture\InjectableFixture;
 use Magento\Customer\Test\Fixture\Address;
@@ -51,6 +52,13 @@ class CustomerForm extends FormTabs
      */
     protected $tabReadiness = '.admin__page-nav-item._active._loading';
 
+    /**
+     * Personal information xpath selector.
+     *
+     * @var string
+     */
+    protected $information = './/th[contains(text(), "%s")]/following-sibling::td[1]';
+
     /**
      * Fill Customer forms on tabs by customer, addresses data.
      *
@@ -162,4 +170,15 @@ public function getJsErrors()
         }
         return $jsErrors;
     }
+
+    /**
+     * Get personal information.
+     *
+     * @param string $title
+     * @return string
+     */
+    public function getPersonalInformation($title)
+    {
+        return $this->_rootElement->find(sprintf($this->information, $title), Locator::SELECTOR_XPATH)->getText();
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerIsLockedOnBackend.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerIsLockedOnBackend.php
new file mode 100644
index 0000000000000..44c68f61a91a2
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerIsLockedOnBackend.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Customer\Test\Constraint;
+
+use Magento\Customer\Test\Fixture\Customer;
+use Magento\Customer\Test\Page\Adminhtml\CustomerIndexEdit;
+use Magento\Mtf\Constraint\AbstractConstraint;
+
+/**
+ * Assert that customer account is locked on backend.
+ */
+class AssertCustomerIsLockedOnBackend extends AbstractConstraint
+{
+    /**
+     * Customer account status.
+     */
+    const CUSTOMER_LOCKED_ACCOUNT = 'Locked';
+
+    /**
+     * Assert customer account status on the backend.
+     *
+     * @param CustomerIndexEdit $customerIndexEdit
+     * @param Customer $customer
+     * @return void
+     */
+    public function processAssert(
+        CustomerIndexEdit $customerIndexEdit,
+        Customer $customer
+    ) {
+        $customerIndexEdit->open(['id' => $customer->getId()]);
+        \PHPUnit_Framework_Assert::assertEquals(
+            self::CUSTOMER_LOCKED_ACCOUNT,
+            $customerIndexEdit->getCustomerForm()->getPersonalInformation('Account Lock'),
+            'Incorrect customer account status.'
+        );
+    }
+
+    /**
+     * Assert that displayed customer account status is correct.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Customer account status is correct.';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Fedex/Test/TestCase/TrackingShipmentForPlacedOrderTest.xml b/dev/tests/functional/tests/app/Magento/Fedex/Test/TestCase/TrackingShipmentForPlacedOrderTest.xml
new file mode 100644
index 0000000000000..e966b16ec6334
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Fedex/Test/TestCase/TrackingShipmentForPlacedOrderTest.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
+    <testCase name="Magento\Shipping\Test\TestCase\TrackingShipmentForPlacedOrderTest" summary="Create shipment for order with FedEx shipping method.">
+        <variation name="TrackingFedExShipmentForPlacedOrderTestVariation1" summary="Creating shipment for order placed within FedEx." ticketId="MAGETWO-58158">
+            <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
+            <data name="customer/dataset" xsi:type="string">default</data>
+            <data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
+            <data name="checkoutMethod" xsi:type="string">login</data>
+            <data name="shipping/shipping_service" xsi:type="string">Federal Express</data>
+            <data name="shipping/shipping_method" xsi:type="string">Smart Post</data>
+            <data name="cart/data/shipping_method" xsi:type="string">Smart Post</data>
+            <data name="payment/method" xsi:type="string">checkmo</data>
+            <data name="configData" xsi:type="string">checkmo, fedex, shipping_origin_US_CA</data>
+            <data name="trackingData" xsi:type="array">
+                <item name="carrier" xsi:type="string">Federal Express</item>
+                <item name="carrier_title" xsi:type="string">Federal Express</item>
+                <item name="tracking_number" xsi:type="string">449044304137821</item>
+            </data>
+            <data name="resultTrackingData" xsi:type="array">
+                <item name="number" xsi:type="string">449044304137821</item>
+            </data>
+            <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
+            <constraint name="Magento\Shipping\Test\Constraint\AssertTrackingDetailsIsPresent" />
+        </variation>
+    </testCase>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Block/Navigation.php b/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Block/Navigation.php
index 01ca5a8020410..0263cf6ad653d 100644
--- a/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Block/Navigation.php
+++ b/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Block/Navigation.php
@@ -8,6 +8,7 @@
 
 use Magento\Mtf\Block\Block;
 use Magento\Mtf\Client\Locator;
+use Magento\Catalog\Test\Fixture\Category;
 
 /**
  * Catalog layered navigation view block.
@@ -49,6 +50,20 @@ class Navigation extends Block
      */
     protected $expandFilterButton = '[data]';
 
+    /**
+     * Locator for category name.
+     *
+     * @var string
+     */
+    private $categoryName = './/li[@class="item"]//a[contains(text(),"%s")]';
+
+    /**
+     * Locator for element with product quantity.
+     *
+     * @var string
+     */
+    private $productQty = '/following-sibling::span[contains(text(), "%s")]';
+
     /**
      * Remove all applied filters.
      *
@@ -78,7 +93,7 @@ public function getFilters()
     }
 
     /**
-     * Apply Layerd Navigation filter.
+     * Apply Layered Navigation filter.
      *
      * @param string $filter
      * @param string $linkPattern
@@ -104,4 +119,19 @@ public function applyFilter($filter, $linkPattern)
         }
         throw new \Exception("Can't find {$filter} filter link by pattern: {$linkPattern}");
     }
+
+    /**
+     * Check that category with product quantity can be displayed on layered navigation.
+     *
+     * @param Category $category
+     * @param int $qty
+     * @return bool
+     */
+    public function isCategoryVisible(Category $category, $qty)
+    {
+        return $this->_rootElement->find(
+            sprintf($this->categoryName, $category->getName()) . sprintf($this->productQty, $qty),
+            Locator::SELECTOR_XPATH
+        )->isVisible();
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Constraint/AssertCategoryLayeredNavigation.php b/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Constraint/AssertCategoryLayeredNavigation.php
new file mode 100644
index 0000000000000..2da9def11612f
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Constraint/AssertCategoryLayeredNavigation.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\LayeredNavigation\Test\Constraint;
+
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Catalog\Test\Fixture\Category;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
+
+/**
+ * Assert that category is present in layered navigation and product is visible in product grid.
+ */
+class AssertCategoryLayeredNavigation extends AbstractConstraint
+{
+    /**
+     * Browser instance.
+     *
+     * @var BrowserInterface
+     */
+    private $browser;
+
+    /**
+     * Assert that category is present in layered navigation and product is visible in product grid.
+     *
+     * @param CatalogCategoryView $catalogCategoryView
+     * @param Category $category
+     * @param BrowserInterface $browser
+     * @return void
+     */
+    public function processAssert(
+        CatalogCategoryView $catalogCategoryView,
+        Category $category,
+        BrowserInterface $browser
+    ) {
+        $this->browser = $browser;
+        $this->openCategory($category->getDataFieldConfig('parent_id')['source']->getParentCategory());
+
+        \PHPUnit_Framework_Assert::assertTrue(
+            $catalogCategoryView->getLayeredNavigationBlock()->isCategoryVisible($category, 1),
+            'Category ' . $category->getName() . ' is absent in Layered Navigation.'
+        );
+
+        $productsOnCategoryPage = $catalogCategoryView->getListProductBlock()->getProductNames();
+        $productsInCategory = $category->getDataFieldConfig('category_products')['source']->getProducts();
+        foreach ($productsInCategory as $product) {
+            \PHPUnit_Framework_Assert::assertTrue(
+                in_array($product->getName(), $productsOnCategoryPage),
+                'Product ' . $product->getName() . ' is absent on category page.'
+            );
+        }
+    }
+
+    /**
+     * Open category.
+     *
+     * @param Category $category
+     * @return void
+     */
+    private function openCategory(Category $category)
+    {
+        $categoryUrlKey = [];
+
+        while ($category) {
+            $categoryUrlKey[] = $category->hasData('url_key')
+                ? strtolower($category->getUrlKey())
+                : trim(strtolower(preg_replace('#[^0-9a-z%]+#i', '-', $category->getName())), '-');
+
+            $category = $category->getDataFieldConfig('parent_id')['source']->getParentCategory();
+            if ($category !== null && 1 == $category->getParentId()) {
+                $category = null;
+            }
+        }
+        $categoryUrlKey = $_ENV['app_frontend_url'] . implode('/', array_reverse($categoryUrlKey)) . '.html';
+
+        $this->browser->open($categoryUrlKey);
+    }
+
+    /**
+     * Assert success message that category is present in layered navigation and product is visible in product grid.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Category is present in layered navigation and product is visible in product grid.';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Info.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Info.php
index 85aa0665414b0..3e45fa13dab7a 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Info.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Info.php
@@ -7,6 +7,7 @@
 namespace Magento\Sales\Test\Block\Adminhtml\Order\View\Tab;
 
 use Magento\Backend\Test\Block\Widget\Tab;
+use Magento\Sales\Test\Block\Adminhtml\Order\View\Tab\Info\ShippingInfoBlock;
 use Magento\Sales\Test\Block\Adminhtml\Order\View\Tab\Info\CommentsHistoryBlock;
 use Magento\Sales\Test\Block\Adminhtml\Order\View\Tab\Info\PaymentInfoBlock;
 
@@ -29,6 +30,13 @@ class Info extends Tab
      */
     private $paymentInfoBlockSelector = '.order-payment-method';
 
+    /**
+     * Selector for `Shipping Information` block.
+     *
+     * @var string
+     */
+    private $shippingInfoBlock = '.order-shipping-method';
+
     /**
      * Selector for Comments history block.
      *
@@ -59,6 +67,19 @@ public function getPaymentInfoBlock()
         );
     }
 
+    /**
+     * Gets Order Shipping Information block.
+     *
+     * @return ShippingInfoBlock
+     */
+    public function getShippingInfoBlock()
+    {
+        return $this->blockFactory->create(
+            ShippingInfoBlock::class,
+            ['element' => $this->_rootElement->find($this->shippingInfoBlock)]
+        );
+    }
+
     /**
      * Returns Comments history block.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Info/ShippingInfoBlock.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Info/ShippingInfoBlock.php
new file mode 100644
index 0000000000000..94e11391bf2e3
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Info/ShippingInfoBlock.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sales\Test\Block\Adminhtml\Order\View\Tab\Info;
+
+use Magento\Mtf\Block\Block;
+
+/**
+ * Representation of Order Shipping Information.
+ */
+class ShippingInfoBlock extends Block
+{
+    /**
+     * Selector for a shipment tracking popup.
+     *
+     * @var string
+     */
+    private $trackingPopupLink = '#linkId';
+
+    /**
+     * Opens the shipment tracking popup.
+     *
+     * @return void
+     */
+    public function openTrackingPopup()
+    {
+        $popup = $this->_rootElement->find($this->trackingPopupLink);
+        $popup->click();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAuthorizationInCommentsHistory.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAuthorizationInCommentsHistory.php
index 78e5a3b31c4cd..898fba0c32f6a 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAuthorizationInCommentsHistory.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAuthorizationInCommentsHistory.php
@@ -40,11 +40,12 @@ public function processAssert(
 
         /** @var \Magento\Sales\Test\Block\Adminhtml\Order\View\Tab\Info $infoTab */
         $infoTab = $salesOrderView->getOrderForm()->openTab('info')->getTab('info');
-        $latestComment = $infoTab->getCommentsHistoryBlock()->getLatestComment();
+        $orderComments = $infoTab->getCommentsHistoryBlock()->getComments();
+        $commentsMessages = array_column($orderComments, 'comment');
 
         \PHPUnit_Framework_Assert::assertRegExp(
             sprintf(self::AUTHORIZED_AMOUNT_PATTERN, $prices['grandTotal']),
-            $latestComment['comment'],
+            implode('. ', $commentsMessages),
             'Incorrect authorized amount value for the order #' . $orderId
         );
     }
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCancelInCommentsHistory.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCancelInCommentsHistory.php
new file mode 100644
index 0000000000000..56a9b02265da4
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCancelInCommentsHistory.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sales\Test\Constraint;
+
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
+use Magento\Sales\Test\Page\Adminhtml\SalesOrderView;
+
+/**
+ * Assert that comment about canceled amount exists in
+ * Comments History section on order page in Admin.
+ */
+class AssertCancelInCommentsHistory extends AbstractConstraint
+{
+    /**
+     * Pattern of message about canceled amount in order.
+     */
+    private $canceledAmountPattern = '/^Canceled order online Amount: \w*\W{1,2}%s. Transaction ID: "[\w\-]*"/';
+
+    /**
+     * @param SalesOrderView $salesOrderView
+     * @param OrderIndex $salesOrder
+     * @param string $orderId
+     * @param array $prices
+     * @return void
+     */
+    public function processAssert(
+        SalesOrderView $salesOrderView,
+        OrderIndex $salesOrder,
+        $orderId,
+        array $prices
+    ) {
+        $salesOrder->open();
+        $salesOrder->getSalesOrderGrid()->searchAndOpen(['id' => $orderId]);
+
+        /** @var \Magento\Sales\Test\Block\Adminhtml\Order\View\Tab\Info $infoTab */
+        $infoTab = $salesOrderView->getOrderForm()->openTab('info')->getTab('info');
+        $comments = $infoTab->getCommentsHistoryBlock()->getComments();
+        $commentsMessages = array_column($comments, 'comment');
+
+        \PHPUnit_Framework_Assert::assertRegExp(
+            sprintf($this->canceledAmountPattern, $prices['grandTotal']),
+            implode('. ', $commentsMessages),
+            'Incorrect canceled amount value for the order #' . $orderId
+        );
+    }
+
+    /**
+     * Returns a string representation of the object.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return "Message about canceled amount is available in Comments History section.";
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/CancelOrderStep.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/CancelOrderStep.php
new file mode 100644
index 0000000000000..deee46aa79a3e
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/CancelOrderStep.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sales\Test\TestStep;
+
+use Magento\Mtf\TestStep\TestStepInterface;
+use Magento\Sales\Test\Fixture\OrderInjectable;
+use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
+use Magento\Sales\Test\Page\Adminhtml\SalesOrderView;
+
+/**
+ * Click cancel from order in Admin.
+ */
+class CancelOrderStep implements TestStepInterface
+{
+    /**
+     * Sales order index page.
+     *
+     * @var OrderIndex
+     */
+    private $orderIndex;
+
+    /**
+     * Order instance.
+     *
+     * @var OrderInjectable
+     */
+    private $order;
+
+    /**
+     * Order View Page.
+     *
+     * @var SalesOrderView
+     */
+    protected $salesOrderView;
+
+    /**
+     * @param OrderIndex $orderIndex
+     * @param OrderInjectable $order
+     * @param SalesOrderView $salesOrderView
+     */
+    public function __construct(
+        OrderIndex $orderIndex,
+        OrderInjectable $order,
+        SalesOrderView $salesOrderView
+    ) {
+        $this->orderIndex = $orderIndex;
+        $this->order = $order;
+        $this->salesOrderView = $salesOrderView;
+    }
+
+    /**
+     * Run step flow
+     *
+     * @return void
+     */
+    public function run()
+    {
+        $this->orderIndex->open();
+        $this->orderIndex->getSalesOrderGrid()->searchAndOpen(['id' => $this->order->getId()]);
+        $this->salesOrderView->getPageActions()->cancel();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/etc/di.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/etc/di.xml
index b6c087e8edba9..3b497fa10d654 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/etc/di.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/etc/di.xml
@@ -116,4 +116,9 @@
             <argument name="severity" xsi:type="string">S1</argument>
         </arguments>
     </type>
+    <type name="Magento\Sales\Test\Constraint\AssertCancelInCommentsHistory">
+        <arguments>
+            <argument name="severity" xsi:type="string">S1</argument>
+        </arguments>
+    </type>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Adminhtml/Order/Tracking/Item.xml b/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Adminhtml/Order/Tracking/Item.xml
index 77968f2f5f515..15fdce6d2dbad 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Adminhtml/Order/Tracking/Item.xml
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Adminhtml/Order/Tracking/Item.xml
@@ -17,5 +17,15 @@
         <number>
             <selector>[name$='[number]']</selector>
         </number>
+        <carrier>
+            <selector>[name$='carrier']</selector>
+            <input>select</input>
+        </carrier>
+        <carrier_title>
+            <selector>[name$='title']</selector>
+        </carrier_title>
+        <tracking_number>
+            <selector>[name$='number']</selector>
+        </tracking_number>
     </fields>
 </mapping>
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Adminhtml/Order/TrackingInfoTable.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Adminhtml/Order/TrackingInfoTable.php
new file mode 100644
index 0000000000000..b352a3197c313
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Adminhtml/Order/TrackingInfoTable.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Shipping\Test\Block\Adminhtml\Order;
+
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+use Magento\Shipping\Test\Block\Adminhtml\Order\Tracking\Item;
+
+/**
+ * Block for shipment tracking info table.
+ */
+class TrackingInfoTable extends Block
+{
+    /**
+     * Selector for tracking number item.
+     *
+     * @var string
+     */
+    private $item = './/tfoot/tr[not(contains(@class,"no-display"))]';
+
+    /**
+     * Selector for a button to add new tracking number item.
+     *
+     * @var string
+     */
+    private $addButton = '[data-ui-id="shipment-tracking-save-button"]';
+
+    /**
+     * Creates tracking number.
+     *
+     * @param array $data
+     */
+    public function addTrackingNumber(array $data)
+    {
+        $trackingItemBlock = $this->getTrackingNumberItem();
+        $trackingItemBlock->fillRow($data);
+
+        $this->_rootElement->find($this->addButton)->click();
+    }
+
+    /**
+     * Creates block for tracking number item.
+     *
+     * @return Item
+     */
+    private function getTrackingNumberItem()
+    {
+        return $this->blockFactory->create(
+            Item::class,
+            ['element' => $this->_rootElement->find($this->item, Locator::SELECTOR_XPATH)]
+        );
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertTrackingDetailsIsPresent.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertTrackingDetailsIsPresent.php
new file mode 100644
index 0000000000000..438f25a26a217
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertTrackingDetailsIsPresent.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Shipping\Test\Constraint;
+
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Sales\Test\Block\Adminhtml\Order\View\Tab\Info;
+use Magento\Sales\Test\Fixture\OrderInjectable;
+use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
+use Magento\Sales\Test\Page\Adminhtml\SalesOrderView;
+
+/**
+ * Class contains asserts for tracking number popup window.
+ */
+class AssertTrackingDetailsIsPresent extends AbstractConstraint
+{
+    /**
+     * Selector for a main container.
+     *
+     * @var string
+     */
+    private $mainContainer = '.main';
+
+    /**
+     * Processes the assertions for tracking number data in the popup window.
+     *
+     * @param BrowserInterface $browser
+     * @param OrderInjectable $order
+     * @param OrderIndex $orderIndex
+     * @param SalesOrderView $salesOrderView
+     * @param $resultTrackingData
+     */
+    public function processAssert(
+        BrowserInterface $browser,
+        OrderInjectable $order,
+        OrderIndex $orderIndex,
+        SalesOrderView $salesOrderView,
+        $resultTrackingData
+    ) {
+        $orderIndex->open();
+        $orderIndex->getSalesOrderGrid()
+            ->searchAndOpen(['id' => $order->getId()]);
+
+        /** @var Info $infoTab */
+        $infoTab = $salesOrderView->getOrderForm()
+            ->openTab('info')
+            ->getTab('info');
+
+        $mainWindow = $browser->getCurrentWindow();
+        $shippingInfoBlock = $infoTab->getShippingInfoBlock();
+        $shippingInfoBlock->openTrackingPopup();
+
+        $browser->selectWindow();
+
+        $selector = '.close';
+        $browser->waitUntil(function () use ($browser, $selector) {
+            $element = $browser->find($selector);
+            return $element->isVisible() ? true : null;
+        });
+
+        $body = $browser->find($this->mainContainer)->getText();
+        foreach ($resultTrackingData as $value) {
+            \PHPUnit_Framework_Assert::assertContains(
+                $value,
+                $body,
+                'The "' . $value . '" is not present in Shipping Tracking popup.'
+            );
+        }
+        $popupWindow = $browser->getCurrentWindow();
+        $browser->selectWindow($mainWindow);
+        $browser->closeWindow($popupWindow);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function toString()
+    {
+        return 'Shipment tracking data is present in the popup window.';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Page/Adminhtml/SalesShipmentView.xml b/dev/tests/functional/tests/app/Magento/Shipping/Test/Page/Adminhtml/SalesShipmentView.xml
index 1eedf8840b76e..13b90b7d79b4b 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Page/Adminhtml/SalesShipmentView.xml
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Page/Adminhtml/SalesShipmentView.xml
@@ -9,5 +9,6 @@
   <page name="SalesShipmentView" area="Adminhtml" mca="sales/shipment/view" module="Magento_Shipping">
     <block name="titleBlock" class="Magento\Theme\Test\Block\Html\Title" locator=".page-title-wrapper" strategy="css selector"/>
     <block name="itemsBlock" class="Magento\Sales\Test\Block\Adminhtml\Order\Shipment\View\Items" locator="//section[div/table[contains(@class, 'order-shipment-table')]]" strategy="xpath"/>
+    <block name="trackingInfoBlock" class="Magento\Shipping\Test\Block\Adminhtml\Order\TrackingInfoTable" locator="#shipment_tracking_info" strategy="css selector"/>
   </page>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/TestCase/TrackingShipmentForPlacedOrderTest.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/TestCase/TrackingShipmentForPlacedOrderTest.php
new file mode 100644
index 0000000000000..8ae6dc59e26bf
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/TestCase/TrackingShipmentForPlacedOrderTest.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Shipping\Test\TestCase;
+
+use Magento\Mtf\TestCase\Scenario;
+
+/**
+ * Preconditions:
+ * 1. Enable payment method "Check/Money Order".
+ *
+ * Steps:
+ * 1. Go to Storefront.
+ * 2. Add products to the shopping cart.
+ * 3. Fill shipping information on Checkout step.
+ * 4. Select shipping method.
+ * 5. Place order.
+ * 6. Go to Sales > Orders.
+ * 7. Select created order in the grid and open it.
+ * 8. Click 'Ship' button.
+ * 9. Fill data according to dataset.
+ * 10. Click 'Submit Shipment' button.
+ * 11. Select created shipment in the grid and open it.
+ * 12. Add tracking number according to dataset.
+ * 13. Select created order in the grid and open it.
+ * 14. Click on 'Track Order' link.
+ * 15. Perform all asserts.
+ *
+ * @group Shipping
+ * @ZephyrId MAGETWO-65163, MAGETWO-58158
+ */
+class TrackingShipmentForPlacedOrderTest extends Scenario
+{
+    /* tags */
+    const MVP = 'yes';
+    const SEVERITY = 'S1';
+    /* end tags */
+
+    /**
+     * Runs one page checkout test.
+     *
+     * @return void
+     */
+    public function test()
+    {
+        $this->executeScenario();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/TestCase/TrackingShipmentForPlacedOrderTest.xml b/dev/tests/functional/tests/app/Magento/Shipping/Test/TestCase/TrackingShipmentForPlacedOrderTest.xml
new file mode 100644
index 0000000000000..2a210e2e58d62
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/TestCase/TrackingShipmentForPlacedOrderTest.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
+    <testCase name="Magento\Shipping\Test\TestCase\TrackingShipmentForPlacedOrderTest" summary="Create shipment for order.">
+        <variation name="TrackingShipmentForPlacedOrderTestVariation1" summary="Creating shipment for order placed within Flat Rate." ticketId="MAGETWO-65163">
+            <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
+            <data name="customer/dataset" xsi:type="string">default</data>
+            <data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
+            <data name="checkoutMethod" xsi:type="string">login</data>
+            <data name="shipping/shipping_service" xsi:type="string">Fixed</data>
+            <data name="shipping/shipping_method" xsi:type="string">Flat Rate</data>
+            <data name="cart/data/shipping_method" xsi:type="string">Flat Rate</data>
+            <data name="payment/method" xsi:type="string">checkmo</data>
+            <data name="configData" xsi:type="string">checkmo, fedex, shipping_origin_US_CA</data>
+            <data name="trackingData" xsi:type="array">
+                <item name="carrier" xsi:type="string">Custom Value</item>
+                <item name="carrier_title" xsi:type="string">Custom Number</item>
+                <item name="tracking_number" xsi:type="string">0123456789</item>
+            </data>
+            <data name="resultTrackingData" xsi:type="array">
+                <item name="number" xsi:type="string">0123456789</item>
+            </data>
+            <data name="tag" xsi:type="string">severity:S1</data>
+            <constraint name="Magento\Shipping\Test\Constraint\AssertTrackingDetailsIsPresent" />
+        </variation>
+    </testCase>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/TestStep/AddTrackingNumberStep.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/TestStep/AddTrackingNumberStep.php
new file mode 100644
index 0000000000000..7a4cc62b132cf
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/TestStep/AddTrackingNumberStep.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Shipping\Test\TestStep;
+
+use Magento\Mtf\TestStep\TestStepInterface;
+use Magento\Shipping\Test\Page\Adminhtml\SalesShipmentView;
+use Magento\Shipping\Test\Page\Adminhtml\ShipmentIndex;
+
+/**
+ * Step to create shipping tracking number for created order shipment.
+ */
+class AddTrackingNumberStep implements TestStepInterface
+{
+    /**
+     * @var ShipmentIndex
+     */
+    private $shipmentIndex;
+
+    /**
+     * @var SalesShipmentView
+     */
+    private $salesShipmentView;
+
+    /**
+     * @var array
+     */
+    private $shipmentIds;
+
+    /**
+     * @var array
+     */
+    private $trackingData;
+
+    /**
+     * @param ShipmentIndex $shipmentIndex
+     * @param SalesShipmentView $salesShipmentView
+     * @param array $shipmentIds
+     * @param array $trackingData
+     */
+    public function __construct(
+        ShipmentIndex $shipmentIndex,
+        SalesShipmentView $salesShipmentView,
+        array $shipmentIds,
+        array $trackingData
+    ) {
+        $this->shipmentIndex = $shipmentIndex;
+        $this->salesShipmentView = $salesShipmentView;
+        $this->shipmentIds = $shipmentIds;
+        $this->trackingData = $trackingData;
+    }
+
+    /**
+     * Creates shipping tracking number.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        $this->shipmentIndex->open();
+        $this->shipmentIndex->getShipmentsGrid()
+            ->searchAndOpen(['id' => array_pop($this->shipmentIds)]);
+
+        $trackingInfoTable = $this->salesShipmentView->getTrackingInfoBlock();
+        $trackingInfoTable->addTrackingNumber($this->trackingData);
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/etc/di.xml b/dev/tests/functional/tests/app/Magento/Shipping/Test/etc/di.xml
index 9d3eeb3facc67..6c421b3c44947 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/etc/di.xml
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/etc/di.xml
@@ -11,4 +11,9 @@
             <argument name="severity" xsi:type="string">S1</argument>
         </arguments>
     </type>
+    <type name="Magento\Shipping\Test\Constraint\AssertTrackingDetailsIsPresent">
+        <arguments>
+            <argument name="severity" xsi:type="string">S1</argument>
+        </arguments>
+    </type>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/etc/testcase.xml b/dev/tests/functional/tests/app/Magento/Shipping/Test/etc/testcase.xml
index 1952dcd36ecbd..22b0f60201e65 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/etc/testcase.xml
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/etc/testcase.xml
@@ -15,4 +15,18 @@
         <step name="selectCheckoutMethod" module="Magento_Checkout" next="fillShippingAddresses" />
         <step name="fillShippingAddresses" module="Magento_Shipping" />
     </scenario>
+    <scenario name="TrackingShipmentForPlacedOrderTest" firstStep="setupConfiguration">
+        <step name="setupConfiguration" module="Magento_Config" next="createProducts" />
+        <step name="createProducts" module="Magento_Catalog" next="addProductsToTheCart" />
+        <step name="addProductsToTheCart" module="Magento_Checkout" next="proceedToCheckout" />
+        <step name="proceedToCheckout" module="Magento_Checkout" next="createCustomer" />
+        <step name="createCustomer" module="Magento_Customer" next="selectCheckoutMethod" />
+        <step name="selectCheckoutMethod" module="Magento_Checkout" next="fillShippingAddress" />
+        <step name="fillShippingAddress" module="Magento_Checkout" next="fillShippingMethod" />
+        <step name="fillShippingMethod" module="Magento_Checkout" next="selectPaymentMethod" />
+        <step name="selectPaymentMethod" module="Magento_Checkout" next="placeOrder" />
+        <step name="placeOrder" module="Magento_Checkout" next="createShipment"/>
+        <step name="createShipment" module="Magento_Sales" next="addTrackingNumber"/>
+        <step name="addTrackingNumber" module="Magento_Shipping" />
+    </scenario>
 </config>
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Block/_files/design/adminhtml/Magento/test_default/web/images/grid_sort_asc.gif b/dev/tests/integration/testsuite/Magento/Backend/Block/_files/design/adminhtml/Magento/test_default/web/images/grid_sort_asc.gif
index b9a4d696fd75a..4fe0d28fe6a5c 100644
Binary files a/dev/tests/integration/testsuite/Magento/Backend/Block/_files/design/adminhtml/Magento/test_default/web/images/grid_sort_asc.gif and b/dev/tests/integration/testsuite/Magento/Backend/Block/_files/design/adminhtml/Magento/test_default/web/images/grid_sort_asc.gif differ
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Block/_files/design/adminhtml/Magento/test_default/web/images/grid_th_onclick_bg.gif b/dev/tests/integration/testsuite/Magento/Backend/Block/_files/design/adminhtml/Magento/test_default/web/images/grid_th_onclick_bg.gif
index c353da5a2772e..93d3924e3fc2a 100644
Binary files a/dev/tests/integration/testsuite/Magento/Backend/Block/_files/design/adminhtml/Magento/test_default/web/images/grid_th_onclick_bg.gif and b/dev/tests/integration/testsuite/Magento/Backend/Block/_files/design/adminhtml/Magento/test_default/web/images/grid_th_onclick_bg.gif differ
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Block/_files/design/adminhtml/Magento/test_default/web/images/pager_arrow_left.gif b/dev/tests/integration/testsuite/Magento/Backend/Block/_files/design/adminhtml/Magento/test_default/web/images/pager_arrow_left.gif
index 619f74852cc4f..c670e68f80cc4 100644
Binary files a/dev/tests/integration/testsuite/Magento/Backend/Block/_files/design/adminhtml/Magento/test_default/web/images/pager_arrow_left.gif and b/dev/tests/integration/testsuite/Magento/Backend/Block/_files/design/adminhtml/Magento/test_default/web/images/pager_arrow_left.gif differ
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Block/_files/design/adminhtml/Magento/test_default/web/images/pager_arrow_left_off.gif b/dev/tests/integration/testsuite/Magento/Backend/Block/_files/design/adminhtml/Magento/test_default/web/images/pager_arrow_left_off.gif
index 7a3ba040acd1a..ec75525772ce9 100644
Binary files a/dev/tests/integration/testsuite/Magento/Backend/Block/_files/design/adminhtml/Magento/test_default/web/images/pager_arrow_left_off.gif and b/dev/tests/integration/testsuite/Magento/Backend/Block/_files/design/adminhtml/Magento/test_default/web/images/pager_arrow_left_off.gif differ
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Block/_files/design/adminhtml/Magento/test_default/web/images/pager_arrow_right.gif b/dev/tests/integration/testsuite/Magento/Backend/Block/_files/design/adminhtml/Magento/test_default/web/images/pager_arrow_right.gif
index e7e62bc7a5602..5f66fc4c31389 100644
Binary files a/dev/tests/integration/testsuite/Magento/Backend/Block/_files/design/adminhtml/Magento/test_default/web/images/pager_arrow_right.gif and b/dev/tests/integration/testsuite/Magento/Backend/Block/_files/design/adminhtml/Magento/test_default/web/images/pager_arrow_right.gif differ
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Block/_files/design/adminhtml/Magento/test_default/web/images/pager_arrow_right_off.gif b/dev/tests/integration/testsuite/Magento/Backend/Block/_files/design/adminhtml/Magento/test_default/web/images/pager_arrow_right_off.gif
index 048f6cbfb218d..c0976c139bbf4 100644
Binary files a/dev/tests/integration/testsuite/Magento/Backend/Block/_files/design/adminhtml/Magento/test_default/web/images/pager_arrow_right_off.gif and b/dev/tests/integration/testsuite/Magento/Backend/Block/_files/design/adminhtml/Magento/test_default/web/images/pager_arrow_right_off.gif differ
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFileTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFileTest.php
index 3b42c40605458..1fab92d19be76 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFileTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFileTest.php
@@ -282,9 +282,9 @@ protected function expectedValidate()
         return [
             'type' => 'image/jpeg',
             'title' => 'test.jpg',
-            'quote_path' => 'custom_options/quote/t/e/e1d601731b4b1a84163cd0e9370a4fcb.jpg',
-            'order_path' => 'custom_options/order/t/e/e1d601731b4b1a84163cd0e9370a4fcb.jpg',
-            'size' => '3300',
+            'quote_path' => 'custom_options/quote/t/e/a071b9ffc8fda6df1652c05a4c61bf8a.jpg',
+            'order_path' => 'custom_options/order/t/e/a071b9ffc8fda6df1652c05a4c61bf8a.jpg',
+            'size' => '3046',
             'width' => 136,
             'height' => 131,
         ];
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/magento_image.jpg b/dev/tests/integration/testsuite/Magento/Catalog/_files/magento_image.jpg
index 0816984ee3606..3b825a41b2101 100644
Binary files a/dev/tests/integration/testsuite/Magento/Catalog/_files/magento_image.jpg and b/dev/tests/integration/testsuite/Magento/Catalog/_files/magento_image.jpg differ
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/magento_small_image.jpg b/dev/tests/integration/testsuite/Magento/Catalog/_files/magento_small_image.jpg
index 77fcd7e97aa1f..c3eae6fe68761 100644
Binary files a/dev/tests/integration/testsuite/Magento/Catalog/_files/magento_small_image.jpg and b/dev/tests/integration/testsuite/Magento/Catalog/_files/magento_small_image.jpg differ
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/magento_thumbnail.jpg b/dev/tests/integration/testsuite/Magento/Catalog/_files/magento_thumbnail.jpg
index da7cabce83e37..5704eccd795de 100644
Binary files a/dev/tests/integration/testsuite/Magento/Catalog/_files/magento_thumbnail.jpg and b/dev/tests/integration/testsuite/Magento/Catalog/_files/magento_thumbnail.jpg differ
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/watermark.jpg b/dev/tests/integration/testsuite/Magento/Catalog/_files/watermark.jpg
index 9dc91b1380990..07b9f5bc8be17 100644
Binary files a/dev/tests/integration/testsuite/Magento/Catalog/_files/watermark.jpg and b/dev/tests/integration/testsuite/Magento/Catalog/_files/watermark.jpg differ
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/controllers/_files/product_image.png b/dev/tests/integration/testsuite/Magento/Catalog/controllers/_files/product_image.png
index 682f708907516..2eb77f1cd2fe2 100644
Binary files a/dev/tests/integration/testsuite/Magento/Catalog/controllers/_files/product_image.png and b/dev/tests/integration/testsuite/Magento/Catalog/controllers/_files/product_image.png differ
diff --git a/dev/tests/integration/testsuite/Magento/Downloadable/_files/test_image.jpg b/dev/tests/integration/testsuite/Magento/Downloadable/_files/test_image.jpg
index ed6e4decf1509..5fbf7dbc09e3d 100644
Binary files a/dev/tests/integration/testsuite/Magento/Downloadable/_files/test_image.jpg and b/dev/tests/integration/testsuite/Magento/Downloadable/_files/test_image.jpg differ
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Image/_files/image_adapters_test.png b/dev/tests/integration/testsuite/Magento/Framework/Image/_files/image_adapters_test.png
index 78ecf286fe5a3..b6dfa4438c4d2 100644
Binary files a/dev/tests/integration/testsuite/Magento/Framework/Image/_files/image_adapters_test.png and b/dev/tests/integration/testsuite/Magento/Framework/Image/_files/image_adapters_test.png differ
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Image/_files/magento_thumbnail.jpg b/dev/tests/integration/testsuite/Magento/Framework/Image/_files/magento_thumbnail.jpg
index da7cabce83e37..5704eccd795de 100644
Binary files a/dev/tests/integration/testsuite/Magento/Framework/Image/_files/magento_thumbnail.jpg and b/dev/tests/integration/testsuite/Magento/Framework/Image/_files/magento_thumbnail.jpg differ
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Image/_files/watermark.jpg b/dev/tests/integration/testsuite/Magento/Framework/Image/_files/watermark.jpg
index fb127a41875b5..cc2e9eb0b122b 100644
Binary files a/dev/tests/integration/testsuite/Magento/Framework/Image/_files/watermark.jpg and b/dev/tests/integration/testsuite/Magento/Framework/Image/_files/watermark.jpg differ
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Image/_files/watermark.png b/dev/tests/integration/testsuite/Magento/Framework/Image/_files/watermark.png
index 183540ce7ea4e..2060ca23057c1 100644
Binary files a/dev/tests/integration/testsuite/Magento/Framework/Image/_files/watermark.png and b/dev/tests/integration/testsuite/Magento/Framework/Image/_files/watermark.png differ
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/Magento/ModuleB/view/adminhtml/images/gallery-image-base-label.png b/dev/tests/integration/testsuite/Magento/Framework/View/_files/Magento/ModuleB/view/adminhtml/images/gallery-image-base-label.png
index 784797b92c24e..4faaa6bfa16cf 100644
Binary files a/dev/tests/integration/testsuite/Magento/Framework/View/_files/Magento/ModuleB/view/adminhtml/images/gallery-image-base-label.png and b/dev/tests/integration/testsuite/Magento/Framework/View/_files/Magento/ModuleB/view/adminhtml/images/gallery-image-base-label.png differ
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/Magento/ModuleC/view/adminhtml/images/allinone.png b/dev/tests/integration/testsuite/Magento/Framework/View/_files/Magento/ModuleC/view/adminhtml/images/allinone.png
index 2c62225329223..fa0b2661e9495 100644
Binary files a/dev/tests/integration/testsuite/Magento/Framework/View/_files/Magento/ModuleC/view/adminhtml/images/allinone.png and b/dev/tests/integration/testsuite/Magento/Framework/View/_files/Magento/ModuleC/view/adminhtml/images/allinone.png differ
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/Magento/ModuleC/view/adminhtml/images/logo.png b/dev/tests/integration/testsuite/Magento/Framework/View/_files/Magento/ModuleC/view/adminhtml/images/logo.png
index ca7bfd5e5558b..b59dc2e1ea6bc 100644
Binary files a/dev/tests/integration/testsuite/Magento/Framework/View/_files/Magento/ModuleC/view/adminhtml/images/logo.png and b/dev/tests/integration/testsuite/Magento/Framework/View/_files/Magento/ModuleC/view/adminhtml/images/logo.png differ
diff --git a/dev/tests/integration/testsuite/Magento/Sitemap/_files/magento_image_sitemap.png b/dev/tests/integration/testsuite/Magento/Sitemap/_files/magento_image_sitemap.png
index 682f708907516..2eb77f1cd2fe2 100644
Binary files a/dev/tests/integration/testsuite/Magento/Sitemap/_files/magento_image_sitemap.png and b/dev/tests/integration/testsuite/Magento/Sitemap/_files/magento_image_sitemap.png differ
diff --git a/dev/tests/integration/testsuite/Magento/Sitemap/_files/second_image.png b/dev/tests/integration/testsuite/Magento/Sitemap/_files/second_image.png
index 682f708907516..2eb77f1cd2fe2 100644
Binary files a/dev/tests/integration/testsuite/Magento/Sitemap/_files/second_image.png and b/dev/tests/integration/testsuite/Magento/Sitemap/_files/second_image.png differ
diff --git a/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Magento/default_iphone/images/preview_image.jpg b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Magento/default_iphone/images/preview_image.jpg
index 75a4298e8cf90..fc5ab0c9b7d06 100644
Binary files a/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Magento/default_iphone/images/preview_image.jpg and b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Magento/default_iphone/images/preview_image.jpg differ
diff --git a/dev/tests/integration/testsuite/Magento/Widget/_files/design/adminhtml/magento_basic/Magento_Catalog/web/images/product_widget_new.png b/dev/tests/integration/testsuite/Magento/Widget/_files/design/adminhtml/magento_basic/Magento_Catalog/web/images/product_widget_new.png
index c2573967031e1..1367e88e17875 100644
Binary files a/dev/tests/integration/testsuite/Magento/Widget/_files/design/adminhtml/magento_basic/Magento_Catalog/web/images/product_widget_new.png and b/dev/tests/integration/testsuite/Magento/Widget/_files/design/adminhtml/magento_basic/Magento_Catalog/web/images/product_widget_new.png differ
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Payment/base/js/model/credit-card-validation/validator.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Payment/base/js/model/credit-card-validation/validator.test.js
new file mode 100644
index 0000000000000..0cd4b8c40dbf9
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Payment/base/js/model/credit-card-validation/validator.test.js
@@ -0,0 +1,24 @@
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'jquery/validate',
+    'Magento_Payment/js/model/credit-card-validation/validator'
+], function ($) {
+    'use strict';
+
+    describe('Magento_Payment/js/model/credit-card-validation/validator', function () {
+
+        it('Check credit card expiration year validator.', function () {
+            var year = new Date().getFullYear();
+
+            expect($.validator.methods['validate-card-year']('1234')).toBeFalsy();
+            expect($.validator.methods['validate-card-year']('')).toBeFalsy();
+            expect($.validator.methods['validate-card-year']((year - 1).toString())).toBeFalsy();
+            expect($.validator.methods['validate-card-year']((year + 1).toString())).toBeTruthy();
+        });
+    });
+});
diff --git a/lib/internal/Magento/Framework/Api/Test/Unit/Api/_files/image.jpg b/lib/internal/Magento/Framework/Api/Test/Unit/Api/_files/image.jpg
index f8e1802e54465..d49c3bf70319a 100644
Binary files a/lib/internal/Magento/Framework/Api/Test/Unit/Api/_files/image.jpg and b/lib/internal/Magento/Framework/Api/Test/Unit/Api/_files/image.jpg differ
diff --git a/lib/internal/Magento/Framework/App/Bootstrap.php b/lib/internal/Magento/Framework/App/Bootstrap.php
index 76ed3d18f5b10..7dc362d13add6 100644
--- a/lib/internal/Magento/Framework/App/Bootstrap.php
+++ b/lib/internal/Magento/Framework/App/Bootstrap.php
@@ -6,14 +6,14 @@
 
 namespace Magento\Framework\App;
 
-use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\AppInterface;
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Autoload\AutoloaderRegistry;
 use Magento\Framework\Autoload\Populator;
 use Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Config\File\ConfigFilePool;
 use Magento\Framework\Filesystem\DriverPool;
 use Magento\Framework\Profiler;
-use Magento\Framework\Config\File\ConfigFilePool;
 
 /**
  * A bootstrap of Magento application
@@ -284,7 +284,14 @@ protected function assertMaintenance()
         $this->initObjectManager();
         /** @var \Magento\Framework\App\MaintenanceMode $maintenance */
         $this->maintenance = $this->objectManager->get(\Magento\Framework\App\MaintenanceMode::class);
-        $isOn = $this->maintenance->isOn(isset($this->server['REMOTE_ADDR']) ? $this->server['REMOTE_ADDR'] : '');
+
+        /** @var \Magento\Framework\HTTP\PhpEnvironment\RemoteAddress $phpRemoteAddressEnvironment */
+        $phpRemoteAddressEnvironment = $this->objectManager->get(
+            \Magento\Framework\HTTP\PhpEnvironment\RemoteAddress::class
+        );
+        $remoteAddress = $phpRemoteAddressEnvironment->getRemoteAddress();
+        $isOn = $this->maintenance->isOn($remoteAddress ? $remoteAddress : '');
+
         if ($isOn && !$isExpected) {
             $this->errorCode = self::ERR_MAINTENANCE;
             throw new \Exception('Unable to proceed: the maintenance mode is enabled. ');
@@ -332,7 +339,7 @@ private function getIsExpected($key, $default)
     {
         if (array_key_exists($key, $this->server)) {
             if (isset($this->server[$key])) {
-                return (bool)(int)$this->server[$key];
+                return (bool) (int) $this->server[$key];
             }
             return null;
         }
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/BootstrapTest.php b/lib/internal/Magento/Framework/App/Test/Unit/BootstrapTest.php
index a218055d8b32a..f45c3b3e90a98 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/BootstrapTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/BootstrapTest.php
@@ -8,11 +8,10 @@
 
 namespace Magento\Framework\App\Test\Unit;
 
+use Magento\Framework\App\Filesystem\DirectoryList;
 use \Magento\Framework\App\Bootstrap;
-use \Magento\Framework\App\State;
 use \Magento\Framework\App\MaintenanceMode;
-
-use Magento\Framework\App\Filesystem\DirectoryList;
+use \Magento\Framework\App\State;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -64,6 +63,11 @@ class BootstrapTest extends \PHPUnit_Framework_TestCase
      */
     protected $bootstrapMock;
 
+    /**
+     * @var \Magento\Framework\HTTP\PhpEnvironment\RemoteAddress | \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $remoteAddress;
+
     protected function setUp()
     {
         $this->objectManagerFactory = $this->getMock(
@@ -82,6 +86,7 @@ protected function setUp()
             false
         );
         $this->maintenanceMode = $this->getMock(\Magento\Framework\App\MaintenanceMode::class, ['isOn'], [], '', false);
+        $this->remoteAddress = $this->getMock('Magento\Framework\HTTP\PhpEnvironment\RemoteAddress', [], [], '', false);
         $filesystem = $this->getMock(\Magento\Framework\Filesystem::class, [], [], '', false);
 
         $this->logger = $this->getMock(\Psr\Log\LoggerInterface::class);
@@ -91,6 +96,7 @@ protected function setUp()
         $mapObjectManager = [
             [\Magento\Framework\App\Filesystem\DirectoryList::class, $this->dirs],
             [\Magento\Framework\App\MaintenanceMode::class, $this->maintenanceMode],
+            [\Magento\Framework\HTTP\PhpEnvironment\RemoteAddress::class, $this->remoteAddress],
             [\Magento\Framework\Filesystem::class, $filesystem],
             [\Magento\Framework\App\DeploymentConfig::class, $this->deploymentConfig],
             ['Psr\Log\LoggerInterface', $this->logger],
@@ -205,7 +211,7 @@ public function testIsDeveloperModeDataProvider()
             [State::MODE_DEVELOPER, State::MODE_PRODUCTION, true],
             [State::MODE_PRODUCTION, State::MODE_DEVELOPER, false],
             [null, State::MODE_DEVELOPER, true],
-            [null, State::MODE_PRODUCTION, false]
+            [null, State::MODE_PRODUCTION, false],
         ];
     }
 
@@ -260,6 +266,7 @@ public function testAssertMaintenance($isOn, $isExpected)
     {
         $bootstrap = self::createBootstrap([Bootstrap::PARAM_REQUIRE_MAINTENANCE => $isExpected]);
         $this->maintenanceMode->expects($this->once())->method('isOn')->willReturn($isOn);
+        $this->remoteAddress->expects($this->once())->method('getRemoteAddress')->willReturn(false);
         $this->application->expects($this->never())->method('launch');
         $this->application->expects($this->once())->method('catchException')->willReturn(true);
         $bootstrap->run($this->application);
@@ -273,7 +280,7 @@ public function assertMaintenanceDataProvider()
     {
         return [
             [true, false],
-            [false, true]
+            [false, true],
         ];
     }
 
diff --git a/lib/web/extjs/resources/images/aero/basic-dialog/bg-left.gif b/lib/web/extjs/resources/images/aero/basic-dialog/bg-left.gif
index 05aecddaca7a1..79bfb1f137ea8 100644
Binary files a/lib/web/extjs/resources/images/aero/basic-dialog/bg-left.gif and b/lib/web/extjs/resources/images/aero/basic-dialog/bg-left.gif differ
diff --git a/lib/web/extjs/resources/images/aero/basic-dialog/expand-over.gif b/lib/web/extjs/resources/images/aero/basic-dialog/expand-over.gif
index ed1cd14f09d7b..adcdda5bd9d6b 100644
Binary files a/lib/web/extjs/resources/images/aero/basic-dialog/expand-over.gif and b/lib/web/extjs/resources/images/aero/basic-dialog/expand-over.gif differ
diff --git a/lib/web/extjs/resources/images/aero/basic-dialog/hd-sprite.gif b/lib/web/extjs/resources/images/aero/basic-dialog/hd-sprite.gif
index 6c5a7983f2d48..0486f0428749e 100644
Binary files a/lib/web/extjs/resources/images/aero/basic-dialog/hd-sprite.gif and b/lib/web/extjs/resources/images/aero/basic-dialog/hd-sprite.gif differ
diff --git a/lib/web/extjs/resources/images/aero/gradient-bg.gif b/lib/web/extjs/resources/images/aero/gradient-bg.gif
index c7a66929406c0..2f5d00479e3bb 100644
Binary files a/lib/web/extjs/resources/images/aero/gradient-bg.gif and b/lib/web/extjs/resources/images/aero/gradient-bg.gif differ
diff --git a/lib/web/extjs/resources/images/aero/grid/sort_asc.gif b/lib/web/extjs/resources/images/aero/grid/sort_asc.gif
index 956fdb30a57e2..0431881b12035 100644
Binary files a/lib/web/extjs/resources/images/aero/grid/sort_asc.gif and b/lib/web/extjs/resources/images/aero/grid/sort_asc.gif differ
diff --git a/lib/web/extjs/resources/images/aero/layout/collapse.gif b/lib/web/extjs/resources/images/aero/layout/collapse.gif
index 7cc6c017fdf30..14496f6bde71e 100644
Binary files a/lib/web/extjs/resources/images/aero/layout/collapse.gif and b/lib/web/extjs/resources/images/aero/layout/collapse.gif differ
diff --git a/lib/web/extjs/resources/images/aero/layout/expand.gif b/lib/web/extjs/resources/images/aero/layout/expand.gif
index 6c001d2c94321..71226e6934a8b 100644
Binary files a/lib/web/extjs/resources/images/aero/layout/expand.gif and b/lib/web/extjs/resources/images/aero/layout/expand.gif differ
diff --git a/lib/web/extjs/resources/images/aero/layout/gradient-bg.gif b/lib/web/extjs/resources/images/aero/layout/gradient-bg.gif
index 412dc54a40597..07aed856aec1d 100644
Binary files a/lib/web/extjs/resources/images/aero/layout/gradient-bg.gif and b/lib/web/extjs/resources/images/aero/layout/gradient-bg.gif differ
diff --git a/lib/web/extjs/resources/images/aero/layout/ns-collapse.gif b/lib/web/extjs/resources/images/aero/layout/ns-collapse.gif
index e4d169101e590..6450efaf4489c 100644
Binary files a/lib/web/extjs/resources/images/aero/layout/ns-collapse.gif and b/lib/web/extjs/resources/images/aero/layout/ns-collapse.gif differ
diff --git a/lib/web/extjs/resources/images/aero/layout/panel-title-light-bg.gif b/lib/web/extjs/resources/images/aero/layout/panel-title-light-bg.gif
index 1a0d0ab8c795b..1752467625502 100644
Binary files a/lib/web/extjs/resources/images/aero/layout/panel-title-light-bg.gif and b/lib/web/extjs/resources/images/aero/layout/panel-title-light-bg.gif differ
diff --git a/lib/web/extjs/resources/images/aero/menu/item-over.gif b/lib/web/extjs/resources/images/aero/menu/item-over.gif
index cfa555e05c009..882bef34f80a9 100644
Binary files a/lib/web/extjs/resources/images/aero/menu/item-over.gif and b/lib/web/extjs/resources/images/aero/menu/item-over.gif differ
diff --git a/lib/web/extjs/resources/images/aero/menu/unchecked.gif b/lib/web/extjs/resources/images/aero/menu/unchecked.gif
index dcac5dedc52c2..d6211144e80d4 100644
Binary files a/lib/web/extjs/resources/images/aero/menu/unchecked.gif and b/lib/web/extjs/resources/images/aero/menu/unchecked.gif differ
diff --git a/lib/web/extjs/resources/images/aero/qtip/bg.gif b/lib/web/extjs/resources/images/aero/qtip/bg.gif
index adecdba6ef109..04bd84f22cd7f 100644
Binary files a/lib/web/extjs/resources/images/aero/qtip/bg.gif and b/lib/web/extjs/resources/images/aero/qtip/bg.gif differ
diff --git a/lib/web/extjs/resources/images/aero/sizer/nw-handle-dark.gif b/lib/web/extjs/resources/images/aero/sizer/nw-handle-dark.gif
index 9b581cfd3ea16..9c139d3f2fddb 100644
Binary files a/lib/web/extjs/resources/images/aero/sizer/nw-handle-dark.gif and b/lib/web/extjs/resources/images/aero/sizer/nw-handle-dark.gif differ
diff --git a/lib/web/extjs/resources/images/aero/sizer/se-handle-dark.gif b/lib/web/extjs/resources/images/aero/sizer/se-handle-dark.gif
index df88fd56d347a..c6c42e3a2235a 100644
Binary files a/lib/web/extjs/resources/images/aero/sizer/se-handle-dark.gif and b/lib/web/extjs/resources/images/aero/sizer/se-handle-dark.gif differ
diff --git a/lib/web/extjs/resources/images/aero/tabs/tab-btm-left-bg.gif b/lib/web/extjs/resources/images/aero/tabs/tab-btm-left-bg.gif
index 1b7b6bf2c13bb..1612e093a0668 100644
Binary files a/lib/web/extjs/resources/images/aero/tabs/tab-btm-left-bg.gif and b/lib/web/extjs/resources/images/aero/tabs/tab-btm-left-bg.gif differ
diff --git a/lib/web/extjs/resources/images/aero/tabs/tab-sprite.gif b/lib/web/extjs/resources/images/aero/tabs/tab-sprite.gif
index e8f71e3ad5075..53c7ddba8e82c 100644
Binary files a/lib/web/extjs/resources/images/aero/tabs/tab-sprite.gif and b/lib/web/extjs/resources/images/aero/tabs/tab-sprite.gif differ
diff --git a/lib/web/extjs/resources/images/aero/tabs/tab-strip-bg.gif b/lib/web/extjs/resources/images/aero/tabs/tab-strip-bg.gif
index e30038f020069..19a8eb56560f8 100644
Binary files a/lib/web/extjs/resources/images/aero/tabs/tab-strip-bg.gif and b/lib/web/extjs/resources/images/aero/tabs/tab-strip-bg.gif differ
diff --git a/lib/web/extjs/resources/images/aero/tabs/tab-strip-bg.png b/lib/web/extjs/resources/images/aero/tabs/tab-strip-bg.png
index 2cf56db07e352..fed48eb4a899f 100644
Binary files a/lib/web/extjs/resources/images/aero/tabs/tab-strip-bg.png and b/lib/web/extjs/resources/images/aero/tabs/tab-strip-bg.png differ
diff --git a/lib/web/extjs/resources/images/aero/tabs/tab-strip-btm-bg.gif b/lib/web/extjs/resources/images/aero/tabs/tab-strip-btm-bg.gif
index 8ea4d324cbe0a..f9e4ade771cd9 100644
Binary files a/lib/web/extjs/resources/images/aero/tabs/tab-strip-btm-bg.gif and b/lib/web/extjs/resources/images/aero/tabs/tab-strip-btm-bg.gif differ
diff --git a/lib/web/extjs/resources/images/aero/toolbar/bg.gif b/lib/web/extjs/resources/images/aero/toolbar/bg.gif
index 09ce6f0c4849e..e5836316a966e 100644
Binary files a/lib/web/extjs/resources/images/aero/toolbar/bg.gif and b/lib/web/extjs/resources/images/aero/toolbar/bg.gif differ
diff --git a/lib/web/extjs/resources/images/aero/toolbar/tb-btn-sprite.gif b/lib/web/extjs/resources/images/aero/toolbar/tb-btn-sprite.gif
index 3b25d064d3cb3..cca86e06fdd6f 100644
Binary files a/lib/web/extjs/resources/images/aero/toolbar/tb-btn-sprite.gif and b/lib/web/extjs/resources/images/aero/toolbar/tb-btn-sprite.gif differ
diff --git a/lib/web/extjs/resources/images/default/basic-dialog/btn-sprite.gif b/lib/web/extjs/resources/images/default/basic-dialog/btn-sprite.gif
index 78877922acc58..066e8db81c830 100644
Binary files a/lib/web/extjs/resources/images/default/basic-dialog/btn-sprite.gif and b/lib/web/extjs/resources/images/default/basic-dialog/btn-sprite.gif differ
diff --git a/lib/web/extjs/resources/images/default/basic-dialog/progress.gif b/lib/web/extjs/resources/images/default/basic-dialog/progress.gif
index c41f3750b997a..8f2365cdde56c 100644
Binary files a/lib/web/extjs/resources/images/default/basic-dialog/progress.gif and b/lib/web/extjs/resources/images/default/basic-dialog/progress.gif differ
diff --git a/lib/web/extjs/resources/images/default/basic-dialog/progress2.gif b/lib/web/extjs/resources/images/default/basic-dialog/progress2.gif
index ac970220ca738..041c268631f00 100644
Binary files a/lib/web/extjs/resources/images/default/basic-dialog/progress2.gif and b/lib/web/extjs/resources/images/default/basic-dialog/progress2.gif differ
diff --git a/lib/web/extjs/resources/images/default/box/tb-blue.gif b/lib/web/extjs/resources/images/default/box/tb-blue.gif
index 45690dd14d393..993412a814ce9 100644
Binary files a/lib/web/extjs/resources/images/default/box/tb-blue.gif and b/lib/web/extjs/resources/images/default/box/tb-blue.gif differ
diff --git a/lib/web/extjs/resources/images/default/editor/tb-sprite.gif b/lib/web/extjs/resources/images/default/editor/tb-sprite.gif
index 874205903d9ba..e074fac74b152 100644
Binary files a/lib/web/extjs/resources/images/default/editor/tb-sprite.gif and b/lib/web/extjs/resources/images/default/editor/tb-sprite.gif differ
diff --git a/lib/web/extjs/resources/images/default/form/clear-trigger.gif b/lib/web/extjs/resources/images/default/form/clear-trigger.gif
index 61fec75b55145..6fcb002b7966f 100644
Binary files a/lib/web/extjs/resources/images/default/form/clear-trigger.gif and b/lib/web/extjs/resources/images/default/form/clear-trigger.gif differ
diff --git a/lib/web/extjs/resources/images/default/form/date-trigger.gif b/lib/web/extjs/resources/images/default/form/date-trigger.gif
index 3c3fc9007c3d3..80a240c64e70f 100644
Binary files a/lib/web/extjs/resources/images/default/form/date-trigger.gif and b/lib/web/extjs/resources/images/default/form/date-trigger.gif differ
diff --git a/lib/web/extjs/resources/images/default/form/text-bg.gif b/lib/web/extjs/resources/images/default/form/text-bg.gif
index 3a991fe9874fb..f629ab08b672c 100644
Binary files a/lib/web/extjs/resources/images/default/form/text-bg.gif and b/lib/web/extjs/resources/images/default/form/text-bg.gif differ
diff --git a/lib/web/extjs/resources/images/default/form/trigger.gif b/lib/web/extjs/resources/images/default/form/trigger.gif
index 461cd1e0b76bf..9f6f54102ce66 100644
Binary files a/lib/web/extjs/resources/images/default/form/trigger.gif and b/lib/web/extjs/resources/images/default/form/trigger.gif differ
diff --git a/lib/web/extjs/resources/images/default/gradient-bg.gif b/lib/web/extjs/resources/images/default/gradient-bg.gif
index c7a66929406c0..2f5d00479e3bb 100644
Binary files a/lib/web/extjs/resources/images/default/gradient-bg.gif and b/lib/web/extjs/resources/images/default/gradient-bg.gif differ
diff --git a/lib/web/extjs/resources/images/default/grid/drop-no.gif b/lib/web/extjs/resources/images/default/grid/drop-no.gif
index 40e3b2d091957..00342def5df73 100644
Binary files a/lib/web/extjs/resources/images/default/grid/drop-no.gif and b/lib/web/extjs/resources/images/default/grid/drop-no.gif differ
diff --git a/lib/web/extjs/resources/images/default/grid/grid-loading.gif b/lib/web/extjs/resources/images/default/grid/grid-loading.gif
index 06f773d36fa5f..6d07d73f102ec 100644
Binary files a/lib/web/extjs/resources/images/default/grid/grid-loading.gif and b/lib/web/extjs/resources/images/default/grid/grid-loading.gif differ
diff --git a/lib/web/extjs/resources/images/default/grid/grid3-hd-btn.gif b/lib/web/extjs/resources/images/default/grid/grid3-hd-btn.gif
index a2584fa93da68..33a9015f1f5a3 100644
Binary files a/lib/web/extjs/resources/images/default/grid/grid3-hd-btn.gif and b/lib/web/extjs/resources/images/default/grid/grid3-hd-btn.gif differ
diff --git a/lib/web/extjs/resources/images/default/grid/grid3-hrow-over.gif b/lib/web/extjs/resources/images/default/grid/grid3-hrow-over.gif
index aec7da9e3a4f8..14002d89fc78c 100644
Binary files a/lib/web/extjs/resources/images/default/grid/grid3-hrow-over.gif and b/lib/web/extjs/resources/images/default/grid/grid3-hrow-over.gif differ
diff --git a/lib/web/extjs/resources/images/default/grid/grid3-hrow.gif b/lib/web/extjs/resources/images/default/grid/grid3-hrow.gif
index bcf5abc9dc807..e8447dc3738f9 100644
Binary files a/lib/web/extjs/resources/images/default/grid/grid3-hrow.gif and b/lib/web/extjs/resources/images/default/grid/grid3-hrow.gif differ
diff --git a/lib/web/extjs/resources/images/default/grid/hmenu-desc.gif b/lib/web/extjs/resources/images/default/grid/hmenu-desc.gif
index b94d06b71ee5c..847c0ddd5e050 100644
Binary files a/lib/web/extjs/resources/images/default/grid/hmenu-desc.gif and b/lib/web/extjs/resources/images/default/grid/hmenu-desc.gif differ
diff --git a/lib/web/extjs/resources/images/default/grid/hmenu-lock.gif b/lib/web/extjs/resources/images/default/grid/hmenu-lock.gif
index 9bbdf5ab7b31b..df0a1701201bb 100644
Binary files a/lib/web/extjs/resources/images/default/grid/hmenu-lock.gif and b/lib/web/extjs/resources/images/default/grid/hmenu-lock.gif differ
diff --git a/lib/web/extjs/resources/images/default/grid/hmenu-lock.png b/lib/web/extjs/resources/images/default/grid/hmenu-lock.png
index dc25572c1775e..92b17cd079bee 100644
Binary files a/lib/web/extjs/resources/images/default/grid/hmenu-lock.png and b/lib/web/extjs/resources/images/default/grid/hmenu-lock.png differ
diff --git a/lib/web/extjs/resources/images/default/grid/hmenu-unlock.png b/lib/web/extjs/resources/images/default/grid/hmenu-unlock.png
index 1da1158e7a686..f99b4a0ad3328 100644
Binary files a/lib/web/extjs/resources/images/default/grid/hmenu-unlock.png and b/lib/web/extjs/resources/images/default/grid/hmenu-unlock.png differ
diff --git a/lib/web/extjs/resources/images/default/grid/loading.gif b/lib/web/extjs/resources/images/default/grid/loading.gif
index 2d92030529ba5..a7f67befff39e 100644
Binary files a/lib/web/extjs/resources/images/default/grid/loading.gif and b/lib/web/extjs/resources/images/default/grid/loading.gif differ
diff --git a/lib/web/extjs/resources/images/default/grid/nowait.gif b/lib/web/extjs/resources/images/default/grid/nowait.gif
index 164884b36daf7..c50deb2744919 100644
Binary files a/lib/web/extjs/resources/images/default/grid/nowait.gif and b/lib/web/extjs/resources/images/default/grid/nowait.gif differ
diff --git a/lib/web/extjs/resources/images/default/grid/row-check-sprite.gif b/lib/web/extjs/resources/images/default/grid/row-check-sprite.gif
index 856f9e06334c1..8d02d84120c1b 100644
Binary files a/lib/web/extjs/resources/images/default/grid/row-check-sprite.gif and b/lib/web/extjs/resources/images/default/grid/row-check-sprite.gif differ
diff --git a/lib/web/extjs/resources/images/default/grid/row-expand-sprite.gif b/lib/web/extjs/resources/images/default/grid/row-expand-sprite.gif
index 16f6f3c79b06f..5d83d26246572 100644
Binary files a/lib/web/extjs/resources/images/default/grid/row-expand-sprite.gif and b/lib/web/extjs/resources/images/default/grid/row-expand-sprite.gif differ
diff --git a/lib/web/extjs/resources/images/default/grid/row-over.gif b/lib/web/extjs/resources/images/default/grid/row-over.gif
index 9ea07d0c11a5a..b872a5c02dad7 100644
Binary files a/lib/web/extjs/resources/images/default/grid/row-over.gif and b/lib/web/extjs/resources/images/default/grid/row-over.gif differ
diff --git a/lib/web/extjs/resources/images/default/grid/row-sel.gif b/lib/web/extjs/resources/images/default/grid/row-sel.gif
index 58a1e0983052a..6fea23590492f 100644
Binary files a/lib/web/extjs/resources/images/default/grid/row-sel.gif and b/lib/web/extjs/resources/images/default/grid/row-sel.gif differ
diff --git a/lib/web/extjs/resources/images/default/grid/sort_asc.gif b/lib/web/extjs/resources/images/default/grid/sort_asc.gif
index 8d71926d7b807..1f9aa64a65f8a 100644
Binary files a/lib/web/extjs/resources/images/default/grid/sort_asc.gif and b/lib/web/extjs/resources/images/default/grid/sort_asc.gif differ
diff --git a/lib/web/extjs/resources/images/default/grid/wait.gif b/lib/web/extjs/resources/images/default/grid/wait.gif
index 37d2b5c70aba4..e0359e4fa274e 100644
Binary files a/lib/web/extjs/resources/images/default/grid/wait.gif and b/lib/web/extjs/resources/images/default/grid/wait.gif differ
diff --git a/lib/web/extjs/resources/images/default/layout/collapse.gif b/lib/web/extjs/resources/images/default/layout/collapse.gif
index 66f5b738cfc43..46e901c9fe1d4 100644
Binary files a/lib/web/extjs/resources/images/default/layout/collapse.gif and b/lib/web/extjs/resources/images/default/layout/collapse.gif differ
diff --git a/lib/web/extjs/resources/images/default/layout/expand.gif b/lib/web/extjs/resources/images/default/layout/expand.gif
index ea72ccb6c83fb..3522fbda2ebff 100644
Binary files a/lib/web/extjs/resources/images/default/layout/expand.gif and b/lib/web/extjs/resources/images/default/layout/expand.gif differ
diff --git a/lib/web/extjs/resources/images/default/layout/gradient-bg.gif b/lib/web/extjs/resources/images/default/layout/gradient-bg.gif
index c7a66929406c0..2f5d00479e3bb 100644
Binary files a/lib/web/extjs/resources/images/default/layout/gradient-bg.gif and b/lib/web/extjs/resources/images/default/layout/gradient-bg.gif differ
diff --git a/lib/web/extjs/resources/images/default/layout/ns-collapse.gif b/lib/web/extjs/resources/images/default/layout/ns-collapse.gif
index 6b4bd894eaf5d..10eed6ed49e67 100644
Binary files a/lib/web/extjs/resources/images/default/layout/ns-collapse.gif and b/lib/web/extjs/resources/images/default/layout/ns-collapse.gif differ
diff --git a/lib/web/extjs/resources/images/default/layout/panel-title-bg.gif b/lib/web/extjs/resources/images/default/layout/panel-title-bg.gif
index 7292d56b0852e..d800801fe611b 100644
Binary files a/lib/web/extjs/resources/images/default/layout/panel-title-bg.gif and b/lib/web/extjs/resources/images/default/layout/panel-title-bg.gif differ
diff --git a/lib/web/extjs/resources/images/default/layout/panel-title-light-bg.gif b/lib/web/extjs/resources/images/default/layout/panel-title-light-bg.gif
index 2b230116bcab5..f8642ae966faf 100644
Binary files a/lib/web/extjs/resources/images/default/layout/panel-title-light-bg.gif and b/lib/web/extjs/resources/images/default/layout/panel-title-light-bg.gif differ
diff --git a/lib/web/extjs/resources/images/default/layout/stick.gif b/lib/web/extjs/resources/images/default/layout/stick.gif
index 2da4d69b73740..6acd57edeee11 100644
Binary files a/lib/web/extjs/resources/images/default/layout/stick.gif and b/lib/web/extjs/resources/images/default/layout/stick.gif differ
diff --git a/lib/web/extjs/resources/images/default/layout/stuck.gif b/lib/web/extjs/resources/images/default/layout/stuck.gif
index 125ccc4ca536d..817ecf351d5e9 100644
Binary files a/lib/web/extjs/resources/images/default/layout/stuck.gif and b/lib/web/extjs/resources/images/default/layout/stuck.gif differ
diff --git a/lib/web/extjs/resources/images/default/menu/checked.gif b/lib/web/extjs/resources/images/default/menu/checked.gif
index 19475dd385fdb..8b75fc6c7d7fd 100644
Binary files a/lib/web/extjs/resources/images/default/menu/checked.gif and b/lib/web/extjs/resources/images/default/menu/checked.gif differ
diff --git a/lib/web/extjs/resources/images/default/menu/group-checked.gif b/lib/web/extjs/resources/images/default/menu/group-checked.gif
index 70ff145ebfcea..e14d1f9337fbb 100644
Binary files a/lib/web/extjs/resources/images/default/menu/group-checked.gif and b/lib/web/extjs/resources/images/default/menu/group-checked.gif differ
diff --git a/lib/web/extjs/resources/images/default/panel/corners-sprite.gif b/lib/web/extjs/resources/images/default/panel/corners-sprite.gif
index 07e983a8f9886..816f26c90dbc3 100644
Binary files a/lib/web/extjs/resources/images/default/panel/corners-sprite.gif and b/lib/web/extjs/resources/images/default/panel/corners-sprite.gif differ
diff --git a/lib/web/extjs/resources/images/default/panel/tool-sprite-tpl.gif b/lib/web/extjs/resources/images/default/panel/tool-sprite-tpl.gif
index 4ad2ea5640c0f..037111ab00a29 100644
Binary files a/lib/web/extjs/resources/images/default/panel/tool-sprite-tpl.gif and b/lib/web/extjs/resources/images/default/panel/tool-sprite-tpl.gif differ
diff --git a/lib/web/extjs/resources/images/default/panel/tool-sprites.gif b/lib/web/extjs/resources/images/default/panel/tool-sprites.gif
index e1af7068d8cc4..ac781e32e3fda 100644
Binary files a/lib/web/extjs/resources/images/default/panel/tool-sprites.gif and b/lib/web/extjs/resources/images/default/panel/tool-sprites.gif differ
diff --git a/lib/web/extjs/resources/images/default/panel/top-bottom.gif b/lib/web/extjs/resources/images/default/panel/top-bottom.gif
index 70d409f16256e..c092dc28008ae 100644
Binary files a/lib/web/extjs/resources/images/default/panel/top-bottom.gif and b/lib/web/extjs/resources/images/default/panel/top-bottom.gif differ
diff --git a/lib/web/extjs/resources/images/default/panel/white-corners-sprite.gif b/lib/web/extjs/resources/images/default/panel/white-corners-sprite.gif
index 835eb584beffb..7651f9a4d7f28 100644
Binary files a/lib/web/extjs/resources/images/default/panel/white-corners-sprite.gif and b/lib/web/extjs/resources/images/default/panel/white-corners-sprite.gif differ
diff --git a/lib/web/extjs/resources/images/default/panel/white-top-bottom.gif b/lib/web/extjs/resources/images/default/panel/white-top-bottom.gif
index d98b6b21bc390..5cb09a31c0058 100644
Binary files a/lib/web/extjs/resources/images/default/panel/white-top-bottom.gif and b/lib/web/extjs/resources/images/default/panel/white-top-bottom.gif differ
diff --git a/lib/web/extjs/resources/images/default/qtip/bg.gif b/lib/web/extjs/resources/images/default/qtip/bg.gif
index 05c859632ae9f..bc196f93d0f18 100644
Binary files a/lib/web/extjs/resources/images/default/qtip/bg.gif and b/lib/web/extjs/resources/images/default/qtip/bg.gif differ
diff --git a/lib/web/extjs/resources/images/default/qtip/close.gif b/lib/web/extjs/resources/images/default/qtip/close.gif
index d52dc77d9bc70..4b8bb40955f70 100644
Binary files a/lib/web/extjs/resources/images/default/qtip/close.gif and b/lib/web/extjs/resources/images/default/qtip/close.gif differ
diff --git a/lib/web/extjs/resources/images/default/qtip/tip-sprite.gif b/lib/web/extjs/resources/images/default/qtip/tip-sprite.gif
index 1e20e45f63014..505c61eee8c8b 100644
Binary files a/lib/web/extjs/resources/images/default/qtip/tip-sprite.gif and b/lib/web/extjs/resources/images/default/qtip/tip-sprite.gif differ
diff --git a/lib/web/extjs/resources/images/default/shadow-lr.png b/lib/web/extjs/resources/images/default/shadow-lr.png
index 23fcf4ae1763d..e59a9d7b431ba 100644
Binary files a/lib/web/extjs/resources/images/default/shadow-lr.png and b/lib/web/extjs/resources/images/default/shadow-lr.png differ
diff --git a/lib/web/extjs/resources/images/default/shadow.png b/lib/web/extjs/resources/images/default/shadow.png
index 6f59e2dfef169..c8239c348d54b 100644
Binary files a/lib/web/extjs/resources/images/default/shadow.png and b/lib/web/extjs/resources/images/default/shadow.png differ
diff --git a/lib/web/extjs/resources/images/default/shared/calendar.gif b/lib/web/extjs/resources/images/default/shared/calendar.gif
index d83ce38be89c6..73b42576a6574 100644
Binary files a/lib/web/extjs/resources/images/default/shared/calendar.gif and b/lib/web/extjs/resources/images/default/shared/calendar.gif differ
diff --git a/lib/web/extjs/resources/images/default/shared/glass-bg.gif b/lib/web/extjs/resources/images/default/shared/glass-bg.gif
index 507b3b05640d1..46a9eb817fa01 100644
Binary files a/lib/web/extjs/resources/images/default/shared/glass-bg.gif and b/lib/web/extjs/resources/images/default/shared/glass-bg.gif differ
diff --git a/lib/web/extjs/resources/images/default/sizer/nw-handle-dark.gif b/lib/web/extjs/resources/images/default/sizer/nw-handle-dark.gif
index c11fb611ac1ef..29673239aae9c 100644
Binary files a/lib/web/extjs/resources/images/default/sizer/nw-handle-dark.gif and b/lib/web/extjs/resources/images/default/sizer/nw-handle-dark.gif differ
diff --git a/lib/web/extjs/resources/images/default/sizer/se-handle-dark.gif b/lib/web/extjs/resources/images/default/sizer/se-handle-dark.gif
index 542698cfe27c3..84bd3079e6f12 100644
Binary files a/lib/web/extjs/resources/images/default/sizer/se-handle-dark.gif and b/lib/web/extjs/resources/images/default/sizer/se-handle-dark.gif differ
diff --git a/lib/web/extjs/resources/images/default/tabs/tab-btm-inactive-left-bg.gif b/lib/web/extjs/resources/images/default/tabs/tab-btm-inactive-left-bg.gif
index 3761c7082ed1f..8b2febb6c8ae0 100644
Binary files a/lib/web/extjs/resources/images/default/tabs/tab-btm-inactive-left-bg.gif and b/lib/web/extjs/resources/images/default/tabs/tab-btm-inactive-left-bg.gif differ
diff --git a/lib/web/extjs/resources/images/default/tabs/tab-btm-left-bg.gif b/lib/web/extjs/resources/images/default/tabs/tab-btm-left-bg.gif
index 70473974a8349..f9dfc12257563 100644
Binary files a/lib/web/extjs/resources/images/default/tabs/tab-btm-left-bg.gif and b/lib/web/extjs/resources/images/default/tabs/tab-btm-left-bg.gif differ
diff --git a/lib/web/extjs/resources/images/default/toolbar/btn-over-bg.gif b/lib/web/extjs/resources/images/default/toolbar/btn-over-bg.gif
index e45386dbb28cb..0fb9eafc6ea56 100644
Binary files a/lib/web/extjs/resources/images/default/toolbar/btn-over-bg.gif and b/lib/web/extjs/resources/images/default/toolbar/btn-over-bg.gif differ
diff --git a/lib/web/extjs/resources/images/default/toolbar/gray-bg.gif b/lib/web/extjs/resources/images/default/toolbar/gray-bg.gif
index 1e2f385e4187c..dc346d90441fd 100644
Binary files a/lib/web/extjs/resources/images/default/toolbar/gray-bg.gif and b/lib/web/extjs/resources/images/default/toolbar/gray-bg.gif differ
diff --git a/lib/web/extjs/resources/images/default/toolbar/tb-bg.gif b/lib/web/extjs/resources/images/default/toolbar/tb-bg.gif
index bdf54311a3b65..e01f501c0d38d 100644
Binary files a/lib/web/extjs/resources/images/default/toolbar/tb-bg.gif and b/lib/web/extjs/resources/images/default/toolbar/tb-bg.gif differ
diff --git a/lib/web/extjs/resources/images/default/tree/drop-between.gif b/lib/web/extjs/resources/images/default/tree/drop-between.gif
index 646bb620510d2..7a213d57e2c41 100644
Binary files a/lib/web/extjs/resources/images/default/tree/drop-between.gif and b/lib/web/extjs/resources/images/default/tree/drop-between.gif differ
diff --git a/lib/web/extjs/resources/images/default/tree/drop-over.gif b/lib/web/extjs/resources/images/default/tree/drop-over.gif
index a7333c0e6a4a1..3eee3f0d7a4a4 100644
Binary files a/lib/web/extjs/resources/images/default/tree/drop-over.gif and b/lib/web/extjs/resources/images/default/tree/drop-over.gif differ
diff --git a/lib/web/extjs/resources/images/default/tree/elbow-end-plus-nl.gif b/lib/web/extjs/resources/images/default/tree/elbow-end-plus-nl.gif
index 112679dea603c..6753ae69fd13b 100644
Binary files a/lib/web/extjs/resources/images/default/tree/elbow-end-plus-nl.gif and b/lib/web/extjs/resources/images/default/tree/elbow-end-plus-nl.gif differ
diff --git a/lib/web/extjs/resources/images/default/tree/elbow-end-plus.gif b/lib/web/extjs/resources/images/default/tree/elbow-end-plus.gif
index 7af2fa71b6ecd..002f46636d3ca 100644
Binary files a/lib/web/extjs/resources/images/default/tree/elbow-end-plus.gif and b/lib/web/extjs/resources/images/default/tree/elbow-end-plus.gif differ
diff --git a/lib/web/extjs/resources/images/default/tree/elbow-plus-nl.gif b/lib/web/extjs/resources/images/default/tree/elbow-plus-nl.gif
index 112679dea603c..6753ae69fd13b 100644
Binary files a/lib/web/extjs/resources/images/default/tree/elbow-plus-nl.gif and b/lib/web/extjs/resources/images/default/tree/elbow-plus-nl.gif differ
diff --git a/lib/web/extjs/resources/images/default/tree/folder-open.gif b/lib/web/extjs/resources/images/default/tree/folder-open.gif
index 8b94266dc26d7..5d8ac4d86da99 100644
Binary files a/lib/web/extjs/resources/images/default/tree/folder-open.gif and b/lib/web/extjs/resources/images/default/tree/folder-open.gif differ
diff --git a/lib/web/extjs/resources/images/default/tree/leaf.gif b/lib/web/extjs/resources/images/default/tree/leaf.gif
index 10cd19cf5ba81..f05729b2365ca 100644
Binary files a/lib/web/extjs/resources/images/default/tree/leaf.gif and b/lib/web/extjs/resources/images/default/tree/leaf.gif differ
diff --git a/lib/web/extjs/resources/images/default/tree/loading.gif b/lib/web/extjs/resources/images/default/tree/loading.gif
index 2d92030529ba5..a7f67befff39e 100644
Binary files a/lib/web/extjs/resources/images/default/tree/loading.gif and b/lib/web/extjs/resources/images/default/tree/loading.gif differ
diff --git a/lib/web/extjs/resources/images/default/window/corners-sprite.gif b/lib/web/extjs/resources/images/default/window/corners-sprite.gif
index 08db1f1c481dd..9012c09a3973f 100644
Binary files a/lib/web/extjs/resources/images/default/window/corners-sprite.gif and b/lib/web/extjs/resources/images/default/window/corners-sprite.gif differ
diff --git a/lib/web/extjs/resources/images/default/window/top-bottom.gif b/lib/web/extjs/resources/images/default/window/top-bottom.gif
index 5d49fe953aa50..b3b885de7e256 100644
Binary files a/lib/web/extjs/resources/images/default/window/top-bottom.gif and b/lib/web/extjs/resources/images/default/window/top-bottom.gif differ
diff --git a/lib/web/extjs/resources/images/galdaka/basic-dialog/close-over.gif b/lib/web/extjs/resources/images/galdaka/basic-dialog/close-over.gif
index 36aa0e559375e..c2cbde6132be8 100644
Binary files a/lib/web/extjs/resources/images/galdaka/basic-dialog/close-over.gif and b/lib/web/extjs/resources/images/galdaka/basic-dialog/close-over.gif differ
diff --git a/lib/web/extjs/resources/images/galdaka/basic-dialog/close.gif b/lib/web/extjs/resources/images/galdaka/basic-dialog/close.gif
index fcfdc30f4da92..c16d47d012fee 100644
Binary files a/lib/web/extjs/resources/images/galdaka/basic-dialog/close.gif and b/lib/web/extjs/resources/images/galdaka/basic-dialog/close.gif differ
diff --git a/lib/web/extjs/resources/images/galdaka/basic-dialog/expand-over.gif b/lib/web/extjs/resources/images/galdaka/basic-dialog/expand-over.gif
index 97d18505dd73a..884755e01828c 100644
Binary files a/lib/web/extjs/resources/images/galdaka/basic-dialog/expand-over.gif and b/lib/web/extjs/resources/images/galdaka/basic-dialog/expand-over.gif differ
diff --git a/lib/web/extjs/resources/images/galdaka/basic-dialog/gradient-bg.gif b/lib/web/extjs/resources/images/galdaka/basic-dialog/gradient-bg.gif
index 3fd1590d15e4c..c9e88ea4f0c87 100644
Binary files a/lib/web/extjs/resources/images/galdaka/basic-dialog/gradient-bg.gif and b/lib/web/extjs/resources/images/galdaka/basic-dialog/gradient-bg.gif differ
diff --git a/lib/web/extjs/resources/images/galdaka/form/choose-trigger.gif b/lib/web/extjs/resources/images/galdaka/form/choose-trigger.gif
index 162269e76466b..03437538522e9 100644
Binary files a/lib/web/extjs/resources/images/galdaka/form/choose-trigger.gif and b/lib/web/extjs/resources/images/galdaka/form/choose-trigger.gif differ
diff --git a/lib/web/extjs/resources/images/galdaka/grid/grid-hrow.gif b/lib/web/extjs/resources/images/galdaka/grid/grid-hrow.gif
index c26b55446a562..7980b6cead175 100644
Binary files a/lib/web/extjs/resources/images/galdaka/grid/grid-hrow.gif and b/lib/web/extjs/resources/images/galdaka/grid/grid-hrow.gif differ
diff --git a/lib/web/extjs/resources/images/galdaka/grid/loading.gif b/lib/web/extjs/resources/images/galdaka/grid/loading.gif
index 2d92030529ba5..a7f67befff39e 100644
Binary files a/lib/web/extjs/resources/images/galdaka/grid/loading.gif and b/lib/web/extjs/resources/images/galdaka/grid/loading.gif differ
diff --git a/lib/web/extjs/resources/images/galdaka/layout/collapse.gif b/lib/web/extjs/resources/images/galdaka/layout/collapse.gif
index 0a67ecb6912e2..79eb54af73460 100644
Binary files a/lib/web/extjs/resources/images/galdaka/layout/collapse.gif and b/lib/web/extjs/resources/images/galdaka/layout/collapse.gif differ
diff --git a/lib/web/extjs/resources/images/galdaka/layout/expand.gif b/lib/web/extjs/resources/images/galdaka/layout/expand.gif
index 935d7b39c14a7..6fbf972e5ef97 100644
Binary files a/lib/web/extjs/resources/images/galdaka/layout/expand.gif and b/lib/web/extjs/resources/images/galdaka/layout/expand.gif differ
diff --git a/lib/web/extjs/resources/images/galdaka/layout/gradient-bg.gif b/lib/web/extjs/resources/images/galdaka/layout/gradient-bg.gif
index 3fd1590d15e4c..c9e88ea4f0c87 100644
Binary files a/lib/web/extjs/resources/images/galdaka/layout/gradient-bg.gif and b/lib/web/extjs/resources/images/galdaka/layout/gradient-bg.gif differ
diff --git a/lib/web/extjs/resources/images/galdaka/layout/ns-collapse.gif b/lib/web/extjs/resources/images/galdaka/layout/ns-collapse.gif
index 31a18abe17de6..9bbb644ec7335 100644
Binary files a/lib/web/extjs/resources/images/galdaka/layout/ns-collapse.gif and b/lib/web/extjs/resources/images/galdaka/layout/ns-collapse.gif differ
diff --git a/lib/web/extjs/resources/images/galdaka/layout/panel-close.gif b/lib/web/extjs/resources/images/galdaka/layout/panel-close.gif
index d84c1e78c2060..19969e6d83a02 100644
Binary files a/lib/web/extjs/resources/images/galdaka/layout/panel-close.gif and b/lib/web/extjs/resources/images/galdaka/layout/panel-close.gif differ
diff --git a/lib/web/extjs/resources/images/galdaka/layout/tab-close-on.gif b/lib/web/extjs/resources/images/galdaka/layout/tab-close-on.gif
index fbedd413bed2e..d402c9c170234 100644
Binary files a/lib/web/extjs/resources/images/galdaka/layout/tab-close-on.gif and b/lib/web/extjs/resources/images/galdaka/layout/tab-close-on.gif differ
diff --git a/lib/web/extjs/resources/images/galdaka/menu/group-checked.gif b/lib/web/extjs/resources/images/galdaka/menu/group-checked.gif
index 900a6245f1cd6..3fac89e19e4c1 100644
Binary files a/lib/web/extjs/resources/images/galdaka/menu/group-checked.gif and b/lib/web/extjs/resources/images/galdaka/menu/group-checked.gif differ
diff --git a/lib/web/extjs/resources/images/galdaka/qtip/tip-sprite.gif b/lib/web/extjs/resources/images/galdaka/qtip/tip-sprite.gif
index b847108cc0440..f4724565c9c9e 100644
Binary files a/lib/web/extjs/resources/images/galdaka/qtip/tip-sprite.gif and b/lib/web/extjs/resources/images/galdaka/qtip/tip-sprite.gif differ
diff --git a/lib/web/extjs/resources/images/galdaka/toolbar/btn-over-bg.gif b/lib/web/extjs/resources/images/galdaka/toolbar/btn-over-bg.gif
index 456916ddd801a..506845567d90f 100644
Binary files a/lib/web/extjs/resources/images/galdaka/toolbar/btn-over-bg.gif and b/lib/web/extjs/resources/images/galdaka/toolbar/btn-over-bg.gif differ
diff --git a/lib/web/extjs/resources/images/galdaka/toolbar/tb-btn-sprite.gif b/lib/web/extjs/resources/images/galdaka/toolbar/tb-btn-sprite.gif
index b381539142973..be5a6efd6dc8c 100644
Binary files a/lib/web/extjs/resources/images/galdaka/toolbar/tb-btn-sprite.gif and b/lib/web/extjs/resources/images/galdaka/toolbar/tb-btn-sprite.gif differ
diff --git a/lib/web/extjs/resources/images/gray/basic-dialog/dlg-bg.gif b/lib/web/extjs/resources/images/gray/basic-dialog/dlg-bg.gif
index 877dc5cd6e66d..b72f2e11abf60 100644
Binary files a/lib/web/extjs/resources/images/gray/basic-dialog/dlg-bg.gif and b/lib/web/extjs/resources/images/gray/basic-dialog/dlg-bg.gif differ
diff --git a/lib/web/extjs/resources/images/gray/gradient-bg.gif b/lib/web/extjs/resources/images/gray/gradient-bg.gif
index c7a66929406c0..2f5d00479e3bb 100644
Binary files a/lib/web/extjs/resources/images/gray/gradient-bg.gif and b/lib/web/extjs/resources/images/gray/gradient-bg.gif differ
diff --git a/lib/web/extjs/resources/images/gray/grid/grid-hrow.gif b/lib/web/extjs/resources/images/gray/grid/grid-hrow.gif
index d1e180ca47962..65be86c6908bd 100644
Binary files a/lib/web/extjs/resources/images/gray/grid/grid-hrow.gif and b/lib/web/extjs/resources/images/gray/grid/grid-hrow.gif differ
diff --git a/lib/web/extjs/resources/images/gray/layout/collapse.gif b/lib/web/extjs/resources/images/gray/layout/collapse.gif
index 00fb014eae7d4..780162202c32a 100644
Binary files a/lib/web/extjs/resources/images/gray/layout/collapse.gif and b/lib/web/extjs/resources/images/gray/layout/collapse.gif differ
diff --git a/lib/web/extjs/resources/images/gray/layout/expand.gif b/lib/web/extjs/resources/images/gray/layout/expand.gif
index c5a38260bb517..33acffe0952b3 100644
Binary files a/lib/web/extjs/resources/images/gray/layout/expand.gif and b/lib/web/extjs/resources/images/gray/layout/expand.gif differ
diff --git a/lib/web/extjs/resources/images/gray/layout/gradient-bg.gif b/lib/web/extjs/resources/images/gray/layout/gradient-bg.gif
index 412dc54a40597..07aed856aec1d 100644
Binary files a/lib/web/extjs/resources/images/gray/layout/gradient-bg.gif and b/lib/web/extjs/resources/images/gray/layout/gradient-bg.gif differ
diff --git a/lib/web/extjs/resources/images/gray/layout/ns-collapse.gif b/lib/web/extjs/resources/images/gray/layout/ns-collapse.gif
index a8713f8aadfa7..dd05dcf45ad43 100644
Binary files a/lib/web/extjs/resources/images/gray/layout/ns-collapse.gif and b/lib/web/extjs/resources/images/gray/layout/ns-collapse.gif differ
diff --git a/lib/web/extjs/resources/images/gray/layout/panel-title-bg.gif b/lib/web/extjs/resources/images/gray/layout/panel-title-bg.gif
index 7292d56b0852e..d800801fe611b 100644
Binary files a/lib/web/extjs/resources/images/gray/layout/panel-title-bg.gif and b/lib/web/extjs/resources/images/gray/layout/panel-title-bg.gif differ
diff --git a/lib/web/extjs/resources/images/gray/layout/panel-title-light-bg.gif b/lib/web/extjs/resources/images/gray/layout/panel-title-light-bg.gif
index b27fc5bc0559e..37fafa32df856 100644
Binary files a/lib/web/extjs/resources/images/gray/layout/panel-title-light-bg.gif and b/lib/web/extjs/resources/images/gray/layout/panel-title-light-bg.gif differ
diff --git a/lib/web/extjs/resources/images/gray/layout/stick.gif b/lib/web/extjs/resources/images/gray/layout/stick.gif
index 2eda3a0f1a7fe..bb466795a504a 100644
Binary files a/lib/web/extjs/resources/images/gray/layout/stick.gif and b/lib/web/extjs/resources/images/gray/layout/stick.gif differ
diff --git a/lib/web/extjs/resources/images/gray/menu/checked.gif b/lib/web/extjs/resources/images/gray/menu/checked.gif
index 19475dd385fdb..8b75fc6c7d7fd 100644
Binary files a/lib/web/extjs/resources/images/gray/menu/checked.gif and b/lib/web/extjs/resources/images/gray/menu/checked.gif differ
diff --git a/lib/web/extjs/resources/images/gray/menu/group-checked.gif b/lib/web/extjs/resources/images/gray/menu/group-checked.gif
index 70ff145ebfcea..e14d1f9337fbb 100644
Binary files a/lib/web/extjs/resources/images/gray/menu/group-checked.gif and b/lib/web/extjs/resources/images/gray/menu/group-checked.gif differ
diff --git a/lib/web/extjs/resources/images/gray/qtip/bg.gif b/lib/web/extjs/resources/images/gray/qtip/bg.gif
index adecdba6ef109..04bd84f22cd7f 100644
Binary files a/lib/web/extjs/resources/images/gray/qtip/bg.gif and b/lib/web/extjs/resources/images/gray/qtip/bg.gif differ
diff --git a/lib/web/extjs/resources/images/gray/qtip/tip-sprite.gif b/lib/web/extjs/resources/images/gray/qtip/tip-sprite.gif
index e3acd261f6540..bb645d84999e0 100644
Binary files a/lib/web/extjs/resources/images/gray/qtip/tip-sprite.gif and b/lib/web/extjs/resources/images/gray/qtip/tip-sprite.gif differ
diff --git a/lib/web/extjs/resources/images/gray/sizer/nw-handle-dark.gif b/lib/web/extjs/resources/images/gray/sizer/nw-handle-dark.gif
index 9b581cfd3ea16..9c139d3f2fddb 100644
Binary files a/lib/web/extjs/resources/images/gray/sizer/nw-handle-dark.gif and b/lib/web/extjs/resources/images/gray/sizer/nw-handle-dark.gif differ
diff --git a/lib/web/extjs/resources/images/gray/sizer/se-handle-dark.gif b/lib/web/extjs/resources/images/gray/sizer/se-handle-dark.gif
index df88fd56d347a..c6c42e3a2235a 100644
Binary files a/lib/web/extjs/resources/images/gray/sizer/se-handle-dark.gif and b/lib/web/extjs/resources/images/gray/sizer/se-handle-dark.gif differ
diff --git a/lib/web/extjs/resources/images/gray/tabs/tab-btm-inactive-left-bg.gif b/lib/web/extjs/resources/images/gray/tabs/tab-btm-inactive-left-bg.gif
index bdf1b0b8bb2b8..96e1dafb367a0 100644
Binary files a/lib/web/extjs/resources/images/gray/tabs/tab-btm-inactive-left-bg.gif and b/lib/web/extjs/resources/images/gray/tabs/tab-btm-inactive-left-bg.gif differ
diff --git a/lib/web/extjs/resources/images/gray/tabs/tab-btm-left-bg.gif b/lib/web/extjs/resources/images/gray/tabs/tab-btm-left-bg.gif
index 475e1a849a635..7738d3ed5081c 100644
Binary files a/lib/web/extjs/resources/images/gray/tabs/tab-btm-left-bg.gif and b/lib/web/extjs/resources/images/gray/tabs/tab-btm-left-bg.gif differ
diff --git a/lib/web/extjs/resources/images/gray/toolbar/gray-bg.gif b/lib/web/extjs/resources/images/gray/toolbar/gray-bg.gif
index 1e2f385e4187c..dc346d90441fd 100644
Binary files a/lib/web/extjs/resources/images/gray/toolbar/gray-bg.gif and b/lib/web/extjs/resources/images/gray/toolbar/gray-bg.gif differ
diff --git a/lib/web/extjs/resources/images/gray/toolbar/tb-btn-sprite.gif b/lib/web/extjs/resources/images/gray/toolbar/tb-btn-sprite.gif
index cc3f295bd7b0a..3a38845fb7a67 100644
Binary files a/lib/web/extjs/resources/images/gray/toolbar/tb-btn-sprite.gif and b/lib/web/extjs/resources/images/gray/toolbar/tb-btn-sprite.gif differ
diff --git a/lib/web/extjs/resources/images/magento/basic-dialog/collapse.gif b/lib/web/extjs/resources/images/magento/basic-dialog/collapse.gif
index d3c6cf6d8ecec..88a1226486e61 100644
Binary files a/lib/web/extjs/resources/images/magento/basic-dialog/collapse.gif and b/lib/web/extjs/resources/images/magento/basic-dialog/collapse.gif differ
diff --git a/lib/web/extjs/resources/images/magento/basic-dialog/expand-on.gif b/lib/web/extjs/resources/images/magento/basic-dialog/expand-on.gif
index 8d79619f34074..4b2edae2a982a 100644
Binary files a/lib/web/extjs/resources/images/magento/basic-dialog/expand-on.gif and b/lib/web/extjs/resources/images/magento/basic-dialog/expand-on.gif differ
diff --git a/lib/web/extjs/resources/images/magento/basic-dialog/expand.gif b/lib/web/extjs/resources/images/magento/basic-dialog/expand.gif
index 152b8b4c960b5..38e50b1024d8e 100644
Binary files a/lib/web/extjs/resources/images/magento/basic-dialog/expand.gif and b/lib/web/extjs/resources/images/magento/basic-dialog/expand.gif differ
diff --git a/lib/web/extjs/resources/images/magento/basic-dialog/hd-sprite.gif b/lib/web/extjs/resources/images/magento/basic-dialog/hd-sprite.gif
index 66beef2c991a6..7657cbd1f0c06 100644
Binary files a/lib/web/extjs/resources/images/magento/basic-dialog/hd-sprite.gif and b/lib/web/extjs/resources/images/magento/basic-dialog/hd-sprite.gif differ
diff --git a/lib/web/extjs/resources/images/magento/basic-dialog/ns-expand-on.gif b/lib/web/extjs/resources/images/magento/basic-dialog/ns-expand-on.gif
index 7c12f0a90b5f9..654ee760debf9 100644
Binary files a/lib/web/extjs/resources/images/magento/basic-dialog/ns-expand-on.gif and b/lib/web/extjs/resources/images/magento/basic-dialog/ns-expand-on.gif differ
diff --git a/lib/web/extjs/resources/images/magento/basic-dialog/ns-expand.gif b/lib/web/extjs/resources/images/magento/basic-dialog/ns-expand.gif
index 9de52292cee62..2f4cc20de9de9 100644
Binary files a/lib/web/extjs/resources/images/magento/basic-dialog/ns-expand.gif and b/lib/web/extjs/resources/images/magento/basic-dialog/ns-expand.gif differ
diff --git a/lib/web/extjs/resources/images/magento/basic-dialog/panel_close.gif b/lib/web/extjs/resources/images/magento/basic-dialog/panel_close.gif
index 98fcd3f54fb6a..ed0b453cda87f 100644
Binary files a/lib/web/extjs/resources/images/magento/basic-dialog/panel_close.gif and b/lib/web/extjs/resources/images/magento/basic-dialog/panel_close.gif differ
diff --git a/lib/web/extjs/resources/images/magento/basic-dialog/pop_close.gif b/lib/web/extjs/resources/images/magento/basic-dialog/pop_close.gif
index cb8f8c140ebbf..2ed0997535811 100644
Binary files a/lib/web/extjs/resources/images/magento/basic-dialog/pop_close.gif and b/lib/web/extjs/resources/images/magento/basic-dialog/pop_close.gif differ
diff --git a/lib/web/extjs/resources/images/magento/layout/checkered-bg.gif b/lib/web/extjs/resources/images/magento/layout/checkered-bg.gif
index 4363d305d4a1b..e55b2b284e3a1 100644
Binary files a/lib/web/extjs/resources/images/magento/layout/checkered-bg.gif and b/lib/web/extjs/resources/images/magento/layout/checkered-bg.gif differ
diff --git a/lib/web/extjs/resources/images/magento/loading_bg.gif b/lib/web/extjs/resources/images/magento/loading_bg.gif
index c7998441af654..ff3d9a6bb0a8b 100644
Binary files a/lib/web/extjs/resources/images/magento/loading_bg.gif and b/lib/web/extjs/resources/images/magento/loading_bg.gif differ
diff --git a/lib/web/extjs/resources/images/magento/tabs/tab-sprite.gif b/lib/web/extjs/resources/images/magento/tabs/tab-sprite.gif
index 0571cfae02659..dcba8472670f0 100644
Binary files a/lib/web/extjs/resources/images/magento/tabs/tab-sprite.gif and b/lib/web/extjs/resources/images/magento/tabs/tab-sprite.gif differ
diff --git a/lib/web/extjs/resources/images/magento/toolbar/btn-arrow.gif b/lib/web/extjs/resources/images/magento/toolbar/btn-arrow.gif
index 5832e8cb03da3..008512f712b49 100644
Binary files a/lib/web/extjs/resources/images/magento/toolbar/btn-arrow.gif and b/lib/web/extjs/resources/images/magento/toolbar/btn-arrow.gif differ
diff --git a/lib/web/extjs/resources/images/magento/toolbar/header_bg.gif b/lib/web/extjs/resources/images/magento/toolbar/header_bg.gif
index b4e9d11623db6..771173d400d1e 100644
Binary files a/lib/web/extjs/resources/images/magento/toolbar/header_bg.gif and b/lib/web/extjs/resources/images/magento/toolbar/header_bg.gif differ
diff --git a/lib/web/extjs/resources/images/magento/tree/elbow-minus-nl.gif b/lib/web/extjs/resources/images/magento/tree/elbow-minus-nl.gif
index 6629b558f0b79..368ebd6f89ee7 100644
Binary files a/lib/web/extjs/resources/images/magento/tree/elbow-minus-nl.gif and b/lib/web/extjs/resources/images/magento/tree/elbow-minus-nl.gif differ
diff --git a/lib/web/extjs/resources/images/vista/basic-dialog/bg-left.gif b/lib/web/extjs/resources/images/vista/basic-dialog/bg-left.gif
index 7aaaa39f378e6..830dfba0978cf 100644
Binary files a/lib/web/extjs/resources/images/vista/basic-dialog/bg-left.gif and b/lib/web/extjs/resources/images/vista/basic-dialog/bg-left.gif differ
diff --git a/lib/web/extjs/resources/images/vista/basic-dialog/bg-right.gif b/lib/web/extjs/resources/images/vista/basic-dialog/bg-right.gif
index d15e78eb39491..20a2d143fe6a5 100644
Binary files a/lib/web/extjs/resources/images/vista/basic-dialog/bg-right.gif and b/lib/web/extjs/resources/images/vista/basic-dialog/bg-right.gif differ
diff --git a/lib/web/extjs/resources/images/vista/basic-dialog/dlg-bg.gif b/lib/web/extjs/resources/images/vista/basic-dialog/dlg-bg.gif
index 877dc5cd6e66d..b72f2e11abf60 100644
Binary files a/lib/web/extjs/resources/images/vista/basic-dialog/dlg-bg.gif and b/lib/web/extjs/resources/images/vista/basic-dialog/dlg-bg.gif differ
diff --git a/lib/web/extjs/resources/images/vista/gradient-bg.gif b/lib/web/extjs/resources/images/vista/gradient-bg.gif
index c7a66929406c0..2f5d00479e3bb 100644
Binary files a/lib/web/extjs/resources/images/vista/gradient-bg.gif and b/lib/web/extjs/resources/images/vista/gradient-bg.gif differ
diff --git a/lib/web/extjs/resources/images/vista/layout/collapse.gif b/lib/web/extjs/resources/images/vista/layout/collapse.gif
index 7cc6c017fdf30..14496f6bde71e 100644
Binary files a/lib/web/extjs/resources/images/vista/layout/collapse.gif and b/lib/web/extjs/resources/images/vista/layout/collapse.gif differ
diff --git a/lib/web/extjs/resources/images/vista/layout/expand.gif b/lib/web/extjs/resources/images/vista/layout/expand.gif
index 6c001d2c94321..71226e6934a8b 100644
Binary files a/lib/web/extjs/resources/images/vista/layout/expand.gif and b/lib/web/extjs/resources/images/vista/layout/expand.gif differ
diff --git a/lib/web/extjs/resources/images/vista/layout/gradient-bg.gif b/lib/web/extjs/resources/images/vista/layout/gradient-bg.gif
index 412dc54a40597..07aed856aec1d 100644
Binary files a/lib/web/extjs/resources/images/vista/layout/gradient-bg.gif and b/lib/web/extjs/resources/images/vista/layout/gradient-bg.gif differ
diff --git a/lib/web/extjs/resources/images/vista/layout/ns-collapse.gif b/lib/web/extjs/resources/images/vista/layout/ns-collapse.gif
index e4d169101e590..6450efaf4489c 100644
Binary files a/lib/web/extjs/resources/images/vista/layout/ns-collapse.gif and b/lib/web/extjs/resources/images/vista/layout/ns-collapse.gif differ
diff --git a/lib/web/extjs/resources/images/vista/layout/panel-title-bg.gif b/lib/web/extjs/resources/images/vista/layout/panel-title-bg.gif
index fe6974cf69eda..729d460547ef6 100644
Binary files a/lib/web/extjs/resources/images/vista/layout/panel-title-bg.gif and b/lib/web/extjs/resources/images/vista/layout/panel-title-bg.gif differ
diff --git a/lib/web/extjs/resources/images/vista/layout/panel-title-light-bg.gif b/lib/web/extjs/resources/images/vista/layout/panel-title-light-bg.gif
index 0a71ca848d8c0..5f6cfa1138abc 100644
Binary files a/lib/web/extjs/resources/images/vista/layout/panel-title-light-bg.gif and b/lib/web/extjs/resources/images/vista/layout/panel-title-light-bg.gif differ
diff --git a/lib/web/extjs/resources/images/vista/layout/stick.gif b/lib/web/extjs/resources/images/vista/layout/stick.gif
index 47f2446e52870..e995bc0a0a46d 100644
Binary files a/lib/web/extjs/resources/images/vista/layout/stick.gif and b/lib/web/extjs/resources/images/vista/layout/stick.gif differ
diff --git a/lib/web/extjs/resources/images/vista/qtip/bg.gif b/lib/web/extjs/resources/images/vista/qtip/bg.gif
index adecdba6ef109..04bd84f22cd7f 100644
Binary files a/lib/web/extjs/resources/images/vista/qtip/bg.gif and b/lib/web/extjs/resources/images/vista/qtip/bg.gif differ
diff --git a/lib/web/extjs/resources/images/vista/sizer/nw-handle-dark.gif b/lib/web/extjs/resources/images/vista/sizer/nw-handle-dark.gif
index 9b581cfd3ea16..9c139d3f2fddb 100644
Binary files a/lib/web/extjs/resources/images/vista/sizer/nw-handle-dark.gif and b/lib/web/extjs/resources/images/vista/sizer/nw-handle-dark.gif differ
diff --git a/lib/web/extjs/resources/images/vista/sizer/se-handle-dark.gif b/lib/web/extjs/resources/images/vista/sizer/se-handle-dark.gif
index df88fd56d347a..c6c42e3a2235a 100644
Binary files a/lib/web/extjs/resources/images/vista/sizer/se-handle-dark.gif and b/lib/web/extjs/resources/images/vista/sizer/se-handle-dark.gif differ
diff --git a/lib/web/extjs/resources/images/vista/tabs/tab-btm-inactive-left-bg.gif b/lib/web/extjs/resources/images/vista/tabs/tab-btm-inactive-left-bg.gif
index b49b749295bd3..93beea5387f0f 100644
Binary files a/lib/web/extjs/resources/images/vista/tabs/tab-btm-inactive-left-bg.gif and b/lib/web/extjs/resources/images/vista/tabs/tab-btm-inactive-left-bg.gif differ
diff --git a/lib/web/extjs/resources/images/vista/tabs/tab-btm-left-bg.gif b/lib/web/extjs/resources/images/vista/tabs/tab-btm-left-bg.gif
index 1391297782b34..bbf114ed5ce76 100644
Binary files a/lib/web/extjs/resources/images/vista/tabs/tab-btm-left-bg.gif and b/lib/web/extjs/resources/images/vista/tabs/tab-btm-left-bg.gif differ
diff --git a/lib/web/extjs/resources/images/vista/tabs/tab-btm-right-bg.gif b/lib/web/extjs/resources/images/vista/tabs/tab-btm-right-bg.gif
index 237774d59b8b5..edbf28aca9858 100644
Binary files a/lib/web/extjs/resources/images/vista/tabs/tab-btm-right-bg.gif and b/lib/web/extjs/resources/images/vista/tabs/tab-btm-right-bg.gif differ
diff --git a/lib/web/extjs/resources/images/vista/toolbar/gray-bg.gif b/lib/web/extjs/resources/images/vista/toolbar/gray-bg.gif
index a9e14d607f26a..3758e55f12ad3 100644
Binary files a/lib/web/extjs/resources/images/vista/toolbar/gray-bg.gif and b/lib/web/extjs/resources/images/vista/toolbar/gray-bg.gif differ
diff --git a/lib/web/extjs/resources/images/vista/toolbar/tb-btn-sprite.gif b/lib/web/extjs/resources/images/vista/toolbar/tb-btn-sprite.gif
index 7c8415fc19fc7..3c9877b9ec6c9 100644
Binary files a/lib/web/extjs/resources/images/vista/toolbar/tb-btn-sprite.gif and b/lib/web/extjs/resources/images/vista/toolbar/tb-btn-sprite.gif differ
diff --git a/lib/web/images/blank-theme-icons.png b/lib/web/images/blank-theme-icons.png
index eb2205587f1f3..872843b4f9228 100644
Binary files a/lib/web/images/blank-theme-icons.png and b/lib/web/images/blank-theme-icons.png differ
diff --git a/lib/web/images/cards.png b/lib/web/images/cards.png
index 097d4979c9132..7094e94dd5521 100644
Binary files a/lib/web/images/cards.png and b/lib/web/images/cards.png differ
diff --git a/lib/web/images/loader-1.gif b/lib/web/images/loader-1.gif
index 1612bcee36660..460734dfdadec 100644
Binary files a/lib/web/images/loader-1.gif and b/lib/web/images/loader-1.gif differ
diff --git a/lib/web/images/sprite-gallery.png b/lib/web/images/sprite-gallery.png
index 880981bbcf3c0..bd638855d1f0f 100644
Binary files a/lib/web/images/sprite-gallery.png and b/lib/web/images/sprite-gallery.png differ
diff --git a/lib/web/jquery/colorpicker/images/blank.gif b/lib/web/jquery/colorpicker/images/blank.gif
index 75b945d255384..74b0a9cd398b9 100644
Binary files a/lib/web/jquery/colorpicker/images/blank.gif and b/lib/web/jquery/colorpicker/images/blank.gif differ
diff --git a/lib/web/jquery/colorpicker/images/colorpicker_background.png b/lib/web/jquery/colorpicker/images/colorpicker_background.png
index 8401572f1939a..2179d1c930239 100644
Binary files a/lib/web/jquery/colorpicker/images/colorpicker_background.png and b/lib/web/jquery/colorpicker/images/colorpicker_background.png differ
diff --git a/lib/web/jquery/colorpicker/images/colorpicker_hex.png b/lib/web/jquery/colorpicker/images/colorpicker_hex.png
index 4e532d7c65393..16a09b474f65a 100644
Binary files a/lib/web/jquery/colorpicker/images/colorpicker_hex.png and b/lib/web/jquery/colorpicker/images/colorpicker_hex.png differ
diff --git a/lib/web/jquery/colorpicker/images/colorpicker_hsb_b.png b/lib/web/jquery/colorpicker/images/colorpicker_hsb_b.png
index dfac595d017e2..678c1f3e90a06 100644
Binary files a/lib/web/jquery/colorpicker/images/colorpicker_hsb_b.png and b/lib/web/jquery/colorpicker/images/colorpicker_hsb_b.png differ
diff --git a/lib/web/jquery/colorpicker/images/colorpicker_hsb_h.png b/lib/web/jquery/colorpicker/images/colorpicker_hsb_h.png
index 3977ed9f21e31..bec1f3b8a317a 100644
Binary files a/lib/web/jquery/colorpicker/images/colorpicker_hsb_h.png and b/lib/web/jquery/colorpicker/images/colorpicker_hsb_h.png differ
diff --git a/lib/web/jquery/colorpicker/images/colorpicker_hsb_s.png b/lib/web/jquery/colorpicker/images/colorpicker_hsb_s.png
index a2a699736c24b..347283fc507a0 100644
Binary files a/lib/web/jquery/colorpicker/images/colorpicker_hsb_s.png and b/lib/web/jquery/colorpicker/images/colorpicker_hsb_s.png differ
diff --git a/lib/web/jquery/colorpicker/images/colorpicker_indic.gif b/lib/web/jquery/colorpicker/images/colorpicker_indic.gif
index f9fa95e2825ea..3dcfb3a1e6b07 100644
Binary files a/lib/web/jquery/colorpicker/images/colorpicker_indic.gif and b/lib/web/jquery/colorpicker/images/colorpicker_indic.gif differ
diff --git a/lib/web/jquery/colorpicker/images/colorpicker_overlay.png b/lib/web/jquery/colorpicker/images/colorpicker_overlay.png
index 561cdd9c59a49..24a4546e8b317 100644
Binary files a/lib/web/jquery/colorpicker/images/colorpicker_overlay.png and b/lib/web/jquery/colorpicker/images/colorpicker_overlay.png differ
diff --git a/lib/web/jquery/colorpicker/images/colorpicker_rgb_b.png b/lib/web/jquery/colorpicker/images/colorpicker_rgb_b.png
index dfac595d017e2..678c1f3e90a06 100644
Binary files a/lib/web/jquery/colorpicker/images/colorpicker_rgb_b.png and b/lib/web/jquery/colorpicker/images/colorpicker_rgb_b.png differ
diff --git a/lib/web/jquery/colorpicker/images/colorpicker_rgb_g.png b/lib/web/jquery/colorpicker/images/colorpicker_rgb_g.png
index 72b32760a5c40..9ff1361b2ea6c 100644
Binary files a/lib/web/jquery/colorpicker/images/colorpicker_rgb_g.png and b/lib/web/jquery/colorpicker/images/colorpicker_rgb_g.png differ
diff --git a/lib/web/jquery/colorpicker/images/colorpicker_rgb_r.png b/lib/web/jquery/colorpicker/images/colorpicker_rgb_r.png
index 4855fe03f8ea8..48175ac302596 100644
Binary files a/lib/web/jquery/colorpicker/images/colorpicker_rgb_r.png and b/lib/web/jquery/colorpicker/images/colorpicker_rgb_r.png differ
diff --git a/lib/web/jquery/colorpicker/images/colorpicker_select.gif b/lib/web/jquery/colorpicker/images/colorpicker_select.gif
index 599f7f13a6854..9e97cb70d1b30 100644
Binary files a/lib/web/jquery/colorpicker/images/colorpicker_select.gif and b/lib/web/jquery/colorpicker/images/colorpicker_select.gif differ
diff --git a/lib/web/jquery/colorpicker/images/colorpicker_submit.png b/lib/web/jquery/colorpicker/images/colorpicker_submit.png
index 7f4c0825f53cc..a87829ba2e43e 100644
Binary files a/lib/web/jquery/colorpicker/images/colorpicker_submit.png and b/lib/web/jquery/colorpicker/images/colorpicker_submit.png differ
diff --git a/lib/web/jquery/colorpicker/images/custom_background.png b/lib/web/jquery/colorpicker/images/custom_background.png
index cf55ffdd68ed4..49e72e005f3a5 100644
Binary files a/lib/web/jquery/colorpicker/images/custom_background.png and b/lib/web/jquery/colorpicker/images/custom_background.png differ
diff --git a/lib/web/jquery/colorpicker/images/custom_hex.png b/lib/web/jquery/colorpicker/images/custom_hex.png
index 888f444495b3e..e64fd8d89f5cd 100644
Binary files a/lib/web/jquery/colorpicker/images/custom_hex.png and b/lib/web/jquery/colorpicker/images/custom_hex.png differ
diff --git a/lib/web/jquery/colorpicker/images/custom_hsb_b.png b/lib/web/jquery/colorpicker/images/custom_hsb_b.png
index 2f99dae8e6ef7..cf4ffa00e9f9f 100644
Binary files a/lib/web/jquery/colorpicker/images/custom_hsb_b.png and b/lib/web/jquery/colorpicker/images/custom_hsb_b.png differ
diff --git a/lib/web/jquery/colorpicker/images/custom_hsb_h.png b/lib/web/jquery/colorpicker/images/custom_hsb_h.png
index a217e9218e6a5..a73bb7ff3f81a 100644
Binary files a/lib/web/jquery/colorpicker/images/custom_hsb_h.png and b/lib/web/jquery/colorpicker/images/custom_hsb_h.png differ
diff --git a/lib/web/jquery/colorpicker/images/custom_hsb_s.png b/lib/web/jquery/colorpicker/images/custom_hsb_s.png
index 7826b415077be..c0ff9b3983095 100644
Binary files a/lib/web/jquery/colorpicker/images/custom_hsb_s.png and b/lib/web/jquery/colorpicker/images/custom_hsb_s.png differ
diff --git a/lib/web/jquery/colorpicker/images/custom_indic.gif b/lib/web/jquery/colorpicker/images/custom_indic.gif
index 222fb94cfd66b..5517d79678195 100644
Binary files a/lib/web/jquery/colorpicker/images/custom_indic.gif and b/lib/web/jquery/colorpicker/images/custom_indic.gif differ
diff --git a/lib/web/jquery/colorpicker/images/custom_rgb_b.png b/lib/web/jquery/colorpicker/images/custom_rgb_b.png
index 80764e5d6dd8a..e326454d6ca60 100644
Binary files a/lib/web/jquery/colorpicker/images/custom_rgb_b.png and b/lib/web/jquery/colorpicker/images/custom_rgb_b.png differ
diff --git a/lib/web/jquery/colorpicker/images/custom_rgb_g.png b/lib/web/jquery/colorpicker/images/custom_rgb_g.png
index fc9778be1eb86..c74376f946dfd 100644
Binary files a/lib/web/jquery/colorpicker/images/custom_rgb_g.png and b/lib/web/jquery/colorpicker/images/custom_rgb_g.png differ
diff --git a/lib/web/jquery/colorpicker/images/custom_rgb_r.png b/lib/web/jquery/colorpicker/images/custom_rgb_r.png
index 91b0cd4c52001..cbbf677aa34f4 100644
Binary files a/lib/web/jquery/colorpicker/images/custom_rgb_r.png and b/lib/web/jquery/colorpicker/images/custom_rgb_r.png differ
diff --git a/lib/web/jquery/colorpicker/images/custom_submit.png b/lib/web/jquery/colorpicker/images/custom_submit.png
index cd202cd93b753..3502e5469d0cf 100644
Binary files a/lib/web/jquery/colorpicker/images/custom_submit.png and b/lib/web/jquery/colorpicker/images/custom_submit.png differ
diff --git a/lib/web/jquery/colorpicker/images/select.png b/lib/web/jquery/colorpicker/images/select.png
index 21213bfd51b08..e74bf4f8a3410 100644
Binary files a/lib/web/jquery/colorpicker/images/select.png and b/lib/web/jquery/colorpicker/images/select.png differ
diff --git a/lib/web/jquery/colorpicker/images/select2.png b/lib/web/jquery/colorpicker/images/select2.png
index 2cd2cabeb6777..a5be3b0797d72 100644
Binary files a/lib/web/jquery/colorpicker/images/select2.png and b/lib/web/jquery/colorpicker/images/select2.png differ
diff --git a/lib/web/jquery/colorpicker/images/slider.png b/lib/web/jquery/colorpicker/images/slider.png
index 8b03da96ebd45..bfdf33bb73702 100644
Binary files a/lib/web/jquery/colorpicker/images/slider.png and b/lib/web/jquery/colorpicker/images/slider.png differ
diff --git a/lib/web/jquery/fileUploader/img/loading.gif b/lib/web/jquery/fileUploader/img/loading.gif
index b5b7869359e88..4ae663fa730eb 100644
Binary files a/lib/web/jquery/fileUploader/img/loading.gif and b/lib/web/jquery/fileUploader/img/loading.gif differ
diff --git a/lib/web/jquery/fileUploader/img/progressbar.gif b/lib/web/jquery/fileUploader/img/progressbar.gif
index 201e911443de1..74bb94e8e5d2b 100644
Binary files a/lib/web/jquery/fileUploader/img/progressbar.gif and b/lib/web/jquery/fileUploader/img/progressbar.gif differ
diff --git a/lib/web/jquery/jstree/themes/apple/bg.jpg b/lib/web/jquery/jstree/themes/apple/bg.jpg
index 3aad05d8fadd7..b8dc44edbd7f3 100644
Binary files a/lib/web/jquery/jstree/themes/apple/bg.jpg and b/lib/web/jquery/jstree/themes/apple/bg.jpg differ
diff --git a/lib/web/jquery/jstree/themes/apple/d.png b/lib/web/jquery/jstree/themes/apple/d.png
index b19838c7d53ae..e8a631d13a07e 100644
Binary files a/lib/web/jquery/jstree/themes/apple/d.png and b/lib/web/jquery/jstree/themes/apple/d.png differ
diff --git a/lib/web/jquery/jstree/themes/apple/throbber.gif b/lib/web/jquery/jstree/themes/apple/throbber.gif
index 82d06cc97f0b9..d44cf73a17680 100644
Binary files a/lib/web/jquery/jstree/themes/apple/throbber.gif and b/lib/web/jquery/jstree/themes/apple/throbber.gif differ
diff --git a/lib/web/jquery/jstree/themes/classic/d.gif b/lib/web/jquery/jstree/themes/classic/d.gif
index 5cfbea2b5d8de..70a51176fb276 100644
Binary files a/lib/web/jquery/jstree/themes/classic/d.gif and b/lib/web/jquery/jstree/themes/classic/d.gif differ
diff --git a/lib/web/jquery/jstree/themes/classic/d.png b/lib/web/jquery/jstree/themes/classic/d.png
index 27bb8b4c45f80..9347ba3d5b71d 100644
Binary files a/lib/web/jquery/jstree/themes/classic/d.png and b/lib/web/jquery/jstree/themes/classic/d.png differ
diff --git a/lib/web/jquery/jstree/themes/classic/throbber.gif b/lib/web/jquery/jstree/themes/classic/throbber.gif
index 82d06cc97f0b9..0fa9f5af614c5 100644
Binary files a/lib/web/jquery/jstree/themes/classic/throbber.gif and b/lib/web/jquery/jstree/themes/classic/throbber.gif differ
diff --git a/lib/web/jquery/jstree/themes/default-rtl/d.gif b/lib/web/jquery/jstree/themes/default-rtl/d.gif
index 0276c823dda73..1030bec3d1371 100644
Binary files a/lib/web/jquery/jstree/themes/default-rtl/d.gif and b/lib/web/jquery/jstree/themes/default-rtl/d.gif differ
diff --git a/lib/web/jquery/jstree/themes/default-rtl/d.png b/lib/web/jquery/jstree/themes/default-rtl/d.png
index 04e2ad8a7aee6..0fff8ac4ef7e4 100644
Binary files a/lib/web/jquery/jstree/themes/default-rtl/d.png and b/lib/web/jquery/jstree/themes/default-rtl/d.png differ
diff --git a/lib/web/jquery/jstree/themes/default-rtl/throbber.gif b/lib/web/jquery/jstree/themes/default-rtl/throbber.gif
index 82d06cc97f0b9..0fa9f5af614c5 100644
Binary files a/lib/web/jquery/jstree/themes/default-rtl/throbber.gif and b/lib/web/jquery/jstree/themes/default-rtl/throbber.gif differ
diff --git a/lib/web/jquery/jstree/themes/default/d.gif b/lib/web/jquery/jstree/themes/default/d.gif
index 16cc63e318c8d..de87c0d8574ed 100644
Binary files a/lib/web/jquery/jstree/themes/default/d.gif and b/lib/web/jquery/jstree/themes/default/d.gif differ
diff --git a/lib/web/jquery/jstree/themes/default/d.png b/lib/web/jquery/jstree/themes/default/d.png
index 9b365e319e771..153f82623641a 100644
Binary files a/lib/web/jquery/jstree/themes/default/d.png and b/lib/web/jquery/jstree/themes/default/d.png differ
diff --git a/lib/web/jquery/jstree/themes/default/throbber.gif b/lib/web/jquery/jstree/themes/default/throbber.gif
index 82d06cc97f0b9..0fa9f5af614c5 100644
Binary files a/lib/web/jquery/jstree/themes/default/throbber.gif and b/lib/web/jquery/jstree/themes/default/throbber.gif differ
diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentovariable/img/icon.gif b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentovariable/img/icon.gif
index 4eaaec11f9a2a..fbc50a329d052 100644
Binary files a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentovariable/img/icon.gif and b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentovariable/img/icon.gif differ
diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/img/icon.gif b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/img/icon.gif
index 7f0df57f83b8d..6e53b80fe79e7 100644
Binary files a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/img/icon.gif and b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/img/icon.gif differ
diff --git a/lib/web/mage/gallery/gallery.png b/lib/web/mage/gallery/gallery.png
index a5077dd7cd7f7..11e0f28188d1a 100644
Binary files a/lib/web/mage/gallery/gallery.png and b/lib/web/mage/gallery/gallery.png differ
diff --git a/lib/web/prototype/windows/themes/alert/overlay.png b/lib/web/prototype/windows/themes/alert/overlay.png
index 9dd8296d46e95..1c27554df4eb5 100644
Binary files a/lib/web/prototype/windows/themes/alert/overlay.png and b/lib/web/prototype/windows/themes/alert/overlay.png differ
diff --git a/lib/web/prototype/windows/themes/alert/progress.gif b/lib/web/prototype/windows/themes/alert/progress.gif
index f9989658953f9..494b6b4d9a3de 100644
Binary files a/lib/web/prototype/windows/themes/alert/progress.gif and b/lib/web/prototype/windows/themes/alert/progress.gif differ
diff --git a/lib/web/prototype/windows/themes/alphacube/bottom-left-c.gif b/lib/web/prototype/windows/themes/alphacube/bottom-left-c.gif
index 06b1ec870553a..848aec172bd01 100644
Binary files a/lib/web/prototype/windows/themes/alphacube/bottom-left-c.gif and b/lib/web/prototype/windows/themes/alphacube/bottom-left-c.gif differ
diff --git a/lib/web/prototype/windows/themes/alphacube/bottom-right-c.gif b/lib/web/prototype/windows/themes/alphacube/bottom-right-c.gif
index 4ea5f7e0e36df..ebeb40c581bba 100644
Binary files a/lib/web/prototype/windows/themes/alphacube/bottom-right-c.gif and b/lib/web/prototype/windows/themes/alphacube/bottom-right-c.gif differ
diff --git a/lib/web/prototype/windows/themes/alphacube/button-close-focus.gif b/lib/web/prototype/windows/themes/alphacube/button-close-focus.gif
index 03930bdfc2a2a..626bb6da505e1 100644
Binary files a/lib/web/prototype/windows/themes/alphacube/button-close-focus.gif and b/lib/web/prototype/windows/themes/alphacube/button-close-focus.gif differ
diff --git a/lib/web/prototype/windows/themes/alphacube/button-max-focus.gif b/lib/web/prototype/windows/themes/alphacube/button-max-focus.gif
index 698d38e9f2c6f..e43795d53187f 100644
Binary files a/lib/web/prototype/windows/themes/alphacube/button-max-focus.gif and b/lib/web/prototype/windows/themes/alphacube/button-max-focus.gif differ
diff --git a/lib/web/prototype/windows/themes/alphacube/button-min-focus.gif b/lib/web/prototype/windows/themes/alphacube/button-min-focus.gif
index 1c4169567d20d..ae7b4cab794fe 100644
Binary files a/lib/web/prototype/windows/themes/alphacube/button-min-focus.gif and b/lib/web/prototype/windows/themes/alphacube/button-min-focus.gif differ
diff --git a/lib/web/prototype/windows/themes/alphacube/top-middle.gif b/lib/web/prototype/windows/themes/alphacube/top-middle.gif
index b1238e516133f..351ce84f6aeee 100644
Binary files a/lib/web/prototype/windows/themes/alphacube/top-middle.gif and b/lib/web/prototype/windows/themes/alphacube/top-middle.gif differ
diff --git a/lib/web/prototype/windows/themes/darkX/button-close-focused.png b/lib/web/prototype/windows/themes/darkX/button-close-focused.png
index 84cf52bfa4e4c..71e5ea0c3bd2a 100644
Binary files a/lib/web/prototype/windows/themes/darkX/button-close-focused.png and b/lib/web/prototype/windows/themes/darkX/button-close-focused.png differ
diff --git a/lib/web/prototype/windows/themes/darkX/button-maximize-focused.png b/lib/web/prototype/windows/themes/darkX/button-maximize-focused.png
index f4b81d00d952f..cd477fefc5a14 100644
Binary files a/lib/web/prototype/windows/themes/darkX/button-maximize-focused.png and b/lib/web/prototype/windows/themes/darkX/button-maximize-focused.png differ
diff --git a/lib/web/prototype/windows/themes/darkX/button-minimize-focused.png b/lib/web/prototype/windows/themes/darkX/button-minimize-focused.png
index d01a32a8c4d33..ee8fbccff8a79 100644
Binary files a/lib/web/prototype/windows/themes/darkX/button-minimize-focused.png and b/lib/web/prototype/windows/themes/darkX/button-minimize-focused.png differ
diff --git a/lib/web/prototype/windows/themes/darkX/frame-bottom-left-focused.png b/lib/web/prototype/windows/themes/darkX/frame-bottom-left-focused.png
index 5f8ce3458c4a8..f61b821d2757a 100644
Binary files a/lib/web/prototype/windows/themes/darkX/frame-bottom-left-focused.png and b/lib/web/prototype/windows/themes/darkX/frame-bottom-left-focused.png differ
diff --git a/lib/web/prototype/windows/themes/darkX/frame-bottom-mid-focused.png b/lib/web/prototype/windows/themes/darkX/frame-bottom-mid-focused.png
index 5f8ce3458c4a8..f61b821d2757a 100644
Binary files a/lib/web/prototype/windows/themes/darkX/frame-bottom-mid-focused.png and b/lib/web/prototype/windows/themes/darkX/frame-bottom-mid-focused.png differ
diff --git a/lib/web/prototype/windows/themes/darkX/frame-bottom-right-focused.png b/lib/web/prototype/windows/themes/darkX/frame-bottom-right-focused.png
index 5f8ce3458c4a8..f61b821d2757a 100644
Binary files a/lib/web/prototype/windows/themes/darkX/frame-bottom-right-focused.png and b/lib/web/prototype/windows/themes/darkX/frame-bottom-right-focused.png differ
diff --git a/lib/web/prototype/windows/themes/darkX/frame-left-focused.png b/lib/web/prototype/windows/themes/darkX/frame-left-focused.png
index a4ff23cf90685..48564b8ec55a1 100644
Binary files a/lib/web/prototype/windows/themes/darkX/frame-left-focused.png and b/lib/web/prototype/windows/themes/darkX/frame-left-focused.png differ
diff --git a/lib/web/prototype/windows/themes/darkX/frame-right-focused.png b/lib/web/prototype/windows/themes/darkX/frame-right-focused.png
index 33de9c897ec9b..8367d59f2a62d 100644
Binary files a/lib/web/prototype/windows/themes/darkX/frame-right-focused.png and b/lib/web/prototype/windows/themes/darkX/frame-right-focused.png differ
diff --git a/lib/web/prototype/windows/themes/darkX/titlebar-left-focused.png b/lib/web/prototype/windows/themes/darkX/titlebar-left-focused.png
index b97818191f1ec..6d1fcde4f6c18 100644
Binary files a/lib/web/prototype/windows/themes/darkX/titlebar-left-focused.png and b/lib/web/prototype/windows/themes/darkX/titlebar-left-focused.png differ
diff --git a/lib/web/prototype/windows/themes/darkX/titlebar-right-focused.png b/lib/web/prototype/windows/themes/darkX/titlebar-right-focused.png
index b97818191f1ec..6d1fcde4f6c18 100644
Binary files a/lib/web/prototype/windows/themes/darkX/titlebar-right-focused.png and b/lib/web/prototype/windows/themes/darkX/titlebar-right-focused.png differ
diff --git a/lib/web/prototype/windows/themes/default/bottom_left.gif b/lib/web/prototype/windows/themes/default/bottom_left.gif
index e6d1d4fa7b187..bde3cd1a85f72 100644
Binary files a/lib/web/prototype/windows/themes/default/bottom_left.gif and b/lib/web/prototype/windows/themes/default/bottom_left.gif differ
diff --git a/lib/web/prototype/windows/themes/default/close.gif b/lib/web/prototype/windows/themes/default/close.gif
index 0ab8a53c1712c..16cd6db7b7780 100644
Binary files a/lib/web/prototype/windows/themes/default/close.gif and b/lib/web/prototype/windows/themes/default/close.gif differ
diff --git a/lib/web/prototype/windows/themes/default/maximize.gif b/lib/web/prototype/windows/themes/default/maximize.gif
index beedb34f4a273..5aa5a71db6324 100644
Binary files a/lib/web/prototype/windows/themes/default/maximize.gif and b/lib/web/prototype/windows/themes/default/maximize.gif differ
diff --git a/lib/web/prototype/windows/themes/default/minimize.gif b/lib/web/prototype/windows/themes/default/minimize.gif
index dc3cbcb267bf9..7bb5dec95e25b 100644
Binary files a/lib/web/prototype/windows/themes/default/minimize.gif and b/lib/web/prototype/windows/themes/default/minimize.gif differ
diff --git a/lib/web/prototype/windows/themes/default/overlay.png b/lib/web/prototype/windows/themes/default/overlay.png
index df58435f06b22..56999cfe093df 100644
Binary files a/lib/web/prototype/windows/themes/default/overlay.png and b/lib/web/prototype/windows/themes/default/overlay.png differ
diff --git a/lib/web/prototype/windows/themes/default/resize.gif b/lib/web/prototype/windows/themes/default/resize.gif
index 9f02be71ffe6e..deb59662e8b08 100644
Binary files a/lib/web/prototype/windows/themes/default/resize.gif and b/lib/web/prototype/windows/themes/default/resize.gif differ
diff --git a/lib/web/prototype/windows/themes/default/top_mid.gif b/lib/web/prototype/windows/themes/default/top_mid.gif
index b858ac2ed117c..9b20bc76cc238 100644
Binary files a/lib/web/prototype/windows/themes/default/top_mid.gif and b/lib/web/prototype/windows/themes/default/top_mid.gif differ
diff --git a/lib/web/prototype/windows/themes/default/top_right.gif b/lib/web/prototype/windows/themes/default/top_right.gif
index 12becda292bd2..906ec7caf0d09 100644
Binary files a/lib/web/prototype/windows/themes/default/top_right.gif and b/lib/web/prototype/windows/themes/default/top_right.gif differ
diff --git a/lib/web/prototype/windows/themes/lighting/background_buttons.gif b/lib/web/prototype/windows/themes/lighting/background_buttons.gif
index b28f2330027d2..6911ebb5f6c3d 100644
Binary files a/lib/web/prototype/windows/themes/lighting/background_buttons.gif and b/lib/web/prototype/windows/themes/lighting/background_buttons.gif differ
diff --git a/lib/web/prototype/windows/themes/lighting/bottom-left-blue.png b/lib/web/prototype/windows/themes/lighting/bottom-left-blue.png
index f912256622cf3..c3c162058ce19 100644
Binary files a/lib/web/prototype/windows/themes/lighting/bottom-left-blue.png and b/lib/web/prototype/windows/themes/lighting/bottom-left-blue.png differ
diff --git a/lib/web/prototype/windows/themes/lighting/bottom-left-darkblue.png b/lib/web/prototype/windows/themes/lighting/bottom-left-darkblue.png
index 020425f976adc..aebfcf9690fe2 100644
Binary files a/lib/web/prototype/windows/themes/lighting/bottom-left-darkblue.png and b/lib/web/prototype/windows/themes/lighting/bottom-left-darkblue.png differ
diff --git a/lib/web/prototype/windows/themes/lighting/bottom-left-green.png b/lib/web/prototype/windows/themes/lighting/bottom-left-green.png
index e59590706acca..a3c8531a8fe4b 100644
Binary files a/lib/web/prototype/windows/themes/lighting/bottom-left-green.png and b/lib/web/prototype/windows/themes/lighting/bottom-left-green.png differ
diff --git a/lib/web/prototype/windows/themes/lighting/bottom-left-grey.png b/lib/web/prototype/windows/themes/lighting/bottom-left-grey.png
index c4d58160b7f25..480d0f40e270b 100644
Binary files a/lib/web/prototype/windows/themes/lighting/bottom-left-grey.png and b/lib/web/prototype/windows/themes/lighting/bottom-left-grey.png differ
diff --git a/lib/web/prototype/windows/themes/lighting/bottom-middle-blue.png b/lib/web/prototype/windows/themes/lighting/bottom-middle-blue.png
index 19a37108a0168..02b67004830f1 100644
Binary files a/lib/web/prototype/windows/themes/lighting/bottom-middle-blue.png and b/lib/web/prototype/windows/themes/lighting/bottom-middle-blue.png differ
diff --git a/lib/web/prototype/windows/themes/lighting/bottom-middle-darkblue.png b/lib/web/prototype/windows/themes/lighting/bottom-middle-darkblue.png
index 16fca0633777e..aadbc79e38f81 100644
Binary files a/lib/web/prototype/windows/themes/lighting/bottom-middle-darkblue.png and b/lib/web/prototype/windows/themes/lighting/bottom-middle-darkblue.png differ
diff --git a/lib/web/prototype/windows/themes/lighting/bottom-middle-green.png b/lib/web/prototype/windows/themes/lighting/bottom-middle-green.png
index 37268592a20be..f474576dcccd2 100644
Binary files a/lib/web/prototype/windows/themes/lighting/bottom-middle-green.png and b/lib/web/prototype/windows/themes/lighting/bottom-middle-green.png differ
diff --git a/lib/web/prototype/windows/themes/lighting/bottom-middle-grey.png b/lib/web/prototype/windows/themes/lighting/bottom-middle-grey.png
index 72a83177be123..bd9a0cbe81698 100644
Binary files a/lib/web/prototype/windows/themes/lighting/bottom-middle-grey.png and b/lib/web/prototype/windows/themes/lighting/bottom-middle-grey.png differ
diff --git a/lib/web/prototype/windows/themes/lighting/bottom-right-blue.png b/lib/web/prototype/windows/themes/lighting/bottom-right-blue.png
index 671f2579c5de4..fb334bad58715 100644
Binary files a/lib/web/prototype/windows/themes/lighting/bottom-right-blue.png and b/lib/web/prototype/windows/themes/lighting/bottom-right-blue.png differ
diff --git a/lib/web/prototype/windows/themes/lighting/bottom-right-darkblue.png b/lib/web/prototype/windows/themes/lighting/bottom-right-darkblue.png
index c1fd8ae1b29ea..7a1284231d12b 100644
Binary files a/lib/web/prototype/windows/themes/lighting/bottom-right-darkblue.png and b/lib/web/prototype/windows/themes/lighting/bottom-right-darkblue.png differ
diff --git a/lib/web/prototype/windows/themes/lighting/bottom-right-green.png b/lib/web/prototype/windows/themes/lighting/bottom-right-green.png
index 51839468c9a92..47d10fd0ea5c5 100644
Binary files a/lib/web/prototype/windows/themes/lighting/bottom-right-green.png and b/lib/web/prototype/windows/themes/lighting/bottom-right-green.png differ
diff --git a/lib/web/prototype/windows/themes/lighting/bottom-right-grey.png b/lib/web/prototype/windows/themes/lighting/bottom-right-grey.png
index 95a00a278162e..91586a524fbe4 100644
Binary files a/lib/web/prototype/windows/themes/lighting/bottom-right-grey.png and b/lib/web/prototype/windows/themes/lighting/bottom-right-grey.png differ
diff --git a/lib/web/prototype/windows/themes/lighting/button-close-blue.png b/lib/web/prototype/windows/themes/lighting/button-close-blue.png
index d5a195c43ffa6..8f86f5cac4faa 100644
Binary files a/lib/web/prototype/windows/themes/lighting/button-close-blue.png and b/lib/web/prototype/windows/themes/lighting/button-close-blue.png differ
diff --git a/lib/web/prototype/windows/themes/lighting/button-close-darkblue.png b/lib/web/prototype/windows/themes/lighting/button-close-darkblue.png
index 9164b807fac60..b31f53844d55c 100644
Binary files a/lib/web/prototype/windows/themes/lighting/button-close-darkblue.png and b/lib/web/prototype/windows/themes/lighting/button-close-darkblue.png differ
diff --git a/lib/web/prototype/windows/themes/lighting/button-close-green.png b/lib/web/prototype/windows/themes/lighting/button-close-green.png
index 9fe569c267c2a..1aca6b830a01b 100644
Binary files a/lib/web/prototype/windows/themes/lighting/button-close-green.png and b/lib/web/prototype/windows/themes/lighting/button-close-green.png differ
diff --git a/lib/web/prototype/windows/themes/lighting/button-close-grey.png b/lib/web/prototype/windows/themes/lighting/button-close-grey.png
index 1856f2ed9334a..d0b2c109978af 100644
Binary files a/lib/web/prototype/windows/themes/lighting/button-close-grey.png and b/lib/web/prototype/windows/themes/lighting/button-close-grey.png differ
diff --git a/lib/web/prototype/windows/themes/lighting/button-maximize-blue.png b/lib/web/prototype/windows/themes/lighting/button-maximize-blue.png
index c5dc71d475e42..b595b32023052 100644
Binary files a/lib/web/prototype/windows/themes/lighting/button-maximize-blue.png and b/lib/web/prototype/windows/themes/lighting/button-maximize-blue.png differ
diff --git a/lib/web/prototype/windows/themes/lighting/button-maximize-darkblue.png b/lib/web/prototype/windows/themes/lighting/button-maximize-darkblue.png
index be92274678704..f565f6b54f518 100644
Binary files a/lib/web/prototype/windows/themes/lighting/button-maximize-darkblue.png and b/lib/web/prototype/windows/themes/lighting/button-maximize-darkblue.png differ
diff --git a/lib/web/prototype/windows/themes/lighting/button-maximize-green.png b/lib/web/prototype/windows/themes/lighting/button-maximize-green.png
index b2af75bba9cb6..88cf646b49b7a 100644
Binary files a/lib/web/prototype/windows/themes/lighting/button-maximize-green.png and b/lib/web/prototype/windows/themes/lighting/button-maximize-green.png differ
diff --git a/lib/web/prototype/windows/themes/lighting/button-maximize-grey.png b/lib/web/prototype/windows/themes/lighting/button-maximize-grey.png
index 5417cef90a96e..d15ba085f7615 100644
Binary files a/lib/web/prototype/windows/themes/lighting/button-maximize-grey.png and b/lib/web/prototype/windows/themes/lighting/button-maximize-grey.png differ
diff --git a/lib/web/prototype/windows/themes/lighting/button-minimize-blue.png b/lib/web/prototype/windows/themes/lighting/button-minimize-blue.png
index 4e9632b87d227..6dd3450138dfc 100644
Binary files a/lib/web/prototype/windows/themes/lighting/button-minimize-blue.png and b/lib/web/prototype/windows/themes/lighting/button-minimize-blue.png differ
diff --git a/lib/web/prototype/windows/themes/lighting/button-minimize-darkblue.png b/lib/web/prototype/windows/themes/lighting/button-minimize-darkblue.png
index d32aa2d0054d6..1c39caee08ed7 100644
Binary files a/lib/web/prototype/windows/themes/lighting/button-minimize-darkblue.png and b/lib/web/prototype/windows/themes/lighting/button-minimize-darkblue.png differ
diff --git a/lib/web/prototype/windows/themes/lighting/button-minimize-green.png b/lib/web/prototype/windows/themes/lighting/button-minimize-green.png
index c05d4571df5b1..0103f76238b1e 100644
Binary files a/lib/web/prototype/windows/themes/lighting/button-minimize-green.png and b/lib/web/prototype/windows/themes/lighting/button-minimize-green.png differ
diff --git a/lib/web/prototype/windows/themes/lighting/button-minimize-grey.png b/lib/web/prototype/windows/themes/lighting/button-minimize-grey.png
index 3e713c9a02d4f..0bdbad339f9d2 100644
Binary files a/lib/web/prototype/windows/themes/lighting/button-minimize-grey.png and b/lib/web/prototype/windows/themes/lighting/button-minimize-grey.png differ
diff --git a/lib/web/prototype/windows/themes/lighting/left-blue.png b/lib/web/prototype/windows/themes/lighting/left-blue.png
index 1d4423a1117c5..72556e01649a0 100644
Binary files a/lib/web/prototype/windows/themes/lighting/left-blue.png and b/lib/web/prototype/windows/themes/lighting/left-blue.png differ
diff --git a/lib/web/prototype/windows/themes/lighting/left-darkblue.png b/lib/web/prototype/windows/themes/lighting/left-darkblue.png
index f826293a0166a..b73ec9053dafb 100644
Binary files a/lib/web/prototype/windows/themes/lighting/left-darkblue.png and b/lib/web/prototype/windows/themes/lighting/left-darkblue.png differ
diff --git a/lib/web/prototype/windows/themes/lighting/left-green.png b/lib/web/prototype/windows/themes/lighting/left-green.png
index 75ac240b917ff..b3b2e86050bbb 100644
Binary files a/lib/web/prototype/windows/themes/lighting/left-green.png and b/lib/web/prototype/windows/themes/lighting/left-green.png differ
diff --git a/lib/web/prototype/windows/themes/lighting/left-grey.png b/lib/web/prototype/windows/themes/lighting/left-grey.png
index cb96db91b1ea6..58736bdf03513 100644
Binary files a/lib/web/prototype/windows/themes/lighting/left-grey.png and b/lib/web/prototype/windows/themes/lighting/left-grey.png differ
diff --git a/lib/web/prototype/windows/themes/lighting/right-blue.png b/lib/web/prototype/windows/themes/lighting/right-blue.png
index 68c0ae14f9df4..a4f596eb32009 100644
Binary files a/lib/web/prototype/windows/themes/lighting/right-blue.png and b/lib/web/prototype/windows/themes/lighting/right-blue.png differ
diff --git a/lib/web/prototype/windows/themes/lighting/right-darkblue.png b/lib/web/prototype/windows/themes/lighting/right-darkblue.png
index 69f017b654554..985a5a2bead7d 100644
Binary files a/lib/web/prototype/windows/themes/lighting/right-darkblue.png and b/lib/web/prototype/windows/themes/lighting/right-darkblue.png differ
diff --git a/lib/web/prototype/windows/themes/lighting/right-green.png b/lib/web/prototype/windows/themes/lighting/right-green.png
index 568e3886cc689..c26399ebd5b65 100644
Binary files a/lib/web/prototype/windows/themes/lighting/right-green.png and b/lib/web/prototype/windows/themes/lighting/right-green.png differ
diff --git a/lib/web/prototype/windows/themes/lighting/right-grey.png b/lib/web/prototype/windows/themes/lighting/right-grey.png
index cb3129479e017..f74172f86ec2a 100644
Binary files a/lib/web/prototype/windows/themes/lighting/right-grey.png and b/lib/web/prototype/windows/themes/lighting/right-grey.png differ
diff --git a/lib/web/prototype/windows/themes/lighting/spinner.gif b/lib/web/prototype/windows/themes/lighting/spinner.gif
index 55472f401c5ad..ad8362bc87693 100644
Binary files a/lib/web/prototype/windows/themes/lighting/spinner.gif and b/lib/web/prototype/windows/themes/lighting/spinner.gif differ
diff --git a/lib/web/prototype/windows/themes/lighting/top-left-blue.png b/lib/web/prototype/windows/themes/lighting/top-left-blue.png
index 7a8a1bc367af0..ffcdf9c15553d 100644
Binary files a/lib/web/prototype/windows/themes/lighting/top-left-blue.png and b/lib/web/prototype/windows/themes/lighting/top-left-blue.png differ
diff --git a/lib/web/prototype/windows/themes/lighting/top-left-darkblue.png b/lib/web/prototype/windows/themes/lighting/top-left-darkblue.png
index 3e6d679a70a58..ecb1aa5edb4f4 100644
Binary files a/lib/web/prototype/windows/themes/lighting/top-left-darkblue.png and b/lib/web/prototype/windows/themes/lighting/top-left-darkblue.png differ
diff --git a/lib/web/prototype/windows/themes/lighting/top-left-green.png b/lib/web/prototype/windows/themes/lighting/top-left-green.png
index 6c21fd879c371..bb16ec635c23e 100644
Binary files a/lib/web/prototype/windows/themes/lighting/top-left-green.png and b/lib/web/prototype/windows/themes/lighting/top-left-green.png differ
diff --git a/lib/web/prototype/windows/themes/lighting/top-left-grey.png b/lib/web/prototype/windows/themes/lighting/top-left-grey.png
index bbadb84be9b39..a2e574b4a4868 100644
Binary files a/lib/web/prototype/windows/themes/lighting/top-left-grey.png and b/lib/web/prototype/windows/themes/lighting/top-left-grey.png differ
diff --git a/lib/web/prototype/windows/themes/lighting/top-middle-blue.png b/lib/web/prototype/windows/themes/lighting/top-middle-blue.png
index 09d8775a1be27..3db022f8ac028 100644
Binary files a/lib/web/prototype/windows/themes/lighting/top-middle-blue.png and b/lib/web/prototype/windows/themes/lighting/top-middle-blue.png differ
diff --git a/lib/web/prototype/windows/themes/lighting/top-middle-darkblue.png b/lib/web/prototype/windows/themes/lighting/top-middle-darkblue.png
index 352d03536a597..07545c6253b28 100644
Binary files a/lib/web/prototype/windows/themes/lighting/top-middle-darkblue.png and b/lib/web/prototype/windows/themes/lighting/top-middle-darkblue.png differ
diff --git a/lib/web/prototype/windows/themes/lighting/top-middle-green.png b/lib/web/prototype/windows/themes/lighting/top-middle-green.png
index 8f526355ae78f..d9f4e47d34a6f 100644
Binary files a/lib/web/prototype/windows/themes/lighting/top-middle-green.png and b/lib/web/prototype/windows/themes/lighting/top-middle-green.png differ
diff --git a/lib/web/prototype/windows/themes/lighting/top-middle-grey.png b/lib/web/prototype/windows/themes/lighting/top-middle-grey.png
index 9386375ea42cd..2bd80085b2234 100644
Binary files a/lib/web/prototype/windows/themes/lighting/top-middle-grey.png and b/lib/web/prototype/windows/themes/lighting/top-middle-grey.png differ
diff --git a/lib/web/prototype/windows/themes/lighting/top-right-blue.png b/lib/web/prototype/windows/themes/lighting/top-right-blue.png
index 2fad9d50f15f6..d4a8efa3c1e1f 100644
Binary files a/lib/web/prototype/windows/themes/lighting/top-right-blue.png and b/lib/web/prototype/windows/themes/lighting/top-right-blue.png differ
diff --git a/lib/web/prototype/windows/themes/lighting/top-right-darkblue.png b/lib/web/prototype/windows/themes/lighting/top-right-darkblue.png
index bdcf9c6dc008d..50e708dd2843b 100644
Binary files a/lib/web/prototype/windows/themes/lighting/top-right-darkblue.png and b/lib/web/prototype/windows/themes/lighting/top-right-darkblue.png differ
diff --git a/lib/web/prototype/windows/themes/lighting/top-right-green.png b/lib/web/prototype/windows/themes/lighting/top-right-green.png
index 5c9340ed11785..4fe8d6acc905b 100644
Binary files a/lib/web/prototype/windows/themes/lighting/top-right-green.png and b/lib/web/prototype/windows/themes/lighting/top-right-green.png differ
diff --git a/lib/web/prototype/windows/themes/lighting/top-right-grey.png b/lib/web/prototype/windows/themes/lighting/top-right-grey.png
index 6ff9258adb94d..87f0a8f2d50c7 100644
Binary files a/lib/web/prototype/windows/themes/lighting/top-right-grey.png and b/lib/web/prototype/windows/themes/lighting/top-right-grey.png differ
diff --git a/lib/web/prototype/windows/themes/nuncio/bottom_left.png b/lib/web/prototype/windows/themes/nuncio/bottom_left.png
index 3d02d2f7bbd30..fc50bbac364a2 100644
Binary files a/lib/web/prototype/windows/themes/nuncio/bottom_left.png and b/lib/web/prototype/windows/themes/nuncio/bottom_left.png differ
diff --git a/lib/web/prototype/windows/themes/nuncio/bottom_mid.png b/lib/web/prototype/windows/themes/nuncio/bottom_mid.png
index 236ddd7debe31..0fc4b67f11146 100644
Binary files a/lib/web/prototype/windows/themes/nuncio/bottom_mid.png and b/lib/web/prototype/windows/themes/nuncio/bottom_mid.png differ
diff --git a/lib/web/prototype/windows/themes/nuncio/bottom_right.png b/lib/web/prototype/windows/themes/nuncio/bottom_right.png
index 854433889956e..22fdbb222934d 100644
Binary files a/lib/web/prototype/windows/themes/nuncio/bottom_right.png and b/lib/web/prototype/windows/themes/nuncio/bottom_right.png differ
diff --git a/lib/web/prototype/windows/themes/nuncio/center_left.png b/lib/web/prototype/windows/themes/nuncio/center_left.png
index 2811596970007..00bf6b4f66cfc 100644
Binary files a/lib/web/prototype/windows/themes/nuncio/center_left.png and b/lib/web/prototype/windows/themes/nuncio/center_left.png differ
diff --git a/lib/web/prototype/windows/themes/nuncio/center_right.png b/lib/web/prototype/windows/themes/nuncio/center_right.png
index 54da3da14f0ee..7a96dc7627c6b 100644
Binary files a/lib/web/prototype/windows/themes/nuncio/center_right.png and b/lib/web/prototype/windows/themes/nuncio/center_right.png differ
diff --git a/lib/web/prototype/windows/themes/nuncio/close.png b/lib/web/prototype/windows/themes/nuncio/close.png
index 91cbebb82b93d..9b875f1fe978d 100644
Binary files a/lib/web/prototype/windows/themes/nuncio/close.png and b/lib/web/prototype/windows/themes/nuncio/close.png differ
diff --git a/lib/web/prototype/windows/themes/nuncio/minimize.png b/lib/web/prototype/windows/themes/nuncio/minimize.png
index ad965c1cbce0c..72770e8056efc 100644
Binary files a/lib/web/prototype/windows/themes/nuncio/minimize.png and b/lib/web/prototype/windows/themes/nuncio/minimize.png differ
diff --git a/lib/web/prototype/windows/themes/nuncio/overlay.png b/lib/web/prototype/windows/themes/nuncio/overlay.png
index e04416ebf8fb6..ef5b6e61249d6 100644
Binary files a/lib/web/prototype/windows/themes/nuncio/overlay.png and b/lib/web/prototype/windows/themes/nuncio/overlay.png differ
diff --git a/lib/web/prototype/windows/themes/nuncio/top_left.png b/lib/web/prototype/windows/themes/nuncio/top_left.png
index 84ad7230ace9f..58fbe2b5ed665 100644
Binary files a/lib/web/prototype/windows/themes/nuncio/top_left.png and b/lib/web/prototype/windows/themes/nuncio/top_left.png differ
diff --git a/lib/web/prototype/windows/themes/nuncio/top_mid.png b/lib/web/prototype/windows/themes/nuncio/top_mid.png
index 3e8ccba309db3..3fe207c981edc 100644
Binary files a/lib/web/prototype/windows/themes/nuncio/top_mid.png and b/lib/web/prototype/windows/themes/nuncio/top_mid.png differ
diff --git a/lib/web/prototype/windows/themes/nuncio/top_right.png b/lib/web/prototype/windows/themes/nuncio/top_right.png
index fb8195848364a..5fcad244e5e31 100644
Binary files a/lib/web/prototype/windows/themes/nuncio/top_right.png and b/lib/web/prototype/windows/themes/nuncio/top_right.png differ
diff --git a/lib/web/prototype/windows/themes/spread/button-close-focus.gif b/lib/web/prototype/windows/themes/spread/button-close-focus.gif
index 03930bdfc2a2a..626bb6da505e1 100644
Binary files a/lib/web/prototype/windows/themes/spread/button-close-focus.gif and b/lib/web/prototype/windows/themes/spread/button-close-focus.gif differ
diff --git a/lib/web/prototype/windows/themes/spread/button-max-focus.gif b/lib/web/prototype/windows/themes/spread/button-max-focus.gif
index 698d38e9f2c6f..e43795d53187f 100644
Binary files a/lib/web/prototype/windows/themes/spread/button-max-focus.gif and b/lib/web/prototype/windows/themes/spread/button-max-focus.gif differ
diff --git a/lib/web/prototype/windows/themes/spread/button-min-focus.gif b/lib/web/prototype/windows/themes/spread/button-min-focus.gif
index 1c4169567d20d..ae7b4cab794fe 100644
Binary files a/lib/web/prototype/windows/themes/spread/button-min-focus.gif and b/lib/web/prototype/windows/themes/spread/button-min-focus.gif differ
diff --git a/lib/web/tiny_mce/plugins/advimage/img/sample.gif b/lib/web/tiny_mce/plugins/advimage/img/sample.gif
index da865127376ca..2c0eb2cb891a7 100644
Binary files a/lib/web/tiny_mce/plugins/advimage/img/sample.gif and b/lib/web/tiny_mce/plugins/advimage/img/sample.gif differ
diff --git a/lib/web/tiny_mce/plugins/emotions/img/smiley-cry.gif b/lib/web/tiny_mce/plugins/emotions/img/smiley-cry.gif
index b644d5a8d6390..7979f828fcd95 100644
Binary files a/lib/web/tiny_mce/plugins/emotions/img/smiley-cry.gif and b/lib/web/tiny_mce/plugins/emotions/img/smiley-cry.gif differ
diff --git a/lib/web/tiny_mce/plugins/emotions/img/smiley-embarassed.gif b/lib/web/tiny_mce/plugins/emotions/img/smiley-embarassed.gif
index ac2083b60a73b..3cdae082bf236 100644
Binary files a/lib/web/tiny_mce/plugins/emotions/img/smiley-embarassed.gif and b/lib/web/tiny_mce/plugins/emotions/img/smiley-embarassed.gif differ
diff --git a/lib/web/tiny_mce/plugins/emotions/img/smiley-innocent.gif b/lib/web/tiny_mce/plugins/emotions/img/smiley-innocent.gif
index 06eb14e793be1..5316499d99172 100644
Binary files a/lib/web/tiny_mce/plugins/emotions/img/smiley-innocent.gif and b/lib/web/tiny_mce/plugins/emotions/img/smiley-innocent.gif differ
diff --git a/lib/web/tiny_mce/plugins/emotions/img/smiley-kiss.gif b/lib/web/tiny_mce/plugins/emotions/img/smiley-kiss.gif
index 11b15c0f1a9b5..f8923c3f2bd61 100644
Binary files a/lib/web/tiny_mce/plugins/emotions/img/smiley-kiss.gif and b/lib/web/tiny_mce/plugins/emotions/img/smiley-kiss.gif differ
diff --git a/lib/web/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif b/lib/web/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif
index 641cdf685f571..6c1d9356d9e13 100644
Binary files a/lib/web/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif and b/lib/web/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif differ
diff --git a/lib/web/tiny_mce/plugins/emotions/img/smiley-undecided.gif b/lib/web/tiny_mce/plugins/emotions/img/smiley-undecided.gif
index 48a020a8fcb11..ca277e482b1bc 100644
Binary files a/lib/web/tiny_mce/plugins/emotions/img/smiley-undecided.gif and b/lib/web/tiny_mce/plugins/emotions/img/smiley-undecided.gif differ
diff --git a/lib/web/tiny_mce/plugins/emotions/img/smiley-yell.gif b/lib/web/tiny_mce/plugins/emotions/img/smiley-yell.gif
index 22e71cdbb103d..6a92d00a96291 100644
Binary files a/lib/web/tiny_mce/plugins/emotions/img/smiley-yell.gif and b/lib/web/tiny_mce/plugins/emotions/img/smiley-yell.gif differ
diff --git a/lib/web/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif b/lib/web/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif
index 7aa09d17a4f90..2d43dd0bbe037 100644
Binary files a/lib/web/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif and b/lib/web/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif differ
diff --git a/lib/web/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif b/lib/web/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif
index 7dc8afcd50193..74d3e5a2a2a77 100644
Binary files a/lib/web/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif and b/lib/web/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif differ
diff --git a/lib/web/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif b/lib/web/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif
index d29d8c18f4db1..f3111bb388d8f 100644
Binary files a/lib/web/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif and b/lib/web/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif differ
diff --git a/lib/web/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif b/lib/web/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif
index aa9076615a2f0..3b708b9e4ec16 100644
Binary files a/lib/web/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif and b/lib/web/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif differ
diff --git a/lib/web/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif b/lib/web/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif
index 9ec867b1671f8..2f13ab69c559d 100644
Binary files a/lib/web/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif and b/lib/web/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif differ
diff --git a/lib/web/tiny_mce/plugins/media/img/realmedia.gif b/lib/web/tiny_mce/plugins/media/img/realmedia.gif
index 60402b118f6ad..3815f2b5157aa 100644
Binary files a/lib/web/tiny_mce/plugins/media/img/realmedia.gif and b/lib/web/tiny_mce/plugins/media/img/realmedia.gif differ
diff --git a/lib/web/tiny_mce/plugins/media/img/windowsmedia.gif b/lib/web/tiny_mce/plugins/media/img/windowsmedia.gif
index f55b2e889ac75..7e29e7a22d319 100644
Binary files a/lib/web/tiny_mce/plugins/media/img/windowsmedia.gif and b/lib/web/tiny_mce/plugins/media/img/windowsmedia.gif differ
diff --git a/lib/web/tiny_mce/plugins/pagebreak/img/pagebreak.gif b/lib/web/tiny_mce/plugins/pagebreak/img/pagebreak.gif
index 110f397aae7d0..134fec7200fc4 100644
Binary files a/lib/web/tiny_mce/plugins/pagebreak/img/pagebreak.gif and b/lib/web/tiny_mce/plugins/pagebreak/img/pagebreak.gif differ
diff --git a/lib/web/tiny_mce/themes/advanced/img/colorpicker.jpg b/lib/web/tiny_mce/themes/advanced/img/colorpicker.jpg
index b1a377aba7784..fa6beabde2c27 100644
Binary files a/lib/web/tiny_mce/themes/advanced/img/colorpicker.jpg and b/lib/web/tiny_mce/themes/advanced/img/colorpicker.jpg differ
diff --git a/lib/web/tiny_mce/themes/advanced/img/icons.png b/lib/web/tiny_mce/themes/advanced/img/icons.png
index ea499c993eb51..65e1ac67fdb01 100644
Binary files a/lib/web/tiny_mce/themes/advanced/img/icons.png and b/lib/web/tiny_mce/themes/advanced/img/icons.png differ
diff --git a/lib/web/tiny_mce/themes/advanced/img/iframe.gif b/lib/web/tiny_mce/themes/advanced/img/iframe.gif
index 602cdc0dd59ee..6ae7d7b7b766d 100644
Binary files a/lib/web/tiny_mce/themes/advanced/img/iframe.gif and b/lib/web/tiny_mce/themes/advanced/img/iframe.gif differ
diff --git a/lib/web/tiny_mce/themes/advanced/img/pagebreak.gif b/lib/web/tiny_mce/themes/advanced/img/pagebreak.gif
index 110f397aae7d0..134fec7200fc4 100644
Binary files a/lib/web/tiny_mce/themes/advanced/img/pagebreak.gif and b/lib/web/tiny_mce/themes/advanced/img/pagebreak.gif differ
diff --git a/lib/web/tiny_mce/themes/advanced/img/realmedia.gif b/lib/web/tiny_mce/themes/advanced/img/realmedia.gif
index 60402b118f6ad..3815f2b5157aa 100644
Binary files a/lib/web/tiny_mce/themes/advanced/img/realmedia.gif and b/lib/web/tiny_mce/themes/advanced/img/realmedia.gif differ
diff --git a/lib/web/tiny_mce/themes/advanced/img/windowsmedia.gif b/lib/web/tiny_mce/themes/advanced/img/windowsmedia.gif
index f55b2e889ac75..7e29e7a22d319 100644
Binary files a/lib/web/tiny_mce/themes/advanced/img/windowsmedia.gif and b/lib/web/tiny_mce/themes/advanced/img/windowsmedia.gif differ
diff --git a/lib/web/tiny_mce/themes/advanced/skins/default/img/buttons.png b/lib/web/tiny_mce/themes/advanced/skins/default/img/buttons.png
index 1e53560e0aa7b..6e385e152444f 100644
Binary files a/lib/web/tiny_mce/themes/advanced/skins/default/img/buttons.png and b/lib/web/tiny_mce/themes/advanced/skins/default/img/buttons.png differ
diff --git a/lib/web/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png b/lib/web/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png
index 7f40f450b6d68..c32aa10f73852 100644
Binary files a/lib/web/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png and b/lib/web/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png differ
diff --git a/lib/web/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png b/lib/web/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png
index e543e0b03c7f0..7aaad49b18f0f 100644
Binary files a/lib/web/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png and b/lib/web/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png differ
diff --git a/lib/web/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png b/lib/web/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png
index c0dcc6cac2003..9218de5b02757 100644
Binary files a/lib/web/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png and b/lib/web/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png differ
diff --git a/lib/web/tiny_mce/themes/simple/img/icons.png b/lib/web/tiny_mce/themes/simple/img/icons.png
index c30720a750780..5d505dbe38ee9 100644
Binary files a/lib/web/tiny_mce/themes/simple/img/icons.png and b/lib/web/tiny_mce/themes/simple/img/icons.png differ
diff --git a/lib/web/tiny_mce/themes/simple/skins/o2k7/img/button_bg.png b/lib/web/tiny_mce/themes/simple/skins/o2k7/img/button_bg.png
index 8082a263dc41a..ba3cc34ebaaa0 100644
Binary files a/lib/web/tiny_mce/themes/simple/skins/o2k7/img/button_bg.png and b/lib/web/tiny_mce/themes/simple/skins/o2k7/img/button_bg.png differ
diff --git a/pub/errors/default/images/logo.gif b/pub/errors/default/images/logo.gif
index ebe91f2c4b5f7..f1f7fcaf4f020 100644
Binary files a/pub/errors/default/images/logo.gif and b/pub/errors/default/images/logo.gif differ
diff --git a/setup/pub/images/ajax-loader.gif b/setup/pub/images/ajax-loader.gif
index 1d3bb7b8a6347..d02ff9c96d108 100644
Binary files a/setup/pub/images/ajax-loader.gif and b/setup/pub/images/ajax-loader.gif differ
diff --git a/setup/pub/images/favicon/favicon-16x16.png b/setup/pub/images/favicon/favicon-16x16.png
index e870c2a248138..0a6bffc73b131 100644
Binary files a/setup/pub/images/favicon/favicon-16x16.png and b/setup/pub/images/favicon/favicon-16x16.png differ
diff --git a/setup/pub/images/favicon/favicon-32x32.png b/setup/pub/images/favicon/favicon-32x32.png
index 7d6b018c30c49..a72d9d7d3421c 100644
Binary files a/setup/pub/images/favicon/favicon-32x32.png and b/setup/pub/images/favicon/favicon-32x32.png differ
diff --git a/setup/pub/images/favicon/favicon-96x96.png b/setup/pub/images/favicon/favicon-96x96.png
index 0aff72cc87d38..6e1428d10a0fb 100644
Binary files a/setup/pub/images/favicon/favicon-96x96.png and b/setup/pub/images/favicon/favicon-96x96.png differ
diff --git a/setup/pub/images/loader-1.gif b/setup/pub/images/loader-1.gif
index 1612bcee36660..460734dfdadec 100644
Binary files a/setup/pub/images/loader-1.gif and b/setup/pub/images/loader-1.gif differ