diff --git a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Css.php b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Css.php
index 5e3bb8774d246..d47832a7187db 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Css.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Css.php
@@ -193,7 +193,7 @@ protected function _addCustomCssFieldset()
                         Storage::PARAM_THEME_ID => $this->_getCurrentTheme()->getId(),
                         Storage::PARAM_CONTENT_TYPE => \Magento\Theme\Model\Wysiwyg\Storage::TYPE_IMAGE
                     ]
-                ) . "', null, null,'" . $this->escapeJs(
+                ) . "', null, null,'" . $this->_escaper->escapeJs(
                     __('Upload Images')
                 ) . "');",
             ]
@@ -220,7 +220,7 @@ protected function _addCustomCssFieldset()
                         Storage::PARAM_THEME_ID => $this->_getCurrentTheme()->getId(),
                         Storage::PARAM_CONTENT_TYPE => \Magento\Theme\Model\Wysiwyg\Storage::TYPE_FONT
                     ]
-                ) . "', null, null,'" . $this->escapeJs(
+                ) . "', null, null,'" . $this->_escaper->escapeJs(
                     __('Upload Fonts')
                 ) . "');",
             ]
diff --git a/app/code/Magento/Theme/Block/Html/Topmenu.php b/app/code/Magento/Theme/Block/Html/Topmenu.php
index fd8aaa7708cf3..98243da91b848 100644
--- a/app/code/Magento/Theme/Block/Html/Topmenu.php
+++ b/app/code/Magento/Theme/Block/Html/Topmenu.php
@@ -246,7 +246,7 @@ protected function _getHtml(
             }
 
             $html .= '<li ' . $this->_getRenderedMenuItemAttributes($child) . '>';
