diff --git a/modules/blockbestsellers/blockbestsellers.tpl b/modules/blockbestsellers/blockbestsellers.tpl
index 8354832..cd94e35 100644
--- a/modules/blockbestsellers/blockbestsellers.tpl
+++ b/modules/blockbestsellers/blockbestsellers.tpl
@@ -31,7 +31,7 @@
                                    class="products-block-image content_img clearfix">
                                   {if !empty($lazy_load)}
                                     <noscript>
-                                      <img src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'small', null, ImageManager::retinaSupport())|escape:'html'}"
+                                      <img src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'small', null, ImageManager::retinaSupport())|escape:'url'}"
                                            alt="{$product.legend|escape:'html':'UTF-8'}"
                                            width="{getWidthSize|intval type='small'}"
                                            height="{getHeightSize|intval type='small'}"
@@ -41,13 +41,13 @@
                                   <picture class="img-responsive{if !empty($lazy_load)} tb-lazy-image{/if}">
                                     <!--[if IE 9]><video style="display: none;"><![endif]-->
                                     {if !empty($webp)}
-                                    <source {if !empty($lazy_load)}srcset="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII= 1w" data-{/if}srcset="{$link->getImageLink($product.link_rewrite, $product.id_image, 'small', 'webp', ImageManager::retinaSupport())|escape:'html'}"
+                                    <source {if !empty($lazy_load)}srcset="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII= 1w" data-{/if}srcset="{$link->getImageLink($product.link_rewrite, $product.id_image, 'small', 'webp', ImageManager::retinaSupport())|escape:'url'}"
                                             sizes="1px"
                                             type="image/webp"
                                     >
                                     {/if}
                                     <!--[if IE 9]></video><![endif]-->
-                                    <img {if !empty($lazy_load)}srcset="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII= 1w" data-{/if}srcset="{$link->getImageLink($product.link_rewrite, $product.id_image, 'small', null, ImageManager::retinaSupport())|escape:'html'}"
+                                    <img {if !empty($lazy_load)}srcset="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII= 1w" data-{/if}srcset="{$link->getImageLink($product.link_rewrite, $product.id_image, 'small', null, ImageManager::retinaSupport())|escape:'url'}"
                                          {if !empty($lazy_load)}src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII="{/if}
                                          sizes="1px"
                                          alt="{$product.legend|escape:'html':'UTF-8'}"
diff --git a/modules/blocknewproducts/blocknewproducts.tpl b/modules/blocknewproducts/blocknewproducts.tpl
index 74986e2..43deacd 100644
--- a/modules/blocknewproducts/blocknewproducts.tpl
+++ b/modules/blocknewproducts/blocknewproducts.tpl
@@ -13,7 +13,7 @@
                                 <a class="products-block-image" href="{$newproduct.link|escape:'html'}"
                                    title="{$newproduct.legend|escape:html:'UTF-8'}"><img
                                             class="replace-2x img-responsive"
-                                            src="{$link->getImageLink($newproduct.link_rewrite, $newproduct.id_image, 'small')|escape:'html'}"
+                                            src="{$link->getImageLink($newproduct.link_rewrite, $newproduct.id_image, 'small')|escape:'url'}"
                                             alt="{$newproduct.name|escape:html:'UTF-8'}"
                                             title="{$newproduct.name|escape:html:'UTF-8'}"></a>
                                 <div class="product-content">
diff --git a/modules/blockspecials/blockspecials.tpl b/modules/blockspecials/blockspecials.tpl
index 705c25c..ee762b1 100644
--- a/modules/blockspecials/blockspecials.tpl
+++ b/modules/blockspecials/blockspecials.tpl
@@ -15,7 +15,7 @@
                                title="{$special.name|escape:'html':'UTF-8'}">
                               {if !empty($lazy_load)}
                                 <noscript>
-                                  <img src="{$link->getImageLink($special.link_rewrite, $special.id_image, 'small', null, ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
+                                  <img src="{$link->getImageLink($special.link_rewrite, $special.id_image, 'small', null, ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
                                        alt="{$special.legend|escape:'html':'UTF-8'}"
                                        title="{$special.name|escape:'html':'UTF-8'}"
                                        width="{getWidthSize|intval type='small'}"
@@ -26,13 +26,13 @@
                               <picture class="img-responsive{if !empty($lazy_load)} tb-lazy-image{/if}">
                                 <!--[if IE 9]><video style="display: none;"><![endif]-->
                                 {if !empty($webp)}
-                                  <source {if !empty($lazy_load)}srcset="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII= 1w" data-{/if}srcset="{$link->getImageLink($special.link_rewrite, $special.id_image, 'small', 'webp', ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
+                                  <source {if !empty($lazy_load)}srcset="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII= 1w" data-{/if}srcset="{$link->getImageLink($special.link_rewrite, $special.id_image, 'small', 'webp', ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
                                           title="{$special.name|escape:'html':'UTF-8'}"
                                           type="image/webp"
                                   >
                                 {/if}
                                 <!--[if IE 9]></video><![endif]-->
-                                <img {if !empty($lazy_load)}srcset="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII= 1w" data-{/if}srcset="{$link->getImageLink($special.link_rewrite, $special.id_image, 'small', null, ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
+                                <img {if !empty($lazy_load)}srcset="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII= 1w" data-{/if}srcset="{$link->getImageLink($special.link_rewrite, $special.id_image, 'small', null, ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
                                      {if !empty($lazy_load)}src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII="{/if}
                                      alt="{$special.legend|escape:'html':'UTF-8'}"
                                      title="{$special.name|escape:'html':'UTF-8'}"
diff --git a/modules/blockwishlist/views/templates/front/managewishlist.tpl b/modules/blockwishlist/views/templates/front/managewishlist.tpl
index 8d76f36..68b6578 100644
--- a/modules/blockwishlist/views/templates/front/managewishlist.tpl
+++ b/modules/blockwishlist/views/templates/front/managewishlist.tpl
@@ -50,7 +50,7 @@
                 >
                   {if !empty($lazy_load)}
                     <noscript>
