diff --git a/components/cart/CartSidebarView/CartSidebarView.tsx b/components/cart/CartSidebarView/CartSidebarView.tsx
index 0c8a2db3f..52a9ee9af 100644
--- a/components/cart/CartSidebarView/CartSidebarView.tsx
+++ b/components/cart/CartSidebarView/CartSidebarView.tsx
@@ -51,7 +51,7 @@ const CartSidebarView: FC = () => {
             </button>
           </div>
           <div className="space-y-1">
-            <UserNav />
+            <UserNav className="" />
           </div>
         </div>
       </header>
diff --git a/components/core/I18nWidget/I18nWidget.tsx b/components/core/I18nWidget/I18nWidget.tsx
index 31f2db76f..6bbed6179 100644
--- a/components/core/I18nWidget/I18nWidget.tsx
+++ b/components/core/I18nWidget/I18nWidget.tsx
@@ -18,8 +18,8 @@ const LOCALES_MAP: Record<string, LOCALE_DATA> = {
   es: {
     name: 'Español',
     img: {
-      filename: 'flag-es.svg',
-      alt: 'Bandera española',
+      filename: 'flag-es-co.svg',
+      alt: 'Bandera Colombiana',
     },
   },
   'en-US': {
diff --git a/public/flag-es-ar.svg b/public/flag-es-ar.svg
new file mode 100644
index 000000000..4d6ffc474
--- /dev/null
+++ b/public/flag-es-ar.svg
@@ -0,0 +1,20 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0.75 12C0.75 14.2069 1.38787 16.263 2.4855 18H21.5145C22.6121 16.263 23.25 14.2069 23.25 12C23.25 9.79312 22.6121 7.737 21.5145 6H2.4855C1.38787 7.737 0.75 9.79312 0.75 12Z" fill="#F9F9F9"/>
+<path d="M21.5144 6C19.5212 2.84625 16.0064 0.75 11.9999 0.75C7.99335 0.75 4.47848 2.84625 2.48535 6H21.5144Z" fill="#B4D7EE"/>
+<path d="M2.48535 18C4.47848 21.1537 7.99335 23.25 11.9999 23.25C16.0064 23.25 19.5212 21.1537 21.5144 18H2.48535Z" fill="#B4D7EE"/>
+<path d="M17.1536 11.9359L14.0921 11.8204C14.091 11.8088 14.0906 11.7971 14.0895 11.7855C14.5901 11.6936 14.9467 11.4109 15.4661 11.4578C16.1025 11.5148 16.4625 11.1653 16.7096 11.0843C16.9571 11.0033 17.1052 11.172 17.1405 11.0996C17.1757 11.0269 16.98 10.8671 16.6282 10.9193C16.2765 10.971 16.1719 11.2384 15.3949 11.1754C14.7349 11.1221 14.5039 11.3873 14.016 11.4124C14.0115 11.3966 14.007 11.3809 14.0021 11.3651L16.7857 10.0879C16.7857 10.0879 16.875 10.0508 16.8502 9.99113C16.8262 9.93151 16.7362 9.96863 16.7362 9.96863L13.8641 11.0336C13.8589 11.0235 13.854 11.0126 13.8484 11.0025C14.2759 10.7265 14.4967 10.3286 14.9944 10.173C15.6045 9.98213 15.8032 9.52163 16.0012 9.35213C16.1985 9.18226 16.4002 9.28163 16.4051 9.20101C16.4096 9.12038 16.1677 9.04801 15.8629 9.23063C15.5576 9.41326 15.5629 9.70013 14.8211 9.93938C14.1911 10.1426 14.079 10.476 13.6384 10.686C13.6282 10.6733 13.6177 10.6609 13.6069 10.6481L15.69 8.40226C15.69 8.40226 15.759 8.33363 15.7136 8.28788C15.6679 8.24176 15.5989 8.31076 15.5989 8.31076L13.353 10.3939C13.3444 10.3864 13.3354 10.3789 13.3267 10.3718C13.6159 9.95288 13.668 9.50026 14.0685 9.16613C14.559 8.75663 14.5661 8.25526 14.6842 8.02276C14.8016 7.79063 15.0255 7.80488 14.9992 7.72876C14.973 7.65263 14.7217 7.67813 14.5099 7.96351C14.2976 8.24888 14.4124 8.51176 13.8184 9.01726C13.3144 9.44626 13.3395 9.79688 13.0125 10.1599C12.9979 10.152 12.9829 10.1445 12.9682 10.1366L14.0332 7.26451C14.0332 7.26451 14.0707 7.17488 14.0104 7.15013C13.95 7.12501 13.9129 7.21463 13.9129 7.21463L12.6352 9.99788C12.6247 9.99451 12.6131 9.99113 12.6019 9.98776C12.7091 9.49013 12.5839 9.05213 12.8261 8.59051C13.1224 8.02426 12.9375 7.55813 12.9574 7.29826C12.9772 7.03838 13.1895 6.96638 13.1362 6.90601C13.0819 6.84563 12.8602 6.96526 12.7736 7.31026C12.687 7.65526 12.8936 7.85401 12.5381 8.54813C12.2362 9.13726 12.3926 9.45226 12.2295 9.91238C12.2134 9.91088 12.1972 9.90938 12.1807 9.90788L12.0656 6.84638C12.0656 6.84638 12.0656 6.74963 12.0011 6.74963C11.9366 6.74963 11.9366 6.84638 11.9366 6.84638L11.8211 9.90788C11.8099 9.90863 11.7979 9.90938 11.7866 9.91051C11.6947 9.40988 11.4116 9.05326 11.4585 8.53388C11.5155 7.89751 11.166 7.53751 11.085 7.29001C11.004 7.04251 11.1727 6.89438 11.1 6.85913C11.0272 6.82388 10.8679 7.01963 10.9204 7.37138C10.9721 7.72313 11.2391 7.82776 11.1765 8.60513C11.1232 9.26476 11.388 9.49576 11.4135 9.98363C11.3977 9.98813 11.382 9.99263 11.3666 9.99751L10.089 7.21426C10.089 7.21426 10.0519 7.12463 9.99225 7.14938C9.93262 7.17376 9.96975 7.26376 9.96975 7.26376L11.0344 10.1355C11.0242 10.1411 11.0137 10.1456 11.0036 10.1513C10.7272 9.72376 10.3294 9.50288 10.1741 9.00526C9.98325 8.39513 9.52275 8.19638 9.35287 7.99876C9.18337 7.80113 9.28275 7.60013 9.20212 7.59488C9.1215 7.59038 9.04912 7.83188 9.23175 8.13713C9.41437 8.44238 9.70125 8.43676 9.94087 9.17888C10.1441 9.80851 10.4775 9.92101 10.6879 10.362C10.6751 10.3721 10.6624 10.3826 10.6496 10.3931L8.40375 8.31001C8.40375 8.31001 8.33512 8.24138 8.28937 8.28676C8.24362 8.33251 8.31225 8.40113 8.31225 8.40113L10.3954 10.647C10.3879 10.656 10.3804 10.6646 10.3729 10.6736C9.954 10.3841 9.50137 10.332 9.16725 9.93188C8.75737 9.44138 8.256 9.43388 8.0235 9.31613C7.79137 9.19876 7.806 8.97488 7.7295 9.00113C7.653 9.02776 7.67887 9.27863 7.96425 9.49088C8.24962 9.70276 8.5125 9.58801 9.018 10.182C9.447 10.6864 9.798 10.6613 10.1602 10.9883C10.1524 11.0029 10.1449 11.0179 10.137 11.0325L7.26525 9.96751C7.26525 9.96751 7.17563 9.93038 7.15088 9.99038C7.12538 10.0504 7.215 10.0875 7.215 10.0875L9.99825 11.3648C9.9945 11.376 9.9915 11.3873 9.98812 11.3981C9.49012 11.2909 9.0525 11.4161 8.59088 11.1743C8.02463 10.8776 7.5585 11.0629 7.299 11.0434C7.03912 11.0235 6.96712 10.8109 6.90637 10.8645C6.84637 10.9185 6.966 11.1401 7.31062 11.2268C7.65562 11.3134 7.85437 11.1068 8.5485 11.4619C9.13725 11.7638 9.45262 11.6074 9.91275 11.7705C9.91087 11.7866 9.90975 11.8031 9.90825 11.8193L6.84675 11.9348C6.84675 11.9348 6.75 11.9348 6.75 11.9993C6.75 12.0641 6.84675 12.0638 6.84675 12.0638L9.90825 12.1793C9.90937 12.1909 9.90975 12.2025 9.91087 12.2138C9.41025 12.3053 9.05362 12.5888 8.53425 12.5419C7.89787 12.4849 7.53787 12.834 7.29037 12.9154C7.04287 12.996 6.89475 12.8276 6.8595 12.9C6.82425 12.9728 7.02 13.1321 7.37175 13.08C7.7235 13.0279 7.82812 12.7613 8.6055 12.8239C9.26512 12.8771 9.49612 12.612 9.984 12.5869C9.9885 12.6023 9.99262 12.6184 9.99787 12.6338L7.21463 13.911C7.21463 13.911 7.125 13.9485 7.14975 14.0081C7.1745 14.0678 7.26413 14.0306 7.26413 14.0306L10.1362 12.9656C10.1415 12.9758 10.1464 12.987 10.152 12.9964C9.7245 13.2731 9.50362 13.671 9.00562 13.8263C8.3955 14.0175 8.19712 14.478 7.99912 14.6471C7.8015 14.817 7.60012 14.7176 7.59525 14.7983C7.59037 14.8789 7.83225 14.9513 8.1375 14.7686C8.44275 14.5864 8.43712 14.2991 9.17925 14.0595C9.80925 13.8563 9.92137 13.5229 10.3624 13.3133C10.3725 13.3256 10.383 13.338 10.3935 13.3508L8.31037 15.597C8.31037 15.597 8.24175 15.6656 8.28712 15.7114C8.33287 15.7568 8.4015 15.6885 8.4015 15.6885L10.6474 13.605C10.6564 13.6129 10.665 13.62 10.674 13.6275C10.3849 14.0464 10.3327 14.499 9.93225 14.8331C9.44175 15.2426 9.43462 15.7444 9.3165 15.9769C9.19912 16.209 8.97487 16.1944 9.0015 16.2709C9.02812 16.347 9.279 16.3215 9.49125 16.0358C9.7035 15.75 9.58837 15.4879 10.1824 14.9824C10.6867 14.553 10.6616 14.2024 10.9886 13.8394C11.0032 13.8476 11.0182 13.8551 11.0329 13.8626L9.96825 16.7351C9.96825 16.7351 9.93075 16.8244 9.99075 16.8495C10.0507 16.875 10.0879 16.7854 10.0879 16.7854L11.3655 14.0021C11.3764 14.0055 11.3876 14.0089 11.3989 14.0123C11.2916 14.5095 11.4169 14.9475 11.1746 15.4095C10.8784 15.9761 11.0632 16.4419 11.0434 16.7014C11.0239 16.9609 10.8112 17.0336 10.8649 17.0936C10.9189 17.154 11.1405 17.0344 11.2271 16.6894C11.3137 16.3444 11.1071 16.146 11.4626 15.4515C11.7641 14.8628 11.6077 14.5478 11.7712 14.0869C11.7874 14.0891 11.8039 14.0899 11.82 14.0918L11.9351 17.1529C11.9351 17.1529 11.9351 17.25 11.9996 17.25C12.0645 17.25 12.0641 17.1529 12.0641 17.1529L12.1796 14.0918C12.1912 14.0906 12.2029 14.0899 12.2141 14.0891C12.3056 14.5898 12.5887 14.946 12.5419 15.4658C12.4849 16.1021 12.8344 16.4621 12.9154 16.7096C12.9967 16.9571 12.828 17.1053 12.9007 17.1401C12.9731 17.1754 13.1325 16.9796 13.0804 16.6275C13.0286 16.2758 12.7612 16.1711 12.8242 15.3941C12.8775 14.7349 12.6127 14.5035 12.5869 14.0156C12.6026 14.0111 12.6184 14.007 12.6341 14.0018L13.9114 16.785C13.9114 16.785 13.9489 16.8746 14.0085 16.8503C14.0681 16.8255 14.0314 16.7359 14.0314 16.7359L12.9664 13.8641C12.9765 13.8581 12.987 13.854 12.9971 13.848C13.2731 14.2755 13.671 14.4964 13.827 14.9944C14.0175 15.6045 14.478 15.8029 14.6479 16.0009C14.8174 16.1985 14.7184 16.3995 14.7986 16.4044C14.8789 16.4093 14.9516 16.1674 14.7694 15.8625C14.5864 15.5573 14.2995 15.5629 14.0599 14.8208C13.8566 14.1908 13.5232 14.0786 13.3132 13.6376C13.326 13.6275 13.3387 13.617 13.3515 13.6065L15.597 15.69C15.597 15.69 15.666 15.7586 15.7114 15.7129C15.7571 15.6675 15.6885 15.5985 15.6885 15.5985L13.6054 13.353C13.6129 13.344 13.6204 13.335 13.6279 13.326C14.0467 13.6155 14.499 13.6676 14.8335 14.0681C15.2434 14.559 15.7447 14.5661 15.9772 14.6839C16.2094 14.8013 16.1947 15.0255 16.2712 14.9993C16.3477 14.9723 16.3222 14.7218 16.0365 14.5091C15.7507 14.2976 15.4879 14.412 14.9824 13.8184C14.5537 13.3136 14.2027 13.3391 13.8397 13.0121C13.8476 12.9975 13.8559 12.9829 13.8634 12.9675L16.7351 14.0329C16.7351 14.0329 16.8247 14.07 16.8495 14.0104C16.8754 13.9493 16.7861 13.9125 16.7861 13.9125L14.0025 12.6349C14.0062 12.624 14.0092 12.6128 14.0122 12.6019C14.5102 12.7088 14.9479 12.5835 15.4099 12.8258C15.9761 13.122 16.4426 12.9368 16.7017 12.9566C16.9616 12.9765 17.0336 13.1891 17.0944 13.1355C17.1544 13.0819 17.0347 12.8603 16.6901 12.7729C16.3451 12.6866 16.146 12.8929 15.4522 12.5378C14.8631 12.2363 14.5477 12.3926 14.0876 12.2291C14.0895 12.213 14.0906 12.1965 14.0921 12.1804L17.1536 12.0649C17.1536 12.0649 17.2504 12.0649 17.2504 12.0004C17.2504 11.9355 17.1536 11.9359 17.1536 11.9359Z" fill="#F6B40E"/>
+<path d="M13.116 11.7262C13.011 11.6134 12.8598 11.5515 12.717 11.5515C12.5733 11.5515 12.4361 11.6137 12.3555 11.7431C12.5167 11.8882 12.8737 11.9036 13.116 11.7262ZM13.0027 11.7097C12.9412 11.7769 12.8662 11.8166 12.7878 11.8327C12.8291 11.8069 12.8572 11.7615 12.8572 11.7094C12.8572 11.6602 12.8328 11.6171 12.7957 11.5909C12.9007 11.6081 12.9881 11.6587 13.0027 11.7097ZM12.6187 11.598C12.5868 11.6246 12.5658 11.6644 12.5658 11.7094C12.5658 11.7645 12.5973 11.8125 12.6427 11.8369C12.5617 11.826 12.4841 11.793 12.4207 11.7427C12.4713 11.6629 12.543 11.6182 12.6187 11.598Z" fill="#85340A"/>
+<path d="M12.7436 11.4514C12.5336 11.4514 12.4856 11.4997 12.3881 11.5804C12.2914 11.661 12.243 11.6449 12.2269 11.661C12.2111 11.6771 12.2269 11.7255 12.2591 11.7094C12.2914 11.6932 12.3562 11.661 12.453 11.58C12.5501 11.4994 12.6469 11.4994 12.7436 11.4994C13.0342 11.4994 13.1959 11.7416 13.2281 11.7255C13.2604 11.7094 13.0669 11.4514 12.7436 11.4514Z" fill="#85340A"/>
+<path d="M13.3252 11.548L13.3242 11.547V11.548" fill="#85340A"/>
+<path d="M12.1285 11.3861C12.106 11.4461 12.0892 11.5076 12.0779 11.5702C12.0355 11.8102 12.0809 12.0622 12.2095 12.3071C12.2257 12.291 12.2579 12.2749 12.274 12.2749C12.13 12.0712 12.0727 11.8725 12.1053 11.6887C12.1218 11.5942 12.1623 11.5035 12.2257 11.4191C12.484 11.1769 12.9517 11.2249 13.3233 11.5474C12.9678 11.0632 12.4837 11.0955 12.1285 11.3861Z" fill="#85340A"/>
+<path d="M12.4842 11.871C12.3544 11.8065 12.3225 11.7743 12.2903 11.7743C12.258 11.7743 12.258 11.8065 12.4193 11.9033C12.5805 12 12.8554 12.0161 13.1303 11.8065C12.807 11.9359 12.6132 11.9359 12.4842 11.871Z" fill="#85340A"/>
+<path d="M12.3078 12.48C12.2564 12.48 12.214 12.4391 12.211 12.3877C12.1953 12.4192 12.133 12.513 12.0104 12.5179C11.8874 12.513 11.8251 12.4192 11.8098 12.3877C11.8068 12.4391 11.764 12.48 11.7126 12.48C11.6586 12.48 11.6159 12.4365 11.6159 12.3832C11.6159 12.342 11.641 12.3045 11.6796 12.2906C11.6103 12.3034 11.5615 12.3645 11.5615 12.4342C11.5615 12.5149 11.6279 12.579 11.7081 12.579C11.7554 12.579 11.7993 12.5565 11.8263 12.5175C11.8821 12.5595 11.9594 12.564 12.001 12.5647C12.0074 12.5647 12.0156 12.5647 12.0201 12.5647C12.0614 12.564 12.139 12.5595 12.1949 12.5175C12.2223 12.5565 12.2658 12.579 12.3126 12.579C12.3929 12.579 12.4596 12.5149 12.4596 12.4342C12.4596 12.3645 12.4101 12.3034 12.3415 12.2906C12.3801 12.3045 12.4053 12.342 12.4053 12.3832C12.4045 12.4365 12.3614 12.48 12.3078 12.48Z" fill="#85340A"/>
+<path d="M11.9985 12.8175H12.0008C12.0653 12.8175 12.162 12.7391 12.2749 12.8036C12.3878 12.8681 12.4538 12.9319 12.5352 12.9645C12.3893 12.8674 12.3233 12.7211 12.1617 12.7211C12.1294 12.7211 12.0653 12.7388 12.0008 12.771H11.9985C11.934 12.7388 11.8699 12.7211 11.8377 12.7211C11.676 12.7211 11.6119 12.8678 11.4668 12.9645C11.5474 12.9319 11.6112 12.8681 11.7244 12.8036C11.8377 12.7391 11.934 12.8175 11.9985 12.8175Z" fill="#85340A"/>
+<path d="M12.001 12.9304H11.9988C11.9384 12.9304 11.89 12.9068 11.7839 12.9116C11.7213 12.9143 11.6388 12.927 11.521 12.9619C11.5045 12.9619 11.4869 12.9619 11.4678 12.9638C11.8071 12.996 11.644 13.1903 11.9991 13.1903H12.0014C12.3565 13.1903 12.196 12.9956 12.5354 12.9638C12.5133 12.9619 12.493 12.9604 12.4746 12.9604C12.1611 12.8681 12.0959 12.9304 12.001 12.9304ZM12.0014 13.1415H11.9991C11.7265 13.1415 11.8105 12.9585 11.5293 12.9615C11.5278 12.9615 11.5255 12.9623 11.524 12.9623C11.8064 12.9019 11.8709 12.9968 11.9988 12.9968H12.001C12.1281 12.9968 12.1926 12.903 12.4701 12.9608C12.1934 12.9593 12.2729 13.1415 12.0014 13.1415Z" fill="#85340A"/>
+<path d="M12.0006 13.1962C11.8401 13.1962 11.71 13.3271 11.71 13.4872C11.7418 13.3526 11.8626 13.2574 12.0006 13.2574C12.1393 13.2574 12.2593 13.3526 12.2912 13.4872C12.2916 13.3267 12.1615 13.1962 12.0006 13.1962Z" fill="#85340A"/>
+<path d="M10.6953 11.548L10.6963 11.547L10.6953 11.548Z" fill="#85340A"/>
+<path d="M11.7939 11.4187C11.8569 11.5035 11.8978 11.5939 11.9143 11.6884C11.9465 11.8725 11.8892 12.0712 11.7452 12.2745C11.7613 12.2745 11.7939 12.2906 11.81 12.3067C11.9383 12.0619 11.9837 11.8099 11.9417 11.5699C11.9308 11.5072 11.9135 11.4457 11.891 11.3857C11.5359 11.0951 11.0514 11.0629 10.6963 11.5466C11.0672 11.2249 11.5355 11.1765 11.7939 11.4187Z" fill="#85340A"/>
+<path d="M11.5671 11.5804C11.6638 11.661 11.7287 11.6933 11.7609 11.7098C11.7928 11.7259 11.8093 11.6775 11.7928 11.6614C11.7767 11.6453 11.7287 11.6614 11.6312 11.5808C11.5344 11.5001 11.4861 11.4518 11.2761 11.4518C10.9532 11.4518 10.7593 11.7101 10.7916 11.7263C10.8238 11.7424 10.9854 11.5001 11.2761 11.5001C11.3732 11.4998 11.4696 11.4998 11.5671 11.5804Z" fill="#85340A"/>
+<path d="M10.9056 11.7412C10.9919 11.8189 11.1336 11.8586 11.2844 11.853C11.2851 11.853 11.2859 11.8534 11.2863 11.8534C11.2878 11.8534 11.2893 11.853 11.2908 11.853C11.4201 11.8466 11.5555 11.8061 11.6658 11.7247C11.5608 11.6119 11.4096 11.55 11.2664 11.55C11.1235 11.5496 10.9859 11.6119 10.9053 11.7412H10.9056ZM10.9716 11.7412C11.0286 11.6497 11.1141 11.6047 11.2023 11.5894C11.1648 11.6156 11.1404 11.6587 11.1404 11.7079C11.1404 11.7656 11.1745 11.8151 11.2236 11.8387C11.1321 11.8324 11.0425 11.7979 10.9716 11.7412ZM11.5525 11.7082C11.5011 11.7645 11.44 11.8016 11.3755 11.8215C11.4093 11.7949 11.431 11.754 11.431 11.7079C11.431 11.6621 11.4096 11.622 11.3766 11.5954C11.4678 11.6167 11.5398 11.6625 11.5525 11.7082Z" fill="#85340A"/>
+<path d="M11.7267 11.7743C11.6945 11.7743 11.6622 11.8065 11.5328 11.871C11.4035 11.9355 11.21 11.9355 10.8867 11.8065C11.1612 12.0165 11.4357 12.0004 11.5973 11.9033C11.7593 11.8065 11.7593 11.7743 11.7267 11.7743Z" fill="#85340A"/>
+</svg>
diff --git a/public/flag-es-co.svg b/public/flag-es-co.svg
new file mode 100644
index 000000000..618820393
--- /dev/null
+++ b/public/flag-es-co.svg
@@ -0,0 +1,10 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<mask id="mask0" mask-type="alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="24" height="24">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.5144 6C19.5212 2.84625 16.0064 0.75 11.9999 0.75C7.99335 0.75 4.47848 2.84625 2.48535 6H2.4855C1.38787 7.737 0.75 9.79313 0.75 12C0.75 14.2069 1.38787 16.263 2.4855 18H2.48535C4.47848 21.1537 7.99335 23.25 11.9999 23.25C16.0064 23.25 19.5212 21.1537 21.5144 18H21.5145C22.6121 16.263 23.25 14.2069 23.25 12C23.25 9.79313 22.6121 7.737 21.5145 6H21.5144Z" fill="#B4D7EE"/>
+</mask>
+<g mask="url(#mask0)">
+<rect x="-2" y="-1" width="27" height="14" fill="#FCD116"/>
+<rect x="-2" y="13" width="27" height="6" fill="#003893"/>
+<rect x="-2" y="19" width="27" height="6" fill="#CE1126"/>
+</g>
+</svg>