diff --git a/modules/blockwishlist/views/templates/hook/displayCustomerAccount.tpl b/modules/blockwishlist/views/templates/hook/displayCustomerAccount.tpl
new file mode 100644
index 0000000..579baf7
--- /dev/null
+++ b/modules/blockwishlist/views/templates/hook/displayCustomerAccount.tpl
@@ -0,0 +1,26 @@
+
+{**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License version 3.0
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/AFL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
+ *}
+
+<a class="w-full md:w-1/3 lg:w-1/5 flex flex-col p-4 border-gray-500" id="wishlist-link" href="{$url}">
+  <span class="flex flex-col items-center font-semibolds text-lg">
+    <svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-heart" width="32" height="32" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M19.5 12.572l-7.5 7.428l-7.5 -7.428a5 5 0 1 1 7.5 -6.566a5 5 0 1 1 7.5 6.572" /></svg>
+    {$wishlistsTitlePage}
+  </span>
+</a>
diff --git a/modules/ps_newproducts/views/templates/hook/ps_newproducts.tpl b/modules/ps_newproducts/views/templates/hook/ps_newproducts.tpl
index 0bb9779..4b895e0 100644
--- a/modules/ps_newproducts/views/templates/hook/ps_newproducts.tpl
+++ b/modules/ps_newproducts/views/templates/hook/ps_newproducts.tpl
@@ -22,18 +22,17 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
  * International Registered Trademark & Property of PrestaShop SA
  *}
-
-<section class="featured-products clearfix mt-3">
-  <h2 class="h2 products-section-title text-uppercase">
+<section class="featured-products flex flex-col gap-8">
+  <h2 class="products-section-title text-2xl font-bold">
     {l s='New products' d='Shop.Theme.Catalog'}
   </h2>
-  <div class="products">
+  <div class="products flex flex-wrap">
     {foreach from=$products item="product"}
       {include file="catalog/_partials/miniatures/product.tpl" product=$product}
     {/foreach}
   </div>
-  <a class="all-product-link float-xs-left float-md-right h4" href="{$allNewProductsLink}">
-    {l s='All new products' d='Shop.Theme.Catalog'}<i class="material-icons">&#xE315;</i>
+  <a class="all-product-link text-2xl font-bold" href="{$allNewProductsLink}">
+    {l s='All new products' d='Shop.Theme.Catalog'}
   </a>
 </section>
 
diff --git a/templates/catalog/_partials/product-cover-thumbnails.tpl b/templates/catalog/_partials/product-cover-thumbnails.tpl
index aaf8111..396d329 100644
--- a/templates/catalog/_partials/product-cover-thumbnails.tpl
+++ b/templates/catalog/_partials/product-cover-thumbnails.tpl
@@ -22,15 +22,15 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
  * International Registered Trademark & Property of PrestaShop SA
  *}
-<div class="images-container flex flex-row-reverse justify-center gap-6 flex-wrap lg:flex-nowrap">
+<div class="images-container flex w-full flex-row-reverse justify-center gap-6 flex-wrap lg:flex-nowrap">
   {block name='product_cover'}
-    <div class="product-cover">
-        <img class="js-qv-product-cover max-w-2xl bg-gray-100" src="{$product.cover.bySize.large_default.url}" alt="{$product.cover.legend}" title="{$product.cover.legend}" style="width:100%;" itemprop="image">
+    <div class="product-cover w-full">
+        <img class="js-qv-product-cover w-full bg-gray-100" src="{$product.cover.bySize.large_default.url}" alt="{$product.cover.legend}" title="{$product.cover.legend}" itemprop="image">
     </div>
   {/block}
 
   {block name='product_images'}
-    <div class="js-qv-mask mask"" >
+    <div class="js-qv-mask mask" >
       <ul class="product-images js-qv-product-images flex flex-row lg:flex-col gap-6">
         {foreach from=$product.images item=image}
           <li class="thumb-container w-14 md:w-24">
diff --git a/templates/customer/_partials/block-address.tpl b/templates/customer/_partials/block-address.tpl
index 433672d..04ecf13 100644
--- a/templates/customer/_partials/block-address.tpl
+++ b/templates/customer/_partials/block-address.tpl
@@ -23,23 +23,21 @@
  * International Registered Trademark & Property of PrestaShop SA
  *}
 {block name='address_block_item'}