-                      <img src="{$link->getImageLink($product.link_rewrite, $product.cover, 'home', null, ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
+                      <img src="{$link->getImageLink($product.link_rewrite, $product.cover, 'home', null, ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
                            alt="{$product.name|escape:'html':'UTF-8'}"
                            width="{getWidthSize|intval type='home'}"
                            height="{getHeightSize|intval type='home'}"
@@ -60,12 +60,12 @@
                   <picture class="replace-2x img-responsive{if !empty($lazy_load)} tb-lazy-image{/if}">
                     <!--[if IE 9]><video style="display: none;"><![endif]-->
                     {if !empty($webp)}
-                      <source {if !empty($lazy_load)}srcset="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII= 1w" data-{/if}srcset="{$link->getImageLink($product.link_rewrite, $product.cover, 'home', 'webp', ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
+                      <source {if !empty($lazy_load)}srcset="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII= 1w" data-{/if}srcset="{$link->getImageLink($product.link_rewrite, $product.cover, 'home', 'webp', ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
                               type="image/webp"
                       >
                     {/if}
                     <!--[if IE 9]></video><![endif]-->
-                    <img {if !empty($lazy_load)}srcset="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII= 1w" data-{/if}srcset="{$link->getImageLink($product.link_rewrite, $product.cover, 'home', null, ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
+                    <img {if !empty($lazy_load)}srcset="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII= 1w" data-{/if}srcset="{$link->getImageLink($product.link_rewrite, $product.cover, 'home', null, ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
                          {if !empty($lazy_load)}src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII="{/if}
                          alt="{$product.name|escape:'html':'UTF-8'}"
                          width="{getWidthSize|intval type='home'}"
@@ -200,7 +200,7 @@
                     <span style="float:left;">
                       {if !empty($lazy_load)}
                         <noscript>
-                          <img src="{$link->getImageLink($product.link_rewrite, $product.cover, 'small', null, ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
+                          <img src="{$link->getImageLink($product.link_rewrite, $product.cover, 'small', null, ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
                                alt="{$product.name|escape:'html':'UTF-8'}"
                                width="{getWidthSize|intval type='small'}"
                                height="{getHeightSize|intval type='small'}"
@@ -210,13 +210,13 @@
                       <picture {if !empty($lazy_load)}class="tb-lazy-image"{/if}>
                         <!--[if IE 9]><video style="display: none;"><![endif]-->
                         {if !empty($webp)}
-                          <source {if !empty($lazy_load)}srcset="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII= 1w" data-{/if}srcset="{$link->getImageLink($product.link_rewrite, $product.cover, 'small', 'webp', ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
+                          <source {if !empty($lazy_load)}srcset="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII= 1w" data-{/if}srcset="{$link->getImageLink($product.link_rewrite, $product.cover, 'small', 'webp', ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
                                   alt="{$product.name|escape:'html':'UTF-8'}"
                                   type="image/webp"
                           >
                         {/if}
                         <!--[if IE 9]></video><![endif]-->
-                        <img {if !empty($lazy_load)}srcset="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII= 1w" data-{/if}srcset="{$link->getImageLink($product.link_rewrite, $product.cover, 'small', null, ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
+                        <img {if !empty($lazy_load)}srcset="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII= 1w" data-{/if}srcset="{$link->getImageLink($product.link_rewrite, $product.cover, 'small', null, ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
                              {if !empty($lazy_load)}src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII="{/if}
                              alt="{$product.name|escape:'html':'UTF-8'}"
                              width="{getWidthSize|intval type='small'}"
diff --git a/modules/blockwishlist/views/templates/front/view.tpl b/modules/blockwishlist/views/templates/front/view.tpl
index 21f6083..963cec7 100644
--- a/modules/blockwishlist/views/templates/front/view.tpl
+++ b/modules/blockwishlist/views/templates/front/view.tpl
@@ -43,7 +43,7 @@
                 >
                   {if !empty($lazy_load)}
                     <noscript>
-                      <img src="{$link->getImageLink($product.link_rewrite, $product.cover, 'home', null, ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
+                      <img src="{$link->getImageLink($product.link_rewrite, $product.cover, 'home', null, ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
                            alt="{$product.name|escape:'html':'UTF-8'}"
                            width="{getWidthSize|intval type='home'}"
                            height="{getHeightSize|intval type='home'}"
@@ -53,12 +53,12 @@
                   <picture class="img-responsive{if !empty($lazy_load)} tb-lazy-image{/if}">
                     <!--[if IE 9]><video style="display: none;"><![endif]-->
                     {if !empty($webp)}
-                      <source {if !empty($lazy_load)}srcset="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII= 1w" data-{/if}srcset="{$link->getImageLink($product.link_rewrite, $product.cover, 'home', 'webp', ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
+                      <source {if !empty($lazy_load)}srcset="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII= 1w" data-{/if}srcset="{$link->getImageLink($product.link_rewrite, $product.cover, 'home', 'webp', ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
                               type="image/webp"
                       >
                     {/if}
                     <!--[if IE 9]></video><![endif]-->
-                    <img {if !empty($lazy_load)}srcset="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII= 1w" data-{/if}srcset="{$link->getImageLink($product.link_rewrite, $product.cover, 'home', null, ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
+                    <img {if !empty($lazy_load)}srcset="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII= 1w" data-{/if}srcset="{$link->getImageLink($product.link_rewrite, $product.cover, 'home', null, ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
                          {if !empty($lazy_load)}src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII="{/if}
                          alt="{$product.name|escape:'html':'UTF-8'}"
                          width="{getWidthSize|intval type='home'}"
diff --git a/modules/favoriteproducts/views/templates/front/favoriteproducts-account.tpl b/modules/favoriteproducts/views/templates/front/favoriteproducts-account.tpl
index 38e8ddc..2019136 100644
--- a/modules/favoriteproducts/views/templates/front/favoriteproducts-account.tpl
+++ b/modules/favoriteproducts/views/templates/front/favoriteproducts-account.tpl
@@ -19,7 +19,7 @@
             >
               {if !empty($lazy_load)}
                 <noscript>
