diff --git a/src/pages/auth/components/LoginStep1.tsx b/src/pages/auth/components/LoginStep1.tsx
index c3089cc..652b712 100644
--- a/src/pages/auth/components/LoginStep1.tsx
+++ b/src/pages/auth/components/LoginStep1.tsx
@@ -1,4 +1,4 @@
-import { FC } from 'react'
+import { type FC } from 'react'
 import Input from '../../../components/Input'
 import { useTranslation } from 'react-i18next'
 import { LoginType } from '../types/AuthTypes'
diff --git a/src/pages/auth/components/LoginStep2.tsx b/src/pages/auth/components/LoginStep2.tsx
index 4fa02a8..3ab544c 100644
--- a/src/pages/auth/components/LoginStep2.tsx
+++ b/src/pages/auth/components/LoginStep2.tsx
@@ -1,4 +1,4 @@
-import { FC } from 'react'
+import { type FC } from 'react'
 import { useTranslation } from 'react-i18next'
 import { OtpVerifyType } from '../types/AuthTypes'
 import { useFormik } from 'formik'
diff --git a/src/pages/auth/components/LoginStep3.tsx b/src/pages/auth/components/LoginStep3.tsx
index 2c74191..d934f73 100644
--- a/src/pages/auth/components/LoginStep3.tsx
+++ b/src/pages/auth/components/LoginStep3.tsx
@@ -1,4 +1,4 @@
-import { FC } from 'react'
+import { type FC } from 'react'
 import Input from '../../../components/Input'
 import { useTranslation } from 'react-i18next'
 import { LoginWithPasswordType } from '../types/AuthTypes'
diff --git a/src/pages/auth/components/RegisterStep1.tsx b/src/pages/auth/components/RegisterStep1.tsx
index 9122f13..f339ec9 100644
--- a/src/pages/auth/components/RegisterStep1.tsx
+++ b/src/pages/auth/components/RegisterStep1.tsx
@@ -1,4 +1,4 @@
-import { FC } from 'react'
+import { type FC } from 'react'
 import Input from '../../../components/Input'
 import { useTranslation } from 'react-i18next'
 import { CheckHasAccountPhoneType } from '../types/AuthTypes'
