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>