-                  <img src="{$link->getImageLink($favoriteProduct.link_rewrite, $favoriteProduct.image, 'medium')|escape:'html':'UTF-8'}"
+                  <img src="{$link->getImageLink($favoriteProduct.link_rewrite, $favoriteProduct.image, 'medium')|escape:'url':'UTF-8'}"
                        alt="{favoriteProduct.name|escape:'htmlall':'UTF-8'}"
                        width="{getWidthSize|intval type='medium'}"
                        height="{getHeightSize|intval type='medium'}"
@@ -27,11 +27,11 @@
                 </noscript>
               {/if}
               <picture {if !empty($lazy_load)}class="tb-lazy-image"{/if}>
-                <source {if !empty($lazy_load)}srcset="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII= 1w" data-{/if}srcset="{$link->getImageLink($favoriteProduct.link_rewrite, $favoriteProduct.image, 'medium')|escape:'html':'UTF-8'}"
+                <source {if !empty($lazy_load)}srcset="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII= 1w" data-{/if}srcset="{$link->getImageLink($favoriteProduct.link_rewrite, $favoriteProduct.image, 'medium')|escape:'url':'UTF-8'}"
                      alt="{favoriteProduct.name|escape:'htmlall':'UTF-8'}"
                      type="image/webp"
                 >
-                <img {if !empty($lazy_load)}srcset="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII= 1w" data-{/if}srcset="{$link->getImageLink($favoriteProduct.link_rewrite, $favoriteProduct.image, 'medium')|escape:'html':'UTF-8'}"
+                <img {if !empty($lazy_load)}srcset="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII= 1w" data-{/if}srcset="{$link->getImageLink($favoriteProduct.link_rewrite, $favoriteProduct.image, 'medium')|escape:'url':'UTF-8'}"
                      {if !empty($lazy_load)}src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII="{/if}
                      alt="{favoriteProduct.name|escape:'htmlall':'UTF-8'}"
                      width="{getWidthSize|intval type='medium'}"
diff --git a/modules/mailalerts/views/templates/front/mailalerts-account.tpl b/modules/mailalerts/views/templates/front/mailalerts-account.tpl
index 57dc60b..194ebff 100644
--- a/modules/mailalerts/views/templates/front/mailalerts-account.tpl
+++ b/modules/mailalerts/views/templates/front/mailalerts-account.tpl
@@ -12,7 +12,7 @@
         {foreach from=$mailAlerts item=mailAlert name=myLoop}
           <li class="clearfix">
             <a class="products-block-image" href="{$link->getProductLink($mailAlert.id_product, null, null, null, null, $mailAlert.id_shop)}" title="{$mailAlert.name|escape:'html':'UTF-8'}">
-              <img src="{$link->getImageLink($mailAlert.link_rewrite, $mailAlert.cover, 'small')|escape:'html'}" alt="">
+              <img src="{$link->getImageLink($mailAlert.link_rewrite, $mailAlert.cover, 'small')|escape:'url'}" alt="">
             </a>
             <div class="product-content">
             <span class="remove">
diff --git a/modules/productscategory/productscategory.tpl b/modules/productscategory/productscategory.tpl
index d01b41c..e1aeb00 100644
--- a/modules/productscategory/productscategory.tpl
+++ b/modules/productscategory/productscategory.tpl
@@ -17,7 +17,7 @@
             >
               {if !empty($lazy_load)}
                 <noscript>
-                  <img src="{$link->getImageLink($categoryProduct.link_rewrite, $categoryProduct.id_image, 'home', null, ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
+                  <img src="{$link->getImageLink($categoryProduct.link_rewrite, $categoryProduct.id_image, 'home', null, ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
                        alt="{$categoryProduct.name|htmlspecialchars}"
                        width="{getWidthSize|intval type='home'}"
                        height="{getHeightSize|intval type='home'}"
@@ -27,13 +27,13 @@
               <picture {if !empty($lazy_load)}class="tb-lazy-image"{/if}>
                 <!--[if IE 9]><video style="display: none;"><![endif]-->
                 {if !empty($webp)}
-                  <source {if !empty($lazy_load)}srcset="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII= 1w" data-{/if}srcset="{$link->getImageLink($categoryProduct.link_rewrite, $categoryProduct.id_image, 'home', 'webp', ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
+                  <source {if !empty($lazy_load)}srcset="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII= 1w" data-{/if}srcset="{$link->getImageLink($categoryProduct.link_rewrite, $categoryProduct.id_image, 'home', 'webp', ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
                           alt="{$categoryProduct.name|htmlspecialchars}"
                           type="image/webp"
                   >
                 {/if}
                 <!--[if IE 9]></video><![endif]-->
-                <img {if !empty($lazy_load)}srcset="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII= 1w" data-{/if}srcset="{$link->getImageLink($categoryProduct.link_rewrite, $categoryProduct.id_image, 'home', null, ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
+                <img {if !empty($lazy_load)}srcset="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII= 1w" data-{/if}srcset="{$link->getImageLink($categoryProduct.link_rewrite, $categoryProduct.id_image, 'home', null, ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
                      {if !empty($lazy_load)}src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII="{/if}
                      alt="{$categoryProduct.name|htmlspecialchars}"
                      width="{getWidthSize|intval type='home'}"
diff --git a/modules/sendtoafriend/sendtoafriend-extra.tpl b/modules/sendtoafriend/sendtoafriend-extra.tpl
index d5f663b..c68efbe 100644
--- a/modules/sendtoafriend/sendtoafriend-extra.tpl
+++ b/modules/sendtoafriend/sendtoafriend-extra.tpl
@@ -12,7 +12,7 @@
           <div class="thumbnail" style="width: {$homeSize.width|intval}px; height: {$homeSize.height|intval}px">
             {if !empty($lazy_load)}
               <noscript>
-                <img src="{$link->getImageLink($stf_product->link_rewrite, $stf_product_cover, 'home', null, ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
+                <img src="{$link->getImageLink($stf_product->link_rewrite, $stf_product_cover, 'home', null, ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
                      alt="{$stf_product->name|escape:'html':'UTF-8'}"
                      width="{getWidthSize|intval type='home'}"
                      height="{getHeightSize|intval type='home'}"