-            $html .= '<a href="' . $child->getUrl() . '" ' . $outermostClassCode . '><span>' . $this->escapeHtml(
+            $html .= '<a href="' . $child->getUrl() . '" ' . $outermostClassCode . '><span>' . $this->_escaper->escapeHtml(
                 $child->getName()
             ) . '</span></a>' . $this->_addSubMenu(
                 $child,
diff --git a/app/code/Magento/Theme/view/adminhtml/templates/browser/content/files.phtml b/app/code/Magento/Theme/view/adminhtml/templates/browser/content/files.phtml
index 6b350cd625445..5756f82edc403 100644
--- a/app/code/Magento/Theme/view/adminhtml/templates/browser/content/files.phtml
+++ b/app/code/Magento/Theme/view/adminhtml/templates/browser/content/files.phtml
@@ -4,21 +4,24 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Theme\Block\Adminhtml\Wysiwyg\Files\Content\Files */
+/**
+ * @var $block \Magento\Theme\Block\Adminhtml\Wysiwyg\Files\Content\Files
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
 
 <?php if ($block->getFilesCount() > 0) : ?>
     <?php foreach ($block->getFiles() as $file) : ?>
-        <div class="filecnt file-font" id="<?= $block->escapeHtmlAttr($file['id']) ?>">
+        <div class="filecnt file-font" id="<?= $escaper->escapeHtmlAttr($file['id']) ?>">
             <p class="nm">
-                <?= $block->escapeHtml($file['text']) ?>
+                <?= $escaper->escapeHtml($file['text']) ?>
                 <?php if (isset($file['thumbnailParams'])) : ?>
-                    <img src="<?= $block->escapeUrl($block->getUrl('*/*/previewImage', $file['thumbnailParams'])) ?>"
-                         alt="<?= $block->escapeHtmlAttr(__('thumbnail')) ?>">
+                    <img src="<?= $escaper->escapeUrl($block->getUrl('*/*/previewImage', $file['thumbnailParams'])) ?>"
+                         alt="<?= $escaper->escapeHtmlAttr(__('thumbnail')) ?>">
                 <?php endif; ?>
             </p>
         </div>
     <?php endforeach; ?>
 <?php else : ?>
-    <?= $block->escapeHtml(__('We found no files.')) ?>
+    <?= $escaper->escapeHtml(__('We found no files.')) ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Theme/view/adminhtml/templates/browser/content/uploader.phtml b/app/code/Magento/Theme/view/adminhtml/templates/browser/content/uploader.phtml
index 66456ae403818..e5ae910876ed8 100644
--- a/app/code/Magento/Theme/view/adminhtml/templates/browser/content/uploader.phtml
+++ b/app/code/Magento/Theme/view/adminhtml/templates/browser/content/uploader.phtml
@@ -4,15 +4,18 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Theme\Block\Adminhtml\Wysiwyg\Files\Content\Uploader */
+/**
+ * @var $block \Magento\Theme\Block\Adminhtml\Wysiwyg\Files\Content\Uploader
+ * @var \Magento\Framework\Escaper $escaper
+ */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
 <div id="<?= $block->getHtmlId() ?>" class="uploader">
     <span class="fileinput-button form-buttons">
-        <span><?= $block->escapeHtml(__('Browse Files')) ?></span>
-        <input id="fileupload" type="file" name="<?= $block->escapeHtmlAttr($block->getConfig()->getFileField()) ?>"
-            data-url="<?= $block->escapeUrl($block->getConfig()->getUrl()) ?>" multiple>
+        <span><?= $escaper->escapeHtml(__('Browse Files')) ?></span>
+        <input id="fileupload" type="file" name="<?= $escaper->escapeHtmlAttr($block->getConfig()->getFileField()) ?>"
+            data-url="<?= $escaper->escapeUrl($block->getConfig()->getUrl()) ?>" multiple>
     </span>
     <div class="clear"></div>
     <script id="<?= $block->getHtmlId() ?>-template" type="text/x-magento-template">
@@ -46,7 +49,7 @@ require([
             form_key: FORM_KEY
         },
         sequentialUploads: true,
-        maxFileSize: {$block->escapeJs($block->getFileSizeService()->getMaxFileSize())} ,
+        maxFileSize: {$escaper->escapeJs($block->getFileSizeService()->getMaxFileSize())} ,
         add: function (e, data) {
             var progressTmpl = mageTemplate('#{$block->getHtmlId()}-template'),
                 fileSize,
diff --git a/app/code/Magento/Theme/view/adminhtml/templates/design/config/edit/scope.phtml b/app/code/Magento/Theme/view/adminhtml/templates/design/config/edit/scope.phtml
index 639eb749d3e71..2ad55f496cd69 100644
--- a/app/code/Magento/Theme/view/adminhtml/templates/design/config/edit/scope.phtml
+++ b/app/code/Magento/Theme/view/adminhtml/templates/design/config/edit/scope.phtml
@@ -4,10 +4,13 @@
  * See COPYING.txt for license details.
  */
 
-/* @var $block \Magento\Theme\Block\Adminhtml\Design\Config\Edit\Scope */
+/**
+ * @var $block \Magento\Theme\Block\Adminhtml\Design\Config\Edit\Scope
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
 
 <div class="store-view">
-    <span class="store-switcher-label"><?= $block->escapeHtml(__('Scope:')) ?></span>
-    <span class="store-switcher-value"><?= $block->escapeHtml($block->getScopeTitle()) ?></span>
+    <span class="store-switcher-label"><?= $escaper->escapeHtml(__('Scope:')) ?></span>
+    <span class="store-switcher-value"><?= $escaper->escapeHtml($block->getScopeTitle()) ?></span>
 </div>
diff --git a/app/code/Magento/Theme/view/adminhtml/templates/tabs/css.phtml b/app/code/Magento/Theme/view/adminhtml/templates/tabs/css.phtml
index 53228243ffd19..bc4a30557b298 100644
--- a/app/code/Magento/Theme/view/adminhtml/templates/tabs/css.phtml
+++ b/app/code/Magento/Theme/view/adminhtml/templates/tabs/css.phtml
@@ -5,6 +5,7 @@
  */
 /**
  * @var $block \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Tab\Css
+ * @var \Magento\Framework\Escaper $escaper
  * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 ?>
@@ -23,7 +24,7 @@ require([
     $( '#css_file_uploader' ).fileupload({
         dataType: 'json',
         replaceFileInput: false,
-        url : '{$block->escapeJs($block->getUrl('*/system_design_theme/uploadcss'))}',
+        url : '{$escaper->escapeJs($block->getUrl('*/system_design_theme/uploadcss'))}',
         acceptFileTypes: /(.|\/)(css)$/i,
 
         /**
diff --git a/app/code/Magento/Theme/view/adminhtml/templates/tabs/fieldset/js.phtml b/app/code/Magento/Theme/view/adminhtml/templates/tabs/fieldset/js.phtml
index e15ac4a088e03..56693b699ae5e 100644
--- a/app/code/Magento/Theme/view/adminhtml/templates/tabs/fieldset/js.phtml
+++ b/app/code/Magento/Theme/view/adminhtml/templates/tabs/fieldset/js.phtml
@@ -6,6 +6,7 @@
 
 /**
  * @var $block \Magento\Backend\Block\Widget\Form\Renderer\Fieldset
+ * @var \Magento\Framework\Escaper $escaper
  * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 
@@ -41,7 +42,7 @@ $jsonHelper = $block->getData('jsonHelper');
                 id="remove_js_files_<%- data.id %>"
                 name="js_removed_files[]"
                 value="<%- data.id %>" />
-            <label for="remove_js_files_<%- data.id %>"><?= $block->escapeHtml(__('Remove')) ?></label>
+            <label for="remove_js_files_<%- data.id %>"><?= $escaper->escapeHtml(__('Remove')) ?></label>
         </div>
     </div>
 
diff --git a/app/code/Magento/Theme/view/adminhtml/templates/tabs/js.phtml b/app/code/Magento/Theme/view/adminhtml/templates/tabs/js.phtml
index 4edc895c559e2..7de47cb8bd83e 100644
--- a/app/code/Magento/Theme/view/adminhtml/templates/tabs/js.phtml
+++ b/app/code/Magento/Theme/view/adminhtml/templates/tabs/js.phtml
@@ -6,6 +6,7 @@
 
 /**
  * @var $block \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Tab\Js
+ * @var \Magento\Framework\Escaper $escaper
  * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 ?>
@@ -26,7 +27,7 @@ require([
         dataType: 'json',
         replaceFileInput: false,
         sequentialUploads: true,
-        url: '{$block->escapeJs($block->getJsUploadUrl())}',
+        url: '{$escaper->escapeJs($block->getJsUploadUrl())}',
 
         /**
          * Add data
diff --git a/app/code/Magento/Theme/view/adminhtml/templates/title.phtml b/app/code/Magento/Theme/view/adminhtml/templates/title.phtml
index 6cefec065c1fd..e947a9f66f3c7 100644
--- a/app/code/Magento/Theme/view/adminhtml/templates/title.phtml
+++ b/app/code/Magento/Theme/view/adminhtml/templates/title.phtml
@@ -6,13 +6,14 @@
 
 /**
  * @var $block \Magento\Theme\Block\Html\Title
+ * @var \Magento\Framework\Escaper $escaper
  */
-$titleIdHtml = ($block->getTitleId()) ? ' id="' . $block->escapeHtmlAttr($block->getTitleId()) . '"' : '';
+$titleIdHtml = ($block->getTitleId()) ? ' id="' . $escaper->escapeHtmlAttr($block->getTitleId()) . '"' : '';
 $titleClass = ($block->getTitleClass()) ? ' ' . $block->getTitleClass() : '';
 $title = $block->getPageTitle();
 ?>
 
-<div class="page-title-wrapper<?= $block->escapeHtmlAttr($titleClass) ?>">
-    <h1 class="page-title"<?= /* @noEscape */ $titleIdHtml ?>><?= $block->escapeHtml($title) ?></h1>
+<div class="page-title-wrapper<?= $escaper->escapeHtmlAttr($titleClass) ?>">
+    <h1 class="page-title"<?= /* @noEscape */ $titleIdHtml ?>><?= $escaper->escapeHtml($title) ?></h1>
     <?= $block->getChildHtml() ?>
 </div>
diff --git a/app/code/Magento/Theme/view/frontend/templates/callouts/left_col.phtml b/app/code/Magento/Theme/view/frontend/templates/callouts/left_col.phtml
index fb11be34a618f..c8d4a3d5b7ceb 100644
--- a/app/code/Magento/Theme/view/frontend/templates/callouts/left_col.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/callouts/left_col.phtml
@@ -3,21 +3,25 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/**
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
 <div class="block block-banner">
     <div class="block-content">
         <?php if (strtolower(substr($block->getLinkUrl(), 0, 4)) === 'http') : ?>
-            <a href="<?= $block->escapeUrl($block->getLinkUrl()) ?>"
-               title="<?= $block->escapeHtmlAttr(__($block->getImgAlt())) ?>">
+            <a href="<?= $escaper->escapeUrl($block->getLinkUrl()) ?>"
+               title="<?= $escaper->escapeHtmlAttr(__($block->getImgAlt())) ?>">
         <?php elseif ($block->getLinkUrl()) : ?>
-            <a href="<?= $block->escapeUrl($block->getUrl($block->getLinkUrl())) ?>"
-               title="<?= $block->escapeHtmlAttr(__($block->getImgAlt())) ?>">
+            <a href="<?= $escaper->escapeUrl($block->getUrl($block->getLinkUrl())) ?>"
+               title="<?= $escaper->escapeHtmlAttr(__($block->getImgAlt())) ?>">
         <?php endif; ?>
-            <img src="<?= $block->escapeUrl($block->getViewFileUrl($block->getImgSrc())) ?>"
+            <img src="<?= $escaper->escapeUrl($block->getViewFileUrl($block->getImgSrc())) ?>"
                 <?php if (!$block->getLinkUrl()) : ?>
-                    title="<?= $block->escapeHtmlAttr(__($block->getImgAlt())) ?>"
+                    title="<?= $escaper->escapeHtmlAttr(__($block->getImgAlt())) ?>"
                 <?php endif; ?>
-                 alt="<?= $block->escapeHtmlAttr(__($block->getImgAlt())) ?>" />
+                 alt="<?= $escaper->escapeHtmlAttr(__($block->getImgAlt())) ?>" />
         <?php if ($block->getLinkUrl()) : ?>
         </a>
         <?php endif ?>
diff --git a/app/code/Magento/Theme/view/frontend/templates/callouts/right_col.phtml b/app/code/Magento/Theme/view/frontend/templates/callouts/right_col.phtml
index fb11be34a618f..c8d4a3d5b7ceb 100644
--- a/app/code/Magento/Theme/view/frontend/templates/callouts/right_col.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/callouts/right_col.phtml
@@ -3,21 +3,25 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/**
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
 <div class="block block-banner">
     <div class="block-content">
         <?php if (strtolower(substr($block->getLinkUrl(), 0, 4)) === 'http') : ?>
-            <a href="<?= $block->escapeUrl($block->getLinkUrl()) ?>"
-               title="<?= $block->escapeHtmlAttr(__($block->getImgAlt())) ?>">
+            <a href="<?= $escaper->escapeUrl($block->getLinkUrl()) ?>"
+               title="<?= $escaper->escapeHtmlAttr(__($block->getImgAlt())) ?>">
         <?php elseif ($block->getLinkUrl()) : ?>
-            <a href="<?= $block->escapeUrl($block->getUrl($block->getLinkUrl())) ?>"
-               title="<?= $block->escapeHtmlAttr(__($block->getImgAlt())) ?>">
+            <a href="<?= $escaper->escapeUrl($block->getUrl($block->getLinkUrl())) ?>"
+               title="<?= $escaper->escapeHtmlAttr(__($block->getImgAlt())) ?>">
         <?php endif; ?>
-            <img src="<?= $block->escapeUrl($block->getViewFileUrl($block->getImgSrc())) ?>"
+            <img src="<?= $escaper->escapeUrl($block->getViewFileUrl($block->getImgSrc())) ?>"
                 <?php if (!$block->getLinkUrl()) : ?>
-                    title="<?= $block->escapeHtmlAttr(__($block->getImgAlt())) ?>"
+                    title="<?= $escaper->escapeHtmlAttr(__($block->getImgAlt())) ?>"
                 <?php endif; ?>
-                 alt="<?= $block->escapeHtmlAttr(__($block->getImgAlt())) ?>" />
+                 alt="<?= $escaper->escapeHtmlAttr(__($block->getImgAlt())) ?>" />
         <?php if ($block->getLinkUrl()) : ?>
         </a>
         <?php endif ?>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/block.phtml b/app/code/Magento/Theme/view/frontend/templates/html/block.phtml
index e8021e2defe0b..8e48afa0e6513 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/block.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/block.phtml
@@ -3,12 +3,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/**
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
-<div class="block <?= $block->escapeHtmlAttr($block->getBlockCss()) ?>">
-    <div class="block-title <?= $block->escapeHtmlAttr($block->getBlockCss()) ?>-title">
-        <strong><?= $block->escapeHtml($block->getBlockTitle()) ?></strong>
+<div class="block <?= $escaper->escapeHtmlAttr($block->getBlockCss()) ?>">
+    <div class="block-title <?= $escaper->escapeHtmlAttr($block->getBlockCss()) ?>-title">
+        <strong><?= $escaper->escapeHtml($block->getBlockTitle()) ?></strong>
     </div>
-    <div class="block-content <?= $block->escapeHtmlAttr($block->getBlockCss()) ?>-content">
+    <div class="block-content <?= $escaper->escapeHtmlAttr($block->getBlockCss()) ?>-content">
         <?= $block->getChildHtml() ?>
     </div>
 </div>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/breadcrumbs.phtml b/app/code/Magento/Theme/view/frontend/templates/html/breadcrumbs.phtml
index ce8e0fd75097f..9c5114068d243 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/breadcrumbs.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/breadcrumbs.phtml
@@ -3,21 +3,25 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/**
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
 <?php if ($crumbs && is_array($crumbs)) : ?>
 <div class="breadcrumbs">
     <ul class="items">
         <?php foreach ($crumbs as $crumbName => $crumbInfo) : ?>
-            <li class="item <?= $block->escapeHtmlAttr($crumbName) ?>">
+            <li class="item <?= $escaper->escapeHtmlAttr($crumbName) ?>">
             <?php if ($crumbInfo['link']) : ?>
-                <a href="<?= $block->escapeUrl($crumbInfo['link']) ?>"
-                   title="<?= $block->escapeHtml($crumbInfo['title']) ?>">
-                    <?= $block->escapeHtml($crumbInfo['label']) ?>
+                <a href="<?= $escaper->escapeUrl($crumbInfo['link']) ?>"
+                   title="<?= $escaper->escapeHtml($crumbInfo['title']) ?>">
+                    <?= $escaper->escapeHtml($crumbInfo['label']) ?>
                 </a>
             <?php elseif ($crumbInfo['last']) : ?>
-                <strong><?= $block->escapeHtml($crumbInfo['label']) ?></strong>
+                <strong><?= $escaper->escapeHtml($crumbInfo['label']) ?></strong>
             <?php else : ?>
-                <?= $block->escapeHtml($crumbInfo['label']) ?>
+                <?= $escaper->escapeHtml($crumbInfo['label']) ?>
             <?php endif; ?>
             </li>
         <?php endforeach; ?>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/bugreport.phtml b/app/code/Magento/Theme/view/frontend/templates/html/bugreport.phtml
index 2adbb28b9c59a..a56ad67ab5bd3 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/bugreport.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/bugreport.phtml
@@ -3,11 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/**
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
 <small class="bugs">
-    <span><?= $block->escapeHtml(__('Help Us Keep Magento Healthy')) ?></span>
+    <span><?= $escaper->escapeHtml(__('Help Us Keep Magento Healthy')) ?></span>
     <a href="http://www.magentocommerce.com/bug-tracking"
-       target="_blank" title="<?= $block->escapeHtmlAttr(__('Report All Bugs')) ?>">
-        <?= $block->escapeHtml(__('Report All Bugs')) ?>
+       target="_blank" title="<?= $escaper->escapeHtmlAttr(__('Report All Bugs')) ?>">
+        <?= $escaper->escapeHtml(__('Report All Bugs')) ?>
     </a>
 </small>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/collapsible.phtml b/app/code/Magento/Theme/view/frontend/templates/html/collapsible.phtml
index 1976870a57492..4f7d59c7936d3 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/collapsible.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/collapsible.phtml
@@ -3,17 +3,21 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/**
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
 
-<div class="block <?= $block->escapeHtmlAttr($block->getBlockCss()) ?>">
-    <div class="title <?= $block->escapeHtmlAttr($block->getBlockCss()) ?>-title"
-         data-mage-init='{"toggleAdvanced": {"toggleContainers": "#<?= $block->escapeHtmlAttr($block->getBlockCss()) ?>", "selectorsToggleClass": "active"}}'>
+<div class="block <?= $escaper->escapeHtmlAttr($block->getBlockCss()) ?>">
+    <div class="title <?= $escaper->escapeHtmlAttr($block->getBlockCss()) ?>-title"
+         data-mage-init='{"toggleAdvanced": {"toggleContainers": "#<?= $escaper->escapeHtmlAttr($block->getBlockCss()) ?>", "selectorsToggleClass": "active"}}'>
         <strong>
-            <?= $block->escapeHtml(__($block->getBlockTitle())) ?>
+            <?= $escaper->escapeHtml(__($block->getBlockTitle())) ?>
         </strong>
     </div>
-    <div class="content <?= $block->escapeHtmlAttr($block->getBlockCss()) ?>-content"
-         id="<?= $block->escapeHtmlAttr($block->getBlockCss()) ?>">
+    <div class="content <?= $escaper->escapeHtmlAttr($block->getBlockCss()) ?>-content"
+         id="<?= $escaper->escapeHtmlAttr($block->getBlockCss()) ?>">
         <?= $block->getChildHtml() ?>
     </div>
 </div>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/container.phtml b/app/code/Magento/Theme/view/frontend/templates/html/container.phtml
index 4ca5983081a6f..ee6f54a8ca33a 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/container.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/container.phtml
@@ -3,5 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/**
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
 <?= $block->getChildHtml();
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/copyright.phtml b/app/code/Magento/Theme/view/frontend/templates/html/copyright.phtml
index 672ff32734f40..67bf546479d72 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/copyright.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/copyright.phtml
@@ -3,7 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/**
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
 <small class="copyright">
-    <span><?= $block->escapeHtml($block->getCopyright()) ?></span>
+    <span><?= $escaper->escapeHtml($block->getCopyright()) ?></span>
 </small>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/footer.phtml b/app/code/Magento/Theme/view/frontend/templates/html/footer.phtml
index d7fbc2979ea40..c8224f8749265 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/footer.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/footer.phtml
@@ -3,14 +3,18 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/**
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
 <div class="footer-container">
     <div class="footer">
         <?= $block->getChildHtml() ?>
-        <p class="bugs"><?= $block->escapeHtml(__('Help Us Keep Magento Healthy')) ?> - <a
+        <p class="bugs"><?= $escaper->escapeHtml(__('Help Us Keep Magento Healthy')) ?> - <a
             href="http://www.magentocommerce.com/bug-tracking"
-            target="_blank"><strong><?= $block->escapeHtml(__('Report All Bugs')) ?></strong></a>
+            target="_blank"><strong><?= $escaper->escapeHtml(__('Report All Bugs')) ?></strong></a>
         </p>
-        <address><?= $block->escapeHtml($block->getCopyright()) ?></address>
+        <address><?= $escaper->escapeHtml($block->getCopyright()) ?></address>
     </div>
 </div>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/header.phtml b/app/code/Magento/Theme/view/frontend/templates/html/header.phtml
index cbefb82f23e33..e33d93828057c 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/header.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/header.phtml
@@ -6,6 +6,7 @@
 
 /**
  * @var \Magento\Theme\Block\Html\Header $block
+ * @var \Magento\Framework\Escaper $escaper
  */
 $welcomeMessage = $block->getWelcome();
 ?>
@@ -13,12 +14,12 @@ $welcomeMessage = $block->getWelcome();
     <li class="greet welcome" data-bind="scope: 'customer'">
         <!-- ko if: customer().fullname  -->
         <span class="logged-in"
-              data-bind="text: new String('<?= $block->escapeHtml(__('Welcome, %1!', '%1')) ?>').replace('%1', customer().fullname)">
+              data-bind="text: new String('<?= $escaper->escapeHtml(__('Welcome, %1!', '%1')) ?>').replace('%1', customer().fullname)">
         </span>
         <!-- /ko -->
         <!-- ko ifnot: customer().fullname  -->
         <span class="not-logged-in"
-              data-bind='html:"<?= $block->escapeHtml($welcomeMessage) ?>"'></span>
+              data-bind='html:"<?= $escaper->escapeHtml($welcomeMessage) ?>"'></span>
         <?= $block->getBlockHtml('header.additional') ?>
         <!-- /ko -->
     </li>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/header/logo.phtml b/app/code/Magento/Theme/view/frontend/templates/html/header/logo.phtml
index 165f12021bb01..58e41cfd94529 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/header/logo.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/header/logo.phtml
@@ -6,11 +6,10 @@
 
 /**
  * @var \Magento\Theme\Block\Html\Header\Logo $block
- */
-$storeName = $block->getThemeName() ? $block->getThemeName() : $block->getLogoAlt();
-/**
+ * @var \Magento\Framework\Escaper $escaper
  * @var \Magento\Theme\ViewModel\Block\Html\Header\LogoSizeResolverInterface|null $logoSizeResolver
  */
+$storeName = $block->getThemeName() ? $block->getThemeName() : $block->getLogoAlt();
 $logoSizeResolver = $block->getLogoSizeResolver();
 $logoWidth = $logoSizeResolver !== null && $logoSizeResolver->getWidth()
     ? $logoSizeResolver->getWidth()
@@ -19,16 +18,16 @@ $logoHeight = $logoSizeResolver !== null && $logoSizeResolver->getHeight()
     ? $logoSizeResolver->getHeight()
     : $block->getLogoHeight();
 ?>
-<span data-action="toggle-nav" class="action nav-toggle"><span><?= $block->escapeHtml(__('Toggle Nav')) ?></span></span>
+<span data-action="toggle-nav" class="action nav-toggle"><span><?= $escaper->escapeHtml(__('Toggle Nav')) ?></span></span>
 <a
     class="logo"
-    href="<?= $block->escapeUrl($block->getUrl('')) ?>"
-    title="<?= $block->escapeHtmlAttr($storeName) ?>"
+    href="<?= $escaper->escapeUrl($block->getUrl('')) ?>"
+    title="<?= $escaper->escapeHtmlAttr($storeName) ?>"
     aria-label="store logo">
-    <img src="<?= $block->escapeUrl($block->getLogoSrc()) ?>"
-         title="<?= $block->escapeHtmlAttr($block->getLogoAlt()) ?>"
-         alt="<?= $block->escapeHtmlAttr($block->getLogoAlt()) ?>"
-            <?= $logoWidth ? 'width="' . $block->escapeHtmlAttr($logoWidth) . '"' : '' ?>
-            <?= $logoHeight ? 'height="' . $block->escapeHtmlAttr($logoHeight) . '"' : '' ?>
+    <img src="<?= $escaper->escapeUrl($block->getLogoSrc()) ?>"
+         title="<?= $escaper->escapeHtmlAttr($block->getLogoAlt()) ?>"
+         alt="<?= $escaper->escapeHtmlAttr($block->getLogoAlt()) ?>"
+            <?= $logoWidth ? 'width="' . $escaper->escapeHtmlAttr($logoWidth) . '"' : '' ?>
+            <?= $logoHeight ? 'height="' . $escaper->escapeHtmlAttr($logoHeight) . '"' : '' ?>
     />
 </a>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/notices.phtml b/app/code/Magento/Theme/view/frontend/templates/html/notices.phtml
index bb9d5cb2fd2e0..c57b64fd0cea3 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/notices.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/notices.phtml
@@ -6,6 +6,7 @@
 
 /**
  * @var $block \Magento\Theme\Block\Html\Notices
+ * @var \Magento\Framework\Escaper $escaper
  * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 ?>
@@ -14,9 +15,9 @@
         <div class="message global noscript">
             <div class="content">
                 <p>
-                    <strong><?= $block->escapeHtml(__('JavaScript seems to be disabled in your browser.')) ?></strong>
+                    <strong><?= $escaper->escapeHtml(__('JavaScript seems to be disabled in your browser.')) ?></strong>
                     <span>
-                        <?= $block->escapeHtml(
+                        <?= $escaper->escapeHtml(
                             __('For the best experience on our site, be sure to turn on Javascript in your browser.')
                         ) ?>
                     </span>
@@ -29,9 +30,9 @@
     <div class="notice global site local_storage">
         <div class="content">
             <p>
-                <strong><?= $block->escapeHtml(__('Local Storage seems to be disabled in your browser.')) ?></strong>
+                <strong><?= $escaper->escapeHtml(__('Local Storage seems to be disabled in your browser.')) ?></strong>
                 <br />
-                <?= $block->escapeHtml(
+                <?= $escaper->escapeHtml(
                     __('For the best experience on our site, be sure to turn on Local Storage in your browser.')
                 ) ?>
             </p>
@@ -64,7 +65,7 @@ script;
 <?php if ($block->displayDemoNotice()): ?>
     <div class="message global demo">
         <div class="content">
-            <p><?= $block->escapeHtml(__('This is a demo store. No orders will be fulfilled.')) ?></p>
+            <p><?= $escaper->escapeHtml(__('This is a demo store. No orders will be fulfilled.')) ?></p>
         </div>
     </div>
 <?php endif; ?>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/pager.phtml b/app/code/Magento/Theme/view/frontend/templates/html/pager.phtml
index 6b28dbd4521a0..f096acbcfaa9f 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/pager.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/pager.phtml
@@ -8,6 +8,7 @@
  * Pager template
  *
  * @see \Magento\Theme\Block\Html\Pager
+ * @var \Magento\Framework\Escaper $escaper
  */
 ?>
 <?php if ($block->getCollection()->getSize()): ?>
@@ -20,13 +21,13 @@
         <p class="toolbar-amount">
             <span class="toolbar-number">
             <?php if ($block->getLastPageNum()>1): ?>
-                <?= $block->escapeHtml(
+                <?= $escaper->escapeHtml(
                     __('Items %1 to %2 of %3 total', $block->getFirstNum(), $block->getLastNum(), $block->getTotalNum())
                 ) ?>
             <?php elseif ($block->getTotalNum() == 1): ?>
-                <?= $block->escapeHtml(__('%1 Item', $block->getTotalNum())) ?>
+                <?= $escaper->escapeHtml(__('%1 Item', $block->getTotalNum())) ?>
             <?php else: ?>
-                <?= $block->escapeHtml(__('%1 Item(s)', $block->getTotalNum())) ?>
+                <?= $escaper->escapeHtml(__('%1 Item(s)', $block->getTotalNum())) ?>
             <?php endif; ?>
             </span>
         </p>
@@ -34,24 +35,24 @@
 
         <?php if ($block->getLastPageNum()>1): ?>
         <div class="pages">
-            <strong class="label pages-label" id="paging-label"><?= $block->escapeHtml(__('Page')) ?></strong>
+            <strong class="label pages-label" id="paging-label"><?= $escaper->escapeHtml(__('Page')) ?></strong>
             <ul class="items pages-items" aria-labelledby="paging-label">
             <?php if (!$block->isFirstPage()): ?>
                 <li class="item pages-item-previous">
                     <?php $text = $block->getAnchorTextForPrevious() ? $block->getAnchorTextForPrevious() : '';?>
-                    <a class="<?= $block->escapeHtmlAttr($text ? 'link ' : 'action ') ?> previous"
-                       href="<?= $block->escapeUrl($block->getPreviousPageUrl()) ?>"
-                       title="<?= $block->escapeHtmlAttr($text ? $text : __('Previous')) ?>">
-                        <span class="label"><?= $block->escapeHtml(__('Page')) ?></span>
-                        <span><?= $block->escapeHtml($text ? $text : __('Previous')) ?></span>
+                    <a class="<?= $escaper->escapeHtmlAttr($text ? 'link ' : 'action ') ?> previous"
+                       href="<?= $escaper->escapeUrl($block->getPreviousPageUrl()) ?>"
+                       title="<?= $escaper->escapeHtmlAttr($text ? $text : __('Previous')) ?>">
+                        <span class="label"><?= $escaper->escapeHtml(__('Page')) ?></span>
+                        <span><?= $escaper->escapeHtml($text ? $text : __('Previous')) ?></span>
                     </a>
                 </li>
             <?php endif;?>
 
             <?php if ($block->canShowFirst()): ?>
                 <li class="item">
-                    <a class="page first" href="<?= $block->escapeUrl($block->getFirstPageUrl()) ?>">
-                        <span class="label"><?= $block->escapeHtml(__('Page')) ?></span>
+                    <a class="page first" href="<?= $escaper->escapeUrl($block->getFirstPageUrl()) ?>">
+                        <span class="label"><?= $escaper->escapeHtml(__('Page')) ?></span>
                         <span>1</span>
                     </a>
                 </li>
@@ -61,7 +62,7 @@
                 <li class="item">
                     <a class="page previous jump"
                        title=""
-                       href="<?= $block->escapeUrl($block->getPreviousJumpUrl()) ?>">
+                       href="<?= $escaper->escapeUrl($block->getPreviousJumpUrl()) ?>">
                         <span>...</span>
                     </a>
                 </li>
@@ -71,15 +72,15 @@
                 <?php if ($block->isPageCurrent($_page)): ?>
                     <li class="item current">
                         <strong class="page">
-                            <span class="label"><?= $block->escapeHtml(__('You\'re currently reading page')) ?></span>
-                            <span><?= $block->escapeHtml($_page) ?></span>
+                            <span class="label"><?= $escaper->escapeHtml(__('You\'re currently reading page')) ?></span>
+                            <span><?= $escaper->escapeHtml($_page) ?></span>
                         </strong>
                     </li>
                 <?php else: ?>
                     <li class="item">
-                        <a href="<?= $block->escapeUrl($block->getPageUrl($_page)) ?>" class="page">
-                            <span class="label"><?= $block->escapeHtml(__('Page')) ?></span>
-                            <span><?= $block->escapeHtml($_page) ?></span>
+                        <a href="<?= $escaper->escapeUrl($block->getPageUrl($_page)) ?>" class="page">
+                            <span class="label"><?= $escaper->escapeHtml(__('Page')) ?></span>
+                            <span><?= $escaper->escapeHtml($_page) ?></span>
                         </a>
                     </li>
                 <?php endif;?>
@@ -87,7 +88,7 @@
 
             <?php if ($block->canShowNextJump()): ?>
                 <li class="item">
-                    <a class="page next jump" title="" href="<?= $block->escapeUrl($block->getNextJumpUrl()) ?>">
+                    <a class="page next jump" title="" href="<?= $escaper->escapeUrl($block->getNextJumpUrl()) ?>">
                         <span>...</span>
                     </a>
                 </li>
@@ -95,9 +96,9 @@
 
             <?php if ($block->canShowLast()): ?>
               <li class="item">
-                  <a class="page last" href="<?= $block->escapeUrl($block->getLastPageUrl()) ?>">
-                      <span class="label"><?= $block->escapeHtml(__('Page')) ?></span>
-                      <span><?= $block->escapeHtml($block->getLastPageNum()) ?></span>
+                  <a class="page last" href="<?= $escaper->escapeUrl($block->getLastPageUrl()) ?>">
+                      <span class="label"><?= $escaper->escapeHtml(__('Page')) ?></span>
+                      <span><?= $escaper->escapeHtml($block->getLastPageNum()) ?></span>
                   </a>
               </li>
             <?php endif;?>
@@ -106,10 +107,10 @@
                 <li class="item pages-item-next">
                     <?php $text = $block->getAnchorTextForNext() ? $block->getAnchorTextForNext() : '';?>
                     <a class="<?= /* @noEscape */ $text ? 'link ' : 'action ' ?> next"
-                       href="<?= $block->escapeUrl($block->getNextPageUrl()) ?>"
-                       title="<?= $block->escapeHtmlAttr($text ? $text : __('Next')) ?>">
-                        <span class="label"><?= $block->escapeHtml(__('Page')) ?></span>
-                        <span><?= $block->escapeHtml($text ? $text : __('Next')) ?></span>
+                       href="<?= $escaper->escapeUrl($block->getNextPageUrl()) ?>"
+                       title="<?= $escaper->escapeHtmlAttr($text ? $text : __('Next')) ?>">
+                        <span class="label"><?= $escaper->escapeHtml(__('Page')) ?></span>
+                        <span><?= $escaper->escapeHtml($text ? $text : __('Next')) ?></span>
                     </a>
                 </li>
             <?php endif;?>
@@ -119,17 +120,17 @@
 
     <?php if ($block->isShowPerPage()): ?>
         <div class="limiter">
-            <strong class="limiter-label"><?= $block->escapeHtml(__('Show')) ?></strong>
+            <strong class="limiter-label"><?= $escaper->escapeHtml(__('Show')) ?></strong>
             <select id="limiter" data-mage-init='{"redirectUrl": {"event":"change"}}' class="limiter-options">
                 <?php foreach ($block->getAvailableLimit() as $_key => $_limit): ?>
-                    <option value="<?= $block->escapeUrl($block->getLimitUrl($_key)) ?>"
+                    <option value="<?= $escaper->escapeUrl($block->getLimitUrl($_key)) ?>"
                         <?php if ($block->isLimitCurrent($_key)): ?>
                         selected="selected"<?php endif ?>>
-                        <?= $block->escapeHtml($_limit) ?>
+                        <?= $escaper->escapeHtml($_limit) ?>
                     </option>
                 <?php endforeach; ?>
             </select>
-            <span class="limiter-text"><?= $block->escapeHtml(__('per page')) ?></span>
+            <span class="limiter-text"><?= $escaper->escapeHtml(__('per page')) ?></span>
         </div>
     <?php endif ?>
 
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/sections.phtml b/app/code/Magento/Theme/view/frontend/templates/html/sections.phtml
index 9c6cf4fa07cf2..87d388524d907 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/sections.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/sections.phtml
@@ -6,15 +6,16 @@
 
 /**
  *  General template for displaying group of blocks divided into sections
+ * @var \Magento\Framework\Escaper $escaper
  */
 
 $group = $block->getGroupName();
 $groupCss = $block->getGroupCss();
 ?>
 <?php if ($detailedInfoGroup = $block->getGroupChildNames($group)):?>
-    <div class="sections <?= $block->escapeHtmlAttr($groupCss) ?>">
+    <div class="sections <?= $escaper->escapeHtmlAttr($groupCss) ?>">
         <?php $layout = $block->getLayout(); ?>
-        <div class="section-items <?= $block->escapeHtmlAttr($groupCss) ?>-items"
+        <div class="section-items <?= $escaper->escapeHtmlAttr($groupCss) ?>-items"
              data-mage-init='{"tabs":{"openedState":"active"}}'>
             <?php foreach ($detailedInfoGroup as $name):?>
                 <?php
@@ -25,15 +26,15 @@ $groupCss = $block->getGroupCss();
                     $alias = $layout->getElementAlias($name);
                     $label = $block->getChildData($alias, 'title');
                 ?>
-                <div class="section-item-title <?= $block->escapeHtmlAttr($groupCss) ?>-item-title"
+                <div class="section-item-title <?= $escaper->escapeHtmlAttr($groupCss) ?>-item-title"
                      data-role="collapsible">
-                    <a class="<?= $block->escapeHtmlAttr($groupCss) ?>-item-switch"
-                       data-toggle="switch" href="#<?= $block->escapeHtmlAttr($alias) ?>">
+                    <a class="<?= $escaper->escapeHtmlAttr($groupCss) ?>-item-switch"
+                       data-toggle="switch" href="#<?= $escaper->escapeHtmlAttr($alias) ?>">
                         <?= /* @noEscape */ $label ?>
                     </a>
                 </div>
-                <div class="section-item-content <?= $block->escapeHtmlAttr($groupCss) ?>-item-content"
-                     id="<?= $block->escapeHtmlAttr($alias) ?>"
+                <div class="section-item-content <?= $escaper->escapeHtmlAttr($groupCss) ?>-item-content"
+                     id="<?= $escaper->escapeHtmlAttr($alias) ?>"
                      data-role="content">
                     <?= /* @noEscape */ $html ?>
                 </div>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/skip.phtml b/app/code/Magento/Theme/view/frontend/templates/html/skip.phtml
index 82ea40ef3424d..e2b27e596b7fd 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/skip.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/skip.phtml
@@ -4,12 +4,15 @@
  * See COPYING.txt for license details.
  */
 
+/**
+ * @var \Magento\Framework\Escaper $escaper
+ */
 $target = $block->getTarget();
 $label = $block->getLabel();
 ?>
-<a class="action skip <?= $block->escapeHtmlAttr($target) ?>"
-   href="#<?= $block->escapeHtmlAttr($target) ?>">
+<a class="action skip <?= $escaper->escapeHtmlAttr($target) ?>"
+   href="#<?= $escaper->escapeHtmlAttr($target) ?>">
     <span>
-        <?= $block->escapeHtml($label) ?>
+        <?= $escaper->escapeHtml($label) ?>
     </span>
 </a>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/skiptarget.phtml b/app/code/Magento/Theme/view/frontend/templates/html/skiptarget.phtml
index 9c85e06afdc10..a8120ce8c721f 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/skiptarget.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/skiptarget.phtml
@@ -4,6 +4,9 @@
  * See COPYING.txt for license details.
  */
 
+/**
+ * @var \Magento\Framework\Escaper $escaper
+ */
 $target_id = $block->getTargetId();
 ?>
-<a id="<?= $block->escapeHtmlAttr($target_id) ?>" tabindex="-1"></a>
+<a id="<?= $escaper->escapeHtmlAttr($target_id) ?>" tabindex="-1"></a>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/title.phtml b/app/code/Magento/Theme/view/frontend/templates/html/title.phtml
index c4961448323fb..67ed18e7d5878 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/title.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/title.phtml
@@ -6,6 +6,7 @@
 
 /**
  * @var $block \Magento\Theme\Block\Html\Title
+ * @var \Magento\Framework\Escaper $escaper
  */
 $cssClass = $block->getCssClass() ? ' ' . $block->getCssClass() : '';
 $titleHtml = '';
@@ -13,16 +14,16 @@ if (trim($block->getPageHeading())) {
     $titleHtml = '<span class="base" data-ui-id="page-title-wrapper" '
         . $block->getAddBaseAttribute()
         . '>'
-        . $block->escapeHtml($block->getPageHeading())
+        . $escaper->escapeHtml($block->getPageHeading())
         . '</span>';
 }
 ?>
 <?php if ($titleHtml) : ?>
-<div class="page-title-wrapper<?= $block->escapeHtmlAttr($cssClass) ?>">
+<div class="page-title-wrapper<?= $escaper->escapeHtmlAttr($cssClass) ?>">
     <h1 class="page-title"
-        <?php if ($block->getId()) : ?> id="<?= $block->escapeHtmlAttr($block->getId()) ?>" <?php endif; ?>
+        <?php if ($block->getId()) : ?> id="<?= $escaper->escapeHtmlAttr($block->getId()) ?>" <?php endif; ?>
         <?php if ($block->getAddBaseAttributeAria()) : ?>
-            aria-labelledby="<?= $block->escapeHtmlAttr($block->getAddBaseAttributeAria()) ?>"
+            aria-labelledby="<?= $escaper->escapeHtmlAttr($block->getAddBaseAttributeAria()) ?>"
         <?php endif; ?>>
         <?= /* @noEscape */ $titleHtml ?>
     </h1>
diff --git a/app/code/Magento/Theme/view/frontend/templates/js/calendar.phtml b/app/code/Magento/Theme/view/frontend/templates/js/calendar.phtml
index d2803a741d9a2..56eef259738fd 100644
--- a/app/code/Magento/Theme/view/frontend/templates/js/calendar.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/js/calendar.phtml
@@ -5,7 +5,10 @@
  */
 
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
-/** @var \Magento\Framework\View\Element\Html\Calendar $block */
+/**
+ * @var \Magento\Framework\View\Element\Html\Calendar $block
+ * @var \Magento\Framework\Escaper $escaper
+ */
 
 /**
  * Calendar localization script. Should be put into page header.
@@ -28,16 +31,16 @@ require([
             dayNamesMin: {$days['abbreviated']},
             monthNames: {$months['wide']},
             monthNamesShort: {$months['abbreviated']},
-            infoTitle: '{$block->escapeJs(__('About the calendar'))}',
+            infoTitle: '{$escaper->escapeJs(__('About the calendar'))}',
             firstDay: {$intFirstDay},
-            closeText: '{$block->escapeJs(__('Close'))}',
-            currentText: '{$block->escapeJs(__('Go Today'))}',
-            prevText: '{$block->escapeJs(__('Previous'))}',
-            nextText: '{$block->escapeJs(__('Next'))}',
-            weekHeader: '{$block->escapeJs(__('WK'))}',
-            timeText: '{$block->escapeJs(__('Time'))}',
-            hourText: '{$block->escapeJs(__('Hour'))}',
-            minuteText: '{$block->escapeJs(__('Minute'))}',
+            closeText: '{$escaper->escapeJs(__('Close'))}',
+            currentText: '{$escaper->escapeJs(__('Go Today'))}',
+            prevText: '{$escaper->escapeJs(__('Previous'))}',
+            nextText: '{$escaper->escapeJs(__('Next'))}',
+            weekHeader: '{$escaper->escapeJs(__('WK'))}',
+            timeText: '{$escaper->escapeJs(__('Time'))}',
+            hourText: '{$escaper->escapeJs(__('Hour'))}',
+            minuteText: '{$escaper->escapeJs(__('Minute'))}',
             dateFormat: "D, d M yy", // $.datepicker.RFC_2822
             showOn: 'button',
             showAnim: '',
diff --git a/app/code/Magento/Theme/view/frontend/templates/js/cookie.phtml b/app/code/Magento/Theme/view/frontend/templates/js/cookie.phtml
index 7ecfd18d0d3b0..ac5ba7f9ee921 100644
--- a/app/code/Magento/Theme/view/frontend/templates/js/cookie.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/js/cookie.phtml
@@ -8,6 +8,7 @@
  * Cookie settings initialization script
  *
  * @var $block \Magento\Framework\View\Element\Js\Cookie
+ * @var \Magento\Framework\Escaper $escaper
  */
 ?>
 
@@ -16,10 +17,10 @@
         "*": {
             "mage/cookies": {
                 "expires": null,
-                "path": "<?= $block->escapeJs($block->getPath()) ?>",
-                "domain": "<?= $block->escapeJs($block->getDomain()) ?>",
+                "path": "<?= $escaper->escapeJs($block->getPath()) ?>",
+                "domain": "<?= $escaper->escapeJs($block->getDomain()) ?>",
                 "secure": false,
-                "lifetime": "<?= $block->escapeJs($block->getLifetime()) ?>"
+                "lifetime": "<?= $escaper->escapeJs($block->getLifetime()) ?>"
             }
         }
     }
diff --git a/app/code/Magento/Theme/view/frontend/templates/js/cookie_status.phtml b/app/code/Magento/Theme/view/frontend/templates/js/cookie_status.phtml
index 7d43ffcbb8063..565d6d3c564bd 100644
--- a/app/code/Magento/Theme/view/frontend/templates/js/cookie_status.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/js/cookie_status.phtml
@@ -4,11 +4,14 @@
  * See COPYING.txt for license details.
  */
 
-/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+/**
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
 
 <div id="cookie-status">
-    <?= $block->escapeHtml(__('The store will not work correctly in the case when cookies are disabled.')); ?>
+    <?= $escaper->escapeHtml(__('The store will not work correctly in the case when cookies are disabled.')); ?>
 </div>
 <?php
 $script = 'document.querySelector("#cookie-status").style.display = "none";';
diff --git a/app/code/Magento/Theme/view/frontend/templates/link.phtml b/app/code/Magento/Theme/view/frontend/templates/link.phtml
index 32f5447aa0aac..e7ec112241735 100644
--- a/app/code/Magento/Theme/view/frontend/templates/link.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/link.phtml
@@ -6,13 +6,14 @@
 
 /**
  * @var $block \Magento\Framework\View\Element\Html\Link
+ * @var \Magento\Framework\Escaper $escaper
  */
 ?>
 <?php if (!$block->getIsDisabled()) : ?>
 <li>
-    <a href="<?= $block->escapeUrl($block->getHref()) ?>"
-        <?php if ($title = $block->getTitle()) : ?> title="<?= $block->escapeHtmlAttr(__($title)) ?>"<?php endif;?>>
-        <?= $block->escapeHtml(__($block->getLabel())) ?>
+    <a href="<?= $escaper->escapeUrl($block->getHref()) ?>"
+        <?php if ($title = $block->getTitle()) : ?> title="<?= $escaper->escapeHtmlAttr(__($title)) ?>"<?php endif;?>>
+        <?= $escaper->escapeHtml(__($block->getLabel())) ?>
     </a>
 </li>
 <?php endif; ?>
diff --git a/app/code/Magento/Theme/view/frontend/templates/page/js/require_js.phtml b/app/code/Magento/Theme/view/frontend/templates/page/js/require_js.phtml
index a83d510ee0926..33fd04009ae61 100644
--- a/app/code/Magento/Theme/view/frontend/templates/page/js/require_js.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/page/js/require_js.phtml
@@ -4,12 +4,15 @@
  * See COPYING.txt for license details.
  */
 
-/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+/**
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ * @var \Magento\Framework\Escaper $escaper
+ */
 
 $scriptString = '
-    var BASE_URL = \'' . /* @noEscape */ $block->escapeJs($block->getBaseUrl()) .'\';
+    var BASE_URL = \'' . /* @noEscape */ $escaper->escapeJs($block->getBaseUrl()) .'\';
     var require = {
-        \'baseUrl\': \'' . /* @noEscape */ $block->escapeJs($block->getViewFileUrl('/')) . '\'
+        \'baseUrl\': \'' . /* @noEscape */ $escaper->escapeJs($block->getViewFileUrl('/')) . '\'
     };';
 
 echo /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false);
diff --git a/app/code/Magento/Theme/view/frontend/templates/text.phtml b/app/code/Magento/Theme/view/frontend/templates/text.phtml
index d4032908a445e..84bab1701542f 100644
--- a/app/code/Magento/Theme/view/frontend/templates/text.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/text.phtml
@@ -4,18 +4,21 @@
  * See COPYING.txt for license details.
  */
 
-$attributes = $block->getCssClass() ? ' class="' . $block->escapeHtmlAttr($block->getCssClass()) . '"' : '';
+/**
+ * @var \Magento\Framework\Escaper $escaper
+ */
+$attributes = $block->getCssClass() ? ' class="' . $escaper->escapeHtmlAttr($block->getCssClass()) . '"' : '';
 $attr = $block->getAttributes();
 if (!empty($attr)) {
     foreach ($block->getAttributes() as $attribute => $value) {
-        $attributes .= ' ' . $block->escapeHtml($attribute) . '="' . $block->escapeHtmlAttr($value) . '"';
+        $attributes .= ' ' . $escaper->escapeHtml($attribute) . '="' . $escaper->escapeHtmlAttr($value) . '"';
     }
 }
 /* @noEscape */ echo '<'
-    . $block->escapeHtml($block->getTag())
+    . $escaper->escapeHtml($block->getTag())
     . $attributes
     . '>'
-    . $block->escapeHtml($block->getText())
+    . $escaper->escapeHtml($block->getText())
     . '</'
-    . $block->escapeHtml($block->getTag())
+    . $escaper->escapeHtml($block->getTag())
     . '>';