diff --git a/app/code/Magento/Email/Model/Template/Filter.php b/app/code/Magento/Email/Model/Template/Filter.php
index 648e4ab8fc380..87add921f9de8 100644
--- a/app/code/Magento/Email/Model/Template/Filter.php
+++ b/app/code/Magento/Email/Model/Template/Filter.php
@@ -3,15 +3,39 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Email\Model\Template;
 
-use Magento\Framework\App\ObjectManager;
+use Exception;
+use Magento\Cms\Block\Block;
+use Magento\Framework\App\Area;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\State;
+use Magento\Framework\Css\PreProcessor\Adapter\CssInliner;
+use Magento\Framework\Escaper;
 use Magento\Framework\Exception\MailException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Directory\Read;
+use Magento\Framework\Filter\Template;
+use Magento\Framework\Filter\Template\Tokenizer\Parameter;
 use Magento\Framework\Filter\VariableResolverInterface;
+use Magento\Framework\Stdlib\StringUtils;
+use Magento\Framework\UrlInterface;
 use Magento\Framework\View\Asset\ContentProcessorException;
 use Magento\Framework\View\Asset\ContentProcessorInterface;
+use Magento\Framework\View\Asset\File\NotFoundException;
+use Magento\Framework\View\Asset\Repository;
+use Magento\Framework\View\Element\AbstractBlock;
+use Magento\Framework\View\LayoutFactory;
+use Magento\Framework\View\LayoutInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Variable\Model\Source\Variables;
+use Magento\Variable\Model\Variable;
+use Magento\Variable\Model\VariableFactory;
+use Psr\Log\LoggerInterface;
 
 /**
  * Core Email Template Filter Model
@@ -22,7 +46,7 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @since 100.0.2
  */