@@ -22,12 +22,12 @@
             <picture class="img-responsive{if !empty($lazy_load)}tb-lazy-image{/if}" style="width: {$homeSize.width|intval}px; height: {$homeSize.height|intval}px">
               <!--[if IE 9]><video style="display: none;"><![endif]-->
               {if !empty($webp)}
-                <source {if !empty($lazy_load)}srcset="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII= 1w" data-{/if}srcset="{$link->getImageLink($stf_product->link_rewrite, $stf_product_cover, 'home', 'webp', ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
+                <source {if !empty($lazy_load)}srcset="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII= 1w" data-{/if}srcset="{$link->getImageLink($stf_product->link_rewrite, $stf_product_cover, 'home', 'webp', ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
                         type="image/webp"
                 >
               {/if}
               <!--[if IE 9]></video><![endif]-->
-              <img {if !empty($lazy_load)}srcset="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII= 1w" data-{/if}srcset="{$link->getImageLink($stf_product->link_rewrite, $stf_product_cover, 'home', null, ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
+              <img {if !empty($lazy_load)}srcset="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII= 1w" data-{/if}srcset="{$link->getImageLink($stf_product->link_rewrite, $stf_product_cover, 'home', null, ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
                    {if !empty($lazy_load)}src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII="{/if}
                    alt="{$stf_product->name|escape:'html':'UTF-8'}"
                    width="{getWidthSize|intval type='home'}"
diff --git a/order-address-product-line.tpl b/order-address-product-line.tpl
index f8c9c7c..988b143 100644
--- a/order-address-product-line.tpl
+++ b/order-address-product-line.tpl
@@ -1,6 +1,6 @@
 <tr id="product_{$product.id_product}_{$product.id_product_attribute}_0_{$product.id_address_delivery|intval}" class="cart_item {if $odd}odd{else}even{/if}">
   <td class="cart_product">
-    <a href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category)|escape:'html':'UTF-8'}"><img src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'small')|escape:'html':'UTF-8'}" alt="{$product.name|escape:'html':'UTF-8'}" width="{getWidthSize|intval type='small'}" height="{getWidthSize|intval type='small'}"></a>
+    <a href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category)|escape:'html':'UTF-8'}"><img src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'small')|escape:'url':'UTF-8'}" alt="{$product.name|escape:'html':'UTF-8'}" width="{getWidthSize|intval type='small'}" height="{getWidthSize|intval type='small'}"></a>
   </td>
   <td class="cart_description">
     <p class="product-name"><a href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category)|escape:'html':'UTF-8'}">{$product.name|escape:'html':'UTF-8'}</a></p>
diff --git a/product-list-item.tpl b/product-list-item.tpl
index be17966..571db28 100644
--- a/product-list-item.tpl
+++ b/product-list-item.tpl
@@ -9,11 +9,11 @@
               {if !empty($lazy_load)}
                 <noscript>
                   <img class="img-responsive center-block"
-                       src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'home', null, ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
+                       src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'home', null, ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
                        srcset="
-                     {$link->getImageLink($product.link_rewrite, $product.id_image, 'home_smallest', null, ImageManager::retinaSupport())|escape:'html':'UTF-8'} 211w,
-                     {$link->getImageLink($product.link_rewrite, $product.id_image, 'home_smaller', null, ImageManager::retinaSupport())|escape:'html':'UTF-8'} 218w,
-                     {$link->getImageLink($product.link_rewrite, $product.id_image, 'home', null, ImageManager::retinaSupport())|escape:'html':'UTF-8'} 250w"
+                     {$link->getImageLink($product.link_rewrite, $product.id_image, 'home_smallest', null, ImageManager::retinaSupport())|escape:'url':'UTF-8'} 211w,
+                     {$link->getImageLink($product.link_rewrite, $product.id_image, 'home_smaller', null, ImageManager::retinaSupport())|escape:'url':'UTF-8'} 218w,
+                     {$link->getImageLink($product.link_rewrite, $product.id_image, 'home', null, ImageManager::retinaSupport())|escape:'url':'UTF-8'} 250w"
                        sizes="(min-width: 1200px) 250px, (min-width: 992px) 218px, (min-width: 768px) 211px, 250px"
                        alt="{if !empty($product.legend)}{$product.legend|escape:'html':'UTF-8'}{else}{$product.name|escape:'html':'UTF-8'}{/if}"
                        title="{if !empty($product.legend)}{$product.legend|escape:'html':'UTF-8'}{else}{$product.name|escape:'html':'UTF-8'}{/if}"
@@ -28,9 +28,9 @@
                 {if !empty($webp)}
                   <source class="img-responsive center-block"
                           {if !empty($lazy_load)}srcset="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII= 1w" data-{/if}srcset="
-                          {$link->getImageLink($product.link_rewrite, $product.id_image, 'home_smallest', 'webp', ImageManager::retinaSupport())|escape:'html':'UTF-8'} 211w,
-                          {$link->getImageLink($product.link_rewrite, $product.id_image, 'home_smaller', 'webp', ImageManager::retinaSupport())|escape:'html':'UTF-8'} 218w,
-                          {$link->getImageLink($product.link_rewrite, $product.id_image, 'home', 'webp', ImageManager::retinaSupport())|escape:'html':'UTF-8'} 250w"
+                          {$link->getImageLink($product.link_rewrite, $product.id_image, 'home_smallest', 'webp', ImageManager::retinaSupport())|escape:'url':'UTF-8'} 211w,
+                          {$link->getImageLink($product.link_rewrite, $product.id_image, 'home_smaller', 'webp', ImageManager::retinaSupport())|escape:'url':'UTF-8'} 218w,
+                          {$link->getImageLink($product.link_rewrite, $product.id_image, 'home', 'webp', ImageManager::retinaSupport())|escape:'url':'UTF-8'} 250w"
                           sizes="(min-width: 1200px) 250px, (min-width: 992px) 218px, (min-width: 768px) 211px, 250px"
                           title="{if !empty($product.legend)}{$product.legend|escape:'html':'UTF-8'}{else}{$product.name|escape:'html':'UTF-8'}{/if}"
                           type="image/webp"