-  <article id="address-{$address.id}" class="address" data-id-address="{$address.id}">
+  <div id="address-{$address.id}" class="flex items-center gap-8" data-id-address="{$address.id}">
     <div class="address-body">
-      <h4>{$address.alias}</h4>
+      <h4 class="font-semibold text-lg">{$address.alias}</h4>
       <address>{$address.formatted nofilter}</address>
     </div>
 
     {block name='address_block_item_actions'}
-      <div class="address-footer">
-        <a href="{url entity=address id=$address.id}" data-link-action="edit-address">
-          <i class="material-icons">&#xE254;</i>
-          <span>{l s='Update' d='Shop.Theme.Actions'}</span>
+      <div class="address-footer flex gap-2">
+        <a href="{url entity=address id=$address.id}" data-link-action="edit-address" >
+          <svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-pencil" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M4 20h4l10.5 -10.5a2.828 2.828 0 1 0 -4 -4l-10.5 10.5v4" /><path d="M13.5 6.5l4 4" /></svg>
         </a>
-        <a href="{url entity=address id=$address.id params=['delete' => 1, 'token' => $token]}" data-link-action="delete-address">
-          <i class="material-icons">&#xE872;</i>
-          <span>{l s='Delete' d='Shop.Theme.Actions'}</span>
+        <a href="{url entity=address id=$address.id params=['delete' => 1, 'token' => $token]}" data-link-action="delete-address" >
+          <svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-trash" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M4 7l16 0" /><path d="M10 11l0 6" /><path d="M14 11l0 6" /><path d="M5 7l1 12a2 2 0 0 0 2 2h8a2 2 0 0 0 2 -2l1 -12" /><path d="M9 7v-3a1 1 0 0 1 1 -1h4a1 1 0 0 1 1 1v3" /></svg>
         </a>
       </div>
     {/block}
-  </article>
+  </div>
 {/block}
diff --git a/templates/customer/_partials/my-account-links.tpl b/templates/customer/_partials/my-account-links.tpl
index 1892017..e2bdbf8 100644
--- a/templates/customer/_partials/my-account-links.tpl
+++ b/templates/customer/_partials/my-account-links.tpl
@@ -23,12 +23,14 @@
  * International Registered Trademark & Property of PrestaShop SA
  *}
 {block name='my_account_links'}
-  <a href="{$urls.pages.my_account}" class="account-link">
-    <i class="material-icons">&#xE5CB;</i>
+<div class='flex gap-8 my-8 items-center'>
+  <a href="{$urls.pages.my_account}" class="flex gap-2 items-center">
+    <svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-arrow-left" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M5 12l14 0" /><path d="M5 12l6 6" /><path d="M5 12l6 -6" /></svg>
     <span>{l s='Back to your account' d='Shop.Theme.Customeraccount'}</span>
   </a>
-  <a href="{$urls.pages.index}" class="account-link">
-    <i class="material-icons">&#xE88A;</i>
+  <a href="{$urls.pages.index}" class="flex gap-2 items-center">
+    <svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-home" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M5 12l-2 0l9 -9l9 9l-2 0" /><path d="M5 12v7a2 2 0 0 0 2 2h10a2 2 0 0 0 2 -2v-7" /><path d="M9 21v-6a2 2 0 0 1 2 -2h2a2 2 0 0 1 2 2v6" /></svg>
     <span>{l s='Home' d='Shop.Theme.Global'}</span>
   </a>
+</div>
 {/block}
diff --git a/templates/customer/addresses.tpl b/templates/customer/addresses.tpl
index 8d59bc7..e6121c9 100644
--- a/templates/customer/addresses.tpl
+++ b/templates/customer/addresses.tpl
@@ -25,21 +25,25 @@
 {extends file='customer/page.tpl'}
 
 {block name='page_title'}
-  {l s='Your addresses' d='Shop.Theme.Customeraccount'}
+  <h2 class="products-section-title text-2xl font-bold mb-8">
+    {l s='Your addresses' d='Shop.Theme.Customeraccount'}
+  </h2>
 {/block}
 
 {block name='page_content'}