diff --git a/src/shared/SideBar.tsx b/src/shared/SideBar.tsx
index 692d2a0..0f96502 100644
--- a/src/shared/SideBar.tsx
+++ b/src/shared/SideBar.tsx
@@ -167,7 +167,7 @@ const SideBar: FC = () => {
 
             {
                 hasSubMenu && (openSidebar || window.innerWidth > 1139) &&
-                <div className='fixed xl:right-[112px] right-[96px] bg-white z-20 xl:top-4 xl:bottom-4 top-0 bottom-0 rounded-tl-[32px] rounded-bl-[32px] w-[190px] border-r'>
+                <div className='fixed xl:right-[112px] right-[96px] bg-white z-20 xl:top-4 xl:bottom-4 top-0 bottom-0 rounded-tl-[32px] rounded-bl-[32px] w-[190px] border-r border-border'>
                     {
                         subMenuName === 'foods' ?
                             <FoodsSubMenu />
diff --git a/src/shared/components/BlogSubMenu.tsx b/src/shared/components/BlogSubMenu.tsx
index 4f108f7..7f75728 100644
--- a/src/shared/components/BlogSubMenu.tsx
+++ b/src/shared/components/BlogSubMenu.tsx
@@ -1,5 +1,5 @@
 import { DocumentText } from 'iconsax-react'
-import { FC } from 'react'
+import { type FC } from 'react'
 import { useTranslation } from 'react-i18next'
 import SubMenuItem from './SubMenuItem'
 import { Pages } from '../../config/Pages'
@@ -14,7 +14,7 @@ const BlogSubMenu: FC = () => {
 
     return (
         <div className='py-12'>
-            <div className='flex gap-3 items-center border-b pb-10 px-6'>
+            <div className='flex gap-3 items-center border-b border-border pb-10 px-6'>
                 <DocumentText
                     size={24}
                     color='#000'
diff --git a/src/shared/components/CustomerSubMenu.tsx b/src/shared/components/CustomerSubMenu.tsx
index 4d42a72..a38f013 100644
--- a/src/shared/components/CustomerSubMenu.tsx
+++ b/src/shared/components/CustomerSubMenu.tsx
@@ -1,5 +1,5 @@
 import { People } from 'iconsax-react'
-import { FC } from 'react'
+import { type FC } from 'react'
 import { useTranslation } from 'react-i18next'
 import SubMenuItem from './SubMenuItem'
 import { Pages } from '../../config/Pages'
@@ -14,7 +14,7 @@ const CustomerSubMenu: FC = () => {
 
     return (
         <div className='py-12'>
-            <div className='flex gap-3 items-center border-b pb-10 px-6'>
+            <div className='flex gap-3 items-center border-b border-border pb-10 px-6'>
                 <People
                     size={24}
                     color='#000'
diff --git a/src/shared/components/CustomersSubMenu.tsx b/src/shared/components/CustomersSubMenu.tsx
index 5aab9b4..0165090 100644
--- a/src/shared/components/CustomersSubMenu.tsx
+++ b/src/shared/components/CustomersSubMenu.tsx
@@ -1,5 +1,5 @@
 import { People } from 'iconsax-react'
-import { FC } from 'react'
+import { type FC } from 'react'
 import { useTranslation } from 'react-i18next'
 import SubMenuItem from './SubMenuItem'
 import { useLocation } from 'react-router-dom'
@@ -16,7 +16,7 @@ const CustomersSubMenu: FC = () => {
 
     return (
         <div className='py-12'>
-            <div className='flex gap-3 items-center border-b pb-10 px-6'>
+            <div className='flex gap-3 items-center border-b border-border pb-10 px-6'>
                 <People
                     size={24}
                     color='#000'
diff --git a/src/shared/components/DiscountSubMenu.tsx b/src/shared/components/DiscountSubMenu.tsx
index 8f739fe..39142e6 100644
--- a/src/shared/components/DiscountSubMenu.tsx
+++ b/src/shared/components/DiscountSubMenu.tsx
@@ -1,5 +1,5 @@
 import { TicketDiscount } from 'iconsax-react'
-import { FC } from 'react'
+import { type FC } from 'react'
 import { useTranslation } from 'react-i18next'
 import SubMenuItem from './SubMenuItem'
 import { useLocation } from 'react-router-dom'
@@ -16,7 +16,7 @@ const DiscountSubMenu: FC = () => {
 
     return (
         <div className='py-12'>
-            <div className='flex gap-3 items-center border-b pb-10 px-6'>
+            <div className='flex gap-3 items-center border-b border-border pb-10 px-6'>
                 <TicketDiscount
                     size={24}
                     color='#000'
diff --git a/src/shared/components/FoodsSubMenu.tsx b/src/shared/components/FoodsSubMenu.tsx
index 262280c..91573b5 100644
--- a/src/shared/components/FoodsSubMenu.tsx
+++ b/src/shared/components/FoodsSubMenu.tsx
@@ -1,5 +1,5 @@
 import { Element3 } from 'iconsax-react'
-import { FC } from 'react'
+import { type FC } from 'react'
 import { useTranslation } from 'react-i18next'
 import SubMenuItem from './SubMenuItem'
 import { useLocation } from 'react-router-dom'
@@ -16,7 +16,7 @@ const FoodsSubMenu: FC = () => {
 
     return (
         <div className='py-12'>
-            <div className='flex gap-3 items-center border-b pb-10 px-6'>
+            <div className='flex gap-3 items-center border-b border-border pb-10 px-6'>
                 <Element3
                     size={24}
                     color='#000'
diff --git a/src/shared/components/LearningSubMenu.tsx b/src/shared/components/LearningSubMenu.tsx
index 663e74a..dd3ad65 100644
--- a/src/shared/components/LearningSubMenu.tsx
+++ b/src/shared/components/LearningSubMenu.tsx
@@ -1,5 +1,5 @@
 import { Teacher } from 'iconsax-react'
-import { FC } from 'react'
+import { type FC } from 'react'
 import { useTranslation } from 'react-i18next'
 import SubMenuItem from './SubMenuItem'
 import { useLocation } from 'react-router-dom'
@@ -16,7 +16,7 @@ const LearningSubMenu: FC = () => {
 
     return (
         <div className='py-12'>
-            <div className='flex gap-3 items-center border-b pb-10 px-6'>
+            <div className='flex gap-3 items-center border-b border-border pb-10 px-6'>
                 <Teacher
                     size={24}
                     color='#000'
diff --git a/src/shared/components/OrdersSubMenu.tsx b/src/shared/components/OrdersSubMenu.tsx
index 94bf272..1ad93bd 100644
--- a/src/shared/components/OrdersSubMenu.tsx
+++ b/src/shared/components/OrdersSubMenu.tsx
@@ -1,5 +1,5 @@
 import { DocumentText } from 'iconsax-react'
-import { FC } from 'react'
+import { type FC } from 'react'
 import { useTranslation } from 'react-i18next'
 import SubMenuItem from './SubMenuItem'
 import { useLocation } from 'react-router-dom'
@@ -16,7 +16,7 @@ const OrdersSubMenu: FC = () => {
 
     return (
         <div className='py-12'>
-            <div className='flex gap-3 items-center border-b pb-10 px-6'>
+            <div className='flex gap-3 items-center border-b border-border pb-10 px-6'>
                 <DocumentText
                     size={24}
                     color='#000'
diff --git a/src/shared/components/ReceiptSubMenu.tsx b/src/shared/components/ReceiptSubMenu.tsx
index d86c205..e1c5d5a 100644
--- a/src/shared/components/ReceiptSubMenu.tsx
+++ b/src/shared/components/ReceiptSubMenu.tsx
@@ -1,5 +1,5 @@
 import { Receipt21 } from 'iconsax-react'
-import { FC } from 'react'
+import { type FC } from 'react'
 import { useTranslation } from 'react-i18next'
 import SubMenuItem from './SubMenuItem'
 import { useLocation } from 'react-router-dom'
@@ -16,7 +16,7 @@ const ReceiptSubMenu: FC = () => {
 
     return (
         <div className='py-12'>
-            <div className='flex gap-3 items-center border-b pb-10 px-6'>
+            <div className='flex gap-3 items-center border-b border-border pb-10 px-6'>
                 <Receipt21
                     size={24}
                     color='#000'
diff --git a/src/shared/components/ServicesSubMenu.tsx b/src/shared/components/ServicesSubMenu.tsx
index 299717a..626ee50 100644
--- a/src/shared/components/ServicesSubMenu.tsx
+++ b/src/shared/components/ServicesSubMenu.tsx
@@ -1,5 +1,5 @@
 import { Element3 } from 'iconsax-react'
-import { FC } from 'react'
+import { type FC } from 'react'
 import { useTranslation } from 'react-i18next'
 import SubMenuItem from './SubMenuItem'
 import { useLocation } from 'react-router-dom'
@@ -17,7 +17,7 @@ const ServicesSubMenu: FC = () => {
 
     return (
         <div className='py-12'>
-            <div className='flex gap-3 items-center border-b pb-10 px-6'>
+            <div className='flex gap-3 items-center border-b border-border pb-10 px-6'>
                 <Element3
                     size={24}
                     color='#000'
diff --git a/src/shared/components/SubMenuItem.tsx b/src/shared/components/SubMenuItem.tsx
index 59451f4..cdaa234 100644
--- a/src/shared/components/SubMenuItem.tsx
+++ b/src/shared/components/SubMenuItem.tsx
@@ -1,4 +1,4 @@
-import { FC } from 'react'
+import { type FC } from 'react'
 import { Link } from 'react-router-dom'
 import { clx } from '../../helpers/utils'
 
diff --git a/src/shared/components/SupportSubMenu.tsx b/src/shared/components/SupportSubMenu.tsx
index 9e0c9c8..54c1f72 100644
--- a/src/shared/components/SupportSubMenu.tsx
+++ b/src/shared/components/SupportSubMenu.tsx
@@ -1,5 +1,5 @@
 import { Headphone } from 'iconsax-react'
-import { FC } from 'react'
+import { type FC } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useLocation } from 'react-router-dom'
 import { Pages } from '../../config/Pages'
@@ -17,7 +17,7 @@ const SupportSubMenu: FC = () => {
 
 
     return <div className='py-12'>
-        <div className='flex gap-3 items-center border-b pb-10 px-6'>
+        <div className='flex gap-3 items-center border-b border-border pb-10 px-6'>
             <Headphone
                 size={24}
                 color='#000'
diff --git a/src/shared/components/TicketSubMenu.tsx b/src/shared/components/TicketSubMenu.tsx
index 6d9436d..31182fc 100644
--- a/src/shared/components/TicketSubMenu.tsx
+++ b/src/shared/components/TicketSubMenu.tsx
@@ -1,5 +1,5 @@
 import { Messages3 } from 'iconsax-react'
-import { FC } from 'react'
+import { type FC } from 'react'
 import { useTranslation } from 'react-i18next'
 import SubMenuItem from './SubMenuItem'
 import { useLocation } from 'react-router-dom'
@@ -17,7 +17,7 @@ const TicketSubMenu: FC = () => {
 
     return (
         <div className='py-12'>
-            <div className='flex gap-3 items-center border-b pb-10 px-6'>
+            <div className='flex gap-3 items-center border-b border-border pb-10 px-6'>
                 <Messages3
                     size={24}
                     color='#000'
diff --git a/src/shared/components/TransactionsSubMenu.tsx b/src/shared/components/TransactionsSubMenu.tsx
index 20e3f23..d72c58e 100644
--- a/src/shared/components/TransactionsSubMenu.tsx
+++ b/src/shared/components/TransactionsSubMenu.tsx
@@ -1,5 +1,5 @@
 import { Card } from 'iconsax-react'
-import { FC } from 'react'
+import { type FC } from 'react'
 import { useTranslation } from 'react-i18next'
 import SubMenuItem from './SubMenuItem'
 
@@ -13,7 +13,7 @@ const TransactionsSubMenu: FC = () => {
 
     return (
         <div className='py-12'>
-            <div className='flex gap-3 items-center border-b pb-10 px-6'>
+            <div className='flex gap-3 items-center border-b border-border pb-10 px-6'>
                 <Card
                     size={24}
                     color='#000'
diff --git a/src/shared/components/UsersSubMenu.tsx b/src/shared/components/UsersSubMenu.tsx
index 54d1367..f6dd4bc 100644
--- a/src/shared/components/UsersSubMenu.tsx
+++ b/src/shared/components/UsersSubMenu.tsx
@@ -1,5 +1,5 @@
 import { Profile } from 'iconsax-react'
-import { FC } from 'react'
+import { type FC } from 'react'
 import { useTranslation } from 'react-i18next'
 import SubMenuItem from './SubMenuItem'
 import { Pages } from '../../config/Pages'
@@ -14,7 +14,7 @@ const UsersSubMenu: FC = () => {
 
     return (
         <div className='py-12'>
-            <div className='flex gap-3 items-center border-b pb-10 px-6'>
+            <div className='flex gap-3 items-center border-b border-border pb-10 px-6'>
                 <Profile
                     size={24}
                     color='#000'