@@ -42,9 +42,9 @@
                 <img class="img-responsive center-block"
                      {if !empty($lazy_load)}src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII="{/if}
                      {if !empty($lazy_load)}srcset="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII= 1w" data-{/if}srcset="
-                     {$link->getImageLink($product.link_rewrite, $product.id_image, 'home_smallest', null, ImageManager::retinaSupport())|escape:'html':'UTF-8'} 211w,
-                     {$link->getImageLink($product.link_rewrite, $product.id_image, 'home_smaller', null, ImageManager::retinaSupport())|escape:'html':'UTF-8'} 218w,
-                     {$link->getImageLink($product.link_rewrite, $product.id_image, 'home', null, ImageManager::retinaSupport())|escape:'html':'UTF-8'} 250w"
+                     {$link->getImageLink($product.link_rewrite, $product.id_image, 'home_smallest', null, ImageManager::retinaSupport())|escape:'url':'UTF-8'} 211w,
+                     {$link->getImageLink($product.link_rewrite, $product.id_image, 'home_smaller', null, ImageManager::retinaSupport())|escape:'url':'UTF-8'} 218w,
+                     {$link->getImageLink($product.link_rewrite, $product.id_image, 'home', null, ImageManager::retinaSupport())|escape:'url':'UTF-8'} 250w"
                      sizes="(min-width: 1200px) 250px, (min-width: 992px) 218px, (min-width: 768px) 211px, 250px"
                      alt="{if !empty($product.legend)}{$product.legend|escape:'html':'UTF-8'}{else}{$product.name|escape:'html':'UTF-8'}{/if}"
                      title="{if !empty($product.legend)}{$product.legend|escape:'html':'UTF-8'}{else}{$product.name|escape:'html':'UTF-8'}{/if}"
diff --git a/product.tpl b/product.tpl
index 2d6fbba..8af058d 100644
--- a/product.tpl
+++ b/product.tpl
@@ -60,7 +60,7 @@
               <noscript>
                 <img class="img-responsive center-block"
                      itemprop="image"
-                     src="{$link->getImageLink($product->link_rewrite, $cover.id_image, 'large', null, ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
+                     src="{$link->getImageLink($product->link_rewrite, $cover.id_image, 'large', null, ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
                      title="{if !empty($cover.legend)}{$cover.legend|escape:'html':'UTF-8'}{else}{$product->name|escape:'html':'UTF-8'}{/if}"
                      alt="{if !empty($cover.legend)}{$cover.legend|escape:'html':'UTF-8'}{else}{$product->name|escape:'html':'UTF-8'}{/if}"
                      width="{$largeDefaultWidth|intval}"
@@ -72,7 +72,7 @@
                 {if !empty($webp)}
                   <source class="img-responsive center-block"
                        itemprop="image"
-                       srcset="{$link->getImageLink($product->link_rewrite, $cover.id_image, 'large', 'webp', ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
+                       srcset="{$link->getImageLink($product->link_rewrite, $cover.id_image, 'large', 'webp', ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
                        title="{if !empty($cover.legend)}{$cover.legend|escape:'html':'UTF-8'}{else}{$product->name|escape:'html':'UTF-8'}{/if}"
                        type="image/webp"
                   >
@@ -81,7 +81,7 @@
                 <img class="img-responsive center-block"
                      itemprop="image"
                      src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII="
-                     srcset="{$link->getImageLink($product->link_rewrite, $cover.id_image, 'large', null, ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
+                     srcset="{$link->getImageLink($product->link_rewrite, $cover.id_image, 'large', null, ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
                      title="{if !empty($cover.legend)}{$cover.legend|escape:'html':'UTF-8'}{else}{$product->name|escape:'html':'UTF-8'}{/if}"
                      alt="{if !empty($cover.legend)}{$cover.legend|escape:'html':'UTF-8'}{else}{$product->name|escape:'html':'UTF-8'}{/if}"
                      width="{$largeDefaultWidth|intval}"
@@ -99,7 +99,7 @@
               <noscript>
                 <img class="img-responsive center-block"
                      itemprop="image"
-                     src="{$img_prod_dir|escape:'html':'UTF-8'}{$lang_iso|escape:'html':'UTF-8'}-default-large.jpg"
+                     src="{$img_prod_dir|escape:'url':'UTF-8'}{$lang_iso|escape:'url':'UTF-8'}-default-large.jpg"
                      title="{$product->name|escape:'html':'UTF-8'}"
                      width="{$largeDefaultWidth|intval}"
                      height="{$largeDefaultHeight|intval}"
@@ -110,7 +110,7 @@
                 {if (!empty($webp))}
                   <source class="img-responsive center-block"
                           itemprop="image"
-                          srcset="{$img_prod_dir|escape:'html':'UTF-8'}{$lang_iso|escape:'html':'UTF-8'}-default-large.webp"
+                          srcset="{$img_prod_dir|escape:'url':'UTF-8'}{$lang_iso|escape:'url':'UTF-8'}-default-large.webp"
                           title="{$product->name|escape:'html':'UTF-8'}"
                           type="image/webp"
                   >
@@ -118,8 +118,8 @@
                 <!--[if IE 9]></video><![endif]-->
                 <img class="img-responsive center-block"
                      itemprop="image"
-                     src="{$img_prod_dir|escape:'html':'UTF-8'}{$lang_iso|escape:'html':'UTF-8'}-default-large.jpg"
-                     srcset="{$img_prod_dir|escape:'html':'UTF-8'}{$lang_iso|escape:'html':'UTF-8'}-default-large.jpg"
+                     src="{$img_prod_dir|escape:'url':'UTF-8'}{$lang_iso|escape:'url':'UTF-8'}-default-large.jpg"
+                     srcset="{$img_prod_dir|escape:'url':'UTF-8'}{$lang_iso|escape:'url':'UTF-8'}-default-large.jpg"
                      title="{$product->name|escape:'html':'UTF-8'}"
                      width="{$largeDefaultWidth|intval}"
                      height="{$largeDefaultHeight|intval}"
@@ -155,7 +155,7 @@
                         >
                           <noscript>
                             <img class="img-responsive"