-  {foreach $customer.addresses as $address}
-    <div class="col-lg-4 col-md-6 col-sm-6">
-    {block name='customer_address'}
-      {include file='customer/_partials/block-address.tpl' address=$address}
-    {/block}
-    </div>
-  {/foreach}
+  <div class="flex w-full flex-wrap">
+    {foreach $customer.addresses as $address}
+      <div class="w-full md:w-1/2 lg:w-1/4">
+      {block name='customer_address'}
+        {include file='customer/_partials/block-address.tpl' address=$address}
+      {/block}
+      </div>
+    {/foreach}
+  </div>
   <div class="clearfix"></div>
   <div class="addresses-footer">
-    <a href="{$urls.pages.address}" data-link-action="add-address">
-      <i class="material-icons">&#xE145;</i>
+    <a href="{$urls.pages.address}" data-link-action="add-address" class="flex flex-col items-center">
+      <svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-pencil-plus" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M4 20h4l10.5 -10.5a2.828 2.828 0 1 0 -4 -4l-10.5 10.5v4" /><path d="M13.5 6.5l4 4" /><path d="M16 19h6" /><path d="M19 16v6" /></svg>
       <span>{l s='Create new address' d='Shop.Theme.Actions'}</span>
     </a>
   </div>
diff --git a/templates/customer/history.tpl b/templates/customer/history.tpl
index 422757f..63b36d3 100644
--- a/templates/customer/history.tpl
+++ b/templates/customer/history.tpl
@@ -25,95 +25,69 @@
 {extends file='customer/page.tpl'}
 
 {block name='page_title'}
-  {l s='Order history' d='Shop.Theme.Customeraccount'}
+  <h2 class="text-2xl font-bold mb-8">
+    {l s='Order history' d='Shop.Theme.Customeraccount'}
+  </h2>
 {/block}
 
 {block name='page_content'}
-  <h6>{l s='Here are the orders you\'ve placed since your account was created.' d='Shop.Theme.Customeraccount'}</h6>
+  <h6 class='text-lg'>{l s='Here are the orders you\'ve placed since your account was created.' d='Shop.Theme.Customeraccount'}</h6>
 
   {if $orders}
-    <table class="table table-striped table-bordered table-labeled hidden-sm-down">
+    <table class="mt-2 w-full">
       <thead class="thead-default">
         <tr>
           <th>{l s='Order reference' d='Shop.Theme.Checkout'}</th>
           <th>{l s='Date' d='Shop.Theme.Checkout'}</th>
           <th>{l s='Total price' d='Shop.Theme.Checkout'}</th>
-          <th class="hidden-md-down">{l s='Payment' d='Shop.Theme.Checkout'}</th>
-          <th class="hidden-md-down">{l s='Status' d='Shop.Theme.Checkout'}</th>
-          <th>{l s='Invoice' d='Shop.Theme.Checkout'}</th>
+          <th class="max-md:hidden">{l s='Payment' d='Shop.Theme.Checkout'}</th>
+          <th>{l s='Status' d='Shop.Theme.Checkout'}</th>
+          <th class="max-md:hidden">{l s='Invoice' d='Shop.Theme.Checkout'}</th>
           <th>&nbsp;</th>
         </tr>
       </thead>
       <tbody>
         {foreach from=$orders item=order}
-          <tr>
-            <th scope="row">{$order.details.reference}</th>
-            <td>{$order.details.order_date}</td>
-            <td class="text-xs-right">{$order.totals.total.value}</td>
-            <td class="hidden-md-down">{$order.details.payment}</td>
-            <td>
-              <span
-                class="label label-pill {$order.history.current.contrast}"
-                style="background-color:{$order.history.current.color}"
-              >
+          <tr class="even:bg-gray-200 text-sm md:text-base">
+            <td class="text-center">{$order.details.reference}</th>
+            <td class="text-center">{$order.details.order_date}</td>
+            <td class="text-center">{$order.totals.total.value}</td>
+            <td class="text-center max-md:hidden">{$order.details.payment}</td>
+            <td class="text-center max-md:px-2">
                 {$order.history.current.ostate_name}
