diff --git a/assets/script/pc_style.css b/assets/script/pc_style.css
index 683358a..9aecc9c 100644
--- a/assets/script/pc_style.css
+++ b/assets/script/pc_style.css
@@ -496,9 +496,9 @@ a {
 }
 .admin-menu .icon-close {
   position: absolute;
-  top: 0;
+  top: 12px;
   right: -30px;
-  height: 30px;
+  height: 34px;
   width: 30px;
   display: block;
   background-color: rgb(0 78 153/var(--tw-bg-opacity));
@@ -516,6 +516,7 @@ a {
 }
 .admin-content-container.show-large-menu {
   width: 82%;
+  margin-left: 0;
 }
 .admin-content-container .note-list {
   min-width: 144px;
@@ -881,4 +882,14 @@ input[type=radio]:focus:before {
 
 .marketing-coupon-page .order-page-table td {
   vertical-align: top;
+}
+
+.table-brand th {
+  padding: 7px 5px;
+  background: #f6f6f6;
+  border: 1px solid #ececec;
+}
+.table-brand td {
+  padding: 7px 6px;
+  border: 1px solid #ececec;
 }/*# sourceMappingURL=pc_style.css.map */
\ No newline at end of file
diff --git a/assets/script/pc_style.css.map b/assets/script/pc_style.css.map
index 9b50967..b34155c 100644
--- a/assets/script/pc_style.css.map
+++ b/assets/script/pc_style.css.map
@@ -1 +1 @@
-{"version":3,"sources":["pc_style.css","pc_style.scss"],"names":[],"mappings":"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","file":"pc_style.css"}
\ No newline at end of file
+{"version":3,"sources":["pc_style.css","pc_style.scss"],"names":[],"mappings":"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","file":"pc_style.css"}
\ No newline at end of file
diff --git a/assets/script/pc_style.scss b/assets/script/pc_style.scss
index 5f8d88a..2d2ee37 100644
--- a/assets/script/pc_style.scss
+++ b/assets/script/pc_style.scss
@@ -484,9 +484,9 @@ a {
     }
     .icon-close {
         position: absolute;
-        top: 0;
+        top: 12px;
         right: -30px;
-        height: 30px;
+        height: 34px;
         width: 30px;
         display: block;
         background-color: rgb(0 78 153 / var(--tw-bg-opacity));
@@ -503,6 +503,7 @@ a {
     width: calc(100% - 50px);
     &.show-large-menu {
         width: 82%;
+        margin-left: 0;
     }
     .note-list {
         min-width: 144px;
@@ -900,4 +901,16 @@ input[type="radio"] {
     .order-page-table td {
         vertical-align: top;
     }
-}
\ No newline at end of file
+}
+
+.table-brand {
+    th {
+        padding: 7px 5px;
+        background: #f6f6f6;
+        border: 1px solid #ececec;
+    }
+    td {
+        padding: 7px 6px;
+        border: 1px solid #ececec;
+    }
+}
diff --git a/data/product/home.php b/data/product/home.php
index 0627cf5..c7fbedf 100644
--- a/data/product/home.php
+++ b/data/product/home.php
@@ -33,4 +33,196 @@ return [
         'html' => $tb_page,
         'total_pages' => $total_pages,
     ],
-];
+
+    "list_category" => [
+        [
+            'id' => 1,
+            'title' => 'Màn hình máy tính',
+            'url' => '/admin/product?category=9',
+            'parentId' => 0,
+            'isParent' => 1,
+            'children' => [
+                [
+                    'id' => 10,
+                    'title' => 'Màn hình theo khoảng giá',
+                    'url' => '/admin/product?category=148',
+                    'parentId' => 1,
+                    'isParent' => 0,
+                    'totalProduct' => 0,
+                    'children' => [
+
+                    ]
+                ],
+                [
+                    'id' => 11,
+                    'title' => 'Màn Hình Theo Kích Thước',
+                    'url' => '/admin/product?category=54',
+                    'parentId' => 1,
+                    'isParent' => 0,
+                    'totalProduct' => 0,
+                    'children' => [
+                        [
+                            'id' => 148,
+                            'title' => '17 inch - 21.5 inch',
+                            'url' => '/admin/product?category=148',
+                            'parentId' => 11,
+                            'isParent' => 0,
+                            'totalProduct' => 5,
+                        ],
+                        [
+                            'id' => 66,
+                            'title' => '22 inch - 24 inch',
+                            'url' => '/admin/product?category=66',
+                            'parentId' => 11,
+                            'isParent' => 0,
+                            'totalProduct' => 41,
+                        ],
+                        [
+                            'id' => 67,
+                            'title' => '25 inch - 27 inch',
+                            'url' => '/admin/product?category=67',
+                            'parentId' => 11,
+                            'isParent' => 0,
+                            'totalProduct' => 42,
+                        ],
+                        [
+                            'id' => 68,
+                            'title' => '28 inch - 32 inch',
+                            'url' => '/admin/product?category=68',
+                            'parentId' => 11,
+                            'isParent' => 0,
+                            'totalProduct' => 11,
+                        ]
+                    ]
+                ]
+
+            ]
+        ],
+        [
+            'id' => 65,
+            'title' => 'PC, Workstation',
+            'url' => '/admin/product?category=65',
+            'parentId' => 0,
+            'isParent' => 1,
+            'children' => []
+        ],
+        [
+            'id' => 3,
+            'title' => 'Gaming Gear',
+            'url' => '/admin/product?category=3',
+            'parentId' => 0,
+            'isParent' => 1,
+            'children' => []
+        ],[
+            'id' => 4,
+            'title' => 'CPU - Bộ Vi Xử Lý',
+            'url' => '/admin/product?category=4',
+            'parentId' => 0,
+            'isParent' => 1,
+            'children' => []
+        ]
+
+    ],
+
+    "brand_letters" => [
+        [
+            'key' => 'A',
+            'url' => '/ajax/brand.php?action=show-brand-list&letter=A&popup=1',
+            'total' => 13,
+        ],
+        [
+            'key' => 'B',
+            'url' => '/ajax/brand.php?action=show-brand-list&letter=B&popup=1',
+            'total' => 2,
+        ],
+        [
+            'key' => 'C',
+            'url' => '/ajax/brand.php?action=show-brand-list&letter=C&popup=1',
+            'total' => 5,
+        ]
+
+    ],
+
+    "list_brands" => [
+        
+            'A' => [
+                [
+                    'id' => 1,
+                    'name' => 'ABS',
+                    'letter' => 'A',
+                    'url' => '/admin/?brand=83&opt=product',
+                    'product' => 1,
+                ],
+                [
+                    'id' => 2,
+                    'name' => 'ACE GAMING',
+                    'letter' => 'A',
+                    'url' => '/admin/?brand=83&opt=product',
+                    'product' => 6,
+                ],
+                [
+                    'id' => 3,
+                    'name' => 'ADATA',
+                    'letter' => 'A',
+                    'url' => '/admin/?brand=83&opt=product',
+                    'product' => 15,
+                ]
+            ],
+
+            'B' => [
+                [
+                    'id' => 3,
+                    'name' => 'BE QUIET	',
+                    'letter' => 'B',
+                    'url' => '/admin/?brand=83&opt=product',
+                    'product' => 2,
+                ],
+                [
+                    'id' => 3,
+                    'name' => 'BENQ',
+                    'letter' => 'B',
+                    'url' => '/admin/?brand=83&opt=product',
+                    'product' => 6,
+                ],
+            ],
+
+            'C' => [
+                [
+                    'id' => 3,
+                    'name' => 'CISCO',
+                    'letter' => 'C',
+                    'url' => '/admin/?brand=83&opt=product',
+                    'product' => 2,
+                ],
+                [
+                    'id' => 3,
+                    'name' => 'Colorful',
+                    'letter' => 'C',
+                    'url' => '/admin/?brand=83&opt=product',
+                    'product' => 6,
+                ],
+                [
+                    'id' => 3,
+                    'name' => 'COOLER MASTER',
+                    'letter' => 'C',
+                    'url' => '/admin/?brand=83&opt=product',
+                    'product' => 6,
+                ],
+                [
+                    'id' => 3,
+                    'name' => 'COOLMOON',
+                    'letter' => 'C',
+                    'url' => '/admin/?brand=83&opt=product',
+                    'product' => 6,
+                ],
+                [
+                    'id' => 3,
+                    'name' => 'CORSAIR',
+                    'letter' => 'C',
+                    'url' => '/admin/?brand=83&opt=product',
+                    'product' => 6,
+                ],
+            ]
+    ]
+    
+];
\ No newline at end of file
diff --git a/template/javascript/global.html b/template/javascript/global.html
index 35c1a91..10f61bf 100644
--- a/template/javascript/global.html
+++ b/template/javascript/global.html
@@ -20,8 +20,8 @@
 
     // Hàm để cập nhật trạng thái hiển thị menu và localStorage
     function capNhatTrangThaiMenu(hideMenuBig) {
-        
-        if(hideMenuBig === false){
+
+        if (hideMenuBig === false) {
             $('#js-admin-content-container').addClass('show-large-menu')
         } else {
             $('#js-admin-content-container').removeClass('show-large-menu')
diff --git a/template/javascript/index.html b/template/javascript/index.html
index ba1630d..292de13 100644
--- a/template/javascript/index.html
+++ b/template/javascript/index.html
@@ -1,10 +1,14 @@
 {% include javascript/global %}
 
 {% if global.module == 'home' %}
-    {% include javascript/homepage %}
+{% include javascript/homepage %}
 
 {% elsif global.module == 'product' %}
-    {% include javascript/product_form %}
 
+{% if global.view == 'home' %}
+{% include javascript/product_list %}
 {% endif %}
 
+{% include javascript/product_form %}
+
+{% endif %}
\ No newline at end of file
diff --git a/template/javascript/product_list.html b/template/javascript/product_list.html
new file mode 100644
index 0000000..03e8cc4
--- /dev/null
+++ b/template/javascript/product_list.html
@@ -0,0 +1,69 @@
+<script>
+    function _get_list_category() {
+        return {
+            "list_category": [
+                {
+                    'id': 1,
+                    'title': 'Màn hình máy tính',
+                    'url': '/?category=9&opt=product&parent=1',
+                    'parentId': 0,
+                    'isParent': 1,
+                    'children': [
+                        {
+                            'id': 10,
+                            'title': 'Màn hình theo khoảng giá',
+                            'url': '/?category=148&opt=product',
+                            'parentId': 1,
+                            'isParent': 0,
+                            'totalProduct': 0,
+                            'children': []
+                        },
+                        {
+                            'id': 11,
+                            'title': 'Màn Hình Theo Kích Thước',
+                            'url': '/?category=54&opt=product&parent=1',
+                            'parentId': 1,
+                            'isParent': 0,
+                            'totalProduct': 0,
+                            'children': [
+                                {
+                                    'id': 148,
+                                    'title': '17 inch - 21.5 inch',
+                                    'url': '/?category=148&opt=product',
+                                    'parentId': 11,
+                                    'isParent': 0,
+                                    'totalProduct': 5,
+                                },
+                                {
+                                    'id': 66,
+                                    'title': '22 inch - 24 inch',
+                                    'url': '?category=66&opt=product',
+                                    'parentId': 11,
+                                    'isParent': 0,
+                                    'totalProduct': 41,
+                                },
+                                {
+                                    'id': 67,
+                                    'title': '25 inch - 27 inch',
+                                    'url': '/?category=67&opt=product',
+                                    'parentId': 11,
+                                    'isParent': 0,
+                                    'totalProduct': 42,
+                                },
+                                {
+                                    'id': 68,
+                                    'title': '28 inch - 32 inch',
+                                    'url': '/?category=68&opt=product',
+                                    'parentId': 11,
+                                    'isParent': 0,
+                                    'totalProduct': 11,
+                                }
+                            ]
+                        }
+                    ]
+                }
+            ]
+        };
+    }
+
+</script>
\ No newline at end of file
diff --git a/template/marketing/coupon-product.html b/template/marketing/coupon-product.html
new file mode 100644
index 0000000..18ee2fe
--- /dev/null
+++ b/template/marketing/coupon-product.html
@@ -0,0 +1 @@
+coupon-product
\ No newline at end of file
diff --git a/template/product/form_components/accessory.html b/template/product/form_components/accessory.html
index 92d8aa1..fefa8e2 100644
--- a/template/product/form_components/accessory.html
+++ b/template/product/form_components/accessory.html
@@ -1,47 +1,37 @@
-
 <!-- phu kien -->
-<div
-        class="bg-white rounded-[15px] shadow-[0_1px_1px_0_rgba(0,0,0,0.1)] py-[18px] px-[16px] mb-[20px]">
+<div class="bg-white rounded-[15px] shadow-[0_1px_1px_0_rgba(0,0,0,0.1)] py-[18px] px-[16px] mb-[20px]">
   <b>1.Các loại phụ kiện của sản phẩm</b>
   <a href="" class="flex items-center">
-    <svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" viewBox="0 0 13 13"
-         fill="none">
-      <path fill-rule="evenodd" clip-rule="evenodd"
-            d="M1.77273 2.36364C1.61601 2.36364 1.46571 2.42589 1.35489 2.53671C1.24407 2.64753 1.18182 2.79783 1.18182 2.95455V11.2273C1.18182 11.384 1.24407 11.5343 1.35489 11.6451C1.46571 11.7559 1.61601 11.8182 1.77273 11.8182H10.0455C10.2022 11.8182 10.3525 11.7559 10.4633 11.6451C10.5741 11.5343 10.6364 11.384 10.6364 11.2273V8.07182C10.6364 7.74547 10.9009 7.48091 11.2273 7.48091C11.5536 7.48091 11.8182 7.74547 11.8182 8.07182V11.2273C11.8182 11.6974 11.6314 12.1483 11.299 12.4808C10.9665 12.8132 10.5156 13 10.0455 13H1.77273C1.30257 13 0.85167 12.8132 0.51922 12.4808C0.186769 12.1483 0 11.6974 0 11.2273V2.95455C0 2.48439 0.186769 2.03349 0.51922 1.70104C0.851671 1.36859 1.30257 1.18182 1.77273 1.18182H4.92818C5.25453 1.18182 5.51909 1.44638 5.51909 1.77273C5.51909 2.09908 5.25453 2.36364 4.92818 2.36364H1.77273Z"
-            fill="#0041E8" />
-      <path fill-rule="evenodd" clip-rule="evenodd"
-            d="M9.62762 0.173073C9.85838 -0.0576911 10.2325 -0.0576911 10.4633 0.173073L12.8269 2.53671C13.0577 2.76747 13.0577 3.14162 12.8269 3.37238L6.91784 9.28147C6.80702 9.39229 6.65672 9.45455 6.5 9.45455H4.13636C3.81001 9.45455 3.54545 9.18999 3.54545 8.86364V6.5C3.54545 6.34328 3.60771 6.19298 3.71853 6.08216L9.62762 0.173073ZM4.72727 6.74476V8.27273H6.25524L11.5734 2.95455L10.0455 1.42658L4.72727 6.74476Z"
-            fill="#0041E8" />
-    </svg>
+    <i class="fa-regular fa-pen-to-square text-[#0041E8]"></i>
     <span class="ml-[5px] text-[#0041E8] font-[500]">Chọn Sản phẩm phụ kiện</span>
   </a>
   <div class="list-item-cate flex items-center flex-wrap mt-[10px] mb-[30px]">
     <a href=""
-       class="border-[1px] border-dashed border-[#9E9E9E] px-[10px] py-[5px] rounded-[4px] mr-[10px] font-[14px] text-[#9E9E9E] mb-[10px]">
+      class="border-[1px] border-dashed border-[#9E9E9E] px-[10px] py-[5px] rounded-[4px] mr-[10px] font-[14px] text-[#9E9E9E] mb-[10px]">
       PC, Workstation
     </a>
     <a href=""
-       class="border-[1px] border-dashed border-[#9E9E9E] px-[10px] py-[5px] rounded-[4px] mr-[10px] font-[14px] text-[#9E9E9E] mb-[10px]">
+      class="border-[1px] border-dashed border-[#9E9E9E] px-[10px] py-[5px] rounded-[4px] mr-[10px] font-[14px] text-[#9E9E9E] mb-[10px]">
       CPU - Bộ Vi Xử Lý
     </a>
     <a href=""
-       class="border-[1px] border-dashed border-[#9E9E9E] px-[10px] py-[5px] rounded-[4px] mr-[10px] font-[14px] text-[#9E9E9E] mb-[10px]">
+      class="border-[1px] border-dashed border-[#9E9E9E] px-[10px] py-[5px] rounded-[4px] mr-[10px] font-[14px] text-[#9E9E9E] mb-[10px]">
       Mainboard - Bo Mạch Chủ
     </a>
     <a href=""
-       class="border-[1px] border-dashed border-[#9E9E9E] px-[10px] py-[5px] rounded-[4px] mr-[10px] font-[14px] text-[#9E9E9E] mb-[10px]">
+      class="border-[1px] border-dashed border-[#9E9E9E] px-[10px] py-[5px] rounded-[4px] mr-[10px] font-[14px] text-[#9E9E9E] mb-[10px]">
       VGA - Card Màn Hình
     </a>
     <a href=""
-       class="border-[1px] border-dashed border-[#9E9E9E] px-[10px] py-[5px] rounded-[4px] mr-[10px] font-[14px] text-[#9E9E9E] mb-[10px]">
+      class="border-[1px] border-dashed border-[#9E9E9E] px-[10px] py-[5px] rounded-[4px] mr-[10px] font-[14px] text-[#9E9E9E] mb-[10px]">
       PC, Workstation
     </a>
     <a href=""
-       class="border-[1px] border-dashed border-[#9E9E9E] px-[10px] py-[5px] rounded-[4px] mr-[10px] font-[14px] text-[#9E9E9E] mb-[10px]">
+      class="border-[1px] border-dashed border-[#9E9E9E] px-[10px] py-[5px] rounded-[4px] mr-[10px] font-[14px] text-[#9E9E9E] mb-[10px]">
       PC, Workstation
     </a>
     <a href=""
-       class="border-[1px] border-dashed border-[#9E9E9E] px-[10px] py-[5px] rounded-[4px] mr-[10px] font-[14px] text-[#9E9E9E] mb-[10px]">
+      class="border-[1px] border-dashed border-[#9E9E9E] px-[10px] py-[5px] rounded-[4px] mr-[10px] font-[14px] text-[#9E9E9E] mb-[10px]">
       PC, Workstation
     </a>
   </div>
@@ -49,53 +39,38 @@
   <b>PC, Workstation</b>
   <table class="accessory">
     <thead>
-    <tr>
-      <th>STT</th>
-      <th>Ảnh</th>
-      <th>Sản phẩm</th>
-      <th>Giá hiện tại</th>
-      <th>Quản lý</th>
-    </tr>
+      <tr>
+        <th>STT</th>
+        <th>Ảnh</th>
+        <th>Sản phẩm</th>
+        <th>Giá hiện tại</th>
+        <th>Quản lý</th>
+      </tr>
     </thead>
     <tbody>
-    <tr>
-      <td>1</td>
-      <td>
-        <img src="https://via.placeholder.com/50" alt="">
-      </td>
-      <td>
-        <a href="">CPU Intel Xeon E5-2665 2.40 GHz / 20MB / 8 Cores 16 Threads /
-          Socket 2011</a>
-        <div class="flex items-center">
-          <span>SKU: HN123567</span>
-          <span class="mx-[5px]">/</span>
-          <span>Số lượng: 1</span>
-        </div>
-      </td>
-      <td>
-        24.900.000 VND
-      </td>
-      <td>
-        <div
-                class="flex items-center justify-center w-[32px] h-[32px] leading-[32px] bg-[#ECECEC] rounded-[4px]">
-          <svg xmlns="http://www.w3.org/2000/svg" width="12" height="13"
-               viewBox="0 0 12 13" fill="none">
-            <path fill-rule="evenodd" clip-rule="evenodd"
-                  d="M0 2.95455C0 2.6282 0.264559 2.36364 0.590909 2.36364H11.2273C11.5536 2.36364 11.8182 2.6282 11.8182 2.95455C11.8182 3.2809 11.5536 3.54545 11.2273 3.54545H0.590909C0.264559 3.54545 0 3.2809 0 2.95455Z"
-                  fill="#9E9E9E" />
-            <path fill-rule="evenodd" clip-rule="evenodd"
-                  d="M4.72727 1.18182C4.57055 1.18182 4.42025 1.24407 4.30944 1.35489C4.19862 1.46571 4.13636 1.61601 4.13636 1.77273V2.36364H7.68182V1.77273C7.68182 1.61601 7.61956 1.46571 7.50875 1.35489C7.39793 1.24407 7.24763 1.18182 7.09091 1.18182H4.72727ZM8.86364 2.36364V1.77273C8.86364 1.30257 8.67687 0.85167 8.34442 0.51922C8.01197 0.186769 7.56107 0 7.09091 0H4.72727C4.25712 0 3.80622 0.186769 3.47377 0.51922C3.14132 0.85167 2.95455 1.30257 2.95455 1.77273V2.36364H1.77273C1.44638 2.36364 1.18182 2.6282 1.18182 2.95455V11.2273C1.18182 11.6974 1.36859 12.1483 1.70104 12.4808C2.03349 12.8132 2.48439 13 2.95455 13H8.86364C9.33379 13 9.78469 12.8132 10.1171 12.4808C10.4496 12.1483 10.6364 11.6974 10.6364 11.2273V2.95455C10.6364 2.6282 10.3718 2.36364 10.0455 2.36364H8.86364ZM2.36364 3.54545V11.2273C2.36364 11.384 2.42589 11.5343 2.53671 11.6451C2.64753 11.7559 2.79783 11.8182 2.95455 11.8182H8.86364C9.02036 11.8182 9.17066 11.7559 9.28147 11.6451C9.39229 11.5343 9.45455 11.384 9.45455 11.2273V3.54545H2.36364Z"
-                  fill="#9E9E9E" />
-            <path fill-rule="evenodd" clip-rule="evenodd"
-                  d="M4.72727 5.31818C5.05362 5.31818 5.31818 5.58274 5.31818 5.90909V9.45455C5.31818 9.7809 5.05362 10.0455 4.72727 10.0455C4.40092 10.0455 4.13636 9.7809 4.13636 9.45455V5.90909C4.13636 5.58274 4.40092 5.31818 4.72727 5.31818Z"
-                  fill="#9E9E9E" />
-            <path fill-rule="evenodd" clip-rule="evenodd"
-                  d="M7.09091 5.31818C7.41726 5.31818 7.68182 5.58274 7.68182 5.90909V9.45455C7.68182 9.7809 7.41726 10.0455 7.09091 10.0455C6.76456 10.0455 6.5 9.7809 6.5 9.45455V5.90909C6.5 5.58274 6.76456 5.31818 7.09091 5.31818Z"
-                  fill="#9E9E9E" />
-          </svg>
-        </div>
-      </td>
-    </tr>
+      <tr>
+        <td>1</td>
+        <td>
+          <img src="https://via.placeholder.com/50" alt="">
+        </td>
+        <td>
+          <a href="">CPU Intel Xeon E5-2665 2.40 GHz / 20MB / 8 Cores 16 Threads /
+            Socket 2011</a>
+          <div class="flex items-center">
+            <span>SKU: HN123567</span>
+            <span class="mx-[5px]">/</span>
+            <span>Số lượng: 1</span>
+          </div>
+        </td>
+        <td>
+          24.900.000 VND
+        </td>
+        <td>
+          <div class="flex items-center justify-center w-[32px] h-[32px] leading-[32px] bg-[#ECECEC] rounded-[4px]">
+            <i class="icons icon-remove"></i>
+          </div>
+        </td>
+      </tr>
     </tbody>
   </table>
-</div>
+</div>
\ No newline at end of file
diff --git a/template/product/form_components/basic.html b/template/product/form_components/basic.html
index 4800322..994bf41 100644
--- a/template/product/form_components/basic.html
+++ b/template/product/form_components/basic.html
@@ -1,91 +1,45 @@
-
 <!-- thong tin san pham -->
-<div class="bg-white rounded-[15px] shadow-[0_1px_1px_0_rgba(0,0,0,0.1)] py-[18px] px-[16px] mb-[20px]"
-     role="tabpanel">
+<div class="bg-white rounded-[15px] shadow-[0_1px_1px_0_rgba(0,0,0,0.1)] py-[18px] px-[16px] mb-[20px]" role="tabpanel">
     <div class="info-product">
         <b>1. Thông tin cơ bản</b>
         <div class="flex items-center mb-[12px]">
             <label for="" class="w-[210px] mr-[15px]">Đặt tên Sản phẩm</label>
             <input type="text" value="Máy in mã vạch MH241" placeholder="Đặt tên sản phẩm"
-                   class="w-[440px] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] mr-[10px]">
+                class="w-[440px] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] mr-[10px]">
             <div class="box-note" data-tip="">
-                <svg xmlns="http://www.w3.org/2000/svg" width="15" height="15"
-                     viewBox="0 0 13 13" fill="none">
-                    <path fill-rule="evenodd" clip-rule="evenodd"
-                          d="M6.5 1.18182C3.56285 1.18182 1.18182 3.56285 1.18182 6.5C1.18182 9.43715 3.56285 11.8182 6.5 11.8182C9.43715 11.8182 11.8182 9.43715 11.8182 6.5C11.8182 3.56285 9.43715 1.18182 6.5 1.18182ZM0 6.5C0 2.91015 2.91015 0 6.5 0C10.0899 0 13 2.91015 13 6.5C13 10.0899 10.0899 13 6.5 13C2.91015 13 0 10.0899 0 6.5Z"
-                          fill="#FFC700" />
-                    <path fill-rule="evenodd" clip-rule="evenodd"
-                          d="M6.65259 4.15075C6.37751 4.10356 6.09461 4.15526 5.85399 4.29667C5.61337 4.43808 5.43056 4.66009 5.33795 4.92338C5.22965 5.23123 4.89229 5.39301 4.58443 5.28471C4.27658 5.17641 4.1148 4.83905 4.2231 4.5312C4.40833 4.00463 4.77395 3.56061 5.25518 3.27779C5.73642 2.99496 6.30223 2.89157 6.85239 2.98594C7.40255 3.08031 7.90156 3.36634 8.26104 3.79337C8.62044 4.22032 8.81718 4.76066 8.81643 5.31873C8.81617 6.22303 8.14571 6.82022 7.66694 7.13941C7.40952 7.31102 7.1563 7.4372 6.96978 7.52011C6.87567 7.56193 6.79643 7.59367 6.73933 7.61542C6.71073 7.62631 6.68754 7.63476 6.67066 7.64076L6.65014 7.64795L6.64361 7.65018L6.6413 7.65096L6.6404 7.65126C6.6404 7.65126 6.63966 7.65151 6.4528 7.09092L6.63966 7.65151C6.33005 7.75471 5.99541 7.58739 5.89221 7.27778C5.78908 6.96839 5.95611 6.63398 6.26532 6.53054L6.26456 6.5308L6.26532 6.53054L6.27474 6.52723C6.28383 6.524 6.29873 6.5186 6.31861 6.51103C6.35845 6.49585 6.4177 6.47219 6.48979 6.44015C6.63565 6.37532 6.82562 6.27992 7.01138 6.15607C7.41887 5.88441 7.63461 5.59541 7.63461 5.31819L7.63461 5.31731C7.63503 5.03822 7.53666 4.76798 7.35692 4.55446C7.17718 4.34095 6.92767 4.19793 6.65259 4.15075Z"
-                          fill="#FFC700" />
-                    <path fill-rule="evenodd" clip-rule="evenodd"
-                          d="M5.90909 9.45455C5.90909 9.12819 6.17365 8.86364 6.5 8.86364H6.50591C6.83226 8.86364 7.09682 9.12819 7.09682 9.45455C7.09682 9.7809 6.83226 10.0455 6.50591 10.0455H6.5C6.17365 10.0455 5.90909 9.7809 5.90909 9.45455Z"
-                          fill="#FFC700" />
-                </svg>
+                <i class="fa-regular fa-circle-question text-[#FFC700]"></i>
             </div>
         </div>
         <div class="flex items-center mb-[12px]">
             <label for="" class="w-[210px] mr-[15px]">Model (nếu có)</label>
             <input type="text" value="MH241" placeholder="Model (nếu có)"
-                   class="w-[440px] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] mr-[10px]">
+                class="w-[440px] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] mr-[10px]">
             <div class="box-note">
-                <svg xmlns="http://www.w3.org/2000/svg" width="15" height="15"
-                     viewBox="0 0 13 13" fill="none">
-                    <path fill-rule="evenodd" clip-rule="evenodd"
-                          d="M6.5 1.18182C3.56285 1.18182 1.18182 3.56285 1.18182 6.5C1.18182 9.43715 3.56285 11.8182 6.5 11.8182C9.43715 11.8182 11.8182 9.43715 11.8182 6.5C11.8182 3.56285 9.43715 1.18182 6.5 1.18182ZM0 6.5C0 2.91015 2.91015 0 6.5 0C10.0899 0 13 2.91015 13 6.5C13 10.0899 10.0899 13 6.5 13C2.91015 13 0 10.0899 0 6.5Z"
-                          fill="#FFC700" />
-                    <path fill-rule="evenodd" clip-rule="evenodd"
-                          d="M6.65259 4.15075C6.37751 4.10356 6.09461 4.15526 5.85399 4.29667C5.61337 4.43808 5.43056 4.66009 5.33795 4.92338C5.22965 5.23123 4.89229 5.39301 4.58443 5.28471C4.27658 5.17641 4.1148 4.83905 4.2231 4.5312C4.40833 4.00463 4.77395 3.56061 5.25518 3.27779C5.73642 2.99496 6.30223 2.89157 6.85239 2.98594C7.40255 3.08031 7.90156 3.36634 8.26104 3.79337C8.62044 4.22032 8.81718 4.76066 8.81643 5.31873C8.81617 6.22303 8.14571 6.82022 7.66694 7.13941C7.40952 7.31102 7.1563 7.4372 6.96978 7.52011C6.87567 7.56193 6.79643 7.59367 6.73933 7.61542C6.71073 7.62631 6.68754 7.63476 6.67066 7.64076L6.65014 7.64795L6.64361 7.65018L6.6413 7.65096L6.6404 7.65126C6.6404 7.65126 6.63966 7.65151 6.4528 7.09092L6.63966 7.65151C6.33005 7.75471 5.99541 7.58739 5.89221 7.27778C5.78908 6.96839 5.95611 6.63398 6.26532 6.53054L6.26456 6.5308L6.26532 6.53054L6.27474 6.52723C6.28383 6.524 6.29873 6.5186 6.31861 6.51103C6.35845 6.49585 6.4177 6.47219 6.48979 6.44015C6.63565 6.37532 6.82562 6.27992 7.01138 6.15607C7.41887 5.88441 7.63461 5.59541 7.63461 5.31819L7.63461 5.31731C7.63503 5.03822 7.53666 4.76798 7.35692 4.55446C7.17718 4.34095 6.92767 4.19793 6.65259 4.15075Z"
-                          fill="#FFC700" />
-                    <path fill-rule="evenodd" clip-rule="evenodd"
-                          d="M5.90909 9.45455C5.90909 9.12819 6.17365 8.86364 6.5 8.86364H6.50591C6.83226 8.86364 7.09682 9.12819 7.09682 9.45455C7.09682 9.7809 6.83226 10.0455 6.50591 10.0455H6.5C6.17365 10.0455 5.90909 9.7809 5.90909 9.45455Z"
-                          fill="#FFC700" />
-                </svg>
+                <i class="fa-regular fa-circle-question text-[#FFC700]"></i>
             </div>
         </div>
         <div class="flex items-center mb-[12px]">
             <label for="" class="w-[210px] mr-[15px]">Mã kho hàng - SKU (nếu có)</label>
             <input type="text" value="MH241" placeholder="Mã kho hàng - SKU (nếu có)"
-                   class="w-[440px] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] mr-[10px]">
+                class="w-[440px] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] mr-[10px]">
             <div class="box-note">
-                <svg xmlns="http://www.w3.org/2000/svg" width="15" height="15"
-                     viewBox="0 0 13 13" fill="none">
-                    <path fill-rule="evenodd" clip-rule="evenodd"
-                          d="M6.5 1.18182C3.56285 1.18182 1.18182 3.56285 1.18182 6.5C1.18182 9.43715 3.56285 11.8182 6.5 11.8182C9.43715 11.8182 11.8182 9.43715 11.8182 6.5C11.8182 3.56285 9.43715 1.18182 6.5 1.18182ZM0 6.5C0 2.91015 2.91015 0 6.5 0C10.0899 0 13 2.91015 13 6.5C13 10.0899 10.0899 13 6.5 13C2.91015 13 0 10.0899 0 6.5Z"
-                          fill="#FFC700" />
-                    <path fill-rule="evenodd" clip-rule="evenodd"
-                          d="M6.65259 4.15075C6.37751 4.10356 6.09461 4.15526 5.85399 4.29667C5.61337 4.43808 5.43056 4.66009 5.33795 4.92338C5.22965 5.23123 4.89229 5.39301 4.58443 5.28471C4.27658 5.17641 4.1148 4.83905 4.2231 4.5312C4.40833 4.00463 4.77395 3.56061 5.25518 3.27779C5.73642 2.99496 6.30223 2.89157 6.85239 2.98594C7.40255 3.08031 7.90156 3.36634 8.26104 3.79337C8.62044 4.22032 8.81718 4.76066 8.81643 5.31873C8.81617 6.22303 8.14571 6.82022 7.66694 7.13941C7.40952 7.31102 7.1563 7.4372 6.96978 7.52011C6.87567 7.56193 6.79643 7.59367 6.73933 7.61542C6.71073 7.62631 6.68754 7.63476 6.67066 7.64076L6.65014 7.64795L6.64361 7.65018L6.6413 7.65096L6.6404 7.65126C6.6404 7.65126 6.63966 7.65151 6.4528 7.09092L6.63966 7.65151C6.33005 7.75471 5.99541 7.58739 5.89221 7.27778C5.78908 6.96839 5.95611 6.63398 6.26532 6.53054L6.26456 6.5308L6.26532 6.53054L6.27474 6.52723C6.28383 6.524 6.29873 6.5186 6.31861 6.51103C6.35845 6.49585 6.4177 6.47219 6.48979 6.44015C6.63565 6.37532 6.82562 6.27992 7.01138 6.15607C7.41887 5.88441 7.63461 5.59541 7.63461 5.31819L7.63461 5.31731C7.63503 5.03822 7.53666 4.76798 7.35692 4.55446C7.17718 4.34095 6.92767 4.19793 6.65259 4.15075Z"
-                          fill="#FFC700" />
-                    <path fill-rule="evenodd" clip-rule="evenodd"
-                          d="M5.90909 9.45455C5.90909 9.12819 6.17365 8.86364 6.5 8.86364H6.50591C6.83226 8.86364 7.09682 9.12819 7.09682 9.45455C7.09682 9.7809 6.83226 10.0455 6.50591 10.0455H6.5C6.17365 10.0455 5.90909 9.7809 5.90909 9.45455Z"
-                          fill="#FFC700" />
-                </svg>
+                <i class="fa-regular fa-circle-question text-[#FFC700]"></i>
             </div>
         </div>
         <div class="flex items-center mb-[12px]">
             <label for="" class="w-[210px] mr-[15px]">Trọng lượng (tính phí
                 shipping)</label>
             <input type="text" value="0" placeholder="Trọng lượng (tính phí shipping)"
-                   class="w-[440px] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] mr-[10px]">
+                class="w-[440px] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] mr-[10px]">
             <div class="box-note flex items-center">
                 <span class="mr-[10px]">gram</span>
-                <svg xmlns="http://www.w3.org/2000/svg" width="15" height="15"
-                     viewBox="0 0 13 13" fill="none">
-                    <path fill-rule="evenodd" clip-rule="evenodd"
-                          d="M6.5 1.18182C3.56285 1.18182 1.18182 3.56285 1.18182 6.5C1.18182 9.43715 3.56285 11.8182 6.5 11.8182C9.43715 11.8182 11.8182 9.43715 11.8182 6.5C11.8182 3.56285 9.43715 1.18182 6.5 1.18182ZM0 6.5C0 2.91015 2.91015 0 6.5 0C10.0899 0 13 2.91015 13 6.5C13 10.0899 10.0899 13 6.5 13C2.91015 13 0 10.0899 0 6.5Z"
-                          fill="#FFC700" />
-                    <path fill-rule="evenodd" clip-rule="evenodd"
-                          d="M6.65259 4.15075C6.37751 4.10356 6.09461 4.15526 5.85399 4.29667C5.61337 4.43808 5.43056 4.66009 5.33795 4.92338C5.22965 5.23123 4.89229 5.39301 4.58443 5.28471C4.27658 5.17641 4.1148 4.83905 4.2231 4.5312C4.40833 4.00463 4.77395 3.56061 5.25518 3.27779C5.73642 2.99496 6.30223 2.89157 6.85239 2.98594C7.40255 3.08031 7.90156 3.36634 8.26104 3.79337C8.62044 4.22032 8.81718 4.76066 8.81643 5.31873C8.81617 6.22303 8.14571 6.82022 7.66694 7.13941C7.40952 7.31102 7.1563 7.4372 6.96978 7.52011C6.87567 7.56193 6.79643 7.59367 6.73933 7.61542C6.71073 7.62631 6.68754 7.63476 6.67066 7.64076L6.65014 7.64795L6.64361 7.65018L6.6413 7.65096L6.6404 7.65126C6.6404 7.65126 6.63966 7.65151 6.4528 7.09092L6.63966 7.65151C6.33005 7.75471 5.99541 7.58739 5.89221 7.27778C5.78908 6.96839 5.95611 6.63398 6.26532 6.53054L6.26456 6.5308L6.26532 6.53054L6.27474 6.52723C6.28383 6.524 6.29873 6.5186 6.31861 6.51103C6.35845 6.49585 6.4177 6.47219 6.48979 6.44015C6.63565 6.37532 6.82562 6.27992 7.01138 6.15607C7.41887 5.88441 7.63461 5.59541 7.63461 5.31819L7.63461 5.31731C7.63503 5.03822 7.53666 4.76798 7.35692 4.55446C7.17718 4.34095 6.92767 4.19793 6.65259 4.15075Z"
-                          fill="#FFC700" />
-                    <path fill-rule="evenodd" clip-rule="evenodd"
-                          d="M5.90909 9.45455C5.90909 9.12819 6.17365 8.86364 6.5 8.86364H6.50591C6.83226 8.86364 7.09682 9.12819 7.09682 9.45455C7.09682 9.7809 6.83226 10.0455 6.50591 10.0455H6.5C6.17365 10.0455 5.90909 9.7809 5.90909 9.45455Z"
-                          fill="#FFC700" />
-                </svg>
+                <i class="fa-regular fa-circle-question text-[#FFC700]"></i>
             </div>
         </div>
         <div class="flex items-center mb-[12px]">
             <label for="" class="w-[210px] mr-[15px]">Thương hiệu</label>
             <select name="" id=""
-                    class="w-[215px] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] mr-[10px]">
+                class="w-[215px] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] mr-[10px]">
                 <option value="">Chọn thương hiệu</option>
                 <option value="">ABS</option>
             </select>
@@ -96,12 +50,12 @@
         <div class="flex items-center mb-[12px]">
             <label for="" class="w-[210px] mr-[15px]">Tóm tắt đặc tính chính</label>
             <textarea name="" id="" placeholder="Nhập tóm tắt đặt tính chính"
-                      class="w-[440px] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] mr-[10px] h-[75px]"></textarea>
+                class="w-[440px] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] mr-[10px] h-[75px]"></textarea>
         </div>
         <div class="flex items-center mb-[12px]">
             <label for="" class="w-[210px] mr-[15px]">Phụ kiện đi kèm</label>
             <input type="text" value="Test" placeholder="Phụ kiện đi kèm"
-                   class="w-[440px] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] mr-[10px]">
+                class="w-[440px] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] mr-[10px]">
         </div>
     </div>
     <div class="product-sale-info mt-[25px]">
@@ -112,14 +66,14 @@
                 <td>
                     <div class="flex items-center">
                         <input type="text" value="0" placeholder="Giá sản phẩm"
-                               class="w-[176px] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] mr-[10px]">
+                            class="w-[176px] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] mr-[10px]">
                         <select name="" id=""
-                                class="w-[88px] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] mx-[15px] ">
+                            class="w-[88px] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] mx-[15px] ">
                             <option value="">VNĐ</option>
                         </select>
                         <span>/</span>
                         <select name="" id=""
-                                class="w-[88px] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] mx-[15px] ">
+                            class="w-[88px] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] mx-[15px] ">
                             <option value="">Chiếc</option>
                         </select>
                     </div>
@@ -128,15 +82,7 @@
                         <span>Tỷ giá:</span>
                         <b>1</b>
                         <a href="" class="ml-[5px]">
-                            <svg xmlns="http://www.w3.org/2000/svg" width="12" height="13"
-                                 viewBox="0 0 12 13" fill="none">
-                                <path fill-rule="evenodd" clip-rule="evenodd"
-                                      d="M6.67307 0.173073C6.90384 -0.0576911 7.27798 -0.0576911 7.50875 0.173073L9.87238 2.53671C10.1031 2.76747 10.1031 3.14162 9.87238 3.37238L3.37238 9.87238C3.26156 9.9832 3.11126 10.0455 2.95455 10.0455H0.590909C0.264559 10.0455 0 9.7809 0 9.45455V7.09091C0 6.93419 0.0622563 6.78389 0.173073 6.67307L6.67307 0.173073ZM1.18182 7.33567V8.86364H2.70978L8.61887 2.95455L7.09091 1.42658L1.18182 7.33567Z"
-                                      fill="#0041E8" />
-                                <path fill-rule="evenodd" clip-rule="evenodd"
-                                      d="M0 12.4091C0 12.0828 0.264559 11.8182 0.590909 11.8182H11.2273C11.5536 11.8182 11.8182 12.0828 11.8182 12.4091C11.8182 12.7355 11.5536 13.0001 11.2273 13.0001H0.590909C0.264559 13.0001 0 12.7355 0 12.4091Z"
-                                      fill="#0041E8" />
-                            </svg>
+                            <i class="icons icon-edit"></i>
                         </a>
                     </div>
                 </td>
@@ -166,7 +112,7 @@
                 <td>
                     <div class="flex items-center">
                         <input type="text" value="0" placeholder="Giá sản phẩm"
-                               class="w-[176px] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] mr-[10px]">
+                            class="w-[176px] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] mr-[10px]">
                         <span>vnd (để tham khảo khi cần)</span>
                     </div>
 
@@ -177,7 +123,7 @@
                 <td>
                     <div class="flex items-center">
                         <input type="text" value="0" placeholder="Giá sản phẩm"
-                               class="w-[176px] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] mr-[10px]">
+                            class="w-[176px] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] mr-[10px]">
                         <span>vnd (để tham khảo khi cần)</span>
                     </div>
 
@@ -188,7 +134,7 @@
                 <td>
                     <div class="flex items-center">
                         <input type="text" value="0" placeholder="Giá sản phẩm"
-                               class="w-[176px] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] mr-[10px]">
+                            class="w-[176px] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] mr-[10px]">
                     </div>
 
                 </td>
@@ -196,22 +142,22 @@
             <tr>
                 <td>Khuyến mại riêng</td>
                 <td>
-                                                <textarea type="text" placeholder="Nhập khuyến mại riêng"
-                                                          class="w-[442px] h-[76px] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] mr-[10px]"></textarea>
+                    <textarea type="text" placeholder="Nhập khuyến mại riêng"
+                        class="w-[442px] h-[76px] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] mr-[10px]"></textarea>
                 </td>
             </tr>
             <tr>
                 <td>Khuyến mại riêng</td>
                 <td>
-                                                <textarea type="text" placeholder="Nhập khuyến mại riêng"
-                                                          class="w-[442px] h-[35px] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] mr-[10px]"></textarea>
+                    <textarea type="text" placeholder="Nhập khuyến mại riêng"
+                        class="w-[442px] h-[35px] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] mr-[10px]"></textarea>
                 </td>
             </tr>
             <tr>
                 <td>Tình trạng (Mới / Cũ)</td>
                 <td>
                     <input type="text" value="" placeholder=""
-                           class="w-[176px] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] mr-[10px]">
+                        class="w-[176px] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] mr-[10px]">
                 </td>
             </tr>
             <tr>
@@ -230,8 +176,7 @@
                 </td>
             </tr>
         </table>
-        <input
-                class="btn w-[82px] h-[32px] bg-[#0041E8] rounded-[4px] mt-[10px] text-white cursor-pointer"
-                name="commit" type="submit" value="Cập nhật">
+        <input class="btn w-[82px] h-[32px] bg-[#0041E8] rounded-[4px] mt-[10px] text-white cursor-pointer"
+            name="commit" type="submit" value="Cập nhật">
     </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/template/product/form_components/description.html b/template/product/form_components/description.html
index 9a4cc34..d105c3e 100644
--- a/template/product/form_components/description.html
+++ b/template/product/form_components/description.html
@@ -6,36 +6,15 @@
     </div>
     <div class="list-btn flex items-center mt-[5px] mb-[20px]">
         <a href="" class="flex items-center mr-[20px]">
-            <svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" viewBox="0 0 13 13" fill="none">
-                <path fill-rule="evenodd" clip-rule="evenodd"
-                    d="M0.65 7.8C1.00899 7.8 1.3 8.09101 1.3 8.45V11.05C1.3 11.2224 1.36848 11.3877 1.49038 11.5096C1.61228 11.6315 1.77761 11.7 1.95 11.7H11.05C11.2224 11.7 11.3877 11.6315 11.5096 11.5096C11.6315 11.3877 11.7 11.2224 11.7 11.05V8.45C11.7 8.09101 11.991 7.8 12.35 7.8C12.709 7.8 13 8.09101 13 8.45V11.05C13 11.5672 12.7946 12.0632 12.4289 12.4289C12.0632 12.7946 11.5672 13 11.05 13H1.95C1.43283 13 0.936837 12.7946 0.571142 12.4289C0.205446 12.0632 0 11.5672 0 11.05V8.45C0 8.09101 0.291015 7.8 0.65 7.8Z"
-                    fill="#0041E8" />
-                <path fill-rule="evenodd" clip-rule="evenodd"
-                    d="M6.04038 0.190381C6.29422 -0.0634602 6.70578 -0.0634602 6.95962 0.190381L10.2096 3.44038C10.4635 3.69422 10.4635 4.10578 10.2096 4.35962C9.95578 4.61346 9.54422 4.61346 9.29038 4.35962L6.5 1.56924L3.70962 4.35962C3.45578 4.61346 3.04422 4.61346 2.79038 4.35962C2.53654 4.10578 2.53654 3.69422 2.79038 3.44038L6.04038 0.190381Z"
-                    fill="#0041E8" />
-                <path fill-rule="evenodd" clip-rule="evenodd"
-                    d="M6.5 9.68575e-09C6.85898 9.68575e-09 7.15 0.291015 7.15 0.65V8.45C7.15 8.80898 6.85898 9.1 6.5 9.1C6.14101 9.1 5.85 8.80898 5.85 8.45V0.65C5.85 0.291015 6.14101 9.68575e-09 6.5 9.68575e-09Z"
-                    fill="#0041E8" />
-            </svg>
+            <i class="fa-solid fa-arrow-up-from-bracket text-[#0041E8]"></i>
             <span class="text-[#0041E8] ml-[5px]">Upload ảnh</span>
         </a>
         <a href="" class="flex items-center mr-[20px]">
-            <svg xmlns="http://www.w3.org/2000/svg" width="15" height="13" viewBox="0 0 15 13" fill="none">
-                <path fill-rule="evenodd" clip-rule="evenodd"
-                    d="M1.95 1.3C1.77761 1.3 1.61228 1.36848 1.49038 1.49038C1.36848 1.61228 1.3 1.77761 1.3 1.95V11.05C1.3 11.2224 1.36848 11.3877 1.49038 11.5096C1.61228 11.6315 1.77761 11.7 1.95 11.7H12.35C12.5224 11.7 12.6877 11.6315 12.8096 11.5096C12.9315 11.3877 13 11.2224 13 11.05V3.9C13 3.72761 12.9315 3.56228 12.8096 3.44038C12.6877 3.31848 12.5224 3.25 12.35 3.25H6.5C6.28267 3.25 6.07972 3.14138 5.95917 2.96055L4.85213 1.3H1.95ZM0.571142 0.571142C0.936838 0.205446 1.43283 0 1.95 0H5.2C5.41733 0 5.62028 0.108616 5.74083 0.289445L6.84787 1.95H12.35C12.8672 1.95 13.3632 2.15545 13.7289 2.52114C14.0946 2.88684 14.3 3.38283 14.3 3.9V11.05C14.3 11.5672 14.0946 12.0632 13.7289 12.4289C13.3632 12.7946 12.8672 13 12.35 13H1.95C1.43283 13 0.936837 12.7946 0.571142 12.4289C0.205446 12.0632 0 11.5672 0 11.05V1.95C0 1.43283 0.205446 0.936838 0.571142 0.571142Z"
-                    fill="#0041E8" />
-            </svg>
+            <i class="fa-regular fa-folder text-[#0041E8]"></i>
             <span class="text-[#0041E8] ml-[5px]">Quản lý</span>
         </a>
         <a href="" class="flex items-center">
-            <svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" viewBox="0 0 13 13" fill="none">
-                <path fill-rule="evenodd" clip-rule="evenodd"
-                    d="M1.77273 2.36364C1.61601 2.36364 1.46571 2.42589 1.35489 2.53671C1.24407 2.64753 1.18182 2.79783 1.18182 2.95455V11.2273C1.18182 11.384 1.24407 11.5343 1.35489 11.6451C1.46571 11.7559 1.61601 11.8182 1.77273 11.8182H10.0455C10.2022 11.8182 10.3525 11.7559 10.4633 11.6451C10.5741 11.5343 10.6364 11.384 10.6364 11.2273V8.07182C10.6364 7.74547 10.9009 7.48091 11.2273 7.48091C11.5536 7.48091 11.8182 7.74547 11.8182 8.07182V11.2273C11.8182 11.6974 11.6314 12.1483 11.299 12.4808C10.9665 12.8132 10.5156 13 10.0455 13H1.77273C1.30257 13 0.85167 12.8132 0.51922 12.4808C0.186769 12.1483 0 11.6974 0 11.2273V2.95455C0 2.48439 0.186769 2.03349 0.51922 1.70104C0.851671 1.36859 1.30257 1.18182 1.77273 1.18182H4.92818C5.25453 1.18182 5.51909 1.44638 5.51909 1.77273C5.51909 2.09908 5.25453 2.36364 4.92818 2.36364H1.77273Z"
-                    fill="#0041E8" />
-                <path fill-rule="evenodd" clip-rule="evenodd"
-                    d="M9.62762 0.173073C9.85838 -0.0576911 10.2325 -0.0576911 10.4633 0.173073L12.8269 2.53671C13.0577 2.76747 13.0577 3.14162 12.8269 3.37238L6.91784 9.28147C6.80702 9.39229 6.65672 9.45455 6.5 9.45455H4.13636C3.81001 9.45455 3.54545 9.18999 3.54545 8.86364V6.5C3.54545 6.34328 3.60771 6.19298 3.71853 6.08216L9.62762 0.173073ZM4.72727 6.74476V8.27273H6.25524L11.5734 2.95455L10.0455 1.42658L4.72727 6.74476Z"
-                    fill="#0041E8" />
-            </svg>
+            <i class="fa-regular fa-pen-to-square text-[#0041E8]"></i>
             <span class="text-[#0041E8] ml-[5px]">Chọn ảnh trong kho ảnh chính</span>
         </a>
     </div>
diff --git a/template/product/form_components/image.html b/template/product/form_components/image.html
index 0261a2c..cb92364 100644
--- a/template/product/form_components/image.html
+++ b/template/product/form_components/image.html
@@ -1,40 +1,23 @@
-
-
 <!-- hinh anh -->
-<div class="bg-white rounded-[15px] shadow-[0_1px_1px_0_rgba(0,0,0,0.1)] py-[18px] px-[16px] mb-[20px]"
-     role="tabpanel">
+<div class="bg-white rounded-[15px] shadow-[0_1px_1px_0_rgba(0,0,0,0.1)] py-[18px] px-[16px] mb-[20px]" role="tabpanel">
     <div class="flex items-center overflow-x-scroll">
         <div class="item w-[50%] rounded-[10px] border-[1px] border-[#f6f6f6] p-[15px]">
             <b class="text-center block">Ảnh chính</b>
             <img src="./images/image-big.png" alt="">
             <p class="text-center block">(Hình sản phẩm)</p>
             <a href="" class="text-center flex justify-center">
-                <svg xmlns="http://www.w3.org/2000/svg" width="12" height="13"
-                     viewBox="0 0 12 13" fill="none">
-                    <path fill-rule="evenodd" clip-rule="evenodd"
-                          d="M0 2.95455C0 2.6282 0.264559 2.36364 0.590909 2.36364H11.2273C11.5536 2.36364 11.8182 2.6282 11.8182 2.95455C11.8182 3.2809 11.5536 3.54545 11.2273 3.54545H0.590909C0.264559 3.54545 0 3.2809 0 2.95455Z"
-                          fill="#9E9E9E" />
-                    <path fill-rule="evenodd" clip-rule="evenodd"
-                          d="M4.72727 1.18182C4.57055 1.18182 4.42025 1.24407 4.30944 1.35489C4.19862 1.46571 4.13636 1.61601 4.13636 1.77273V2.36364H7.68182V1.77273C7.68182 1.61601 7.61956 1.46571 7.50875 1.35489C7.39793 1.24407 7.24763 1.18182 7.09091 1.18182H4.72727ZM8.86364 2.36364V1.77273C8.86364 1.30257 8.67687 0.85167 8.34442 0.51922C8.01197 0.186769 7.56107 0 7.09091 0H4.72727C4.25712 0 3.80622 0.186769 3.47377 0.51922C3.14132 0.85167 2.95455 1.30257 2.95455 1.77273V2.36364H1.77273C1.44638 2.36364 1.18182 2.6282 1.18182 2.95455V11.2273C1.18182 11.6974 1.36859 12.1483 1.70104 12.4808C2.03349 12.8132 2.48439 13 2.95455 13H8.86364C9.33379 13 9.78469 12.8132 10.1171 12.4808C10.4496 12.1483 10.6364 11.6974 10.6364 11.2273V2.95455C10.6364 2.6282 10.3718 2.36364 10.0455 2.36364H8.86364ZM2.36364 3.54545V11.2273C2.36364 11.384 2.42589 11.5343 2.53671 11.6451C2.64753 11.7559 2.79783 11.8182 2.95455 11.8182H8.86364C9.02036 11.8182 9.17066 11.7559 9.28147 11.6451C9.39229 11.5343 9.45455 11.384 9.45455 11.2273V3.54545H2.36364Z"
-                          fill="#9E9E9E" />
-                    <path fill-rule="evenodd" clip-rule="evenodd"
-                          d="M4.72727 5.31818C5.05362 5.31818 5.31818 5.58274 5.31818 5.90909V9.45455C5.31818 9.7809 5.05362 10.0455 4.72727 10.0455C4.40092 10.0455 4.13636 9.7809 4.13636 9.45455V5.90909C4.13636 5.58274 4.40092 5.31818 4.72727 5.31818Z"
-                          fill="#9E9E9E" />
-                    <path fill-rule="evenodd" clip-rule="evenodd"
-                          d="M7.09091 5.31818C7.41726 5.31818 7.68182 5.58274 7.68182 5.90909V9.45455C7.68182 9.7809 7.41726 10.0455 7.09091 10.0455C6.76456 10.0455 6.5 9.7809 6.5 9.45455V5.90909C6.5 5.58274 6.76456 5.31818 7.09091 5.31818Z"
-                          fill="#9E9E9E" />
-                </svg>
+                <i class="icons icon-remove"></i>
             </a>
             <div class="flex items-center justify-between mt-[10px]">
                 <div class="item flex items-center mr-[20px]">
                     <p class="whitespace-nowrap">STT</p>
                     <input type="text"
-                           class="w-[112px] h-[32px] px-[10px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] ml-[10px] rounded-[4px] border-[#d8d8d8] border-[1px]">
+                        class="w-[112px] h-[32px] px-[10px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] ml-[10px] rounded-[4px] border-[#d8d8d8] border-[1px]">
                 </div>
                 <div class="item flex items-center">
                     <p class="whitespace-nowrap">ALT</p>
                     <input type="text"
-                           class="w-[112px] h-[32px] px-[10px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] ml-[10px] rounded-[4px] border-[#d8d8d8] border-[1px]">
+                        class="w-[112px] h-[32px] px-[10px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] ml-[10px] rounded-[4px] border-[#d8d8d8] border-[1px]">
                 </div>
             </div>
         </div>
@@ -43,32 +26,18 @@
             <img src="./images/image-big.png" alt="">
             <p class="text-center block">(Hình sản phẩm)</p>
             <a href="" class="text-center flex justify-center">
-                <svg xmlns="http://www.w3.org/2000/svg" width="12" height="13"
-                     viewBox="0 0 12 13" fill="none">
-                    <path fill-rule="evenodd" clip-rule="evenodd"
-                          d="M0 2.95455C0 2.6282 0.264559 2.36364 0.590909 2.36364H11.2273C11.5536 2.36364 11.8182 2.6282 11.8182 2.95455C11.8182 3.2809 11.5536 3.54545 11.2273 3.54545H0.590909C0.264559 3.54545 0 3.2809 0 2.95455Z"
-                          fill="#9E9E9E" />
-                    <path fill-rule="evenodd" clip-rule="evenodd"
-                          d="M4.72727 1.18182C4.57055 1.18182 4.42025 1.24407 4.30944 1.35489C4.19862 1.46571 4.13636 1.61601 4.13636 1.77273V2.36364H7.68182V1.77273C7.68182 1.61601 7.61956 1.46571 7.50875 1.35489C7.39793 1.24407 7.24763 1.18182 7.09091 1.18182H4.72727ZM8.86364 2.36364V1.77273C8.86364 1.30257 8.67687 0.85167 8.34442 0.51922C8.01197 0.186769 7.56107 0 7.09091 0H4.72727C4.25712 0 3.80622 0.186769 3.47377 0.51922C3.14132 0.85167 2.95455 1.30257 2.95455 1.77273V2.36364H1.77273C1.44638 2.36364 1.18182 2.6282 1.18182 2.95455V11.2273C1.18182 11.6974 1.36859 12.1483 1.70104 12.4808C2.03349 12.8132 2.48439 13 2.95455 13H8.86364C9.33379 13 9.78469 12.8132 10.1171 12.4808C10.4496 12.1483 10.6364 11.6974 10.6364 11.2273V2.95455C10.6364 2.6282 10.3718 2.36364 10.0455 2.36364H8.86364ZM2.36364 3.54545V11.2273C2.36364 11.384 2.42589 11.5343 2.53671 11.6451C2.64753 11.7559 2.79783 11.8182 2.95455 11.8182H8.86364C9.02036 11.8182 9.17066 11.7559 9.28147 11.6451C9.39229 11.5343 9.45455 11.384 9.45455 11.2273V3.54545H2.36364Z"
-                          fill="#9E9E9E" />
-                    <path fill-rule="evenodd" clip-rule="evenodd"
-                          d="M4.72727 5.31818C5.05362 5.31818 5.31818 5.58274 5.31818 5.90909V9.45455C5.31818 9.7809 5.05362 10.0455 4.72727 10.0455C4.40092 10.0455 4.13636 9.7809 4.13636 9.45455V5.90909C4.13636 5.58274 4.40092 5.31818 4.72727 5.31818Z"
-                          fill="#9E9E9E" />
-                    <path fill-rule="evenodd" clip-rule="evenodd"
-                          d="M7.09091 5.31818C7.41726 5.31818 7.68182 5.58274 7.68182 5.90909V9.45455C7.68182 9.7809 7.41726 10.0455 7.09091 10.0455C6.76456 10.0455 6.5 9.7809 6.5 9.45455V5.90909C6.5 5.58274 6.76456 5.31818 7.09091 5.31818Z"
-                          fill="#9E9E9E" />
-                </svg>
+                <i class="icons icon-remove"></i>
             </a>
             <div class="flex items-center justify-between mt-[10px]">
                 <div class="item flex items-center mr-[20px]">
                     <p class="whitespace-nowrap">STT</p>
                     <input type="text"
-                           class="w-[112px] h-[32px] px-[10px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] ml-[10px] rounded-[4px] border-[#d8d8d8] border-[1px]">
+                        class="w-[112px] h-[32px] px-[10px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] ml-[10px] rounded-[4px] border-[#d8d8d8] border-[1px]">
                 </div>
                 <div class="item flex items-center">
                     <p class="whitespace-nowrap">ALT</p>
                     <input type="text"
-                           class="w-[112px] h-[32px] px-[10px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] ml-[10px] rounded-[4px] border-[#d8d8d8] border-[1px]">
+                        class="w-[112px] h-[32px] px-[10px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] ml-[10px] rounded-[4px] border-[#d8d8d8] border-[1px]">
                 </div>
             </div>
         </div>
@@ -77,79 +46,43 @@
             <img src="./images/image-big.png" alt="">
             <p class="text-center block">(Hình sản phẩm)</p>
             <a href="" class="text-center flex justify-center">
-                <svg xmlns="http://www.w3.org/2000/svg" width="12" height="13"
-                     viewBox="0 0 12 13" fill="none">
-                    <path fill-rule="evenodd" clip-rule="evenodd"
-                          d="M0 2.95455C0 2.6282 0.264559 2.36364 0.590909 2.36364H11.2273C11.5536 2.36364 11.8182 2.6282 11.8182 2.95455C11.8182 3.2809 11.5536 3.54545 11.2273 3.54545H0.590909C0.264559 3.54545 0 3.2809 0 2.95455Z"
-                          fill="#9E9E9E" />
-                    <path fill-rule="evenodd" clip-rule="evenodd"
-                          d="M4.72727 1.18182C4.57055 1.18182 4.42025 1.24407 4.30944 1.35489C4.19862 1.46571 4.13636 1.61601 4.13636 1.77273V2.36364H7.68182V1.77273C7.68182 1.61601 7.61956 1.46571 7.50875 1.35489C7.39793 1.24407 7.24763 1.18182 7.09091 1.18182H4.72727ZM8.86364 2.36364V1.77273C8.86364 1.30257 8.67687 0.85167 8.34442 0.51922C8.01197 0.186769 7.56107 0 7.09091 0H4.72727C4.25712 0 3.80622 0.186769 3.47377 0.51922C3.14132 0.85167 2.95455 1.30257 2.95455 1.77273V2.36364H1.77273C1.44638 2.36364 1.18182 2.6282 1.18182 2.95455V11.2273C1.18182 11.6974 1.36859 12.1483 1.70104 12.4808C2.03349 12.8132 2.48439 13 2.95455 13H8.86364C9.33379 13 9.78469 12.8132 10.1171 12.4808C10.4496 12.1483 10.6364 11.6974 10.6364 11.2273V2.95455C10.6364 2.6282 10.3718 2.36364 10.0455 2.36364H8.86364ZM2.36364 3.54545V11.2273C2.36364 11.384 2.42589 11.5343 2.53671 11.6451C2.64753 11.7559 2.79783 11.8182 2.95455 11.8182H8.86364C9.02036 11.8182 9.17066 11.7559 9.28147 11.6451C9.39229 11.5343 9.45455 11.384 9.45455 11.2273V3.54545H2.36364Z"
-                          fill="#9E9E9E" />
-                    <path fill-rule="evenodd" clip-rule="evenodd"
-                          d="M4.72727 5.31818C5.05362 5.31818 5.31818 5.58274 5.31818 5.90909V9.45455C5.31818 9.7809 5.05362 10.0455 4.72727 10.0455C4.40092 10.0455 4.13636 9.7809 4.13636 9.45455V5.90909C4.13636 5.58274 4.40092 5.31818 4.72727 5.31818Z"
-                          fill="#9E9E9E" />
-                    <path fill-rule="evenodd" clip-rule="evenodd"
-                          d="M7.09091 5.31818C7.41726 5.31818 7.68182 5.58274 7.68182 5.90909V9.45455C7.68182 9.7809 7.41726 10.0455 7.09091 10.0455C6.76456 10.0455 6.5 9.7809 6.5 9.45455V5.90909C6.5 5.58274 6.76456 5.31818 7.09091 5.31818Z"
-                          fill="#9E9E9E" />
-                </svg>
+                <i class="icons icon-remove"></i>
             </a>
             <div class="flex items-center justify-between mt-[10px]">
                 <div class="item flex items-center mr-[20px]">
                     <p class="whitespace-nowrap">STT</p>
                     <input type="text"
-                           class="w-[112px] h-[32px] px-[10px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] ml-[10px] rounded-[4px] border-[#d8d8d8] border-[1px]">
+                        class="w-[112px] h-[32px] px-[10px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] ml-[10px] rounded-[4px] border-[#d8d8d8] border-[1px]">
                 </div>
                 <div class="item flex items-center">
                     <p class="whitespace-nowrap">ALT</p>
                     <input type="text"
-                           class="w-[112px] h-[32px] px-[10px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] ml-[10px] rounded-[4px] border-[#d8d8d8] border-[1px]">
+                        class="w-[112px] h-[32px] px-[10px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] ml-[10px] rounded-[4px] border-[#d8d8d8] border-[1px]">
                 </div>
             </div>
         </div>
     </div>
-    <div
-            class="border-[1px] my-[15px] shadow-[0_1px_1px_0_rgba(0,0,0,0.1)] rounded-[10px] p-[15px]">
+    <div class="border-[1px] my-[15px] shadow-[0_1px_1px_0_rgba(0,0,0,0.1)] rounded-[10px] p-[15px]">
         <b>Thêm ảnh cho sản phẩm</b>
         <p>Bạn có thể: Chọn ảnh có sẵn trong kho ảnh, hoặc upload ảnh từ máy tính:</p>
         <div class="flex items-center mt-[10px]">
             <a href=""
-               class="item flex items-center px-[15px] py-[8px] border-[1px] border-[#0041E8] rounded-[4px] mr-[15px]">
-                <svg xmlns="http://www.w3.org/2000/svg" width="13" height="13"
-                     viewBox="0 0 13 13" fill="none">
-                    <path fill-rule="evenodd" clip-rule="evenodd"
-                          d="M0.65 7.8C1.00899 7.8 1.3 8.09101 1.3 8.45V11.05C1.3 11.2224 1.36848 11.3877 1.49038 11.5096C1.61228 11.6315 1.77761 11.7 1.95 11.7H11.05C11.2224 11.7 11.3877 11.6315 11.5096 11.5096C11.6315 11.3877 11.7 11.2224 11.7 11.05V8.45C11.7 8.09101 11.991 7.8 12.35 7.8C12.709 7.8 13 8.09101 13 8.45V11.05C13 11.5672 12.7946 12.0632 12.4289 12.4289C12.0632 12.7946 11.5672 13 11.05 13H1.95C1.43283 13 0.936837 12.7946 0.571142 12.4289C0.205446 12.0632 0 11.5672 0 11.05V8.45C0 8.09101 0.291015 7.8 0.65 7.8Z"
-                          fill="#0041E8" />
-                    <path fill-rule="evenodd" clip-rule="evenodd"
-                          d="M6.04038 0.190381C6.29422 -0.0634602 6.70578 -0.0634602 6.95962 0.190381L10.2096 3.44038C10.4635 3.69422 10.4635 4.10578 10.2096 4.35962C9.95578 4.61346 9.54422 4.61346 9.29038 4.35962L6.5 1.56924L3.70962 4.35962C3.45578 4.61346 3.04422 4.61346 2.79038 4.35962C2.53654 4.10578 2.53654 3.69422 2.79038 3.44038L6.04038 0.190381Z"
-                          fill="#0041E8" />
-                    <path fill-rule="evenodd" clip-rule="evenodd"
-                          d="M6.5 9.68575e-09C6.85898 9.68575e-09 7.15 0.291015 7.15 0.65V8.45C7.15 8.80898 6.85898 9.1 6.5 9.1C6.14101 9.1 5.85 8.80898 5.85 8.45V0.65C5.85 0.291015 6.14101 9.68575e-09 6.5 9.68575e-09Z"
-                          fill="#0041E8" />
-                </svg>
+                class="item flex items-center px-[15px] py-[8px] border-[1px] border-[#0041E8] rounded-[4px] mr-[15px]">
+                <i class="fa-solid fa-arrow-up-from-bracket text-[#0041E8]"></i>
                 <span class="pl-[5px] text-[#0041E8] font-[500]">Upload ảnh</span>
             </a>
-            <a href=""
-               class="item flex items-center px-[15px] py-[8px] border-[1px] border-[#0041E8] rounded-[4px]">
-                <svg xmlns="http://www.w3.org/2000/svg" width="13" height="13"
-                     viewBox="0 0 13 13" fill="none">
-                    <path fill-rule="evenodd" clip-rule="evenodd"
-                          d="M1.77273 2.36364C1.61601 2.36364 1.46571 2.42589 1.35489 2.53671C1.24407 2.64753 1.18182 2.79783 1.18182 2.95455V11.2273C1.18182 11.384 1.24407 11.5343 1.35489 11.6451C1.46571 11.7559 1.61601 11.8182 1.77273 11.8182H10.0455C10.2022 11.8182 10.3525 11.7559 10.4633 11.6451C10.5741 11.5343 10.6364 11.384 10.6364 11.2273V8.07182C10.6364 7.74547 10.9009 7.48091 11.2273 7.48091C11.5536 7.48091 11.8182 7.74547 11.8182 8.07182V11.2273C11.8182 11.6974 11.6314 12.1483 11.299 12.4808C10.9665 12.8132 10.5156 13 10.0455 13H1.77273C1.30257 13 0.85167 12.8132 0.51922 12.4808C0.186769 12.1483 0 11.6974 0 11.2273V2.95455C0 2.48439 0.186769 2.03349 0.51922 1.70104C0.851671 1.36859 1.30257 1.18182 1.77273 1.18182H4.92818C5.25453 1.18182 5.51909 1.44638 5.51909 1.77273C5.51909 2.09908 5.25453 2.36364 4.92818 2.36364H1.77273Z"
-                          fill="#0041E8" />
-                    <path fill-rule="evenodd" clip-rule="evenodd"
-                          d="M9.62762 0.173073C9.85838 -0.0576911 10.2325 -0.0576911 10.4633 0.173073L12.8269 2.53671C13.0577 2.76747 13.0577 3.14162 12.8269 3.37238L6.91784 9.28147C6.80702 9.39229 6.65672 9.45455 6.5 9.45455H4.13636C3.81001 9.45455 3.54545 9.18999 3.54545 8.86364V6.5C3.54545 6.34328 3.60771 6.19298 3.71853 6.08216L9.62762 0.173073ZM4.72727 6.74476V8.27273H6.25524L11.5734 2.95455L10.0455 1.42658L4.72727 6.74476Z"
-                          fill="#0041E8" />
-                </svg>
+            <a href="" class="item flex items-center px-[15px] py-[8px] border-[1px] border-[#0041E8] rounded-[4px]">
+                <i class="fa-regular fa-pen-to-square text-[#0041E8]"></i>
                 <span class="pl-[5px] text-[#0041E8] font-[500]">Chọn ảnh trong kho ảnh
-                                                chính</span>
+                    chính</span>
             </a>
         </div>
         <p class="text-[#E00000] italic mt-[10px]">Chú ý: Bạn có thể chọn nhiều ảnh cùng 1
             lúc:
             Chấp nhận các file ảnh: jpg,gif</p>
     </div>
-    <input
-            class=" w-[82px] h-[32px] bg-[#0041E8] rounded-[4px] text-white cursor-pointer py-[0]"
-            name="commit" type="submit" value="Cập nhật">
+    <input class=" w-[82px] h-[32px] bg-[#0041E8] rounded-[4px] text-white cursor-pointer py-[0]" name="commit"
+        type="submit" value="Cập nhật">
     <div class="note mt-[15px] mb-[5px]">
         <b>Chú ý:</b>
         <ul>
@@ -167,4 +100,4 @@
             </li>
         </ul>
     </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/template/product/form_components/spec_group.html b/template/product/form_components/spec_group.html
index 3ba4360..0cc49fd 100644
--- a/template/product/form_components/spec_group.html
+++ b/template/product/form_components/spec_group.html
@@ -1,7 +1,5 @@
-
 <!-- thuoc tinh -->
-<div class="bg-white rounded-[15px] shadow-[0_1px_1px_0_rgba(0,0,0,0.1)] py-[18px] px-[16px] mb-[20px]"
-     role="tabpanel">
+<div class="bg-white rounded-[15px] shadow-[0_1px_1px_0_rgba(0,0,0,0.1)] py-[18px] px-[16px] mb-[20px]" role="tabpanel">
     <table class="product-specifications">
         <tr>
             <td>
@@ -13,22 +11,22 @@
                 <div class="flex items-center flex-wrap">
                     <div class="item w-[50%] flex items-center mb-[10px]">
                         <input type="checkbox" checked="checked"
-                               class="checkbox checked:bg-[#0041E8] w-[20px] h-[20px] [--chkbg:theme(#0041E8)]  [--chkfg:white] rounded-[4px]">
+                            class="checkbox checked:bg-[#0041E8] w-[20px] h-[20px] [--chkbg:theme(#0041E8)]  [--chkfg:white] rounded-[4px]">
                         <span class="ml-[10px]">Màn hình máy tính</span>
                     </div>
                     <div class="item w-[50%] flex items-center mb-[10px]">
                         <input type="checkbox" checked="checked"
-                               class="checkbox checked:bg-[#0041E8] w-[20px] h-[20px] [--chkbg:theme(#0041E8)]  [--chkfg:white] rounded-[4px]">
+                            class="checkbox checked:bg-[#0041E8] w-[20px] h-[20px] [--chkbg:theme(#0041E8)]  [--chkfg:white] rounded-[4px]">
                         <span class="ml-[10px]">Màn hình máy tính</span>
                     </div>
                     <div class="item w-[50%] flex items-center mb-[10px]">
                         <input type="checkbox" checked="checked"
-                               class="checkbox checked:bg-[#0041E8] w-[20px] h-[20px] [--chkbg:theme(#0041E8)]  [--chkfg:white] rounded-[4px]">
+                            class="checkbox checked:bg-[#0041E8] w-[20px] h-[20px] [--chkbg:theme(#0041E8)]  [--chkfg:white] rounded-[4px]">
                         <span class="ml-[10px]">Màn hình máy tính</span>
                     </div>
                     <div class="item w-[50%] flex items-center mb-[10px]">
                         <input type="checkbox" checked="checked"
-                               class="checkbox checked:bg-[#0041E8] w-[20px] h-[20px] [--chkbg:theme(#0041E8)]  [--chkfg:white] rounded-[4px]">
+                            class="checkbox checked:bg-[#0041E8] w-[20px] h-[20px] [--chkbg:theme(#0041E8)]  [--chkfg:white] rounded-[4px]">
                         <span class="ml-[10px]">Màn hình máy tính</span>
                     </div>
                 </div>
@@ -36,19 +34,11 @@
                     <b>Bổ sung giá trị:</b>
                     <p class="mx-[5px]">mỗi giá trị 1 dòng</p>
                     <a href="">
-                        <svg xmlns="http://www.w3.org/2000/svg" width="12" height="13"
-                             viewBox="0 0 12 13" fill="none">
-                            <path fill-rule="evenodd" clip-rule="evenodd"
-                                  d="M6.67307 0.173073C6.90384 -0.0576911 7.27798 -0.0576911 7.50875 0.173073L9.87238 2.53671C10.1031 2.76747 10.1031 3.14162 9.87238 3.37238L3.37238 9.87238C3.26156 9.9832 3.11126 10.0455 2.95455 10.0455H0.590909C0.264559 10.0455 0 9.7809 0 9.45455V7.09091C0 6.93419 0.0622563 6.78389 0.173073 6.67307L6.67307 0.173073ZM1.18182 7.33567V8.86364H2.70978L8.61887 2.95455L7.09091 1.42658L1.18182 7.33567Z"
-                                  fill="#0041E8" />
-                            <path fill-rule="evenodd" clip-rule="evenodd"
-                                  d="M0 12.4091C0 12.0828 0.264559 11.8182 0.590909 11.8182H11.2273C11.5536 11.8182 11.8182 12.0828 11.8182 12.4091C11.8182 12.7355 11.5536 13.0001 11.2273 13.0001H0.590909C0.264559 13.0001 0 12.7355 0 12.4091Z"
-                                  fill="#0041E8" />
-                        </svg>
+                        <i class="icons icon-edit"></i>
                     </a>
                 </div>
                 <textarea type="text" name="" id=""
-                          class="w-[450px] min-h-[50px] p-[5px] border-[1px] mt-[10px] rounded-[4px]"></textarea>
+                    class="w-[450px] min-h-[50px] p-[5px] border-[1px] mt-[10px] rounded-[4px]"></textarea>
             </td>
         </tr>
         <tr>
@@ -61,22 +51,22 @@
                 <div class="flex items-center flex-wrap">
                     <div class="item w-[50%] flex items-center mb-[10px]">
                         <input type="checkbox" checked="checked"
-                               class="checkbox checked:bg-[#0041E8] w-[20px] h-[20px] [--chkbg:theme(#0041E8)]  [--chkfg:white] rounded-[4px]">
+                            class="checkbox checked:bg-[#0041E8] w-[20px] h-[20px] [--chkbg:theme(#0041E8)]  [--chkfg:white] rounded-[4px]">
                         <span class="ml-[10px]">Màn hình máy tính</span>
                     </div>
                     <div class="item w-[50%] flex items-center mb-[10px]">
                         <input type="checkbox" checked="checked"
-                               class="checkbox checked:bg-[#0041E8] w-[20px] h-[20px] [--chkbg:theme(#0041E8)]  [--chkfg:white] rounded-[4px]">
+                            class="checkbox checked:bg-[#0041E8] w-[20px] h-[20px] [--chkbg:theme(#0041E8)]  [--chkfg:white] rounded-[4px]">
                         <span class="ml-[10px]">Màn hình máy tính</span>
                     </div>
                     <div class="item w-[50%] flex items-center mb-[10px]">
                         <input type="checkbox" checked="checked"
-                               class="checkbox checked:bg-[#0041E8] w-[20px] h-[20px] [--chkbg:theme(#0041E8)]  [--chkfg:white] rounded-[4px]">
+                            class="checkbox checked:bg-[#0041E8] w-[20px] h-[20px] [--chkbg:theme(#0041E8)]  [--chkfg:white] rounded-[4px]">
                         <span class="ml-[10px]">Màn hình máy tính</span>
                     </div>
                     <div class="item w-[50%] flex items-center mb-[10px]">
                         <input type="checkbox" checked="checked"
-                               class="checkbox checked:bg-[#0041E8] w-[20px] h-[20px] [--chkbg:theme(#0041E8)]  [--chkfg:white] rounded-[4px]">
+                            class="checkbox checked:bg-[#0041E8] w-[20px] h-[20px] [--chkbg:theme(#0041E8)]  [--chkfg:white] rounded-[4px]">
                         <span class="ml-[10px]">Màn hình máy tính</span>
                     </div>
                 </div>
@@ -84,19 +74,11 @@
                     <b>Bổ sung giá trị:</b>
                     <p class="mx-[5px]">mỗi giá trị 1 dòng</p>
                     <a href="">
-                        <svg xmlns="http://www.w3.org/2000/svg" width="12" height="13"
-                             viewBox="0 0 12 13" fill="none">
-                            <path fill-rule="evenodd" clip-rule="evenodd"
-                                  d="M6.67307 0.173073C6.90384 -0.0576911 7.27798 -0.0576911 7.50875 0.173073L9.87238 2.53671C10.1031 2.76747 10.1031 3.14162 9.87238 3.37238L3.37238 9.87238C3.26156 9.9832 3.11126 10.0455 2.95455 10.0455H0.590909C0.264559 10.0455 0 9.7809 0 9.45455V7.09091C0 6.93419 0.0622563 6.78389 0.173073 6.67307L6.67307 0.173073ZM1.18182 7.33567V8.86364H2.70978L8.61887 2.95455L7.09091 1.42658L1.18182 7.33567Z"
-                                  fill="#0041E8" />
-                            <path fill-rule="evenodd" clip-rule="evenodd"
-                                  d="M0 12.4091C0 12.0828 0.264559 11.8182 0.590909 11.8182H11.2273C11.5536 11.8182 11.8182 12.0828 11.8182 12.4091C11.8182 12.7355 11.5536 13.0001 11.2273 13.0001H0.590909C0.264559 13.0001 0 12.7355 0 12.4091Z"
-                                  fill="#0041E8" />
-                        </svg>
+                        <i class="icons icon-edit"></i>
                     </a>
                 </div>
                 <textarea type="text" name="" id=""
-                          class="w-[450px] min-h-[50px] p-[5px] border-[1px] mt-[10px] rounded-[4px]"></textarea>
+                    class="w-[450px] min-h-[50px] p-[5px] border-[1px] mt-[10px] rounded-[4px]"></textarea>
             </td>
         </tr>
         <tr>
@@ -109,22 +91,22 @@
                 <div class="flex items-center flex-wrap">
                     <div class="item w-[50%] flex items-center mb-[10px]">
                         <input type="checkbox" checked="checked"
-                               class="checkbox checked:bg-[#0041E8] w-[20px] h-[20px] [--chkbg:theme(#0041E8)]  [--chkfg:white] rounded-[4px]">
+                            class="checkbox checked:bg-[#0041E8] w-[20px] h-[20px] [--chkbg:theme(#0041E8)]  [--chkfg:white] rounded-[4px]">
                         <span class="ml-[10px]">Màn hình máy tính</span>
                     </div>
                     <div class="item w-[50%] flex items-center mb-[10px]">
                         <input type="checkbox" checked="checked"
-                               class="checkbox checked:bg-[#0041E8] w-[20px] h-[20px] [--chkbg:theme(#0041E8)]  [--chkfg:white] rounded-[4px]">
+                            class="checkbox checked:bg-[#0041E8] w-[20px] h-[20px] [--chkbg:theme(#0041E8)]  [--chkfg:white] rounded-[4px]">
                         <span class="ml-[10px]">Màn hình máy tính</span>
                     </div>
                     <div class="item w-[50%] flex items-center mb-[10px]">
                         <input type="checkbox" checked="checked"
-                               class="checkbox checked:bg-[#0041E8] w-[20px] h-[20px] [--chkbg:theme(#0041E8)]  [--chkfg:white] rounded-[4px]">
+                            class="checkbox checked:bg-[#0041E8] w-[20px] h-[20px] [--chkbg:theme(#0041E8)]  [--chkfg:white] rounded-[4px]">
                         <span class="ml-[10px]">Màn hình máy tính</span>
                     </div>
                     <div class="item w-[50%] flex items-center mb-[10px]">
                         <input type="checkbox" checked="checked"
-                               class="checkbox checked:bg-[#0041E8] w-[20px] h-[20px] [--chkbg:theme(#0041E8)]  [--chkfg:white] rounded-[4px]">
+                            class="checkbox checked:bg-[#0041E8] w-[20px] h-[20px] [--chkbg:theme(#0041E8)]  [--chkfg:white] rounded-[4px]">
                         <span class="ml-[10px]">Màn hình máy tính</span>
                     </div>
                 </div>
@@ -132,19 +114,11 @@
                     <b>Bổ sung giá trị:</b>
                     <p class="mx-[5px]">mỗi giá trị 1 dòng</p>
                     <a href="">
-                        <svg xmlns="http://www.w3.org/2000/svg" width="12" height="13"
-                             viewBox="0 0 12 13" fill="none">
-                            <path fill-rule="evenodd" clip-rule="evenodd"
-                                  d="M6.67307 0.173073C6.90384 -0.0576911 7.27798 -0.0576911 7.50875 0.173073L9.87238 2.53671C10.1031 2.76747 10.1031 3.14162 9.87238 3.37238L3.37238 9.87238C3.26156 9.9832 3.11126 10.0455 2.95455 10.0455H0.590909C0.264559 10.0455 0 9.7809 0 9.45455V7.09091C0 6.93419 0.0622563 6.78389 0.173073 6.67307L6.67307 0.173073ZM1.18182 7.33567V8.86364H2.70978L8.61887 2.95455L7.09091 1.42658L1.18182 7.33567Z"
-                                  fill="#0041E8" />
-                            <path fill-rule="evenodd" clip-rule="evenodd"
-                                  d="M0 12.4091C0 12.0828 0.264559 11.8182 0.590909 11.8182H11.2273C11.5536 11.8182 11.8182 12.0828 11.8182 12.4091C11.8182 12.7355 11.5536 13.0001 11.2273 13.0001H0.590909C0.264559 13.0001 0 12.7355 0 12.4091Z"
-                                  fill="#0041E8" />
-                        </svg>
+                        <i class="icons icon-edit"></i>
                     </a>
                 </div>
                 <textarea type="text" name="" id=""
-                          class="w-[450px] min-h-[50px] p-[5px] border-[1px] mt-[10px] rounded-[4px]"></textarea>
+                    class="w-[450px] min-h-[50px] p-[5px] border-[1px] mt-[10px] rounded-[4px]"></textarea>
             </td>
         </tr>
         <tr>
@@ -157,22 +131,22 @@
                 <div class="flex items-center flex-wrap">
                     <div class="item w-[50%] flex items-center mb-[10px]">
                         <input type="checkbox" checked="checked"
-                               class="checkbox checked:bg-[#0041E8] w-[20px] h-[20px] [--chkbg:theme(#0041E8)]  [--chkfg:white] rounded-[4px]">
+                            class="checkbox checked:bg-[#0041E8] w-[20px] h-[20px] [--chkbg:theme(#0041E8)]  [--chkfg:white] rounded-[4px]">
                         <span class="ml-[10px]">Màn hình máy tính</span>
                     </div>
                     <div class="item w-[50%] flex items-center mb-[10px]">
                         <input type="checkbox" checked="checked"
-                               class="checkbox checked:bg-[#0041E8] w-[20px] h-[20px] [--chkbg:theme(#0041E8)]  [--chkfg:white] rounded-[4px]">
+                            class="checkbox checked:bg-[#0041E8] w-[20px] h-[20px] [--chkbg:theme(#0041E8)]  [--chkfg:white] rounded-[4px]">
                         <span class="ml-[10px]">Màn hình máy tính</span>
                     </div>
                     <div class="item w-[50%] flex items-center mb-[10px]">
                         <input type="checkbox" checked="checked"
-                               class="checkbox checked:bg-[#0041E8] w-[20px] h-[20px] [--chkbg:theme(#0041E8)]  [--chkfg:white] rounded-[4px]">
+                            class="checkbox checked:bg-[#0041E8] w-[20px] h-[20px] [--chkbg:theme(#0041E8)]  [--chkfg:white] rounded-[4px]">
                         <span class="ml-[10px]">Màn hình máy tính</span>
                     </div>
                     <div class="item w-[50%] flex items-center mb-[10px]">
                         <input type="checkbox" checked="checked"
-                               class="checkbox checked:bg-[#0041E8] w-[20px] h-[20px] [--chkbg:theme(#0041E8)]  [--chkfg:white] rounded-[4px]">
+                            class="checkbox checked:bg-[#0041E8] w-[20px] h-[20px] [--chkbg:theme(#0041E8)]  [--chkfg:white] rounded-[4px]">
                         <span class="ml-[10px]">Màn hình máy tính</span>
                     </div>
                 </div>
@@ -180,29 +154,19 @@
                     <b>Bổ sung giá trị:</b>
                     <p class="mx-[5px]">mỗi giá trị 1 dòng</p>
                     <a href="">
-                        <svg xmlns="http://www.w3.org/2000/svg" width="12" height="13"
-                             viewBox="0 0 12 13" fill="none">
-                            <path fill-rule="evenodd" clip-rule="evenodd"
-                                  d="M6.67307 0.173073C6.90384 -0.0576911 7.27798 -0.0576911 7.50875 0.173073L9.87238 2.53671C10.1031 2.76747 10.1031 3.14162 9.87238 3.37238L3.37238 9.87238C3.26156 9.9832 3.11126 10.0455 2.95455 10.0455H0.590909C0.264559 10.0455 0 9.7809 0 9.45455V7.09091C0 6.93419 0.0622563 6.78389 0.173073 6.67307L6.67307 0.173073ZM1.18182 7.33567V8.86364H2.70978L8.61887 2.95455L7.09091 1.42658L1.18182 7.33567Z"
-                                  fill="#0041E8" />
-                            <path fill-rule="evenodd" clip-rule="evenodd"
-                                  d="M0 12.4091C0 12.0828 0.264559 11.8182 0.590909 11.8182H11.2273C11.5536 11.8182 11.8182 12.0828 11.8182 12.4091C11.8182 12.7355 11.5536 13.0001 11.2273 13.0001H0.590909C0.264559 13.0001 0 12.7355 0 12.4091Z"
-                                  fill="#0041E8" />
-                        </svg>
+                        <i class="icons icon-edit"></i>
                     </a>
                 </div>
                 <textarea type="text" name="" id=""
-                          class="w-[450px] min-h-[50px] p-[5px] border-[1px] mt-[10px] rounded-[4px]"></textarea>
+                    class="w-[450px] min-h-[50px] p-[5px] border-[1px] mt-[10px] rounded-[4px]"></textarea>
             </td>
         </tr>
     </table>
     <div class="flex items-center mt-[10px]">
-        <input
-                class=" w-[82px] h-[32px] bg-[#0041E8] rounded-[4px] text-white cursor-pointer py-[0]"
-                name="commit" type="submit" value="Cập nhật">
-        <a href=""
-           class="px-[10px] py-[5px] rounded-[4px] border-[1px] border-[#0041E8] text-[#0041E8] ml-[7px]">
+        <input class=" w-[82px] h-[32px] bg-[#0041E8] rounded-[4px] text-white cursor-pointer py-[0]" name="commit"
+            type="submit" value="Cập nhật">
+        <a href="" class="px-[10px] py-[5px] rounded-[4px] border-[1px] border-[#0041E8] text-[#0041E8] ml-[7px]">
             Cập nhật không thuộc tính
         </a>
     </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/template/product/form_components/variant.html b/template/product/form_components/variant.html
index eb09ecc..b3b0b01 100644
--- a/template/product/form_components/variant.html
+++ b/template/product/form_components/variant.html
@@ -1,21 +1,11 @@
-
 <!-- cau hinh -->
-<div
-        class="bg-white rounded-[15px] shadow-[0_1px_1px_0_rgba(0,0,0,0.1)] py-[18px] px-[16px] mb-[20px]">
+<div class="bg-white rounded-[15px] shadow-[0_1px_1px_0_rgba(0,0,0,0.1)] py-[18px] px-[16px] mb-[20px]">
     <b>Chủng loại của sản phẩm</b>
     <a href="" class="flex items-center py-[5px]">
-        <svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" viewBox="0 0 13 13"
-             fill="none">
-            <path fill-rule="evenodd" clip-rule="evenodd"
-                  d="M1.77273 2.36364C1.61601 2.36364 1.46571 2.42589 1.35489 2.53671C1.24407 2.64753 1.18182 2.79783 1.18182 2.95455V11.2273C1.18182 11.384 1.24407 11.5343 1.35489 11.6451C1.46571 11.7559 1.61601 11.8182 1.77273 11.8182H10.0455C10.2022 11.8182 10.3525 11.7559 10.4633 11.6451C10.5741 11.5343 10.6364 11.384 10.6364 11.2273V8.07182C10.6364 7.74547 10.9009 7.48091 11.2273 7.48091C11.5536 7.48091 11.8182 7.74547 11.8182 8.07182V11.2273C11.8182 11.6974 11.6314 12.1483 11.299 12.4808C10.9665 12.8132 10.5156 13 10.0455 13H1.77273C1.30257 13 0.85167 12.8132 0.51922 12.4808C0.186769 12.1483 0 11.6974 0 11.2273V2.95455C0 2.48439 0.186769 2.03349 0.51922 1.70104C0.851671 1.36859 1.30257 1.18182 1.77273 1.18182H4.92818C5.25453 1.18182 5.51909 1.44638 5.51909 1.77273C5.51909 2.09908 5.25453 2.36364 4.92818 2.36364H1.77273Z"
-                  fill="#0041E8" />
-            <path fill-rule="evenodd" clip-rule="evenodd"
-                  d="M9.62762 0.173073C9.85838 -0.0576911 10.2325 -0.0576911 10.4633 0.173073L12.8269 2.53671C13.0577 2.76747 13.0577 3.14162 12.8269 3.37238L6.91784 9.28147C6.80702 9.39229 6.65672 9.45455 6.5 9.45455H4.13636C3.81001 9.45455 3.54545 9.18999 3.54545 8.86364V6.5C3.54545 6.34328 3.60771 6.19298 3.71853 6.08216L9.62762 0.173073ZM4.72727 6.74476V8.27273H6.25524L11.5734 2.95455L10.0455 1.42658L4.72727 6.74476Z"
-                  fill="#0041E8" />
-        </svg>
+        <i class="icons icon-edit"></i>
         <span class="text-[#0041E8] ml-[5px]">
-                                        Sửa thuộc tính
-                                    </span>
+            Sửa thuộc tính
+        </span>
     </a>
     <p class="text-[#E00000] italic pb-[7px]">* Chú ý: Giá bán của sản phẩm sẽ là giá của
         chủng loại
@@ -23,108 +13,87 @@
         loại=0 thì sẽ mặc định dùng giá sản
         phẩm. Cài đặt giá chung cho sản phẩm ở Tab "Cơ bản"</p>
     <div
-            class="border-[1px] border-[#F6F6F6] shadow-[0_1px_1px_0_rgba(0,0,0,0.10)] rounded-[5px] p-[15px] flex items-center justify-between">
+        class="border-[1px] border-[#F6F6F6] shadow-[0_1px_1px_0_rgba(0,0,0,0.10)] rounded-[5px] p-[15px] flex items-center justify-between">
         <p>Cài nhanh cho tất cả chủng loại:</p>
         <div class="item flex items-center">
             <p>Giá bán:</p>
             <input type="text"
-                   class="w-[190px] h-[32px] border-[1px] rounded-[4px] shadow-[0_1px_1px_0_rgba(0,0,0,0.12)] ml-[10px]">
+                class="w-[190px] h-[32px] border-[1px] rounded-[4px] shadow-[0_1px_1px_0_rgba(0,0,0,0.12)] ml-[10px]">
         </div>
         <div class="item flex items-center">
             <p>Số lượng:</p>
             <input type="text"
-                   class="w-[190px] h-[32px] border-[1px] rounded-[4px] shadow-[0_1px_1px_0_rgba(0,0,0,0.12)] ml-[10px]">
+                class="w-[190px] h-[32px] border-[1px] rounded-[4px] shadow-[0_1px_1px_0_rgba(0,0,0,0.12)] ml-[10px]">
         </div>
     </div>
     <table class="w-[100%] table-config">
         <tbody>
-        <tr>
-            <th>Ảnh</th>
-            <th>Mã kho</th>
-            <th>Tên</th>
-            <th>Giá bán</th>
-            <th>SL</th>
-            <th>Linh ngoài</th>
-            <th>
-                <div class="flex items-center">
-                    <input type="checkbox" class="w-[15px] h-[15px]">
-                    <span class="ml-[3px]">Hiển thị</span>
-                </div>
-            </th>
-            <th>Quản lý</th>
-            <th></th>
-        </tr>
+            <tr>
+                <th>Ảnh</th>
+                <th>Mã kho</th>
+                <th>Tên</th>
+                <th>Giá bán</th>
+                <th>SL</th>
+                <th>Linh ngoài</th>
+                <th>
+                    <div class="flex items-center">
+                        <input type="checkbox" class="w-[15px] h-[15px]">
+                        <span class="ml-[3px]">Hiển thị</span>
+                    </div>
+                </th>
+                <th>Quản lý</th>
+                <th></th>
+            </tr>
         </tbody>
         <tbody>
-        <tr>
-            <td>
-                <a href=""><svg xmlns="http://www.w3.org/2000/svg" width="12"
-                                height="13" viewBox="0 0 12 13" fill="none">
-                    <path fill-rule="evenodd" clip-rule="evenodd"
-                          d="M6.67307 0.173073C6.90384 -0.0576911 7.27798 -0.0576911 7.50875 0.173073L9.87238 2.53671C10.1031 2.76747 10.1031 3.14162 9.87238 3.37238L3.37238 9.87238C3.26156 9.9832 3.11126 10.0455 2.95455 10.0455H0.590909C0.264559 10.0455 0 9.7809 0 9.45455V7.09091C0 6.93419 0.0622563 6.78389 0.173073 6.67307L6.67307 0.173073ZM1.18182 7.33567V8.86364H2.70978L8.61887 2.95455L7.09091 1.42658L1.18182 7.33567Z"
-                          fill="#0041E8" />
-                    <path fill-rule="evenodd" clip-rule="evenodd"
-                          d="M0 12.4091C0 12.0828 0.264559 11.8182 0.590909 11.8182H11.2273C11.5536 11.8182 11.8182 12.0828 11.8182 12.4091C11.8182 12.7355 11.5536 13.0001 11.2273 13.0001H0.590909C0.264559 13.0001 0 12.7355 0 12.4091Z"
-                          fill="#0041E8" />
-                </svg></a>
-            </td>
-            <td>
-                <input type="text" value="mh241"
-                       class="w-[80px] h-[32px] py-[5px] px-[10px] border-[1px] border-[#D8D8D8] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)]">
-            </td>
-            <td>
-                <input type="text" value="mh241"
-                       class="w-[112px] h-[32px] py-[5px] px-[10px] border-[1px] border-[#D8D8D8] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)]">
-            </td>
-            <td>
-                <input type="text" value="mh241"
-                       class="w-[68px] h-[32px] py-[5px] px-[10px] border-[1px] border-[#D8D8D8] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)]">
-            </td>
-            <td>
-                <input type="text" value="mh241"
-                       class="w-[42px] h-[32px] py-[5px] px-[10px] border-[1px] border-[#D8D8D8] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)]">
-            </td>
-            <td>
-                <input type="text" value="mh241"
-                       class="w-[142px] h-[32px] py-[5px] px-[10px] border-[1px] border-[#D8D8D8] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)]">
-            </td>
-            <td>
-                <input type="checkbox" class="w-[15px] h-[15px]">
-            </td>
-            <td>
-                <span>STT</span>
-                <input type="text" value="0"
-                       class="w-[46px] h-[32px] py-[5px] px-[10px] border-[1px] border-[#D8D8D8] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)]">
-            </td>
-            <td>
-                <a href=""
-                   class="w-[32px] h-[32px] leading-[32px] text-center bg-[#ECECEC] flex items-center justify-center rounded-[4px]">
-                    <svg xmlns="http://www.w3.org/2000/svg" width="12" height="13"
-                         viewBox="0 0 12 13" fill="none">
-                        <path fill-rule="evenodd" clip-rule="evenodd"
-                              d="M0 2.95455C0 2.6282 0.264559 2.36364 0.590909 2.36364H11.2273C11.5536 2.36364 11.8182 2.6282 11.8182 2.95455C11.8182 3.2809 11.5536 3.54545 11.2273 3.54545H0.590909C0.264559 3.54545 0 3.2809 0 2.95455Z"
-                              fill="#9E9E9E" />
-                        <path fill-rule="evenodd" clip-rule="evenodd"
-                              d="M4.72727 1.18182C4.57055 1.18182 4.42025 1.24407 4.30944 1.35489C4.19862 1.46571 4.13636 1.61601 4.13636 1.77273V2.36364H7.68182V1.77273C7.68182 1.61601 7.61956 1.46571 7.50875 1.35489C7.39793 1.24407 7.24763 1.18182 7.09091 1.18182H4.72727ZM8.86364 2.36364V1.77273C8.86364 1.30257 8.67687 0.85167 8.34442 0.51922C8.01197 0.186769 7.56107 0 7.09091 0H4.72727C4.25712 0 3.80622 0.186769 3.47377 0.51922C3.14132 0.85167 2.95455 1.30257 2.95455 1.77273V2.36364H1.77273C1.44638 2.36364 1.18182 2.6282 1.18182 2.95455V11.2273C1.18182 11.6974 1.36859 12.1483 1.70104 12.4808C2.03349 12.8132 2.48439 13 2.95455 13H8.86364C9.33379 13 9.78469 12.8132 10.1171 12.4808C10.4496 12.1483 10.6364 11.6974 10.6364 11.2273V2.95455C10.6364 2.6282 10.3718 2.36364 10.0455 2.36364H8.86364ZM2.36364 3.54545V11.2273C2.36364 11.384 2.42589 11.5343 2.53671 11.6451C2.64753 11.7559 2.79783 11.8182 2.95455 11.8182H8.86364C9.02036 11.8182 9.17066 11.7559 9.28147 11.6451C9.39229 11.5343 9.45455 11.384 9.45455 11.2273V3.54545H2.36364Z"
-                              fill="#9E9E9E" />
-                        <path fill-rule="evenodd" clip-rule="evenodd"
-                              d="M4.72727 5.31818C5.05362 5.31818 5.31818 5.58274 5.31818 5.90909V9.45455C5.31818 9.7809 5.05362 10.0455 4.72727 10.0455C4.40092 10.0455 4.13636 9.7809 4.13636 9.45455V5.90909C4.13636 5.58274 4.40092 5.31818 4.72727 5.31818Z"
-                              fill="#9E9E9E" />
-                        <path fill-rule="evenodd" clip-rule="evenodd"
-                              d="M7.09091 5.31818C7.41726 5.31818 7.68182 5.58274 7.68182 5.90909V9.45455C7.68182 9.7809 7.41726 10.0455 7.09091 10.0455C6.76456 10.0455 6.5 9.7809 6.5 9.45455V5.90909C6.5 5.58274 6.76456 5.31818 7.09091 5.31818Z"
-                              fill="#9E9E9E" />
-                    </svg>
-                </a>
-            </td>
-        </tr>
+            <tr>
+                <td>
+                    <a href="">
+                        <i class="icons icon-edit"></i>
+                    </a>
+                </td>
+                <td>
+                    <input type="text" value="mh241"
+                        class="w-[80px] h-[32px] py-[5px] px-[10px] border-[1px] border-[#D8D8D8] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)]">
+                </td>
+                <td>
+                    <input type="text" value="mh241"
+                        class="w-[112px] h-[32px] py-[5px] px-[10px] border-[1px] border-[#D8D8D8] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)]">
+                </td>
+                <td>
+                    <input type="text" value="mh241"
+                        class="w-[68px] h-[32px] py-[5px] px-[10px] border-[1px] border-[#D8D8D8] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)]">
+                </td>
+                <td>
+                    <input type="text" value="mh241"
+                        class="w-[42px] h-[32px] py-[5px] px-[10px] border-[1px] border-[#D8D8D8] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)]">
+                </td>
+                <td>
+                    <input type="text" value="mh241"
+                        class="w-[142px] h-[32px] py-[5px] px-[10px] border-[1px] border-[#D8D8D8] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)]">
+                </td>
+                <td>
+                    <input type="checkbox" class="w-[15px] h-[15px]">
+                </td>
+                <td>
+                    <span>STT</span>
+                    <input type="text" value="0"
+                        class="w-[46px] h-[32px] py-[5px] px-[10px] border-[1px] border-[#D8D8D8] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)]">
+                </td>
+                <td>
+                    <a href=""
+                        class="w-[32px] h-[32px] leading-[32px] text-center bg-[#ECECEC] flex items-center justify-center rounded-[4px]">
+                        <i class="icons icon-remove"></i>
+                    </a>
+                </td>
+            </tr>
         </tbody>
     </table>
     <a href="" class="my-[10px] flex items-center justify-center">
-                                    <span
-                                            class="w-[15px] h-[15px] rounded-[50%] border-[1px] border-[#0041E8] block leading-[12px] text-center text-[#0041E8]">+</span>
+        <span
+            class="w-[15px] h-[15px] rounded-[50%] border-[1px] border-[#0041E8] block leading-[12px] text-center text-[#0041E8]">+</span>
         <span class="ml-[5px] text-[#0041E8] font-[500]">Thêm chủng loại</span>
     </a>
-    <input
-            class=" w-[82px] h-[32px] bg-[#0041E8] rounded-[4px] text-white cursor-pointer py-[0]"
-            name="commit" type="submit" value="Cập nhật">
-</div>
+    <input class=" w-[82px] h-[32px] bg-[#0041E8] rounded-[4px] text-white cursor-pointer py-[0]" name="commit"
+        type="submit" value="Cập nhật">
+</div>
\ No newline at end of file
diff --git a/template/product/home.html b/template/product/home.html
index be56215..8245ad2 100644
--- a/template/product/home.html
+++ b/template/product/home.html
@@ -1,21 +1,14 @@
-<div class="grid w-[100%] ">
-    <div class="m-[15px] px-[15px] py-[20px] rounded-[15px] bg-white shadow-[0_1px_1px_0_rgba(0,0,0,0.1)]">
+<div class="w-[100%]">
+    <div
+        class="m-[15px] px-[15px] py-[20px] rounded-[15px] bg-white shadow-[0_1px_1px_0_rgba(0,0,0,0.1)] overflow-x-auto">
         <h1 class="text-2xl font-[700] mb-3">Danh sách sản phẩm ({{ page.total | format_number }})</h1>
-        <form
-            class="w-[100%] flex w-[100%] rounded-[10px] p-[15px] border-solid border-[#F6F6F6] border-[1px] shadow-[0_1px_1px_0_rgba(0,0,0,0.1)]">
-            <input type="search" class="block border h-[36px] ps-3 rounded w-[375px]" placeholder="Tìm sản phẩm">
-            <div
-                class="w-[100px] rounded-[4px] ml-[9px] bg-[#0041E8] text-white flex leading-[35px] text-center items-center justify-center cursor-pointer">
-                Tìm kiếm
-            </div>
-        </form>
         <div class="flex justify-between items-center mt-[20px]">
             <div class="btn-left flex items-center">
-                <a href=""
+                <a href="javascript:void(0)" onclick="js_list_category.showModal()"
                     class="px-[10px] py-[8px] border-[#79B0E2] border-[1px] rounded-[4px] text-[#79B0E2] hover:bg-[#0061ff] hover:text-white mr-[15px]">
                     Chọn danh mục để xem
                 </a>
-                <a href=""
+                <a href="javascript:void(0)" onclick="js_list_brand.showModal()"
                     class="px-[10px] py-[8px] border-[#79B0E2] border-[1px] rounded-[4px] text-[#79B0E2] hover:bg-[#0061ff] hover:text-white mr-[15px]">
                     Chọn thương hiệu để xem
                 </a>
@@ -29,53 +22,12 @@
                 </a>
                 <a href=""
                     class="flex items-center px-[10px] py-[8px] border-[#0041E8] border-[1px] rounded-[4px] text-[#0041E8] hover:bg-[#0041E8] hover:text-white ml-[15px] hover:stroke-white font-[500]">
-                    <svg class="hover:fill-white" xmlns="http://www.w3.org/2000/svg" width="14" height="15"
-                        viewBox="0 0 14 15" fill="none">
-                        <path fill-rule="evenodd" clip-rule="evenodd"
-                            d="M1.30461 1.30461C1.49965 1.10957 1.76417 1 2.04 1H8.28C8.41791 1 8.55018 1.05479 8.6477 1.1523L12.2877 4.7923C12.3852 4.88982 12.44 5.02209 12.44 5.16V7.76C12.44 8.04719 12.2072 8.28 11.92 8.28C11.6328 8.28 11.4 8.04719 11.4 7.76V5.37539L8.06461 2.04L2.04 2.04L2.04 7.76C2.04 8.04719 1.80719 8.28 1.52 8.28C1.23281 8.28 1 8.04719 1 7.76V2.04C1 1.76417 1.10957 1.49965 1.30461 1.30461Z"
-                            fill="#0041E8" />
-                        <path fill-rule="evenodd" clip-rule="evenodd"
-                            d="M8.28 1C8.56719 1 8.8 1.23281 8.8 1.52V4.64H11.92C12.2072 4.64 12.44 4.87281 12.44 5.16C12.44 5.44719 12.2072 5.68 11.92 5.68H8.28C7.99281 5.68 7.76 5.44719 7.76 5.16V1.52C7.76 1.23281 7.99281 1 8.28 1Z"
-                            fill="#0041E8" />
-                        <path fill-rule="evenodd" clip-rule="evenodd"
-                            d="M1 10.36C1 10.0728 1.23281 9.84 1.52 9.84H2.56C2.97374 9.84 3.37053 10.0044 3.66309 10.2969C3.95564 10.5895 4.12 10.9863 4.12 11.4C4.12 11.8137 3.95564 12.2105 3.66309 12.5031C3.37053 12.7956 2.97374 12.96 2.56 12.96H2.04V13.48C2.04 13.7672 1.80719 14 1.52 14C1.23281 14 1 13.7672 1 13.48V10.36ZM2.04 11.92H2.56C2.69791 11.92 2.83018 11.8652 2.9277 11.7677C3.02521 11.6702 3.08 11.5379 3.08 11.4C3.08 11.2621 3.02521 11.1298 2.9277 11.0323C2.83018 10.9348 2.69791 10.88 2.56 10.88H2.04V11.92Z"
-                            fill="#0041E8" />
-                        <path fill-rule="evenodd" clip-rule="evenodd"
-                            d="M10.1 10.36C10.1 10.0728 10.3328 9.84 10.62 9.84H12.44C12.7272 9.84 12.96 10.0728 12.96 10.36C12.96 10.6472 12.7272 10.88 12.44 10.88H11.14V13.48C11.14 13.7672 10.9072 14 10.62 14C10.3328 14 10.1 13.7672 10.1 13.48V10.36Z"
-                            fill="#0041E8" />
-                        <path fill-rule="evenodd" clip-rule="evenodd"
-                            d="M10.1 12.18C10.1 11.8928 10.3328 11.66 10.62 11.66H12.18C12.4672 11.66 12.7 11.8928 12.7 12.18C12.7 12.4672 12.4672 12.7 12.18 12.7H10.62C10.3328 12.7 10.1 12.4672 10.1 12.18Z"
-                            fill="#0041E8" />
-                        <path fill-rule="evenodd" clip-rule="evenodd"
-                            d="M5.29 10.36C5.29 10.0728 5.52281 9.84 5.81 9.84H6.72C7.27165 9.84 7.80071 10.0591 8.19078 10.4492C8.58086 10.8393 8.8 11.3683 8.8 11.92C8.8 12.4716 8.58086 13.0007 8.19078 13.3908C7.80071 13.7809 7.27165 14 6.72 14H5.81C5.52281 14 5.29 13.7672 5.29 13.48V10.36ZM6.33 10.88V12.96H6.72C6.99583 12.96 7.26035 12.8504 7.45539 12.6554C7.65043 12.4604 7.76 12.1958 7.76 11.92C7.76 11.6442 7.65043 11.3796 7.45539 11.1846C7.26035 10.9896 6.99583 10.88 6.72 10.88H6.33Z"
-                            fill="#0041E8" />
-                        <path
-                            d="M8.28 1H2.04C1.76417 1 1.49965 1.10957 1.30461 1.30461C1.10957 1.49965 1 1.76417 1 2.04V7.76C1 8.04719 1.23281 8.28 1.52 8.28C1.80719 8.28 2.04 8.04719 2.04 7.76L2.04 2.04L8.06461 2.04L11.4 5.37539V7.76C11.4 8.04719 11.6328 8.28 11.92 8.28C12.2072 8.28 12.44 8.04719 12.44 7.76V5.16M8.28 1C8.41791 1 8.55018 1.05479 8.6477 1.1523L12.2877 4.7923C12.3852 4.88982 12.44 5.02209 12.44 5.16M8.28 1C8.56719 1 8.8 1.23281 8.8 1.52V4.64H11.92C12.2072 4.64 12.44 4.87281 12.44 5.16M8.28 1C7.99281 1 7.76 1.23281 7.76 1.52V5.16C7.76 5.44719 7.99281 5.68 8.28 5.68H11.92C12.2072 5.68 12.44 5.44719 12.44 5.16M1.52 9.84C1.23281 9.84 1 10.0728 1 10.36V13.48C1 13.7672 1.23281 14 1.52 14C1.80719 14 2.04 13.7672 2.04 13.48V12.96H2.56C2.97374 12.96 3.37053 12.7956 3.66309 12.5031C3.95564 12.2105 4.12 11.8137 4.12 11.4C4.12 10.9863 3.95564 10.5895 3.66309 10.2969C3.37053 10.0044 2.97374 9.84 2.56 9.84H1.52ZM2.56 11.92H2.04V10.88H2.56C2.69791 10.88 2.83018 10.9348 2.9277 11.0323C3.02521 11.1298 3.08 11.2621 3.08 11.4C3.08 11.5379 3.02521 11.6702 2.9277 11.7677C2.83018 11.8652 2.69791 11.92 2.56 11.92ZM10.62 9.84C10.3328 9.84 10.1 10.0728 10.1 10.36V13.48C10.1 13.7672 10.3328 14 10.62 14C10.9072 14 11.14 13.7672 11.14 13.48V10.88H12.44C12.7272 10.88 12.96 10.6472 12.96 10.36C12.96 10.0728 12.7272 9.84 12.44 9.84H10.62ZM10.62 11.66C10.3328 11.66 10.1 11.8928 10.1 12.18C10.1 12.4672 10.3328 12.7 10.62 12.7H12.18C12.4672 12.7 12.7 12.4672 12.7 12.18C12.7 11.8928 12.4672 11.66 12.18 11.66H10.62ZM5.81 9.84C5.52281 9.84 5.29 10.0728 5.29 10.36V13.48C5.29 13.7672 5.52281 14 5.81 14H6.72C7.27165 14 7.80071 13.7809 8.19078 13.3908C8.58086 13.0007 8.8 12.4716 8.8 11.92C8.8 11.3683 8.58086 10.8393 8.19078 10.4492C7.80071 10.0591 7.27165 9.84 6.72 9.84H5.81ZM6.33 12.96V10.88H6.72C6.99583 10.88 7.26035 10.9896 7.45539 11.1846C7.65043 11.3796 7.76 11.6442 7.76 11.92C7.76 12.1958 7.65043 12.4604 7.45539 12.6554C7.26035 12.8504 6.99583 12.96 6.72 12.96H6.33Z"
-                            stroke="#0041E8" stroke-width="0.3" stroke-linecap="round" stroke-linejoin="round" />
-                    </svg>
+                    <i class="fa-regular fa-file-pdf"></i>
                     <span class="ml-1">Danh sách cập nhật</span>
                 </a>
                 <a href=""
                     class="flex items-center px-[10px] py-[8px] border-[#0041E8] border-[1px] rounded-[4px] text-[#0041E8] hover:bg-[#0041E8] hover:text-white ml-[15px] hover:stroke-white font-[500]">
-                    <svg class="hover:fill-white" xmlns="http://www.w3.org/2000/svg" width="13" height="15"
-                        viewBox="0 0 13 15">
-                        <path fill-rule="evenodd" clip-rule="evenodd"
-                            d="M1.29289 1.29289C1.48043 1.10536 1.73478 1 2 1H8C8.13261 1 8.25979 1.05268 8.35355 1.14645L11.8536 4.64645C11.9473 4.74021 12 4.86739 12 5V13C12 13.2652 11.8946 13.5196 11.7071 13.7071C11.5196 13.8946 11.2652 14 11 14H2C1.73478 14 1.48043 13.8946 1.29289 13.7071C1.10536 13.5196 1 13.2652 1 13V2C1 1.73478 1.10536 1.48043 1.29289 1.29289ZM7.79289 2L2 2L2 13H11V5.20711L7.79289 2Z"
-                            fill="#0041E8" stroke="#0041E8" stroke-width="0.3" stroke-linecap="round"
-                            stroke-linejoin="round" />
-                        <path fill-rule="evenodd" clip-rule="evenodd"
-                            d="M8 1C8.27614 1 8.5 1.22386 8.5 1.5V4.5H11.5C11.7761 4.5 12 4.72386 12 5C12 5.27614 11.7761 5.5 11.5 5.5H8C7.72386 5.5 7.5 5.27614 7.5 5V1.5C7.5 1.22386 7.72386 1 8 1Z"
-                            fill="#0041E8" stroke="#0041E8" stroke-width="0.3" stroke-linecap="round"
-                            stroke-linejoin="round" />
-                        <path fill-rule="evenodd" clip-rule="evenodd"
-                            d="M4.64645 7.14645C4.84171 6.95118 5.15829 6.95118 5.35355 7.14645L8.35355 10.1464C8.54882 10.3417 8.54882 10.6583 8.35355 10.8536C8.15829 11.0488 7.84171 11.0488 7.64645 10.8536L4.64645 7.85355C4.45118 7.65829 4.45118 7.34171 4.64645 7.14645Z"
-                            fill="#0041E8" stroke="#0041E8" stroke-width="0.3" stroke-linecap="round"
-                            stroke-linejoin="round" />
-                        <path fill-rule="evenodd" clip-rule="evenodd"
-                            d="M8.35355 7.14645C8.54882 7.34171 8.54882 7.65829 8.35355 7.85355L5.35355 10.8536C5.15829 11.0488 4.84171 11.0488 4.64645 10.8536C4.45118 10.6583 4.45118 10.3417 4.64645 10.1464L7.64645 7.14645C7.84171 6.95118 8.15829 6.95118 8.35355 7.14645Z"
-                            fill="#0041E8" stroke="#0041E8" stroke-width="0.3" stroke-linecap="round"
-                            stroke-linejoin="round" />
-                    </svg>
+                    <i class="fa-regular fa-file-excel"></i>
                     <span class="ml-1">Cập nhật Excel</span>
                 </a>
             </div>
@@ -114,7 +66,7 @@
                     </td>
                     <td>
                         <a href="/admin/product/form?id={{item.id}}"
-                            class="text-[#0041E8] w-[300px] inline-block">{{item.title}}</a>
+                            class="text-[#0041E8] inline-block w-[140px]">{{item.title}}</a>
                         {% if item.config_count > 0 %}<p class="text-[#FFC700]">[Có cấu hình]</p>{% endif %}
                         <div class="flex items-center">
                             <span>Danh mục:</span>
@@ -145,7 +97,7 @@
                     </td>
                     <td>
                         <div class="flex items-center mb-[1px]">
-                            <span class="whitespace-nowrap">- Giá bán:</span>
+                            <span class="">- Giá bán:</span>
                             <b class="text-[#E00000] ml-[3px] whitespace-nowrap">
                                 {% if item.price > 0 %}
                                 {{item.price | format_price }} vnd
@@ -240,4 +192,101 @@
 
     </div>
 
+
+    <dialog id="js_list_category" class="modal">
+        <div class="modal-box w-11/12 max-w-5xl">
+            <form method="dialog">
+                <button class="btn btn-sm btn-circle btn-ghost absolute right-2 top-2">✕</button>
+            </form>
+            <div class="flex items-center">
+                <b class="text-[16px]">Tổng sản phẩm:</b>
+                <p class="ml-[5px]">{{page.total}} sản phẩm</p>
+            </div>
+            <div class="list-category mt-[5px] max-h-[400px] max-h-[400px] overflow-x-auto">
+                {% for cate in page.list_category %}
+                <a href="{{cate.url}}" class="item block mb-[5px] text-[#0041E8]">
+                    {% if cate.children.size > 0 %}
+                    <b class="text-[#0041E8]">+ (#{{cate.id}}){{cate.title}}</b>
+                    {% else %}
+                    + (#{{cate.id}}){{cate.title}}
+                    {% endif %}
+                </a>
+                {% if cate.children.size > 0 %}
+                <div class="ml-[15px]">
+                    {% for cate2 in cate.children %}
+                    <a href="{{cate2.url}}" class="item block mb-[5px] text-[#0041E8]">
+                        {% if cate2.children.size > 0 %}
+                        <b class="text-[#0041E8]">+ (#{{cate2.id}}){{cate2.title}}</b>
+                        {% else %}
+                        + (#{{cate2.id}}){{cate2.title}} ({{cate2.totalProduct}})
+                        {% endif %}
+                    </a>
+                    {% if cate2.children.size > 0 %}
+                    <div class="ml-[15px]">
+                        {% for cate3 in cate2.children %}
+                        <a href="{{cate3.url}}" class="item block mb-[5px] text-[#0041E8]">+
+                            (#{{cate3.id}}){{cate3.title}}
+                            ({{cate3.totalProduct}})</a>
+                        {% endfor %}
+                    </div>
+                    {% endif %}
+                    {% endfor %}
+                </div>
+                {% endif %}
+                {% endfor %}
+            </div>
+        </div>
+        <form method="dialog" class="modal-backdrop">
+            <button>close</button>
+        </form>
+    </dialog>
+
+
+    <dialog id="js_list_brand" class="modal">
+        <div class="modal-box w-11/12 max-w-3xl">
+            <form method="dialog">
+                <button class="btn btn-sm btn-circle btn-ghost absolute right-2 top-2">✕</button>
+            </form>
+            <div class="flex flex-wrap items-center">
+                <b class="inline-block w-[120px]">Tìm theo chữ cái</b>
+                <div class="list-key inline-block ml-[10px] w-[calc(100%-140px)]">
+                    {% for key in page.brand_letters %}
+                    <a href="{{key.url}}">
+                        <span class="text-[#0041E8] underline">{{key.key}}</span> <span>({{key.total}})</span>
+                    </a>
+                    {% endfor %}
+                </div>
+
+                <table class="mt-[15px] w-[100%] table-brand">
+                    <thead>
+                        <tr>
+                            <th>STT</th>
+                            <th>Thương hiệu</th>
+                            <th class="whitespace-nowrap">Số lượng sản phẩm</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        {% assign stt = 0 %}
+                        {% for item in page.list_brands %}
+                        {% for item2 in item.1 %}
+                        {% increment stt %}
+                        <tr>
+                            <td class="w-[10%]">{{stt}}</td>
+                            <td>{{item2.name}}</td>
+                            <td class="w-[18%]">
+                                <span>{{item2.product}}</span>
+                                <a href="{{item2.url}}" class="text-[#0041E8]">(Xem sp)</a>
+                            </td>
+                        </tr>
+                        {% endfor %}
+                        {% endfor %}
+                    </tbody>
+                </table>
+            </div>
+        </div>
+        <form method="dialog" class="modal-backdrop">
+            <button>close</button>
+        </form>
+    </dialog>
+
 </div>
\ No newline at end of file
diff --git a/template/theme.html b/template/theme.html
index 7649df7..02d027d 100644
--- a/template/theme.html
+++ b/template/theme.html
@@ -22,266 +22,262 @@
     <script src="https://cdn.jsdelivr.net/npm/jquery@3.3.1/dist/jquery.min.js"></script>
 
 </head>
-
 <body>
+    {{ global|show_var }}
+    <div class="admin-global-container">
 
-{{ global | show_var }}
-
-{{ page | show_var }}
-
-<div class="admin-global-container">
-
-    <!-- Menu full  -->
-    <div class="admin-menu-container box-menu sticky top-0 bottom-0 h-[100vh] hidden" id="js-menu-big">
-        <a href="javascript:void(0)" class="icon-close" title="Thu gọn menu" id="js-hide-menu">
-            <i class="fa-solid fa-outdent"></i>
-        </a>
-
-        <a href="" class="menu-logo">
-            <img src="{{ 'logo.png' | asset_url }}" />
-        </a>
-
-        <div class="menu-list">
-            <a href="/" class="item">
-                <i class="icons icon-home"></i>
-                <span class="title"> Dashboard </span>
+        <!-- Menu full  -->
+        <div class="admin-menu-container box-menu sticky top-0 bottom-0 h-[100vh] hidden" id="js-menu-big">
+            <a href="javascript:void(0)" class="icon-close" title="Thu gọn menu" id="js-hide-menu">
+                <i class="fa-solid fa-outdent"></i>
             </a>
 
-            {% for _category in global.main_menu %}
-            {% assign _type = _category[0] %}
-            {% assign _menuArray = _category[1].menu %}
-            {% if _category[1].enable == 1 %}
-            <details {% if _type == global.module %} open {% endif %}>
-                <summary class="item">
-                    <div class="flex items-center">
+            <a href="" class="menu-logo">
+                <img src="{{ 'logo.png' | asset_url }}" />
+            </a>
+            
+            <div class="menu-list">
+                <a href="/" class="item">
+                    <i class="icons icon-home"></i>
+                    <span class="title"> Dashboard </span>
+                </a>
 
-                        {% if _type == 'order' %} <i class="icons icon-order"></i>
-                        {% elsif _type == 'product' %} <i class="icons icon-product"></i>
-                        {% elsif _type == 'customer' %}<i class="icons icon-customer"></i>
-                        {% elsif _type == 'marketing' %}<i class="icons icon-marketing"></i>
-                        {% elsif _type == 'investor_relation' %} <i class="icons icon-investor_relation"></i>
-                        {% elsif _type == 'article' %} <i class="icons icon-content"></i>
-                        {% elsif _type == 'job' %} <i class="icons icon-job"></i>
-                        {% elsif _type == 'pcbuilder' %} <i class="icons icon-pcbuilder"></i>
-                        {% elsif _type == 'payinstall' %} <i class="icons icon-payinstall"></i>
-                        {% elsif _type == 'distributor' %} <i class="icons icon-distributor"></i>
-                        {% elsif _type == 'report' %}<i class="icons icon-stats"></i>
-                        {% elsif _type == 'system' %}<i class="icons icon-system"></i>
-                        {% endif %}
+                {% for _category in global.main_menu %}
+                {% assign _type = _category[0] %}
+                {% assign _menuArray = _category[1].menu %}
+                {% if _category[1].enable == 1 %}
+                <details {% if _type == global.module %} open {% endif %}>
+                    <summary class="item">
+                        <div class="flex items-center">
 
-                        <span class="title"> {{ _category[1].name }} </span>
+                            {% if _type == 'order' %} <i class="icons icon-order"></i>
+                            {% elsif _type == 'product' %} <i class="icons icon-product"></i>
+                            {% elsif _type == 'customer' %}<i class="icons icon-customer"></i>
+                            {% elsif _type == 'marketing' %}<i class="icons icon-marketing"></i>
+                            {% elsif _type == 'investor_relation' %} <i class="icons icon-investor_relation"></i>
+                            {% elsif _type == 'article' %} <i class="icons icon-content"></i>
+                            {% elsif _type == 'job' %} <i class="icons icon-job"></i>
+                            {% elsif _type == 'pcbuilder' %} <i class="icons icon-pcbuilder"></i>
+                            {% elsif _type == 'payinstall' %} <i class="icons icon-payinstall"></i>
+                            {% elsif _type == 'distributor' %} <i class="icons icon-distributor"></i>
+                            {% elsif _type == 'report' %}<i class="icons icon-stats"></i>
+                            {% elsif _type == 'system' %}<i class="icons icon-system"></i>
+                            {% endif %}
+
+                            <span class="title"> {{ _category[1].name }} </span>
+                        </div>
+
+                        <i class="fa-solid fa-angle-right"></i>
+                    </summary>
+
+                    <div class="sub-menu">
+                        {% for _item in _menuArray %}
+                        <a href="{{ _item.url }}" {% if _item.view == global.view and _item.module == global.module %}
+                            class="current" {% endif %}> {{ _item.name }} </a>
+                        {% endfor %}
                     </div>
+                </details>
+                {% endif %}
+                {% endfor %}
+            </div>
 
-                    <i class="fa-solid fa-angle-right"></i>
-                </summary>
+            <div class="menu-list">
+                <p style="color: #81B5E4;margin: 0 0 10px;font-weight: 700;padding: 0 16px;">TÀI KHOẢN</p>
 
-                <div class="sub-menu">
-                    {% for _item in _menuArray %}
-                    <a href="{{_item.url }}" {% if _item.url == global.url %} class="current" {% endif %}> {{ _item.name }} </a>
-                    {% endfor %}
+                <a href="" class="item">
+                    <i class="icons icon-settings"></i>
+                    <span class="title"> Cài đặt </span>
+                </a>
+
+                <a href="" class="item">
+                    <i class="icons icon-support"></i>
+                    <span class="title"> Hỗ trợ </span>
+                </a>
+
+                <a href="" class="item">
+                    <i class="icons icon-account"></i>
+                    <span class="title"> Quản lý tài khoản </span>
+                </a>
+            </div>
+
+            <a href="" class="item">
+                <i class="icons icon-logout"></i>
+                <span class="title"> Thoát quản trị </span>
+            </a>
+        </div>
+
+        <!-- Menu collapse -->
+        <div class="admin-menu box-menu fixed top-0 bg-[#004E99] flex flex-col justify-between pb-[20px] min-h-[100vh]" id="js-menu-small">
+            <div>
+                <div class="logo item items-center justify-center border-[rgba(255,255,255,0.15)] border-b p-[20px_0_!important]">
+                    <a href="/" class="">
+                        <img src="{{ 'logo_small.png' | asset_url }}" alt="">
+                    </a>
+
+                    <a href="javascript:void(0)" title="Mở menu" class="icon-close" id="js-show-menu">
+                        <i class="fa-solid fa-indent"></i>
+                    </a>
                 </div>
-            </details>
-            {% endif %}
-            {% endfor %}
-        </div>
 
-        <div class="menu-list">
-            <p style="color: #81B5E4;margin: 0 0 10px;font-weight: 700;padding: 0 16px;">TÀI KHOẢN</p>
+                <div class="item">
+                    <a href="/" class="icons icon-home"> </a>
 
-            <a href="" class="item">
-                <i class="icons icon-settings"></i>
-                <span class="title"> Cài đặt </span>
-            </a>
+                    <div class="sub-menu">
+                        <p class="font-bold"> Dashboard </p>
+                    </div>
+                </div>
 
-            <a href="" class="item">
-                <i class="icons icon-support"></i>
-                <span class="title"> Hỗ trợ </span>
-            </a>
+                {% for _category in global.main_menu %}
+                {% assign _type = _category[0] %}
+                {% assign _menuArray = _category[1].menu %}
 
-            <a href="" class="item">
-                <i class="icons icon-account"></i>
-                <span class="title"> Quản lý tài khoản </span>
-            </a>
-        </div>
+                {% if _category[1].enable == 1 %}
+                <div class="item {% if _type == 'system' %} border-[rgba(255,255,255,0.15)] border-b{% endif %} {% if _type == global.module %} current {% endif %}">
+                    {% if _type == 'order' %} <i class="icons icon-sell"> </i>
+                    {% elsif _type == 'product' %} <i class="icons icon-product"> </i>
+                    {% elsif _type == 'customer' %}<i class="icons icon-user"> </i>
+                    {% elsif _type == 'marketing' %} <i class="icons icon-marketing"> </i>
+                    {% elsif _type == 'investor_relation' %} <i class="icons icon-investor_relation"> </i>
+                    {% elsif _type == 'article' %} <i class="icons icon-content"> </i>
+                    {% elsif _type == 'job' %} <i class="icons icon-job"> </i>
+                    {% elsif _type == 'pcbuilder' %} <i class="icons icon-pcbuilder"> </i>
+                    {% elsif _type == 'payinstall' %} <i class="icons icon-payinstall"> </i>
+                    {% elsif _type == 'distributor' %} <i class="icons icon-distributor"> </i>
+                    {% elsif _type == 'report' %}<i class="icons icon-stats"></i>
+                    {% elsif _type == 'system' %}<i class="icons icon-system"></i>
+                    {% endif %}
 
-        <a href="" class="item">
-            <i class="icons icon-logout"></i>
-            <span class="title"> Thoát quản trị </span>
-        </a>
-    </div>
+                    <div class="sub-menu">
+                        <p class="font-bold"> {{ _category[1].name }} </p>
 
-    <!-- Menu collapse -->
-    <div class="admin-menu box-menu sticky top-0 bg-[#004E99] flex flex-col justify-between pb-[20px] min-h-[100vh]" id="js-menu-small">
-        <div>
-            <div class="logo item items-center justify-center border-[rgba(255,255,255,0.15)] border-b p-[20px_0_!important]">
-                <a href="/" class="">
-                    <img src="{{ 'logo_small.png' | asset_url }}" alt="">
-                </a>
+                        <div class="menu-list">
+                            {% for _item in _menuArray %}
+                            <a href="{{ _item.url }}" {% if _item.view == global.view %} class="current" {% endif %}>
+                                {{ _item.name }}
+                            </a>
+                            {% endfor %}
+                        </div>
+                    </div>
+                </div>
+                {% endif %}
+                {% endfor %}
+
+                <div class="item">
+                    <a href="" class="icons icon-settings"> </a>
+
+                    <div class="sub-menu">
+                        <p class="font-bold"> Cài đặt </p>
+
+                        <div class="menu-list">
+                            {% for _item in global.main_menu.system.menu %}
+                            <a href="{{_item.url }}"> {{_item.name }} </a>
+                            {% endfor %}
+                        </div>
+                    </div>
+                </div>
                 
-                <a href="javascript:void(0)" title="Mở menu" class="icon-close" id="js-show-menu">
-                    <i class="fa-solid fa-indent"></i>
-                </a>
+                <div class="item">
+                    <a href="" class="icons icon-support"> </a>
+
+                    <div class="sub-menu">
+                        <p class="font-bold"> Hỗ trợ </p>
+
+                        <div class="menu-list">
+                            <a href=""> Menu title </a>
+                            <a href=""> Menu title </a>
+                            <a href=""> Menu title </a>
+                            <a href=""> Menu title </a>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="item">
+                    <a href="" class="icons icon-account"> </a>
+
+                    <div class="sub-menu">
+                        <p class="font-bold"> Quản lý tài khoản </p>
+
+                        <div class="menu-list">
+                            <a href=""> Menu title </a>
+                            <a href=""> Menu title </a>
+                            <a href=""> Menu title </a>
+                            <a href=""> Menu title </a>
+                        </div>
+                    </div>
+                </div>
             </div>
 
             <div class="item">
-                <a href="/" class="icons icon-home"> </a>
+                <a href="" class="icons icon-logout"> </a>
 
                 <div class="sub-menu">
-                    <p class="font-bold"> Dashboard </p>
+                    <p class="font-bold"> Thoát quản trị </p>
                 </div>
             </div>
+        </div>
+        
+        <div class="admin-content-container ml-[50px]" id="js-admin-content-container">
+            <!-- Header -->
+            <div class="admin-header-container flex items-center justify-between bg-white px-4 py-3">
+                <form class="max-w-[420px] relative w-[100%] menu-hide" id="js-form-search">
+                    <div class="absolute inset-y-0 start-0 flex items-center ps-3 pointer-events-none">
+                        <i class="icons icon-search"></i>
+                    </div>
 
-            {% for _category in global.main_menu %}
-            {% assign _type = _category[0] %}
-            {% assign _menuArray = _category[1].menu %}
+                    <input type="search" class="block border h-[36px] ps-10 rounded w-full" placeholder="Tìm kiếm">
+                </form>
 
-            {% if _category[1].enable == 1 %}
-            <div class="item {% if _type == 'system' %} border-[rgba(255,255,255,0.15)] border-b{% endif %} {% if _type == global.module %} current {% endif %}">
-                {% if _type == 'order' %} <i class="icons icon-sell"> </i>
-                {% elsif _type == 'product' %} <i class="icons icon-product"> </i>
-                {% elsif _type == 'customer' %}<a href="" class="icons icon-user"> </a>
-                {% elsif _type == 'marketing' %} <i class="icons icon-marketing"> </i>
-                {% elsif _type == 'investor_relation' %} <i class="icons icon-investor_relation"> </i>
-                {% elsif _type == 'article' %} <i class="icons icon-content"> </i>
-                {% elsif _type == 'job' %} <i class="icons icon-job"> </i>
-                {% elsif _type == 'pcbuilder' %} <i class="icons icon-pcbuilder"> </i>
-                {% elsif _type == 'payinstall' %} <i class="icons icon-payinstall"> </i>
-                {% elsif _type == 'distributor' %} <i class="icons icon-distributor"> </i>
-                {% elsif _type == 'report' %}<i class="icons icon-stats"></i>
-                {% elsif _type == 'system' %}<i class="icons icon-system"></i>
-                {% endif %}
+                <div class="admin-header-right flex items-center justify-end">
+                    <a href="" title="Truy cập trung tâm hỗ trợ của Hurasoft">
+                        <i class="icons header-support"></i>
+                    </a>
 
-                <div class="sub-menu">
-                    <p class="font-bold"> {{ _category[1].name }} </p>
+                    <div
+                        class="group relative cursor-pointer ml-[20px] mr-[35px] group [&_summary::-webkit-details-marker]:hidden">
+                        <div class="relative flex">
+                            <i class="icons icon-notification"></i>
 
-                    <div class="menu-list">
-                        {% for _item in _menuArray %}
-                        <a href="{{ _item.url }}" {% if _item.view == global.view %} class="current" {% endif %}>
-                            {{ _item.name }}
-                        </a>
-                        {% endfor %}
+                            <span
+                                class="absolute bg-[#E00000] font-[500] h-[17px] leading-[17px] note right-[-5px] rounded-lg text-[#fff] text-[13px] text-center top-[-3px] w-[17px]">
+                                0
+                            </span>
+                        </div>
+
+                        <div
+                            class="group-hover:opacity-[1] group-hover:z-[1] opacity-0 absolute bg-white leading-[30px] note-list shadow whitespace-nowrap z-[-1] rounded-[4px] right-[-10px]">
+                            <a href=""> Menu title </a>
+                            <a href=""> Menu title </a>
+                            <a href=""> Menu title </a>
+                            <a href=""> Menu title </a>
+                        </div>
+                    </div>
+
+                    <div class="group relative cursor-pointer group [&_summary::-webkit-details-marker]:hidden">
+                        <div class="flex items-center">
+                            <p class="m-0 mr-[10px]"> ducdt@hurasoft.com </p>
+
+                            <img src="https://via.placeholder.com/72x72"
+                                class="block rounded-[50%] w-[36px] h-[36px] mr-[8px]" />
+
+                            <i class="fa-solid fa-sort-down text-[#C9C9C9] mb-[3px]"></i>
+                        </div>
+
+                        <div
+                            class="group-hover:opacity-[1] group-hover:z-[1] opacity-0 absolute bg-white leading-[30px] note-list shadow whitespace-nowrap z-[-1] rounded-[4px] right-0">
+                            <a href="">Đổi mật khẩu</a>
+                            <a href="">Thoát quản trị</a>
+                        </div>
                     </div>
                 </div>
             </div>
-            {% endif %}
-            {% endfor %}
-        </div>
 
-        <div class="item bottom">
-            <a href="" class="icons icon-settings"> </a>
-
-            <div class="sub-menu">
-                <p class="font-bold"> Cài đặt </p>
-
-                <div class="menu-list">
-                    {% for _item in global.main_menu.system.menu %}
-                    <a href="{{_item.url }}"> {{_item.name }} </a>
-                    {% endfor %}
-                </div>
-            </div>
-        </div>
-
-        <div class="item bottom">
-            <a href="" class="icons icon-support"> </a>
-
-            <div class="sub-menu">
-                <p class="font-bold"> Hỗ trợ </p>
-
-                <div class="menu-list">
-                    <a href=""> Menu title </a>
-                    <a href=""> Menu title </a>
-                    <a href=""> Menu title </a>
-                    <a href=""> Menu title </a>
-                </div>
-            </div>
-        </div>
-
-        <div class="item bottom">
-            <a href="" class="icons icon-account"> </a>
-
-            <div class="sub-menu">
-                <p class="font-bold"> Quản lý tài khoản </p>
-
-                <div class="menu-list">
-                    <a href=""> Menu title </a>
-                    <a href=""> Menu title </a>
-                    <a href=""> Menu title </a>
-                    <a href=""> Menu title </a>
-                </div>
-            </div>
-        </div>
-
-        <div class="item">
-            <a href="" class="icons icon-logout"> </a>
-
-            <div class="sub-menu">
-                <p class="font-bold"> Thoát quản trị </p>
-            </div>
+            <!-- Content -->
+            {{ page_content }}
         </div>
     </div>
 
-    <div class="admin-content-container" id="js-admin-content-container">
-        <!-- Header -->
-        <div class="admin-header-container flex items-center justify-between bg-white px-4 py-3">
-            <form class="max-w-[420px] relative w-[100%] menu-hide" id="js-form-search">
-                <div class="absolute inset-y-0 start-0 flex items-center ps-3 pointer-events-none">
-                    <i class="icons icon-search"></i>
-                </div>
-
-                <input type="search" class="block border h-[36px] ps-10 rounded w-full" placeholder="Tìm kiếm">
-            </form>
-
-            <div class="admin-header-right flex items-center justify-end">
-                <a href="" title="Truy cập trung tâm hỗ trợ của Hurasoft">
-                    <i class="icons header-support"></i>
-                </a>
-
-                <div
-                    class="group relative cursor-pointer ml-[20px] mr-[35px] group [&_summary::-webkit-details-marker]:hidden">
-                    <div class="relative flex">
-                        <i class="icons icon-notification"></i>
-
-                        <span
-                            class="absolute bg-[#E00000] font-[500] h-[17px] leading-[17px] note right-[-5px] rounded-lg text-[#fff] text-[13px] text-center top-[-3px] w-[17px]">
-                            0
-                        </span>
-                    </div>
-
-                    <div
-                        class="group-hover:opacity-[1] group-hover:z-[1] opacity-0 absolute bg-white leading-[30px] note-list shadow whitespace-nowrap z-[-1] rounded-[4px] right-[-10px]">
-                        <a href=""> Menu title </a>
-                        <a href=""> Menu title </a>
-                        <a href=""> Menu title </a>
-                        <a href=""> Menu title </a>
-                    </div>
-                </div>
-
-                <div class="group relative cursor-pointer group [&_summary::-webkit-details-marker]:hidden">
-                    <div class="flex items-center">
-                        <p class="m-0 mr-[10px]"> ducdt@hurasoft.com </p>
-
-                        <img src="https://via.placeholder.com/72x72"
-                            class="block rounded-[50%] w-[36px] h-[36px] mr-[8px]" />
-
-                        <i class="fa-solid fa-sort-down text-[#C9C9C9] mb-[3px]"></i>
-                    </div>
-
-                    <div
-                        class="group-hover:opacity-[1] group-hover:z-[1] opacity-0 absolute bg-white leading-[30px] note-list shadow whitespace-nowrap z-[-1] rounded-[4px] right-0">
-                        <a href="">Đổi mật khẩu</a>
-                        <a href="">Thoát quản trị</a>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <!-- Content -->
-        {{ page_content }}
-    </div>
-</div>
-
-
-{% include javascript/index %}
+    {% include javascript/index %}
 
 </body>
+
 </html>
\ No newline at end of file