-                                 src="{$link->getImageLink($product->link_rewrite, $image.id_image, 'cart', null, ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
+                                 src="{$link->getImageLink($product->link_rewrite, $image.id_image, 'cart', null, ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
                                  alt="{$imageTitle|escape:'htmlall':'UTF-8'}"
                                  title="{$imageTitle|escape:'htmlall':'UTF-8'}"
                                  itemprop="image"
@@ -166,14 +166,14 @@
                           <picture class="img-responsive" id="thumb_{$image.id_image|intval}">
                             <!--[if IE 9]><video style="display: none;"><![endif]-->
                             {if !empty($webp)}
-                              <source srcset="{$link->getImageLink($product->link_rewrite, $image.id_image, 'cart', 'webp', ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
+                              <source srcset="{$link->getImageLink($product->link_rewrite, $image.id_image, 'cart', 'webp', ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
                                       title="{$imageTitle|escape:'htmlall':'UTF-8'}"
                                       itemprop="image"
                                       type="image/webp"
                               >
                             {/if}
                             <!--[if IE 9]></video><![endif]-->
-                            <img src="{$link->getImageLink($product->link_rewrite, $image.id_image, 'cart', null, ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
+                            <img src="{$link->getImageLink($product->link_rewrite, $image.id_image, 'cart', null, ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
                                  alt="{$imageTitle|escape:'htmlall':'UTF-8'}"
                                  title="{$imageTitle|escape:'htmlall':'UTF-8'}"
                                  itemprop="image"
@@ -192,8 +192,8 @@
                           {if !empty($lazy_load)}
                             <noscript>
                               <img class="img-responsive"
-                                   src="{$link->getImageLink($product->link_rewrite, $image.id_image, 'cart', null, ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
-                                   srcset="{$link->getImageLink($product->link_rewrite, $image.id_image, 'cart', null, ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
+                                   src="{$link->getImageLink($product->link_rewrite, $image.id_image, 'cart', null, ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
+                                   srcset="{$link->getImageLink($product->link_rewrite, $image.id_image, 'cart', null, ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
                                    alt="{$imageTitle|escape:'htmlall':'UTF-8'}"
                                    title="{$imageTitle|escape:'htmlall':'UTF-8'}"
                                    itemprop="image"
@@ -205,15 +205,15 @@
                           <picture class="img-responsive" id="thumb_{$image.id_image|intval}">
                             <!--[if IE 9]><video style="display: none;"><![endif]-->
                             {if !empty($webp)}
-                              <source srcset="{$link->getImageLink($product->link_rewrite, $image.id_image, 'cart', 'webp', ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
+                              <source srcset="{$link->getImageLink($product->link_rewrite, $image.id_image, 'cart', 'webp', ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
                                       title="{$imageTitle}"
                                       itemprop="image"
                                       type="image/webp"
                               >
                             {/if}
                             <!--[if IE 9]></video><![endif]-->
-                            <img src="{$link->getImageLink($product->link_rewrite, $image.id_image, 'cart', null, ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
-                                 srcset="{$link->getImageLink($product->link_rewrite, $image.id_image, 'cart', null, ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
+                            <img src="{$link->getImageLink($product->link_rewrite, $image.id_image, 'cart', null, ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
+                                 srcset="{$link->getImageLink($product->link_rewrite, $image.id_image, 'cart', null, ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
                                  alt="{$imageTitle}"
                                  title="{$imageTitle}"
                                  itemprop="image"
diff --git a/products-comparison.tpl b/products-comparison.tpl
index 5dbdcda..5e40edd 100644
--- a/products-comparison.tpl
+++ b/products-comparison.tpl
@@ -22,7 +22,7 @@
               <a class="product_image" href="{$product->getLink()|escape:'html':'UTF-8'}" title="{$product->name|escape:'html':'UTF-8'}">
                 {if !empty($lazy_load)}
                   <noscript>
-                    <img src="{$link->getImageLink($product->link_rewrite, $product->id_image, 'home', null, ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
+                    <img src="{$link->getImageLink($product->link_rewrite, $product->id_image, 'home', null, ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
                          width="{getWidthSize|intval type='home'}"
                          height="{getHeightSize|intval type='home'}"
                     >
@@ -31,12 +31,12 @@
                 <picture class="img-responsive center-block{if !empty($lazy_load)} tb-lazy-image{/if}">
                   <!--[if IE 9]><video style="display: none;"><![endif]-->
                   {if !empty($webp)}
-                    <source {if !empty($lazy_load)}srcset="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII= 1w" data-{/if}srcset="{$link->getImageLink($product->link_rewrite, $product->id_image, 'home', 'webp', ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
+                    <source {if !empty($lazy_load)}srcset="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII= 1w" data-{/if}srcset="{$link->getImageLink($product->link_rewrite, $product->id_image, 'home', 'webp', ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
                             type="image/webp"
                     >
                   {/if}
                   <!--[if IE 9]></video><![endif]-->
-                  <img {if !empty($lazy_load)}srcset="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII= 1w" data-{/if}srcset="{$link->getImageLink($product->link_rewrite, $product->id_image, 'home', null, ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
+                  <img {if !empty($lazy_load)}srcset="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII= 1w" data-{/if}srcset="{$link->getImageLink($product->link_rewrite, $product->id_image, 'home', null, ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
                        {if !empty($lazy_load)}src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII="{/if}
                        width="{getWidthSize|intval type='home'}"
                        height="{getHeightSize|intval type='home'}"
diff --git a/scenes.tpl b/scenes.tpl
index 99e78ba..93eb493 100644
--- a/scenes.tpl
+++ b/scenes.tpl
@@ -26,7 +26,7 @@
                 {if isset($imageIds)}
                   {if !empty($lazy_load)}
                     <noscript>
-                      <img src="{$link->getImageLink($product.id_product, $imageIds, 'home', null, ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
+                      <img src="{$link->getImageLink($product.id_product, $imageIds, 'home', null, ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
                            alt=""
                            width="{getWidthSize|intval type='home'}"
                            height="{getWidthSize|intval type='home'}"