-              </span>
             </td>
-            <td class="text-sm-center hidden-md-down">
+            <td class="text-center max-md:hidden">
               {if $order.details.invoice_url}
-                <a href="{$order.details.invoice_url}"><i class="material-icons">&#xE415;</i></a>
+                <a href="{$order.details.invoice_url}">
+                  <svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-file-download mx-auto" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M14 3v4a1 1 0 0 0 1 1h4" /><path d="M17 21h-10a2 2 0 0 1 -2 -2v-14a2 2 0 0 1 2 -2h7l5 5v11a2 2 0 0 1 -2 2z" /><path d="M12 17v-6" /><path d="M9.5 14.5l2.5 2.5l2.5 -2.5" /></svg>
+                </a>
               {else}
                 -
               {/if}
             </td>
-            <td class="text-sm-center order-actions">
+            <td class="text-center md:flex gap-2 items-center justify-center">
               <a href="{$order.details.details_url}" data-link-action="view-order-details">
-                {l s='Details' d='Shop.Theme.Customeraccount'}
+                  <svg xmlns="http://www.w3.org/2000/svg" class="md:hidden icon icon-tabler icon-tabler-file-description" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M14 3v4a1 1 0 0 0 1 1h4" /><path d="M17 21h-10a2 2 0 0 1 -2 -2v-14a2 2 0 0 1 2 -2h7l5 5v11a2 2 0 0 1 -2 2z" /><path d="M9 17h6" /><path d="M9 13h6" /></svg>
+                  <h2 class="text-sm md:text-base max-md:hidden">
+                    {l s='Details' d='Shop.Theme.Customeraccount'}
+                  </h2>
               </a>
               {if $order.details.reorder_url}
-                <a href="{$order.details.reorder_url}">{l s='Reorder' d='Shop.Theme.Actions'}</a>
+                <a href="{$order.details.reorder_url}">
+                    <svg xmlns="http://www.w3.org/2000/svg" class="md:hidden icon icon-tabler icon-tabler-reorder" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M3 15m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v2a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z" /><path d="M10 15m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v2a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z" /><path d="M17 15m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v2a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z" /><path d="M5 11v-3a3 3 0 0 1 3 -3h8a3 3 0 0 1 3 3v3" /><path d="M16.5 8.5l2.5 2.5l2.5 -2.5" /></svg>
+                    <h2 class="text-sm md:text-sm max-md:hidden">
+                        {l s='Reorder' d='Shop.Theme.Actions'}
+                    </h2>
+                </a>
               {/if}
             </td>
           </tr>
         {/foreach}
       </tbody>
     </table>
-
-    <div class="orders hidden-md-up">
-      {foreach from=$orders item=order}
-        <div class="order">
-          <div class="row">
-            <div class="col-xs-10">
-              <a href="{$order.details.details_url}"><h3>{$order.details.reference}</h3></a>
-              <div class="date">{$order.details.order_date}</div>
-              <div class="total">{$order.totals.total.value}</div>
-              <div class="status">
-                <span
-                  class="label label-pill {$order.history.current.contrast}"
-                  style="background-color:{$order.history.current.color}"
-                >
-                  {$order.history.current.ostate_name}
-                </span>
-              </div>
-            </div>
-            <div class="col-xs-2 text-xs-right">
-                <div>
-                  <a href="{$order.details.details_url}" data-link-action="view-order-details" title="{l s='Details' d='Shop.Theme.Customeraccount'}">
-                    <i class="material-icons">&#xE8B6;</i>
-                  </a>
-                </div>
-                {if $order.details.reorder_url}
-                  <div>
-                    <a href="{$order.details.reorder_url}" title="{l s='Reorder' d='Shop.Theme.Actions'}">
-                      <i class="material-icons">&#xE863;</i>
-                    </a>
-                  </div>
-                {/if}
-            </div>
-          </div>
-        </div>
-      {/foreach}
+    {else}
+    <div class='w-full mt-2 p-2 bg-red-100 border border-red-300'>
+      <span>You have not placed any orders yet !</span>
     </div>