-class Filter extends \Magento\Framework\Filter\Template
+class Filter extends Template
 {
     /**
      * The name used in the {{trans}} directive
@@ -89,17 +113,17 @@ class Filter extends \Magento\Framework\Filter\Template
     private $plainTemplateMode = false;
 
     /**
-     * @var \Magento\Framework\View\Asset\Repository
+     * @var Repository
      */
     protected $_assetRepo;
 
     /**
-     * @var \Psr\Log\LoggerInterface
+     * @var LoggerInterface
      */
     protected $_logger;
 
     /**
-     * @var \Magento\Framework\Escaper
+     * @var Escaper
      */
     protected $_escaper;
 
@@ -107,29 +131,29 @@ class Filter extends \Magento\Framework\Filter\Template
      * Core store config
      * Variable factory
      *
-     * @var \Magento\Variable\Model\VariableFactory
+     * @var VariableFactory
      */
     protected $_variableFactory;
 
     /**
-     * @var \Magento\Store\Model\StoreManagerInterface
+     * @var StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
-     * @var \Magento\Framework\View\LayoutInterface
+     * @var LayoutInterface
      */
     protected $_layout;
 
     /**
-     * @var \Magento\Framework\View\LayoutFactory
+     * @var LayoutFactory
      */
     protected $_layoutFactory;
 
     /**
      * Setup callbacks for filters
      *
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     * @var ScopeConfigInterface
      */
     protected $_scopeConfig;
 
@@ -143,28 +167,22 @@ class Filter extends \Magento\Framework\Filter\Template
     /**
      * App state
      *
-     * @var \Magento\Framework\App\State
+     * @var State
      */
     protected $_appState;
 
     /**
-     * @var \Magento\Framework\UrlInterface
+     * @var UrlInterface
      */
     protected $urlModel;
 
     /**
-     * @var \Pelago\Emogrifier
-     * @deprecated 100.2.0
-     */
-    protected $emogrifier;
-
-    /**
-     * @var \Magento\Framework\Css\PreProcessor\Adapter\CssInliner
+     * @var CssInliner
      */
     private $cssInliner;
 
     /**
-     * @var \Magento\Variable\Model\Source\Variables
+     * @var Variables
      */
     protected $configVariables;
 
@@ -179,52 +197,52 @@ class Filter extends \Magento\Framework\Filter\Template
     private $pubDirectory;
 
     /**
-     * @var \Magento\Framework\Filesystem\Directory\Read
+     * @var Read
      */
     private $pubDirectoryRead;
 
+
     /**
-     * @param \Magento\Framework\Stdlib\StringUtils $string
-     * @param \Psr\Log\LoggerInterface $logger
-     * @param \Magento\Framework\Escaper $escaper
-     * @param \Magento\Framework\View\Asset\Repository $assetRepo
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Variable\Model\VariableFactory $coreVariableFactory
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\View\LayoutInterface $layout
-     * @param \Magento\Framework\View\LayoutFactory $layoutFactory
-     * @param \Magento\Framework\App\State $appState
-     * @param \Magento\Framework\UrlInterface $urlModel
-     * @param \Pelago\Emogrifier $emogrifier
-     * @param \Magento\Variable\Model\Source\Variables $configVariables
+     * Filter constructor.
+     * @param StringUtils $string
+     * @param LoggerInterface $logger
+     * @param Escaper $escaper
+     * @param Repository $assetRepo
+     * @param ScopeConfigInterface $scopeConfig
+     * @param VariableFactory $coreVariableFactory
+     * @param StoreManagerInterface $storeManager
+     * @param LayoutInterface $layout
+     * @param LayoutFactory $layoutFactory
+     * @param State $appState
+     * @param UrlInterface $urlModel
+     * @param Variables $configVariables
+     * @param VariableResolverInterface $variableResolver
+     * @param Css\Processor $cssProcessor
+     * @param Filesystem $pubDirectory
+     * @param CssInliner $cssInliner
      * @param array $variables
-     * @param \Magento\Framework\Css\PreProcessor\Adapter\CssInliner|null $cssInliner
      * @param array $directiveProcessors
-     * @param VariableResolverInterface|null $variableResolver
-     * @param Css\Processor|null $cssProcessor
-     * @param Filesystem|null $pubDirectory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
-        \Magento\Framework\Stdlib\StringUtils $string,
-        \Psr\Log\LoggerInterface $logger,
-        \Magento\Framework\Escaper $escaper,
-        \Magento\Framework\View\Asset\Repository $assetRepo,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Variable\Model\VariableFactory $coreVariableFactory,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\View\LayoutInterface $layout,
-        \Magento\Framework\View\LayoutFactory $layoutFactory,
-        \Magento\Framework\App\State $appState,
-        \Magento\Framework\UrlInterface $urlModel,
-        \Pelago\Emogrifier $emogrifier,
-        \Magento\Variable\Model\Source\Variables $configVariables,
+        StringUtils $string,
+        LoggerInterface $logger,
+        Escaper $escaper,
+        Repository $assetRepo,
+        ScopeConfigInterface $scopeConfig,
+        VariableFactory $coreVariableFactory,
+        StoreManagerInterface $storeManager,
+        LayoutInterface $layout,
+        LayoutFactory $layoutFactory,
+        State $appState,
+        UrlInterface $urlModel,
+        Variables $configVariables,
+        VariableResolverInterface $variableResolver,
+        Css\Processor $cssProcessor,
+        Filesystem $pubDirectory,
+        CssInliner $cssInliner,
         $variables = [],
-        \Magento\Framework\Css\PreProcessor\Adapter\CssInliner $cssInliner = null,
-        array $directiveProcessors = [],
-        VariableResolverInterface $variableResolver = null,
-        Css\Processor $cssProcessor = null,
-        Filesystem $pubDirectory = null
+        array $directiveProcessors = []
     ) {
         $this->_escaper = $escaper;
         $this->_assetRepo = $assetRepo;
@@ -237,13 +255,9 @@ public function __construct(
         $this->_layoutFactory = $layoutFactory;
         $this->_appState = $appState;
         $this->urlModel = $urlModel;
-        $this->emogrifier = $emogrifier;
-        $this->cssInliner = $cssInliner ?: \Magento\Framework\App\ObjectManager::getInstance()
-            ->get(\Magento\Framework\Css\PreProcessor\Adapter\CssInliner::class);
-        $this->cssProcessor = $cssProcessor ?: ObjectManager::getInstance()
-            ->get(Css\Processor::class);
-        $this->pubDirectory = $pubDirectory ?: ObjectManager::getInstance()
-            ->get(Filesystem::class);
+        $this->cssInliner = $cssInliner;
+        $this->cssProcessor = $cssProcessor;
+        $this->pubDirectory = $pubDirectory;
         $this->configVariables = $configVariables;
         parent::__construct($string, $variables, $directiveProcessors, $variableResolver);
     }
@@ -395,7 +409,7 @@ public function blockDirective($construction)
         if (isset($blockParameters['class'])) {
             $block = $this->_layout->createBlock($blockParameters['class'], null, ['data' => $blockParameters]);
         } elseif (isset($blockParameters['id'])) {
-            $block = $this->_layout->createBlock(\Magento\Cms\Block\Block::class);
+            $block = $this->_layout->createBlock(Block::class);
             if ($block) {
                 $block->setBlockId($blockParameters['id']);
             }
@@ -436,7 +450,7 @@ public function layoutDirective($construction)
     {
         $this->_directiveParams = $this->getParameters($construction[2]);
         if (!isset($this->_directiveParams['area'])) {
-            $this->_directiveParams['area'] = \Magento\Framework\App\Area::AREA_FRONTEND;
+            $this->_directiveParams['area'] = Area::AREA_FRONTEND;
         }
         if ($this->_directiveParams['area'] != $this->_appState->getAreaCode()) {
             return $this->_appState->emulateAreaCode(
@@ -457,7 +471,7 @@ public function emulateAreaCallback()
     {
         $skipParams = ['handle', 'area'];
 
-        /** @var $layout \Magento\Framework\View\LayoutInterface */
+        /** @var $layout LayoutInterface */
         $layout = $this->_layoutFactory->create(['cacheable' => false]);
         $layout->getUpdate()->addHandle($this->_directiveParams['handle'])->load();
 
@@ -466,7 +480,7 @@ public function emulateAreaCallback()
 
         $rootBlock = false;
         foreach ($layout->getAllBlocks() as $block) {
-            /* @var $block \Magento\Framework\View\Element\AbstractBlock */
+            /* @var $block AbstractBlock */
             if (!$block->getParentBlock() && !$rootBlock) {
                 $rootBlock = $block;
             }
@@ -499,7 +513,7 @@ public function emulateAreaCallback()
      */
     protected function _getBlockParameters($value)
     {
-        $tokenizer = new \Magento\Framework\Filter\Template\Tokenizer\Parameter();
+        $tokenizer = new Parameter();
         $tokenizer->setString($value);
 
         return $tokenizer->tokenize();
@@ -529,7 +543,7 @@ public function mediaDirective($construction)
         // phpcs:disable Magento2.Functions.DiscouragedFunction
         $params = $this->getParameters(html_entity_decode($construction[2], ENT_QUOTES));
         return $this->_storeManager->getStore()
-            ->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA) . $params['url'];
+            ->getBaseUrl(UrlInterface::URL_TYPE_MEDIA) . $params['url'];
     }
 
     /**
@@ -573,10 +587,10 @@ public function storeDirective($construction)
     /**
      * Set current URL model, which will be used for URLs generation.
      *
-     * @param \Magento\Framework\UrlInterface $urlModel
+     * @param UrlInterface $urlModel
      * @return $this
      */
-    public function setUrlModel(\Magento\Framework\UrlInterface $urlModel)
+    public function setUrlModel(UrlInterface $urlModel)
     {
         $this->urlModel = $urlModel;
         return $this;
@@ -752,7 +766,7 @@ public function protocolDirective($construction)
         if (isset($params['store'])) {
             try {
                 $store = $this->_storeManager->getStore($params['store']);
-            } catch (\Exception $e) {
+            } catch (Exception $e) {
                 throw new MailException(
                     __('Requested invalid store "%1"', $params['store'])
                 );
@@ -820,7 +834,7 @@ public function configDirective($construction)
         if (isset($params['path']) && $this->isAvailableConfigVariable($params['path'])) {
             $configValue = $this->_scopeConfig->getValue(
                 $params['path'],
-                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+                ScopeInterface::SCOPE_STORE,
                 $storeId
             );
         }
@@ -858,8 +872,8 @@ public function customvarDirective($construction)
                 $params['code']
             );
             $mode = $this->isPlainTemplateMode()
-                ? \Magento\Variable\Model\Variable::TYPE_TEXT
-                : \Magento\Variable\Model\Variable::TYPE_HTML;
+                ? Variable::TYPE_TEXT
+                : Variable::TYPE_HTML;
             $value = $variable->getValue($mode);
             if ($value) {
                 $customVarValue = $value;
@@ -892,19 +906,17 @@ public function cssDirective($construction)
             return '/* ' . __('"file" parameter must be specified') . ' */';
         }
 
-        $css = $this->cssProcessor->process(
-            $this->getCssFilesContent([$params['file']])
-        );
+        try {
+            $css = $this->cssProcessor->process($this->getCssFilesContent([$params['file']]));
+        } catch (ContentProcessorException $exception) {
+            return '/*' . PHP_EOL . $exception->getMessage() . PHP_EOL . '*/';
+        }
 
-        if (strpos($css, ContentProcessorInterface::ERROR_MESSAGE_PREFIX) !== false) {
-            // Return compilation error wrapped in CSS comment
-            return '/*' . PHP_EOL . $css . PHP_EOL . '*/';
-        } elseif (!empty($css)) {
-            return $css;
-        } else {
-            // Return CSS comment for debugging purposes
+        if (empty($css)){
             return '/* ' . __('Contents of the specified CSS file could not be loaded or is empty') . ' */';
         }
+
+        return $css;
     }
 
     /**
@@ -922,7 +934,7 @@ public function cssDirective($construction)
      *
      * @param string[] $construction
      * @return string
-     * @throws \Magento\Framework\Exception\MailException
+     * @throws MailException
      */
     public function inlinecssDirective($construction)
     {
@@ -939,7 +951,7 @@ public function inlinecssDirective($construction)
 
         $params = $this->getParameters($construction[2]);
         if (!isset($params['file']) || !$params['file']) {
-            throw new \Magento\Framework\Exception\MailException(
+            throw new MailException(
                 __('"file" parameter must be specified and must not be empty')
             );
         }
@@ -978,7 +990,8 @@ protected function getInlineCssFiles()
      *
      * @param [] $files
      * @return string
-     * @throws \Magento\Framework\Exception\MailException
+     * @throws MailException
+     * @throws ContentProcessorException
      */
     public function getCssFilesContent(array $files)
     {
@@ -987,7 +1000,7 @@ public function getCssFilesContent(array $files)
 
         $designParams = $this->getDesignParams();
         if (!count($designParams)) {
-            throw new \Magento\Framework\Exception\MailException(
+            throw new MailException(
                 __('Design params must be set before calling this method')
             );
         }
@@ -1002,9 +1015,7 @@ public function getCssFilesContent(array $files)
                     $css .= $asset->getContent();
                 }
             }
-        } catch (ContentProcessorException $exception) {
-            $css = $exception->getMessage();
-        } catch (\Magento\Framework\View\Asset\File\NotFoundException $exception) {
+        } catch (NotFoundException $exception) {
             $css = '';
         }
 
@@ -1019,50 +1030,55 @@ public function getCssFilesContent(array $files)
      *
      * @param string $html
      * @return string
-     * @throws \Magento\Framework\Exception\MailException
+     * @throws MailException
      */
     public function applyInlineCss($html)
     {
-        // Check to see if the {{inlinecss file=""}} directive set CSS file(s) to inline and then load those files
-        $cssToInline = $this->getCssFilesContent(
-            $this->getInlineCssFiles()
-        );
+        try {
+            // Check to see if the {{inlinecss file=""}} directive set CSS file(s) to inline and then load those files
+            $cssToInline = $this->getCssFilesContent($this->getInlineCssFiles());
+        } catch (ContentProcessorException $exception) {
+            return $this->getExceptionHtml($html, $exception);
+        }
+
         $cssToInline = $this->cssProcessor->process($cssToInline);
 
         // Only run Emogrify if HTML and CSS contain content
-        if ($html && $cssToInline) {
-            try {
-                // Don't try to compile CSS that has compilation errors
-                if (strpos($cssToInline, ContentProcessorInterface::ERROR_MESSAGE_PREFIX)
-                    !== false
-                ) {
-                    throw new \Magento\Framework\Exception\MailException(
-                        __('<pre> %1 </pre>', PHP_EOL . $cssToInline . PHP_EOL)
-                    );
-                }
-
-                $this->cssInliner->setHtml($html);
-
-                $this->cssInliner->setCss($cssToInline);
-
-                // Don't parse inline <style> tags, since existing tag is intentionally for non-inline styles
-                $this->cssInliner->disableStyleBlocksParsing();
+        if (!$html || !$cssToInline) {
+            return $html;
+        }
 
-                $processedHtml = $this->cssInliner->process();
-            } catch (\Exception $e) {
-                if ($this->_appState->getMode() == \Magento\Framework\App\State::MODE_DEVELOPER) {
-                    $processedHtml = __('CSS inlining error:') . PHP_EOL . $e->getMessage()
-                        . PHP_EOL
-                        . $html;
-                } else {
-                    $processedHtml = $html;
-                }
-                $this->_logger->error($e);
+        try {
+            // Don't try to compile CSS that has compilation errors
+            if (strpos($cssToInline, ContentProcessorInterface::ERROR_MESSAGE_PREFIX) !== false) {
+                throw new MailException(__('<pre> %1 </pre>', PHP_EOL . $cssToInline . PHP_EOL));
             }
-        } else {
-            $processedHtml = $html;
+            $this->cssInliner->setHtml($html);
+            $this->cssInliner->setCss($cssToInline);
+            // Don't parse inline <style> tags, since existing tag is intentionally for non-inline styles
+            $this->cssInliner->disableStyleBlocksParsing();
+            return $this->cssInliner->process();
+        } catch (Exception $exception) {
+            return $this->getExceptionHtml($html, $exception);
+        }
+    }
+
+    /**
+     * Handle css inlining exception, log it, add to the content in developer mode
+     *
+     * @param string $html
+     * @param Exception $exception
+     * @return string
+     */
+    private function getExceptionHtml(string $html, Exception $exception): string
+    {
+        $this->_logger->error($exception);
+        if ($this->_appState->getMode() == \Magento\Framework\App\State::MODE_DEVELOPER) {
+            return __('CSS inlining error:') . PHP_EOL . $exception->getMessage()
+                . PHP_EOL
+                . $html;
         }
-        return $processedHtml;
+        return $html;
     }
 
     /**
@@ -1078,12 +1094,12 @@ public function filter($value)
     {
         try {
             $value = parent::filter($value);
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             // Since a single instance of this class can be used to filter content multiple times, reset callbacks to
             // prevent callbacks running for unrelated content (e.g., email subject and email body)
             $this->resetAfterFilterCallbacks();
 
-            if ($this->_appState->getMode() == \Magento\Framework\App\State::MODE_DEVELOPER) {
+            if ($this->_appState->getMode() == State::MODE_DEVELOPER) {
                 $value = sprintf(__('Error filtering template: %s'), $e->getMessage());
             } else {
                 $value = __("We're sorry, an error has occurred while generating this content.");
diff --git a/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php b/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php
index ac890dd3d4a73..6a0ec8765f885 100644
--- a/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php
+++ b/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php
@@ -38,7 +38,6 @@
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Variable\Model\Source\Variables;
 use Magento\Variable\Model\VariableFactory;
-use Pelago\Emogrifier;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
@@ -114,11 +113,6 @@ class FilterTest extends TestCase
      */
     private $configVariables;
 
-    /**
-     * @var Emogrifier
-     */
-    private $emogrifier;
-
     /**
      * @var CssInliner
      */
@@ -144,6 +138,11 @@ class FilterTest extends TestCase
      */
     private $variableResolver;
 
+    /**
+     * @var MockObject|VariableResolverInterface
+     */
+    private $variableResolverInterface;
+
     /**
      * @var array
      */
@@ -195,8 +194,6 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
 
-        $this->emogrifier = $this->objectManager->getObject(Emogrifier::class);
-
         $this->configVariables = $this->getMockBuilder(Variables::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -257,14 +254,13 @@ protected function getModel($mockedMethods = null)
                     $this->layoutFactory,
                     $this->appState,
                     $this->backendUrlBuilder,
-                    $this->emogrifier,
                     $this->configVariables,
-                    [],
-                    $this->cssInliner,
-                    $this->directiveProcessors,
                     $this->variableResolver,
                     $this->cssProcessor,
-                    $this->pubDirectory
+                    $this->pubDirectory,
+                    $this->cssInliner,
+                    [],
+                    $this->directiveProcessors
                 ]
             )
             ->setMethods($mockedMethods)
diff --git a/app/code/Magento/Widget/Model/Template/Filter.php b/app/code/Magento/Widget/Model/Template/Filter.php
index c79334f67a9c3..5f412018ba87a 100644
--- a/app/code/Magento/Widget/Model/Template/Filter.php
+++ b/app/code/Magento/Widget/Model/Template/Filter.php
@@ -5,6 +5,25 @@
  */
 namespace Magento\Widget\Model\Template;
 
+use Magento\Email\Model\Template\Css;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\State;
+use Magento\Framework\Css\PreProcessor\Adapter\CssInliner;
+use Magento\Framework\Escaper;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filter\VariableResolverInterface;
+use Magento\Framework\Stdlib\StringUtils;
+use Magento\Framework\UrlInterface;
+use Magento\Framework\View\Asset\Repository;
+use Magento\Framework\View\LayoutFactory;
+use Magento\Framework\View\LayoutInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Variable\Model\Source\Variables;
+use Magento\Variable\Model\VariableFactory;
+use Magento\Widget\Block\BlockInterface;
+use Magento\Widget\Model\Widget;
+use Psr\Log\LoggerInterface;
+
 /**
  * Template Filter Model
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -17,44 +36,55 @@ class Filter extends \Magento\Cms\Model\Template\Filter
     protected $_widgetResource;
 
     /**
-     * @var \Magento\Widget\Model\Widget
+     * @var Widget
      */
     protected $_widget;
 
     /**
-     * @param \Magento\Framework\Stdlib\StringUtils $string
-     * @param \Psr\Log\LoggerInterface $logger
-     * @param \Magento\Framework\Escaper $escaper
-     * @param \Magento\Framework\View\Asset\Repository $assetRepo
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Variable\Model\VariableFactory $coreVariableFactory
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\View\LayoutInterface $layout
-     * @param \Magento\Framework\View\LayoutFactory $layoutFactory
-     * @param \Magento\Framework\App\State $appState
-     * @param \Magento\Framework\UrlInterface $urlModel
-     * @param \Pelago\Emogrifier $emogrifier
-     * @param \Magento\Variable\Model\Source\Variables $configVariables
+     * Filter constructor.
+     * @param StringUtils $string
+     * @param LoggerInterface $logger
+     * @param Escaper $escaper
+     * @param Repository $assetRepo
+     * @param ScopeConfigInterface $scopeConfig
+     * @param VariableFactory $coreVariableFactory
+     * @param StoreManagerInterface $storeManager
+     * @param LayoutInterface $layout
+     * @param LayoutFactory $layoutFactory
+     * @param State $appState
+     * @param UrlInterface $urlModel
+     * @param Variables $configVariables
+     * @param VariableResolverInterface $variableResolver
+     * @param Css\Processor $cssProcessor
+     * @param Filesystem $pubDirectory
+     * @param CssInliner $cssInliner
      * @param \Magento\Widget\Model\ResourceModel\Widget $widgetResource
-     * @param \Magento\Widget\Model\Widget $widget
+     * @param Widget $widget
+     * @param array $variables
+     * @param array $directiveProcessors
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
-        \Magento\Framework\Stdlib\StringUtils $string,
-        \Psr\Log\LoggerInterface $logger,
-        \Magento\Framework\Escaper $escaper,
-        \Magento\Framework\View\Asset\Repository $assetRepo,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Variable\Model\VariableFactory $coreVariableFactory,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\View\LayoutInterface $layout,
-        \Magento\Framework\View\LayoutFactory $layoutFactory,
-        \Magento\Framework\App\State $appState,
-        \Magento\Framework\UrlInterface $urlModel,
-        \Pelago\Emogrifier $emogrifier,
-        \Magento\Variable\Model\Source\Variables $configVariables,
+        StringUtils $string,
+        LoggerInterface $logger,
+        Escaper $escaper,
+        Repository $assetRepo,
+        ScopeConfigInterface $scopeConfig,
+        VariableFactory $coreVariableFactory,
+        StoreManagerInterface $storeManager,
+        LayoutInterface $layout,
+        LayoutFactory $layoutFactory,
+        State $appState,
+        UrlInterface $urlModel,
+        Variables $configVariables,
+        VariableResolverInterface $variableResolver,
+        Css\Processor $cssProcessor,
+        Filesystem $pubDirectory,
+        CssInliner $cssInliner,
         \Magento\Widget\Model\ResourceModel\Widget $widgetResource,
-        \Magento\Widget\Model\Widget $widget
+        Widget $widget,
+        $variables = [],
+        array $directiveProcessors = []
     ) {
         $this->_widgetResource = $widgetResource;
         $this->_widget = $widget;
@@ -70,8 +100,13 @@ public function __construct(
             $layoutFactory,
             $appState,
             $urlModel,
-            $emogrifier,
-            $configVariables
+            $configVariables,
+            $variableResolver,
+            $cssProcessor,
+            $pubDirectory,
+            $cssInliner,
+            $variables,
+            $directiveProcessors
         );
     }
 
@@ -114,7 +149,7 @@ public function generateWidget($construction)
 
         // define widget block and check the type is instance of Widget Interface
         $widget = $this->_layout->createBlock($type, $name, ['data' => $params]);
-        if (!$widget instanceof \Magento\Widget\Block\BlockInterface) {
+        if (!$widget instanceof BlockInterface) {
             return '';
         }
 
@@ -140,8 +175,9 @@ public function widgetDirective($construction)
      */
     public function mediaDirective($construction)
     {
+        // phpcs:disable Magento2.Functions.DiscouragedFunction
         $params = $this->getParameters(html_entity_decode($construction[2], ENT_QUOTES));
         return $this->_storeManager->getStore()
-            ->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA) . $params['url'];
+            ->getBaseUrl(UrlInterface::URL_TYPE_MEDIA) . $params['url'];
     }
 }
diff --git a/app/code/Magento/Widget/composer.json b/app/code/Magento/Widget/composer.json
index 2cf8429095ce7..3014c99a35a14 100644
--- a/app/code/Magento/Widget/composer.json
+++ b/app/code/Magento/Widget/composer.json
@@ -10,6 +10,7 @@
         "magento/module-backend": "*",
         "magento/module-catalog": "*",
         "magento/module-cms": "*",
+        "magento/module-email": "*",
         "magento/module-store": "*",
         "magento/module-theme": "*",
         "magento/module-variable": "*",
diff --git a/composer.json b/composer.json
index 168128e9bc0ba..2a4bbb229031c 100644
--- a/composer.json
+++ b/composer.json
@@ -69,7 +69,7 @@
         "magento/zendframework1": "~1.14.2",
         "monolog/monolog": "^1.17",
         "paragonie/sodium_compat": "^1.6",
-        "pelago/emogrifier": "^3.1.0",
+        "pelago/emogrifier": "^5.0.0",
         "php-amqplib/php-amqplib": "~2.10.0",
         "phpseclib/mcrypt_compat": "1.0.8",
         "phpseclib/phpseclib": "2.0.*",
@@ -88,7 +88,7 @@
     "require-dev": {
         "allure-framework/allure-phpunit": "~1.2.0",
         "dealerdirect/phpcodesniffer-composer-installer": "^0.5.0",
-        "friendsofphp/php-cs-fixer": "~2.16.0",
+        "friendsofphp/php-cs-fixer": "~2.18.1",
         "lusitanian/oauth": "~0.8.10",
         "magento/magento-coding-standard": "*",
         "magento/magento2-functional-testing-framework": "^3.0",
diff --git a/composer.lock b/composer.lock
index 251e0a7bcbb07..ba560a95d9237 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "b1bb5890f51a5fe54aa9b4e67980f750",
+    "content-hash": "438feb5366e2edd6b88e3c286b637f9b",
     "packages": [
         {
             "name": "aws/aws-sdk-php",
@@ -4119,39 +4119,38 @@
         },
         {
             "name": "pelago/emogrifier",
-            "version": "v3.1.0",
+            "version": "v5.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/MyIntervals/emogrifier.git",
-                "reference": "f6a5c7d44612d86c3901c93f1592f5440e6b2cd8"
+                "reference": "b43b650880d189b0ada61d95d0729c7424b1752d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/MyIntervals/emogrifier/zipball/f6a5c7d44612d86c3901c93f1592f5440e6b2cd8",
-                "reference": "f6a5c7d44612d86c3901c93f1592f5440e6b2cd8",
+                "url": "https://api.github.com/repos/MyIntervals/emogrifier/zipball/b43b650880d189b0ada61d95d0729c7424b1752d",
+                "reference": "b43b650880d189b0ada61d95d0729c7424b1752d",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
-                "php": "^5.6 || ~7.0 || ~7.1 || ~7.2 || ~7.3 || ~7.4",
-                "symfony/css-selector": "^2.8 || ^3.0 || ^4.0 || ^5.0"
+                "php": "~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0",
+                "symfony/css-selector": "^3.4.32 || ^4.4 || ^5.1"
             },
             "require-dev": {
-                "friendsofphp/php-cs-fixer": "^2.15.3",
-                "phpmd/phpmd": "^2.7.0",
-                "phpunit/phpunit": "^5.7.27",
-                "squizlabs/php_codesniffer": "^3.5.0"
+                "php-parallel-lint/php-parallel-lint": "^1.2.0",
+                "slevomat/coding-standard": "^6.4.1",
+                "squizlabs/php_codesniffer": "^3.5.8"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0.x-dev"
+                    "dev-master": "5.0.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Pelago\\": "src/"
+                    "Pelago\\Emogrifier\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -4189,7 +4188,7 @@
                 "email",
                 "pre-processing"
             ],
-            "time": "2019-12-26T19:37:31+00:00"
+            "time": "2020-11-23T18:37:25+00:00"
         },
         {
             "name": "php-amqplib/php-amqplib",
@@ -7556,16 +7555,16 @@
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v2.16.7",
+            "version": "v2.18.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
-                "reference": "4e35806a6d7d8510d6842ae932e8832363d22c87"
+                "reference": "c68ff6231adb276857761e43b7ed082f164dce0b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/4e35806a6d7d8510d6842ae932e8832363d22c87",
-                "reference": "4e35806a6d7d8510d6842ae932e8832363d22c87",
+                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/c68ff6231adb276857761e43b7ed082f164dce0b",
+                "reference": "c68ff6231adb276857761e43b7ed082f164dce0b",
                 "shasum": ""
             },
             "require": {
@@ -7574,7 +7573,7 @@
                 "doctrine/annotations": "^1.2",
                 "ext-json": "*",
                 "ext-tokenizer": "*",
-                "php": "^7.1",
+                "php": "^5.6 || ^7.0 || ^8.0",
                 "php-cs-fixer/diff": "^1.3",
                 "symfony/console": "^3.4.43 || ^4.1.6 || ^5.0",
                 "symfony/event-dispatcher": "^3.0 || ^4.0 || ^5.0",
@@ -7587,17 +7586,19 @@
                 "symfony/stopwatch": "^3.0 || ^4.0 || ^5.0"
             },
             "require-dev": {
-                "johnkary/phpunit-speedtrap": "^1.1 || ^2.0 || ^3.0",
                 "justinrainbow/json-schema": "^5.0",
                 "keradus/cli-executor": "^1.4",
                 "mikey179/vfsstream": "^1.6",
-                "php-coveralls/php-coveralls": "^2.4.1",
+                "php-coveralls/php-coveralls": "^2.4.2",
                 "php-cs-fixer/accessible-object": "^1.0",
                 "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2",
                 "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1",
-                "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.1",
+                "phpspec/prophecy-phpunit": "^1.1 || ^2.0",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.13 || ^9.5",
+                "phpunitgoodpractices/polyfill": "^1.5",
                 "phpunitgoodpractices/traits": "^1.9.1",
-                "symfony/phpunit-bridge": "^5.1",
+                "sanmai/phpunit-legacy-adapter": "^6.4 || ^8.2.1",
+                "symfony/phpunit-bridge": "^5.2.1",
                 "symfony/yaml": "^3.0 || ^4.0 || ^5.0"
             },
             "suggest": {
@@ -7649,7 +7650,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-27T22:44:27+00:00"
+            "time": "2021-01-21T18:50:42+00:00"
         },
         {
             "name": "hoa/consistency",
@@ -11919,12 +11920,12 @@
             "version": "1.9.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/webmozart/assert.git",
+                "url": "https://github.com/webmozarts/assert.git",
                 "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389",
+                "url": "https://api.github.com/repos/webmozarts/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389",
                 "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389",
                 "shasum": ""
             },
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/Adapter/CssInlinerTest.php b/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/Adapter/CssInlinerTest.php
index 5ee8e3de6e6e9..9e470a1e538c3 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/Adapter/CssInlinerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/Adapter/CssInlinerTest.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Framework\Css\PreProcessor\Adapter;
 
+use Pelago\Emogrifier\CssInliner as EmogrifierCssInliner;
+
 class CssInlinerTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -34,8 +36,8 @@ public function testGetFiles($htmlFilePath, $cssFilePath, $cssExpected)
     {
         $html = file_get_contents($htmlFilePath);
         $css = file_get_contents($cssFilePath);
-        $this->model->setCss($css);
         $this->model->setHtml($html);
+        $this->model->setCss($css);
         $result = $this->model->process();
         $this->assertStringContainsString($cssExpected, $result);
     }
@@ -68,13 +70,9 @@ public function getFilesDataProvider()
      */
     public function testGetFilesEmogrifier($htmlFilePath, $cssFilePath, $cssExpected)
     {
-        $emogrifier = new \Pelago\Emogrifier;
-
         $html = file_get_contents($htmlFilePath);
         $css = file_get_contents($cssFilePath);
-        $emogrifier->setCss($css);
-        $emogrifier->setHtml($html);
-        $result = $emogrifier->emogrify();
+        $result = EmogrifierCssInliner::fromHtml($html)->inlineCss($css)->render();
 
         /**
          * This test was implemented for the issue which existed in the older version of Emogrifier.
diff --git a/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php b/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php
index b54761698f16c..81f3608674752 100644
--- a/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php
+++ b/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php
@@ -6,7 +6,8 @@
 namespace Magento\Framework\Css\PreProcessor\Adapter;
 
 use Magento\Framework\App\State;
-use Pelago\Emogrifier;
+use Pelago\Emogrifier\CssInliner as EmogrifierCssInliner;
+use Symfony\Component\CssSelector\Exception\ParseException;
 
 /**
  * This class will inline the css of an html to each tag to be used for applications such as a styled email.
@@ -14,17 +15,31 @@
 class CssInliner
 {
     /**
-     * @var Emogrifier
+     * @var State
      */
-    private $emogrifier;
+    private $appState;
+
+    /**
+     * @var string
+     */
+    private $html = '';
+
+    /**
+     * @var string
+     */
+    private $css = '';
+
+    /**
+     * @var bool
+     */
+    private $disableStyleBlocksParsing = false;
 
     /**
      * @param State $appState
      */
     public function __construct(State $appState)
     {
-        $this->emogrifier = new Emogrifier();
-        $this->emogrifier->setDebug($appState->getMode() === State::MODE_DEVELOPER);
+        $this->appState = $appState;
     }
 
     /**
@@ -35,7 +50,7 @@ public function __construct(State $appState)
      */
     public function setHtml($html)
     {
-        $this->emogrifier->setHtml($html);
+        $this->html = $html;
     }
 
     /**
@@ -46,7 +61,7 @@ public function setHtml($html)
      */
     public function setCss($css)
     {
-        $this->emogrifier->setCss($css);
+        $this->css = $css;
     }
 
     /**
@@ -56,7 +71,7 @@ public function setCss($css)
      */
     public function disableStyleBlocksParsing()
     {
-        $this->emogrifier->disableStyleBlocksParsing();
+        $this->disableStyleBlocksParsing = true;
     }
 
     /**
@@ -64,9 +79,19 @@ public function disableStyleBlocksParsing()
      *
      * @return string
      * @throws \BadMethodCallException
+     * @throws ParseException
      */
     public function process()
     {
-        return $this->emogrifier->emogrify();
+        $emogrifier = EmogrifierCssInliner::fromHtml($this->html)
+            ->setDebug($this->appState->getMode() === State::MODE_DEVELOPER);
+
+        if ($this->disableStyleBlocksParsing) {
+            $emogrifier->disableStyleBlocksParsing();
+        }
+
+        $emogrifier->inlineCss($this->css);
+
+        return $emogrifier->render();
     }
 }