@@ -36,12 +36,12 @@
                   <picture class="img-responsive{if !empty($lazy_load)} tb-lazy-image{/if}">
                     <!--[if IE 9]><video style="display: none;"><![endif]-->
                     {if !empty($webp)}
-                      <source {if !empty($lazy_load)}srcset="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII= 1w" data-{/if}srcset="{$link->getImageLink($product.id_product, $imageIds, 'home', 'webp', ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
+                      <source {if !empty($lazy_load)}srcset="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII= 1w" data-{/if}srcset="{$link->getImageLink($product.id_product, $imageIds, 'home', 'webp', ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
                               type="image/webp"
                       >
                     {/if}
                     <!--[if IE 9]></video><![endif]-->
-                    <img {if !empty($lazy_load)}srcset="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII= 1w" data-{/if}srcset="{$link->getImageLink($product.id_product, $imageIds, 'home', null, ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
+                    <img {if !empty($lazy_load)}srcset="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII= 1w" data-{/if}srcset="{$link->getImageLink($product.id_product, $imageIds, 'home', null, ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
                          {if !empty($lazy_load)}src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII="{/if}
                          alt=""
                          width="{getWidthSize|intval type='home'}"
diff --git a/shopping-cart-product-line.tpl b/shopping-cart-product-line.tpl
index 6ae24d4..47f59a7 100644
--- a/shopping-cart-product-line.tpl
+++ b/shopping-cart-product-line.tpl
@@ -3,7 +3,7 @@
     <a href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category, null, null, $product.id_shop, $product.id_product_attribute, false, false, true)|escape:'html':'UTF-8'}">
       {if !empty($lazy_load)}
         <noscript>
-          <img src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'small', null, ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
+          <img src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'small', null, ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
                alt="{$product.name|escape:'html':'UTF-8'}"
                width="{getWidthSize|intval type='small'}"
                height="{getHeightSize|intval type='small'}"
@@ -13,13 +13,13 @@
       <picture {if !empty($lazy_load)}class="tb-lazy-image"{/if}>
         <!--[if IE 9]><video style="display: none;"><![endif]-->
         {if !empty($webp)}
-          <source {if !empty($lazy_load)}srcset="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII= 1w" data-{/if}srcset="{$link->getImageLink($product.link_rewrite, $product.id_image, 'small', 'webp', ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
+          <source {if !empty($lazy_load)}srcset="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII= 1w" data-{/if}srcset="{$link->getImageLink($product.link_rewrite, $product.id_image, 'small', 'webp', ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
                   alt="{$product.name|escape:'html':'UTF-8'}"
                   type="image/webp"
           >
         {/if}
         <!--[if IE 9]></video><![endif]-->
-        <img {if !empty($lazy_load)}srcset="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII= 1w" data-{/if}srcset="{$link->getImageLink($product.link_rewrite, $product.id_image, 'small', null, ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
+        <img {if !empty($lazy_load)}srcset="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII= 1w" data-{/if}srcset="{$link->getImageLink($product.link_rewrite, $product.id_image, 'small', null, ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
              {if !empty($lazy_load)}src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII="{/if}
              alt="{$product.name|escape:'html':'UTF-8'}"
              width="{getWidthSize|intval type='small'}"
diff --git a/shopping-cart.tpl b/shopping-cart.tpl
index a84d430..027aa9a 100644
--- a/shopping-cart.tpl
+++ b/shopping-cart.tpl
@@ -32,7 +32,7 @@
         <div class="left">{l s='Last product added'}</div>
       </div>
       <a class="cart_last_product_img" href="{$link->getProductLink($lastProductAdded.id_product, $lastProductAdded.link_rewrite, $lastProductAdded.category, null, null, $lastProductAdded.id_shop)|escape:'html':'UTF-8'}">
-        <img src="{$link->getImageLink($lastProductAdded.link_rewrite, $lastProductAdded.id_image, 'small')|escape:'html':'UTF-8'}" alt="{$lastProductAdded.name|escape:'html':'UTF-8'}">
+        <img src="{$link->getImageLink($lastProductAdded.link_rewrite, $lastProductAdded.id_image, 'small')|escape:'url':'UTF-8'}" alt="{$lastProductAdded.name|escape:'html':'UTF-8'}">
       </a>
       <div class="cart_last_product_content">
         <p class="product-name">
diff --git a/templates/product/product-wide.tpl b/templates/product/product-wide.tpl
index 8241a19..57857ab 100644
--- a/templates/product/product-wide.tpl
+++ b/templates/product/product-wide.tpl
@@ -64,7 +64,7 @@
               <noscript>
                 <img class="img-responsive center-block"
                      itemprop="image"
-                     src="{$link->getImageLink($product->link_rewrite, $cover.id_image, 'product_wide', null, ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
+                     src="{$link->getImageLink($product->link_rewrite, $cover.id_image, 'product_wide', null, ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
                      title="{if !empty($cover.legend)}{$cover.legend|escape:'html':'UTF-8'}{else}{$product->name|escape:'html':'UTF-8'}{/if}"
                      alt="{if !empty($cover.legend)}{$cover.legend|escape:'html':'UTF-8'}{else}{$product->name|escape:'html':'UTF-8'}{/if}"
                      width="{$largeDefaultWidth|intval}"
@@ -76,7 +76,7 @@
                 {if !empty($webp)}
                   <source class="img-responsive center-block"
                        itemprop="image"
-                       srcset="{$link->getImageLink($product->link_rewrite, $cover.id_image, 'product_wide', 'webp', ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
+                       srcset="{$link->getImageLink($product->link_rewrite, $cover.id_image, 'product_wide', 'webp', ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
                        title="{if !empty($cover.legend)}{$cover.legend|escape:'html':'UTF-8'}{else}{$product->name|escape:'html':'UTF-8'}{/if}"
                        type="image/webp"
                   >
@@ -85,7 +85,7 @@
                 <img class="img-responsive center-block"
                      itemprop="image"
                      src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII="