-
   {/if}
 {/block}
diff --git a/templates/customer/my-account.tpl b/templates/customer/my-account.tpl
index 27e9a0b..869cc4a 100644
--- a/templates/customer/my-account.tpl
+++ b/templates/customer/my-account.tpl
@@ -25,67 +25,71 @@
 {extends file='customer/page.tpl'}
 
 {block name='page_title'}
-  {l s='Your account' d='Shop.Theme.Customeraccount'}
+  <h2 class="products-section-title text-2xl font-bold">
+    {l s='Your account' d='Shop.Theme.Customeraccount'}
+  </h2>
 {/block}
 
 {block name='page_content'}
-  <div class="row">
-    <div class="links">
+  <div class="w-full my-8">
+    <div class="links flex justify-center flex-wrap py-4">
 
-      <a class="col-lg-4 col-md-6 col-sm-6 col-xs-12" id="identity-link" href="{$urls.pages.identity}">
-        <span class="link-item">
-          <i class="material-icons">&#xE853;</i>
+      <a class="w-full md:w-1/3 lg:w-1/4 flex flex-col p-4 border-gray-500" id="identity-link" href="{$urls.pages.identity}">
+        <span class="flex flex-col items-center font-semibolds text-lg">
+          <svg xmlns="http://www.w3.org/2000/svg" class="icon text-gray-950 icon-tabler icon-tabler-user-edit" width="32" height="32" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M8 7a4 4 0 1 0 8 0a4 4 0 0 0 -8 0" /><path d="M6 21v-2a4 4 0 0 1 4 -4h3.5" /><path d="M18.42 15.61a2.1 2.1 0 0 1 2.97 2.97l-3.39 3.42h-3v-3l3.42 -3.39z" /></svg>
           {l s='Information' d='Shop.Theme.Customeraccount'}
         </span>
       </a>
 
       {if $customer.addresses|count}
-        <a class="col-lg-4 col-md-6 col-sm-6 col-xs-12" id="addresses-link" href="{$urls.pages.addresses}">
-          <span class="link-item">
-            <i class="material-icons">&#xE56A;</i>
+        <a class="w-full md:w-1/3 lg:w-1/4 flex flex-col p-4 border-gray-500" id="addresses-link" href="{$urls.pages.addresses}">
+          <span class="flex flex-col items-center font-semibolds text-lg">
+            <svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-map" width="32" height="32" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M3 7l6 -3l6 3l6 -3v13l-6 3l-6 -3l-6 3v-13" /><path d="M9 4v13" /><path d="M15 7v13" /></svg>
             {l s='Addresses' d='Shop.Theme.Customeraccount'}
           </span>
         </a>
       {else}
-        <a class="col-lg-4 col-md-6 col-sm-6 col-xs-12" id="address-link" href="{$urls.pages.address}">
-          <span class="link-item">
-            <i class="material-icons">&#xE567;</i>
+        <a class="w-full md:w-1/3 lg:w-1/4 flex flex-col p-4 border-gray-500" id="address-link" href="{$urls.pages.address}">
+          <span class="flex flex-col items-center font-semibolds text-lg">
+            <svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-map-2" width="32" height="32" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M12 18.5l-3 -1.5l-6 3v-13l6 -3l6 3l6 -3v7.5" /><path d="M9 4v13" /><path d="M15 7v5.5" /><path d="M21.121 20.121a3 3 0 1 0 -4.242 0c.418 .419 1.125 1.045 2.121 1.879c1.051 -.89 1.759 -1.516 2.121 -1.879z" /><path d="M19 18v.01" /></svg>
             {l s='Add first address' d='Shop.Theme.Customeraccount'}
           </span>
         </a>
       {/if}
 
       {if !$configuration.is_catalog}
-        <a class="col-lg-4 col-md-6 col-sm-6 col-xs-12" id="history-link" href="{$urls.pages.history}">
-          <span class="link-item">
-            <i class="material-icons">&#xE916;</i>
+        <a class="w-full md:w-1/3 lg:w-1/4 flex flex-col p-4 border-gray-500" id="history-link" href="{$urls.pages.history}">
+          <span class="flex flex-col items-center font-semibolds text-lg">
+            <svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-history" width="32" height="32" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M12 8l0 4l2 2" /><path d="M3.05 11a9 9 0 1 1 .5 4m-.5 5v-5h5" /></svg>
             {l s='Order history and details' d='Shop.Theme.Customeraccount'}
           </span>
         </a>
       {/if}
 
       {if !$configuration.is_catalog}