-                     srcset="{$link->getImageLink($product->link_rewrite, $cover.id_image, 'product_wide', null, ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
+                     srcset="{$link->getImageLink($product->link_rewrite, $cover.id_image, 'product_wide', null, ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
                      title="{if !empty($cover.legend)}{$cover.legend|escape:'html':'UTF-8'}{else}{$product->name|escape:'html':'UTF-8'}{/if}"
                      alt="{if !empty($cover.legend)}{$cover.legend|escape:'html':'UTF-8'}{else}{$product->name|escape:'html':'UTF-8'}{/if}"
                      width="{$largeDefaultWidth|intval}"
@@ -103,7 +103,7 @@
               <noscript>
                 <img class="img-responsive center-block"
                      itemprop="image"
-                     src="{$img_prod_dir|escape:'html':'UTF-8'}{$lang_iso|escape:'html':'UTF-8'}-default-product_wide.jpg"
+                     src="{$img_prod_dir|escape:'url':'UTF-8'}{$lang_iso|escape:'url':'UTF-8'}-default-product_wide.jpg"
                      title="{$product->name|escape:'html':'UTF-8'}"
                      width="{$largeDefaultWidth|intval}"
                      height="{$largeDefaultHeight|intval}"
@@ -114,7 +114,7 @@
                 {if (!empty($webp))}
                   <source class="img-responsive center-block"
                           itemprop="image"
-                          srcset="{$img_prod_dir|escape:'html':'UTF-8'}{$lang_iso|escape:'html':'UTF-8'}-default-product_wide.webp"
+                          srcset="{$img_prod_dir|escape:'url':'UTF-8'}{$lang_iso|escape:'url':'UTF-8'}-default-product_wide.webp"
                           title="{$product->name|escape:'html':'UTF-8'}"
                           type="image/webp"
                   >
@@ -122,8 +122,8 @@
                 <!--[if IE 9]></video><![endif]-->
                 <img class="img-responsive center-block"
                      itemprop="image"
-                     src="{$img_prod_dir|escape:'html':'UTF-8'}{$lang_iso|escape:'html':'UTF-8'}-default-product_wide.jpg"
-                     srcset="{$img_prod_dir|escape:'html':'UTF-8'}{$lang_iso|escape:'html':'UTF-8'}-default-product_wide.jpg"
+                     src="{$img_prod_dir|escape:'url':'UTF-8'}{$lang_iso|escape:'url':'UTF-8'}-default-product_wide.jpg"
+                     srcset="{$img_prod_dir|escape:'url':'UTF-8'}{$lang_iso|escape:'url':'UTF-8'}-default-product_wide.jpg"
                      title="{$product->name|escape:'html':'UTF-8'}"
                      width="{$largeDefaultWidth|intval}"
                      height="{$largeDefaultHeight|intval}"
@@ -160,7 +160,7 @@
                         >
                           <noscript>
                             <img class="img-responsive"
-                                 src="{$link->getImageLink($product->link_rewrite, $imageIds, 'cart', null, ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
+                                 src="{$link->getImageLink($product->link_rewrite, $imageIds, 'cart', null, ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
                                  alt="{$imageTitle|escape:'htmlall':'UTF-8'}"
                                  title="{$imageTitle|escape:'htmlall':'UTF-8'}"
                                  itemprop="image"
@@ -171,14 +171,14 @@
                           <picture class="img-responsive" id="thumb_{$image.id_image|intval}">
                             <!--[if IE 9]><video style="display: none;"><![endif]-->
                             {if !empty($webp)}
-                              <source srcset="{$link->getImageLink($product->link_rewrite, $imageIds, 'cart', 'webp', ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
+                              <source srcset="{$link->getImageLink($product->link_rewrite, $imageIds, 'cart', 'webp', ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
                                       title="{$imageTitle|escape:'htmlall':'UTF-8'}"
                                       itemprop="image"
                                       type="image/webp"
                               >
                             {/if}
                             <!--[if IE 9]></video><![endif]-->
-                            <img src="{$link->getImageLink($product->link_rewrite, $imageIds, 'cart', null, ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
+                            <img src="{$link->getImageLink($product->link_rewrite, $imageIds, 'cart', null, ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
                                  alt="{$imageTitle|escape:'htmlall':'UTF-8'}"
                                  title="{$imageTitle|escape:'htmlall':'UTF-8'}"
                                  itemprop="image"
@@ -197,8 +197,8 @@
                           {if !empty($lazy_load)}
                             <noscript>
                               <img class="img-responsive"
-                                   src="{$link->getImageLink($product->link_rewrite, $imageIds, 'cart', null, ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
-                                   srcset="{$link->getImageLink($product->link_rewrite, $imageIds, 'cart', null, ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
+                                   src="{$link->getImageLink($product->link_rewrite, $imageIds, 'cart', null, ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
+                                   srcset="{$link->getImageLink($product->link_rewrite, $imageIds, 'cart', null, ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
                                    alt="{$imageTitle|escape:'htmlall':'UTF-8'}"
                                    title="{$imageTitle|escape:'htmlall':'UTF-8'}"
                                    itemprop="image"
@@ -210,15 +210,15 @@
                           <picture class="img-responsive" id="thumb_{$image.id_image|intval}">
                             <!--[if IE 9]><video style="display: none;"><![endif]-->
                             {if !empty($webp)}
-                              <source srcset="{$link->getImageLink($product->link_rewrite, $imageIds, 'cart', 'webp', ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
+                              <source srcset="{$link->getImageLink($product->link_rewrite, $imageIds, 'cart', 'webp', ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
                                       title="{$imageTitle}"
                                       itemprop="image"
                                       type="image/webp"
                               >
                             {/if}
                             <!--[if IE 9]></video><![endif]-->
-                            <img src="{$link->getImageLink($product->link_rewrite, $imageIds, 'cart', null, ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
-                                 srcset="{$link->getImageLink($product->link_rewrite, $imageIds, 'cart', null, ImageManager::retinaSupport())|escape:'html':'UTF-8'}"
+                            <img src="{$link->getImageLink($product->link_rewrite, $imageIds, 'cart', null, ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
+                                 srcset="{$link->getImageLink($product->link_rewrite, $imageIds, 'cart', null, ImageManager::retinaSupport())|escape:'url':'UTF-8'}"
                                  alt="{$imageTitle}"
                                  title="{$imageTitle}"
                                  itemprop="image"