-        <a class="col-lg-4 col-md-6 col-sm-6 col-xs-12" id="order-slips-link" href="{$urls.pages.order_slip}">
-          <span class="link-item">
-            <i class="material-icons">&#xE8B0;</i>
-            {l s='Credit slips' d='Shop.Theme.Customeraccount'}
-          </span>
-        </a>
+        {** 
+          <a class="w-full md:w-1/3 lg:w-1/4 flex flex-col p-4 border-gray-500" id="order-slips-link" href="{$urls.pages.order_slip}">
+            <span class="flex flex-col items-center font-semibolds text-lg">
+              <svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-credit-card" width="32" height="32" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M3 5m0 3a3 3 0 0 1 3 -3h12a3 3 0 0 1 3 3v8a3 3 0 0 1 -3 3h-12a3 3 0 0 1 -3 -3z" /><path d="M3 10l18 0" /><path d="M7 15l.01 0" /><path d="M11 15l2 0" /></svg>
+              {l s='Credit slips' d='Shop.Theme.Customeraccount'}
+            </span>
+          </a>
+        *}
       {/if}
 
       {if $configuration.voucher_enabled && !$configuration.is_catalog}
-        <a class="col-lg-4 col-md-6 col-sm-6 col-xs-12" id="discounts-link" href="{$urls.pages.discount}">
-          <span class="link-item">
-            <i class="material-icons">&#xE54E;</i>
+        <a class="w-full md:w-1/3 lg:w-1/4 flex flex-col p-4" id="discounts-link" href="{$urls.pages.discount}">
+          <span class="flex flex-col items-center font-semibolds text-lg">
+            <svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-ticket" width="32" height="32" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M15 5l0 2" /><path d="M15 11l0 2" /><path d="M15 17l0 2" /><path d="M5 5h14a2 2 0 0 1 2 2v3a2 2 0 0 0 0 4v3a2 2 0 0 1 -2 2h-14a2 2 0 0 1 -2 -2v-3a2 2 0 0 0 0 -4v-3a2 2 0 0 1 2 -2" /></svg>
             {l s='Vouchers' d='Shop.Theme.Customeraccount'}
           </span>
         </a>
       {/if}
 
       {if $configuration.return_enabled && !$configuration.is_catalog}
-        <a class="col-lg-4 col-md-6 col-sm-6 col-xs-12" id="returns-link" href="{$urls.pages.order_follow}">
-          <span class="link-item">
-            <i class="material-icons">&#xE860;</i>
+        <a class="w-full md:w-1/3 lg:w-1/4 flex flex-col p-4" id="returns-link" href="{$urls.pages.order_follow}">
+          <span class="flex flex-col items-center font-semibolds text-lg">
+            <svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-truck-return" width="32" height="32" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M7 17m-2 0a2 2 0 1 0 4 0a2 2 0 1 0 -4 0" /><path d="M17 17m-2 0a2 2 0 1 0 4 0a2 2 0 1 0 -4 0" /><path d="M5 17h-2v-11a1 1 0 0 1 1 -1h9v6h-5l2 2m0 -4l-2 2" /><path d="M9 17l6 0" /><path d="M13 6h5l3 5v6h-2" /></svg>
             {l s='Merchandise returns' d='Shop.Theme.Customeraccount'}
           </span>
         </a>
@@ -102,8 +106,8 @@
 
 {block name='page_footer'}
   {block name='my_account_links'}
-    <div class="text-sm-center">
-      <a href="{$logout_url}" >
+    <div class="flex justify-center">
+      <a href="{$logout_url}" class=" hover:text-white hover:no-underline px-6 py-2 bg-blue-950 disabled:bg-gray-700 text-white text-base font-light" >
         {l s='Sign out' d='Shop.Theme.Actions'}
       </a>
     </div>