From 80f5febb518be45f8519288780929fbccb1d02c5 Mon Sep 17 00:00:00 2001
From: chamikaJ <chamika@ceydigital.com>
Date: Wed, 23 Jul 2025 10:33:55 +0530
Subject: [PATCH 1/6] feat(antd-imports): establish centralized import rules
 for Ant Design components

- Introduced a new rules file for Ant Design component imports, enforcing the use of centralized imports from `@antd-imports` to enhance tree-shaking, maintainability, and performance.
- Updated various components to replace direct imports from 'antd' and '@ant-design/icons' with the centralized import path.
- Refactored existing components to utilize memoization and callbacks for improved performance and readability.
- Enhanced the billing and configuration components with updated styles and improved user experience.
---
 .cursor/rules/antd-components.mdc             | 237 +++++++++++++++
 .../billing/billing-tables/charges-table.tsx  |  12 +-
 .../admin-center/billing/current-bill.tsx     | 116 ++++---
 .../current-plan-details.tsx                  | 285 +++++++++++-------
 .../drawers/upgrade-plans/upgrade-plans.tsx   |  55 ++--
 .../configuration/configuration.tsx           | 167 +++++-----
 .../pages/admin-center/billing/billing.tsx    |  43 +--
 worklenz-frontend/src/shared/antd-imports.ts  |   2 +
 8 files changed, 639 insertions(+), 278 deletions(-)
 create mode 100644 .cursor/rules/antd-components.mdc

diff --git a/.cursor/rules/antd-components.mdc b/.cursor/rules/antd-components.mdc
new file mode 100644
index 00000000..756179bd
--- /dev/null
+++ b/.cursor/rules/antd-components.mdc
@@ -0,0 +1,237 @@
+---
+alwaysApply: true
+---
+# Ant Design Import Rules for Worklenz
+
+## 🚨 CRITICAL: Always Use Centralized Imports
+
+**NEVER import Ant Design components directly from 'antd' or '@ant-design/icons'**
+
+### ✅ Correct Import Pattern
+```typescript
+import { Button, Input, Select, EditOutlined, PlusOutlined } from '@antd-imports';
+// or
+import { Button, Input, Select, EditOutlined, PlusOutlined } from '@/shared/antd-imports';
+```
+
+### ❌ Forbidden Import Patterns
+```typescript
+// NEVER do this:
+import { Button, Input, Select } from 'antd';
+import { EditOutlined, PlusOutlined } from '@ant-design/icons';
+```
+
+## Why This Rule Exists
+
+### Benefits of Centralized Imports:
+- **Better Tree-Shaking**: Optimized bundle size through centralized management
+- **Consistent React Context**: Proper context sharing across components
+- **Type Safety**: Centralized TypeScript definitions
+- **Maintainability**: Single source of truth for all Ant Design imports
+- **Performance**: Reduced bundle size and improved loading times
+
+## What's Available in `@antd-imports`
+
+### Core Components
+- **Layout**: Layout, Row, Col, Flex, Divider, Space
+- **Navigation**: Menu, Tabs, Breadcrumb, Pagination
+- **Data Entry**: Input, Select, DatePicker, TimePicker, Form, Checkbox, InputNumber
+- **Data Display**: Table, List, Card, Tag, Avatar, Badge, Progress, Statistic
+- **Feedback**: Modal, Drawer, Alert, Message, Notification, Spin, Skeleton, Result
+- **Other**: Button, Typography, Tooltip, Popconfirm, Dropdown, ConfigProvider
+
+### Icons
+Common icons including: EditOutlined, DeleteOutlined, PlusOutlined, MoreOutlined, CheckOutlined, CloseOutlined, CalendarOutlined, UserOutlined, TeamOutlined, and many more.
+
+### Utilities
+- **appMessage**: Centralized message utility
+- **appNotification**: Centralized notification utility
+- **antdConfig**: Default Ant Design configuration
+- **taskManagementAntdConfig**: Task-specific configuration
+
+## Implementation Guidelines
+
+### When Creating New Components:
+1. **Always** import from `@antd-imports` or `@/shared/antd-imports`
+2. Use `appMessage` and `appNotification` for user feedback
+3. Apply `antdConfig` for consistent styling
+4. Use `taskManagementAntdConfig` for task-related components
+
+### When Refactoring Existing Code:
+1. Replace direct 'antd' imports with `@antd-imports`
+2. Replace direct '@ant-design/icons' imports with `@antd-imports`
+3. Update any custom message/notification calls to use the utilities
+
+### File Location
+The centralized import file is located at: `worklenz-frontend/src/shared/antd-imports.ts`
+
+## Examples
+
+### Component Creation
+```typescript
+import React from 'react';
+import { Button, Input, Modal, EditOutlined, appMessage } from '@antd-imports';
+
+const MyComponent = () => {
+  const handleClick = () => {
+    appMessage.success('Operation completed!');
+  };
+
+  return (
+    <Button icon={<EditOutlined />} onClick={handleClick}>
+      Edit Item
+    </Button>
+  );
+};
+```
+
+### Form Implementation
+```typescript
+import { Form, Input, Select, Button, DatePicker } from '@antd-imports';
+
+const MyForm = () => {
+  return (
+    <Form layout="vertical">
+      <Form.Item label="Name" name="name">
+        <Input />
+      </Form.Item>
+      <Form.Item label="Type" name="type">
+        <Select options={options} />
+      </Form.Item>
+      <Form.Item label="Date" name="date">
+        <DatePicker />
+      </Form.Item>
+    </Form>
+  );
+};
+```
+
+## Enforcement
+
+This rule is **MANDATORY** and applies to:
+- All new component development
+- All code refactoring
+- All bug fixes
+- All feature implementations
+
+**Violations will result in code review rejection.**
+
+### File Path:
+The centralized file is located at: `worklenz-frontend/src/shared/antd-imports.ts`
+# Ant Design Import Rules for Worklenz
+
+## 🚨 CRITICAL: Always Use Centralized Imports
+
+**NEVER import Ant Design components directly from 'antd' or '@ant-design/icons'**
+
+### ✅ Correct Import Pattern
+```typescript
+import { Button, Input, Select, EditOutlined, PlusOutlined } from '@antd-imports';
+// or
+import { Button, Input, Select, EditOutlined, PlusOutlined } from '@/shared/antd-imports';
+```
+
+### ❌ Forbidden Import Patterns
+```typescript
+// NEVER do this:
+import { Button, Input, Select } from 'antd';
+import { EditOutlined, PlusOutlined } from '@ant-design/icons';
+```
+
+## Why This Rule Exists
+
+### Benefits of Centralized Imports:
+- **Better Tree-Shaking**: Optimized bundle size through centralized management
+- **Consistent React Context**: Proper context sharing across components
+- **Type Safety**: Centralized TypeScript definitions
+- **Maintainability**: Single source of truth for all Ant Design imports
+- **Performance**: Reduced bundle size and improved loading times
+
+## What's Available in `@antd-imports`
+
+### Core Components
+- **Layout**: Layout, Row, Col, Flex, Divider, Space
+- **Navigation**: Menu, Tabs, Breadcrumb, Pagination
+- **Data Entry**: Input, Select, DatePicker, TimePicker, Form, Checkbox, InputNumber
+- **Data Display**: Table, List, Card, Tag, Avatar, Badge, Progress, Statistic
+- **Feedback**: Modal, Drawer, Alert, Message, Notification, Spin, Skeleton, Result
+- **Other**: Button, Typography, Tooltip, Popconfirm, Dropdown, ConfigProvider
+
+### Icons
+Common icons including: EditOutlined, DeleteOutlined, PlusOutlined, MoreOutlined, CheckOutlined, CloseOutlined, CalendarOutlined, UserOutlined, TeamOutlined, and many more.
+
+### Utilities
+- **appMessage**: Centralized message utility
+- **appNotification**: Centralized notification utility
+- **antdConfig**: Default Ant Design configuration
+- **taskManagementAntdConfig**: Task-specific configuration
+
+## Implementation Guidelines
+
+### When Creating New Components:
+1. **Always** import from `@antd-imports` or `@/shared/antd-imports`
+2. Use `appMessage` and `appNotification` for user feedback
+3. Apply `antdConfig` for consistent styling
+4. Use `taskManagementAntdConfig` for task-related components
+
+### When Refactoring Existing Code:
+1. Replace direct 'antd' imports with `@antd-imports`
+2. Replace direct '@ant-design/icons' imports with `@antd-imports`
+3. Update any custom message/notification calls to use the utilities
+
+### File Location
+The centralized import file is located at: `worklenz-frontend/src/shared/antd-imports.ts`
+
+## Examples
+
+### Component Creation
+```typescript
+import React from 'react';
+import { Button, Input, Modal, EditOutlined, appMessage } from '@antd-imports';
+
+const MyComponent = () => {
+  const handleClick = () => {
+    appMessage.success('Operation completed!');
+  };
+
+  return (
+    <Button icon={<EditOutlined />} onClick={handleClick}>
+      Edit Item
+    </Button>
+  );
+};
+```
+
+### Form Implementation
+```typescript
+import { Form, Input, Select, Button, DatePicker } from '@antd-imports';
+
+const MyForm = () => {
+  return (
+    <Form layout="vertical">
+      <Form.Item label="Name" name="name">
+        <Input />
+      </Form.Item>
+      <Form.Item label="Type" name="type">
+        <Select options={options} />
+      </Form.Item>
+      <Form.Item label="Date" name="date">
+        <DatePicker />
+      </Form.Item>
+    </Form>
+  );
+};
+```
+
+## Enforcement
+
+This rule is **MANDATORY** and applies to:
+- All new component development
+- All code refactoring
+- All bug fixes
+- All feature implementations
+
+**Violations will result in code review rejection.**
+
+### File Path:
+The centralized file is located at: `worklenz-frontend/src/shared/antd-imports.ts`
\ No newline at end of file
diff --git a/worklenz-frontend/src/components/admin-center/billing/billing-tables/charges-table.tsx b/worklenz-frontend/src/components/admin-center/billing/billing-tables/charges-table.tsx
index 1ce40a72..24a483f8 100644
--- a/worklenz-frontend/src/components/admin-center/billing/billing-tables/charges-table.tsx
+++ b/worklenz-frontend/src/components/admin-center/billing/billing-tables/charges-table.tsx
@@ -27,19 +27,19 @@ const ChargesTable: React.FC = () => {
 
   const columns: TableProps<IBillingCharge>['columns'] = [
     {
-      title: t('description'),
+      title: t('description') as string,
       key: 'name',
       dataIndex: 'name',
     },
     {
-      title: t('billingPeriod'),
+      title: t('billingPeriod') as string,
       key: 'billingPeriod',
       render: record => {
         return `${formatDate(new Date(record.start_date))} - ${formatDate(new Date(record.end_date))}`;
       },
     },
     {
-      title: t('billStatus'),
+      title: t('billStatus') as string,
       key: 'status',
       dataIndex: 'status',
       render: (_, record) => {
@@ -55,7 +55,7 @@ const ChargesTable: React.FC = () => {
       },
     },
     {
-      title: t('perUserValue'),
+      title: t('perUserValue') as string,
       key: 'perUserValue',
       dataIndex: 'perUserValue',
       render: (_, record) => (
@@ -65,12 +65,12 @@ const ChargesTable: React.FC = () => {
       ),
     },
     {
-      title: t('users'),
+      title: t('users') as string,
       key: 'quantity',
       dataIndex: 'quantity',
     },
     {
-      title: t('amount'),
+      title: t('amount') as string,
       key: 'amount',
       dataIndex: 'amount',
       render: (_, record) => (
diff --git a/worklenz-frontend/src/components/admin-center/billing/current-bill.tsx b/worklenz-frontend/src/components/admin-center/billing/current-bill.tsx
index 86252375..e255d00b 100644
--- a/worklenz-frontend/src/components/admin-center/billing/current-bill.tsx
+++ b/worklenz-frontend/src/components/admin-center/billing/current-bill.tsx
@@ -1,5 +1,5 @@
-import { Card, Col, Row, Tooltip, Typography } from 'antd';
-import React, { useEffect } from 'react';
+import { Card, Col, Row, Tooltip } from '@/shared/antd-imports';
+import React, { useEffect, useMemo, useCallback } from 'react';
 import './current-bill.css';
 import { InfoCircleTwoTone } from '@ant-design/icons';
 import ChargesTable from './billing-tables/charges-table';
@@ -20,7 +20,7 @@ import AccountStorage from './account-storage/account-storage';
 import { useAuthService } from '@/hooks/useAuth';
 import { ISUBSCRIPTION_TYPE } from '@/shared/constants';
 
-const CurrentBill: React.FC = () => {
+const CurrentBill: React.FC = React.memo(() => {
   const dispatch = useAppDispatch();
   const { t } = useTranslation('admin-center/current-bill');
   const themeMode = useAppSelector(state => state.themeReducer.mode);
@@ -32,70 +32,90 @@ const CurrentBill: React.FC = () => {
     dispatch(fetchFreePlanSettings());
   }, [dispatch]);
 
-  const titleStyle = {
-    color: themeMode === 'dark' ? '#ffffffd9' : '#000000d9',
-    fontWeight: 500,
-    fontSize: '16px',
-    display: 'flex',
-    gap: '4px',
-  };
-
-  const renderMobileView = () => (
-    <div>
-      <Col span={24}>
-        <CurrentPlanDetails />
-      </Col>
-
-      <Col span={24} style={{ marginTop: '1.5rem' }}>
-        <AccountStorage themeMode={themeMode} />
-      </Col>
-    </div>
+  const titleStyle = useMemo(
+    () => ({
+      color: themeMode === 'dark' ? '#ffffffd9' : '#000000d9',
+      fontWeight: 500,
+      fontSize: '16px',
+      display: 'flex',
+      gap: '4px',
+    }),
+    [themeMode]
   );
 
-  const renderChargesAndInvoices = () => (
-    <>
-      <div style={{ marginTop: '1.5rem' }}>
-        <Card
-          title={
-            <span style={titleStyle}>
-              <span>{t('charges')}</span>
-              <Tooltip title={t('tooltip')}>
-                <InfoCircleTwoTone />
-              </Tooltip>
-            </span>
-          }
-          style={{ marginTop: '16px' }}
-        >
-          <ChargesTable />
-        </Card>
-      </div>
+  const cardStyle = useMemo(() => ({ marginTop: '16px' }), []);
+  const colStyle = useMemo(() => ({ marginTop: '1.5rem' }), []);
+  const tabletColStyle = useMemo(() => ({ paddingRight: '10px' }), []);
+  const tabletColStyleRight = useMemo(() => ({ paddingLeft: '10px' }), []);
 
-      <div style={{ marginTop: '1.5rem' }}>
-        <Card title={<span style={titleStyle}>{t('invoices')}</span>} style={{ marginTop: '16px' }}>
-          <InvoicesTable />
-        </Card>
+  const renderMobileView = useCallback(
+    () => (
+      <div>
+        <Col span={24}>
+          <CurrentPlanDetails />
+        </Col>
+
+        <Col span={24} style={colStyle}>
+          <AccountStorage themeMode={themeMode} />
+        </Col>
       </div>
-    </>
+    ),
+    [colStyle, themeMode]
+  );
+
+  const renderChargesAndInvoices = useCallback(
+    () => (
+      <>
+        <div style={colStyle}>
+          <Card
+            title={
+              <span style={titleStyle}>
+                <span>{t('charges')}</span>
+                <Tooltip title={t('tooltip')}>
+                  <InfoCircleTwoTone />
+                </Tooltip>
+              </span>
+            }
+            style={cardStyle}
+          >
+            <ChargesTable />
+          </Card>
+        </div>
+
+        <div style={colStyle}>
+          <Card title={<span style={titleStyle}>{t('invoices')}</span>} style={cardStyle}>
+            <InvoicesTable />
+          </Card>
+        </div>
+      </>
+    ),
+    [colStyle, titleStyle, cardStyle, t]
+  );
+
+  const shouldShowChargesAndInvoices = useMemo(
+    () => currentSession?.subscription_type === ISUBSCRIPTION_TYPE.PADDLE,
+    [currentSession?.subscription_type]
   );
 
   return (
     <div style={{ width: '100%' }} className="current-billing">
       {isTablet ? (
         <Row>
-          <Col span={16} style={{ paddingRight: '10px' }}>
+          <Col span={16} style={tabletColStyle}>
             <CurrentPlanDetails />
           </Col>
-          <Col span={8} style={{ paddingLeft: '10px' }}>
+          <Col span={8} style={tabletColStyleRight}>
             <AccountStorage themeMode={themeMode} />
           </Col>
         </Row>
       ) : (
         renderMobileView()
       )}
-      {currentSession?.subscription_type === ISUBSCRIPTION_TYPE.PADDLE &&
-        renderChargesAndInvoices()}
+      {shouldShowChargesAndInvoices && renderChargesAndInvoices()}
     </div>
   );
-};
+});
+
+CurrentBill.displayName = 'CurrentBill';
 
 export default CurrentBill;
diff --git a/worklenz-frontend/src/components/admin-center/billing/current-plan-details/current-plan-details.tsx b/worklenz-frontend/src/components/admin-center/billing/current-plan-details/current-plan-details.tsx
index 77de144e..ba2e09b0 100644
--- a/worklenz-frontend/src/components/admin-center/billing/current-plan-details/current-plan-details.tsx
+++ b/worklenz-frontend/src/components/admin-center/billing/current-plan-details/current-plan-details.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useState, useMemo, useCallback, useEffect } from 'react';
 import { adminCenterApiService } from '@/api/admin-center/admin-center.api.service';
 import {
   evt_billing_pause_plan,
@@ -17,10 +17,9 @@ import {
   Typography,
   Statistic,
   Select,
-  Form,
   Row,
   Col,
-} from 'antd/es';
+} from '@/shared/antd-imports';
 import RedeemCodeDrawer from '../drawers/redeem-code-drawer/redeem-code-drawer';
 import {
   fetchBillingInfo,
@@ -38,6 +37,21 @@ import UpgradePlans from '../drawers/upgrade-plans/upgrade-plans';
 import { ISUBSCRIPTION_TYPE, SUBSCRIPTION_STATUS } from '@/shared/constants';
 import { billingApiService } from '@/api/admin-center/billing.api.service';
 
+type SubscriptionAction = 'pause' | 'resume';
+type SeatOption = { label: string; value: number | string };
+
+const SEAT_COUNT_LIMIT = '100+';
+const BILLING_DELAY_MS = 8000;
+const LTD_USER_LIMIT = 50;
+const BUTTON_STYLE = {
+  backgroundColor: '#1890ff',
+  borderColor: '#1890ff',
+};
+const STATISTIC_VALUE_STYLE = {
+  fontSize: '24px',
+  fontWeight: 'bold' as const,
+};
+
 const CurrentPlanDetails = () => {
   const dispatch = useAppDispatch();
   const { t } = useTranslation('admin-center/current-bill');
@@ -47,7 +61,7 @@ const CurrentPlanDetails = () => {
   const [cancellingPlan, setCancellingPlan] = useState(false);
   const [addingSeats, setAddingSeats] = useState(false);
   const [isMoreSeatsModalVisible, setIsMoreSeatsModalVisible] = useState(false);
-  const [selectedSeatCount, setSelectedSeatCount] = useState<number | string>(5);
+  const [selectedSeatCount, setSelectedSeatCount] = useState<number | string>(1);
 
   const themeMode = useAppSelector(state => state.themeReducer.mode);
   const { loadingBillingInfo, billingInfo, freePlanSettings, isUpgradeModalOpen } = useAppSelector(
@@ -55,14 +69,16 @@ const CurrentPlanDetails = () => {
   );
 
   const browserTimeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+  
+  const seatCountOptions: SeatOption[] = useMemo(() => {
+    const options: SeatOption[] = [
+      1, 2, 3, 4, 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60, 65, 70, 75, 80, 85, 90,
+    ].map(value => ({ label: value.toString(), value }));
+    options.push({ label: SEAT_COUNT_LIMIT, value: SEAT_COUNT_LIMIT });
+    return options;
+  }, []);
 
-  type SeatOption = { label: string; value: number | string };
-  const seatCountOptions: SeatOption[] = [
-    1, 2, 3, 4, 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60, 65, 70, 75, 80, 85, 90,
-  ].map(value => ({ label: value.toString(), value }));
-  seatCountOptions.push({ label: '100+', value: '100+' });
-
-  const handleSubscriptionAction = async (action: 'pause' | 'resume') => {
+  const handleSubscriptionAction = useCallback(async (action: SubscriptionAction) => {
     const isResume = action === 'resume';
     const setLoadingState = isResume ? setCancellingPlan : setPausingPlan;
     const apiMethod = isResume
@@ -78,21 +94,21 @@ const CurrentPlanDetails = () => {
           setLoadingState(false);
           dispatch(fetchBillingInfo());
           trackMixpanelEvent(eventType);
-        }, 8000);
-        return; // Exit function to prevent finally block from executing
+        }, BILLING_DELAY_MS);
+        return;
       }
     } catch (error) {
       logger.error(`Error ${action}ing subscription`, error);
-      setLoadingState(false); // Only set to false on error
+      setLoadingState(false);
     }
-  };
+  }, [dispatch, trackMixpanelEvent]);
 
-  const handleAddMoreSeats = () => {
+  const handleAddMoreSeats = useCallback(() => {
     setIsMoreSeatsModalVisible(true);
-  };
+  }, []);
 
-  const handlePurchaseMoreSeats = async () => {
-    if (selectedSeatCount.toString() === '100+' || !billingInfo?.total_seats) return;
+  const handlePurchaseMoreSeats = useCallback(async () => {
+    if (selectedSeatCount.toString() === SEAT_COUNT_LIMIT || !billingInfo?.total_seats) return;
 
     try {
       setAddingSeats(true);
@@ -108,51 +124,75 @@ const CurrentPlanDetails = () => {
     } finally {
       setAddingSeats(false);
     }
-  };
+  }, [selectedSeatCount, billingInfo?.total_seats, dispatch, trackMixpanelEvent]);
 
-  const calculateRemainingSeats = () => {
+  const calculateRemainingSeats = useMemo(() => {
     if (billingInfo?.total_seats && billingInfo?.total_used) {
       return billingInfo.total_seats - billingInfo.total_used;
     }
     return 0;
-  };
+  }, [billingInfo?.total_seats, billingInfo?.total_used]);
 
-  const checkSubscriptionStatus = (allowedStatuses: any[]) => {
+  // Calculate intelligent default for seat selection based on current usage
+  const getDefaultSeatCount = useMemo(() => {
+    const currentUsed = billingInfo?.total_used || 0;
+    const availableSeats = calculateRemainingSeats;
+    
+    // If only 1 user and no available seats, suggest 1 additional seat
+    if (currentUsed === 1 && availableSeats === 0) {
+      return 1;
+    }
+    
+    // If they have some users but running low on seats, suggest enough for current users
+    if (availableSeats < currentUsed && currentUsed > 0) {
+      return Math.max(1, currentUsed - availableSeats);
+    }
+    
+    // Default fallback
+    return Math.max(1, Math.min(5, currentUsed || 1));
+  }, [billingInfo?.total_used, calculateRemainingSeats]);
+
+  // Update selected seat count when billing info changes
+  useEffect(() => {
+    setSelectedSeatCount(getDefaultSeatCount);
+  }, [getDefaultSeatCount]);
+
+  const checkSubscriptionStatus = useCallback((allowedStatuses: string[]) => {
     if (!billingInfo?.status || billingInfo.is_ltd_user) return false;
     return allowedStatuses.includes(billingInfo.status);
-  };
+  }, [billingInfo?.status, billingInfo?.is_ltd_user]);
 
-  const shouldShowRedeemButton = () => {
+  const shouldShowRedeemButton = useMemo(() => {
     if (billingInfo?.trial_in_progress) return true;
-    return billingInfo?.ltd_users ? billingInfo.ltd_users < 50 : false;
-  };
+    return billingInfo?.ltd_users ? billingInfo.ltd_users < LTD_USER_LIMIT : false;
+  }, [billingInfo?.trial_in_progress, billingInfo?.ltd_users]);
 
-  const showChangeButton = () => {
+  const showChangeButton = useMemo(() => {
     return checkSubscriptionStatus([SUBSCRIPTION_STATUS.ACTIVE, SUBSCRIPTION_STATUS.PASTDUE]);
-  };
+  }, [checkSubscriptionStatus]);
 
-  const showPausePlanButton = () => {
+  const showPausePlanButton = useMemo(() => {
     return checkSubscriptionStatus([SUBSCRIPTION_STATUS.ACTIVE, SUBSCRIPTION_STATUS.PASTDUE]);
-  };
+  }, [checkSubscriptionStatus]);
 
-  const showResumePlanButton = () => {
+  const showResumePlanButton = useMemo(() => {
     return checkSubscriptionStatus([SUBSCRIPTION_STATUS.PAUSED]);
-  };
+  }, [checkSubscriptionStatus]);
 
-  const shouldShowAddSeats = () => {
+  const shouldShowAddSeats = useMemo(() => {
     if (!billingInfo) return false;
     return (
       billingInfo.subscription_type === ISUBSCRIPTION_TYPE.PADDLE &&
       billingInfo.status === SUBSCRIPTION_STATUS.ACTIVE
     );
-  };
+  }, [billingInfo]);
 
-  const renderExtra = () => {
+  const renderExtra = useCallback(() => {
     if (!billingInfo || billingInfo.is_custom) return null;
 
     return (
       <Space>
-        {showPausePlanButton() && (
+        {showPausePlanButton && (
           <Button
             type="link"
             danger
@@ -163,7 +203,7 @@ const CurrentPlanDetails = () => {
           </Button>
         )}
 
-        {showResumePlanButton() && (
+        {showResumePlanButton && (
           <Button
             type="primary"
             loading={cancellingPlan}
@@ -179,7 +219,7 @@ const CurrentPlanDetails = () => {
           </Button>
         )}
 
-        {showChangeButton() && (
+        {showChangeButton && (
           <Button
             type="primary"
             loading={pausingPlan || cancellingPlan}
@@ -190,9 +230,19 @@ const CurrentPlanDetails = () => {
         )}
       </Space>
     );
-  };
+  }, [
+    billingInfo,
+    showPausePlanButton,
+    showResumePlanButton,
+    showChangeButton,
+    pausingPlan,
+    cancellingPlan,
+    handleSubscriptionAction,
+    dispatch,
+    t,
+  ]);
 
-  const renderLtdDetails = () => {
+  const renderLtdDetails = useCallback(() => {
     if (!billingInfo || billingInfo.is_custom) return null;
     return (
       <Flex vertical>
@@ -200,41 +250,41 @@ const CurrentPlanDetails = () => {
         <Typography.Text>{t('ltdUsers', { ltd_users: billingInfo.ltd_users })}</Typography.Text>
       </Flex>
     );
-  };
+  }, [billingInfo, t]);
 
-  const renderTrialDetails = () => {
-    const checkIfTrialExpired = () => {
-      if (!billingInfo?.trial_expire_date) return false;
-      const today = new Date();
-      today.setHours(0, 0, 0, 0); // Set to start of day for comparison
-      const trialExpireDate = new Date(billingInfo.trial_expire_date);
-      trialExpireDate.setHours(0, 0, 0, 0); // Set to start of day for comparison
-      return today > trialExpireDate;
-    };
+  const checkIfTrialExpired = useCallback(() => {
+    if (!billingInfo?.trial_expire_date) return false;
+    const today = new Date();
+    today.setHours(0, 0, 0, 0);
+    const trialExpireDate = new Date(billingInfo.trial_expire_date);
+    trialExpireDate.setHours(0, 0, 0, 0);
+    return today > trialExpireDate;
+  }, [billingInfo?.trial_expire_date]);
 
-    const getExpirationMessage = (expireDate: string) => {
-      const today = new Date();
-      today.setHours(0, 0, 0, 0); // Set to start of day for comparison
+  const getExpirationMessage = useCallback((expireDate: string) => {
+    const today = new Date();
+    today.setHours(0, 0, 0, 0);
 
-      const tomorrow = new Date(today);
-      tomorrow.setDate(tomorrow.getDate() + 1);
+    const tomorrow = new Date(today);
+    tomorrow.setDate(tomorrow.getDate() + 1);
 
-      const expDate = new Date(expireDate);
-      expDate.setHours(0, 0, 0, 0); // Set to start of day for comparison
+    const expDate = new Date(expireDate);
+    expDate.setHours(0, 0, 0, 0);
 
-      if (expDate.getTime() === today.getTime()) {
-        return t('expirestoday', 'today');
-      } else if (expDate.getTime() === tomorrow.getTime()) {
-        return t('expirestomorrow', 'tomorrow');
-      } else if (expDate < today) {
-        const diffTime = Math.abs(today.getTime() - expDate.getTime());
-        const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24));
-        return t('expiredDaysAgo', '{{days}} days ago', { days: diffDays });
-      } else {
-        return calculateTimeGap(expireDate);
-      }
-    };
+    if (expDate.getTime() === today.getTime()) {
+      return t('expirestoday', 'today');
+    } else if (expDate.getTime() === tomorrow.getTime()) {
+      return t('expirestomorrow', 'tomorrow');
+    } else if (expDate < today) {
+      const diffTime = Math.abs(today.getTime() - expDate.getTime());
+      const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24));
+      return t('expiredDaysAgo', '{{days}} days ago', { days: diffDays });
+    } else {
+      return calculateTimeGap(expireDate);
+    }
+  }, [t]);
 
+  const renderTrialDetails = useCallback(() => {
     const isExpired = checkIfTrialExpired();
     const trialExpireDate = billingInfo?.trial_expire_date || '';
 
@@ -257,9 +307,9 @@ const CurrentPlanDetails = () => {
         </Tooltip>
       </Flex>
     );
-  };
+  }, [billingInfo?.trial_expire_date, checkIfTrialExpired, getExpirationMessage, t]);
 
-  const renderFreePlan = () => (
+  const renderFreePlan = useCallback(() => (
     <Flex vertical>
       <Typography.Text strong>{t('freePlan')}</Typography.Text>
       <Typography.Text>
@@ -271,9 +321,9 @@ const CurrentPlanDetails = () => {
         <br />- {freePlanSettings?.free_tier_storage} MB {t('storage')}
       </Typography.Text>
     </Flex>
-  );
+  ), [freePlanSettings, t]);
 
-  const renderPaddleSubscriptionInfo = () => {
+  const renderPaddleSubscriptionInfo = useCallback(() => {
     return (
       <Flex vertical>
         <Typography.Text strong>{billingInfo?.plan_name}</Typography.Text>
@@ -287,14 +337,14 @@ const CurrentPlanDetails = () => {
           </Typography.Text>
         </Flex>
 
-        {shouldShowAddSeats() && billingInfo?.total_seats && (
+        {shouldShowAddSeats && billingInfo?.total_seats && (
           <div style={{ marginTop: '16px' }}>
             <Row gutter={16} align="middle">
               <Col span={6}>
                 <Statistic
-                  title={t('totalSeats')}
+                  title={t('totalSeats') as string}
                   value={billingInfo.total_seats}
-                  valueStyle={{ fontSize: '24px', fontWeight: 'bold' }}
+                  valueStyle={STATISTIC_VALUE_STYLE}
                 />
               </Col>
               <Col span={8}>
@@ -302,16 +352,16 @@ const CurrentPlanDetails = () => {
                   type="primary"
                   icon={<PlusOutlined />}
                   onClick={handleAddMoreSeats}
-                  style={{ backgroundColor: '#1890ff', borderColor: '#1890ff' }}
+                  style={BUTTON_STYLE}
                 >
                   {t('addMoreSeats')}
                 </Button>
               </Col>
               <Col span={6}>
                 <Statistic
-                  title={t('availableSeats')}
-                  value={calculateRemainingSeats()}
-                  valueStyle={{ fontSize: '24px', fontWeight: 'bold' }}
+                  title={t('availableSeats') as string}
+                  value={calculateRemainingSeats}
+                  valueStyle={STATISTIC_VALUE_STYLE}
                 />
               </Col>
             </Row>
@@ -319,17 +369,17 @@ const CurrentPlanDetails = () => {
         )}
       </Flex>
     );
-  };
+  }, [billingInfo, shouldShowAddSeats, handleAddMoreSeats, calculateRemainingSeats, t]);
 
-  const renderCreditSubscriptionInfo = () => {
+  const renderCreditSubscriptionInfo = useCallback(() => {
     return (
       <Flex vertical>
         <Typography.Text strong>{t('creditPlan', 'Credit Plan')}</Typography.Text>
       </Flex>
     );
-  };
+  }, [t]);
 
-  const renderCustomSubscriptionInfo = () => {
+  const renderCustomSubscriptionInfo = useCallback(() => {
     return (
       <Flex vertical>
         <Typography.Text strong>{t('customPlan', 'Custom Plan')}</Typography.Text>
@@ -340,7 +390,36 @@ const CurrentPlanDetails = () => {
         </Typography.Text>
       </Flex>
     );
-  };
+  }, [billingInfo?.valid_till_date, t]);
+
+  const renderSubscriptionContent = useCallback(() => {
+    if (!billingInfo) return null;
+
+    switch (billingInfo.subscription_type) {
+      case ISUBSCRIPTION_TYPE.LIFE_TIME_DEAL:
+        return renderLtdDetails();
+      case ISUBSCRIPTION_TYPE.TRIAL:
+        return renderTrialDetails();
+      case ISUBSCRIPTION_TYPE.FREE:
+        return renderFreePlan();
+      case ISUBSCRIPTION_TYPE.PADDLE:
+        return renderPaddleSubscriptionInfo();
+      case ISUBSCRIPTION_TYPE.CREDIT:
+        return renderCreditSubscriptionInfo();
+      case ISUBSCRIPTION_TYPE.CUSTOM:
+        return renderCustomSubscriptionInfo();
+      default:
+        return null;
+    }
+  }, [
+    billingInfo,
+    renderLtdDetails,
+    renderTrialDetails,
+    renderFreePlan,
+    renderPaddleSubscriptionInfo,
+    renderCreditSubscriptionInfo,
+    renderCustomSubscriptionInfo,
+  ]);
 
   return (
     <Card
@@ -361,19 +440,10 @@ const CurrentPlanDetails = () => {
     >
       <Flex vertical>
         <div style={{ marginBottom: '14px' }}>
-          {billingInfo?.subscription_type === ISUBSCRIPTION_TYPE.LIFE_TIME_DEAL &&
-            renderLtdDetails()}
-          {billingInfo?.subscription_type === ISUBSCRIPTION_TYPE.TRIAL && renderTrialDetails()}
-          {billingInfo?.subscription_type === ISUBSCRIPTION_TYPE.FREE && renderFreePlan()}
-          {billingInfo?.subscription_type === ISUBSCRIPTION_TYPE.PADDLE &&
-            renderPaddleSubscriptionInfo()}
-          {billingInfo?.subscription_type === ISUBSCRIPTION_TYPE.CREDIT &&
-            renderCreditSubscriptionInfo()}
-          {billingInfo?.subscription_type === ISUBSCRIPTION_TYPE.CUSTOM &&
-            renderCustomSubscriptionInfo()}
+          {renderSubscriptionContent()}
         </div>
 
-        {shouldShowRedeemButton() && (
+        {shouldShowRedeemButton && (
           <>
             <Button
               type="link"
@@ -408,17 +478,28 @@ const CurrentPlanDetails = () => {
             <Typography.Paragraph
               style={{ fontSize: '16px', margin: '0 0 16px 0', fontWeight: 500 }}
             >
-              {t('purchaseSeatsText', "To continue, you'll need to purchase additional seats.")}
+              {billingInfo?.total_used === 1 
+                ? t('purchaseSeatsTextSingle', "Add more seats to invite team members to your workspace.")
+                : t('purchaseSeatsText', "To continue, you'll need to purchase additional seats.")
+              }
             </Typography.Paragraph>
 
             <Typography.Paragraph style={{ margin: '0 0 16px 0' }}>
               {t('currentSeatsText', 'You currently have {{seats}} seats available.', {
                 seats: billingInfo?.total_seats,
               })}
+              {billingInfo?.total_used === 1 && (
+                <span style={{ color: '#666', marginLeft: '8px' }}>
+                  ({t('singleUserNote', 'Currently used by 1 team member')})
+                </span>
+              )}
             </Typography.Paragraph>
 
             <Typography.Paragraph style={{ margin: '0 0 24px 0' }}>
-              {t('selectSeatsText', 'Please select the number of additional seats to purchase.')}
+              {billingInfo?.total_used === 1
+                ? t('selectSeatsTextSingle', 'Select how many additional seats you need for new team members.')
+                : t('selectSeatsText', 'Please select the number of additional seats to purchase.')
+              }
             </Typography.Paragraph>
 
             <div style={{ marginBottom: '24px' }}>
@@ -430,18 +511,18 @@ const CurrentPlanDetails = () => {
                 options={seatCountOptions}
                 style={{ width: '300px' }}
               />
+
             </div>
 
             <Flex justify="end">
-              {selectedSeatCount.toString() !== '100+' ? (
+              {selectedSeatCount.toString() !== SEAT_COUNT_LIMIT ? (
                 <Button
                   type="primary"
                   loading={addingSeats}
                   onClick={handlePurchaseMoreSeats}
                   style={{
                     minWidth: '100px',
-                    backgroundColor: '#1890ff',
-                    borderColor: '#1890ff',
+                    ...BUTTON_STYLE,
                     borderRadius: '2px',
                   }}
                 >
diff --git a/worklenz-frontend/src/components/admin-center/billing/drawers/upgrade-plans/upgrade-plans.tsx b/worklenz-frontend/src/components/admin-center/billing/drawers/upgrade-plans/upgrade-plans.tsx
index 8cccc24c..c6e148e3 100644
--- a/worklenz-frontend/src/components/admin-center/billing/drawers/upgrade-plans/upgrade-plans.tsx
+++ b/worklenz-frontend/src/components/admin-center/billing/drawers/upgrade-plans/upgrade-plans.tsx
@@ -11,7 +11,7 @@ import {
   Tooltip,
   Typography,
   message,
-} from 'antd/es';
+} from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 
 import { adminCenterApiService } from '@/api/admin-center/admin-center.api.service';
@@ -69,16 +69,27 @@ const UpgradePlans = () => {
 
     const step = 5;
     const maxSeats = 90;
-    const minValue = Math.min(currentSeats + 1);
+    const minValue = Math.max(1, currentSeats + 1); // Start from 1 or currentSeats + 1, whichever is higher
     const rangeStart = Math.ceil(minValue / step) * step;
     const range = Array.from(
       { length: Math.floor((maxSeats - rangeStart) / step) + 1 },
       (_, i) => rangeStart + i * step
     );
 
-    return currentSeats < step
-      ? [...Array.from({ length: rangeStart - minValue }, (_, i) => minValue + i), ...range]
-      : range;
+    // Always include 1 as the first option
+    const options = [1];
+    
+    if (currentSeats < step) {
+      // Add individual numbers from minValue to rangeStart
+      for (let i = Math.max(2, minValue); i < rangeStart; i++) {
+        options.push(i);
+      }
+    }
+    
+    // Add the range of step-based numbers
+    options.push(...range);
+    
+    return options;
   };
 
   const fetchPricingPlans = async () => {
@@ -343,14 +354,14 @@ const UpgradePlans = () => {
       <Flex justify="center" align="center">
         <Typography.Title level={2}>
           {billingInfo?.status === SUBSCRIPTION_STATUS.TRIALING
-            ? t('selectPlan')
-            : t('changeSubscriptionPlan')}
+            ? t('selectPlan', 'Select Plan')
+            : t('changeSubscriptionPlan', 'Change Subscription Plan')}
         </Typography.Title>
       </Flex>
 
       <Flex justify="center" align="center">
         <Form form={form}>
-          <Form.Item name="seatCount" label={t('noOfSeats')}>
+          <Form.Item name="seatCount" label={t('noOfSeats', 'Number of Seats')}>
             <Select
               style={{ width: 100 }}
               value={selectedSeatCount}
@@ -371,25 +382,25 @@ const UpgradePlans = () => {
             <Card
               style={{ ...isSelected(paddlePlans.FREE), height: '100%' }}
               hoverable
-              title={<span style={cardStyles.title}>{t('freePlan')}</span>}
+              title={<span style={cardStyles.title}>{t('freePlan', 'Free Plan')}</span>}
               onClick={() => setSelectedCard(paddlePlans.FREE)}
             >
               <div style={cardStyles.priceContainer}>
                 <Flex justify="space-between" align="center">
                   <Typography.Title level={1}>$ 0.00</Typography.Title>
-                  <Typography.Text>{t('freeForever')}</Typography.Text>
+                  <Typography.Text>{t('freeForever', 'Free Forever')}</Typography.Text>
                 </Flex>
                 <Flex justify="center" align="center">
                   <Typography.Text strong style={{ fontSize: '16px' }}>
-                    {t('bestForPersonalUse')}
+                    {t('bestForPersonalUse', 'Best for Personal Use')}
                   </Typography.Text>
                 </Flex>
               </div>
 
               <div style={cardStyles.featureList}>
-                {renderFeature(`${plans.free_tier_storage} ${t('storage')}`)}
-                {renderFeature(`${plans.projects_limit} ${t('projects')}`)}
-                {renderFeature(`${plans.team_member_limit} ${t('teamMembers')}`)}
+                {renderFeature(`${plans.free_tier_storage} ${t('storage', 'Storage')}`)}
+                {renderFeature(`${plans.projects_limit} ${t('projects', 'Projects')}`)}
+                {renderFeature(`${plans.team_member_limit} ${t('teamMembers', 'Team Members')}`)}
               </div>
             </Card>
           </Col>
@@ -401,9 +412,9 @@ const UpgradePlans = () => {
               hoverable
               title={
                 <span style={cardStyles.title}>
-                  {t('annualPlan')}{' '}
+                  {t('annualPlan', 'Annual Plan')}{' '}
                   <Tag color="volcano" style={{ lineHeight: '21px' }}>
-                    {t('tag')}
+                    {t('tag', 'Popular')}
                   </Tag>
                 </span>
               }
@@ -429,16 +440,16 @@ const UpgradePlans = () => {
                   </Typography.Text>
                 </Flex>
                 <Flex justify="center" align="center">
-                  <Typography.Text>{t('billedAnnually')}</Typography.Text>
+                  <Typography.Text>{t('billedAnnually', 'Billed Annually')}</Typography.Text>
                 </Flex>
               </div>
 
               <div style={cardStyles.featureList} className="mt-4">
-                {renderFeature(t('startupText01'))}
-                {renderFeature(t('startupText02'))}
-                {renderFeature(t('startupText03'))}
-                {renderFeature(t('startupText04'))}
-                {renderFeature(t('startupText05'))}
+                {renderFeature(t('startupText01', 'Unlimited Projects'))}
+                {renderFeature(t('startupText02', 'Unlimited Team Members'))}
+                {renderFeature(t('startupText03', 'Unlimited Storage'))}
+                {renderFeature(t('startupText04', 'Priority Support'))}
+                {renderFeature(t('startupText05', 'Advanced Analytics'))}
               </div>
             </Card>
           </Col>
diff --git a/worklenz-frontend/src/components/admin-center/configuration/configuration.tsx b/worklenz-frontend/src/components/admin-center/configuration/configuration.tsx
index afa5b51a..ffb1e806 100644
--- a/worklenz-frontend/src/components/admin-center/configuration/configuration.tsx
+++ b/worklenz-frontend/src/components/admin-center/configuration/configuration.tsx
@@ -1,5 +1,5 @@
-import { Button, Card, Col, Divider, Form, Input, notification, Row, Select } from 'antd';
-import React, { useEffect, useState } from 'react';
+import { Button, Card, Col, Divider, Form, Input, Row, Select } from '@/shared/antd-imports';
+import React, { useEffect, useState, useMemo, useCallback } from 'react';
 import { RootState } from '../../../app/store';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { IBillingConfigurationCountry } from '@/types/admin-center/country.types';
@@ -7,14 +7,15 @@ import { adminCenterApiService } from '@/api/admin-center/admin-center.api.servi
 import { IBillingConfiguration } from '@/types/admin-center/admin-center.types';
 import logger from '@/utils/errorLogger';
 
-const Configuration: React.FC = () => {
+const Configuration: React.FC = React.memo(() => {
   const themeMode = useAppSelector((state: RootState) => state.themeReducer.mode);
 
   const [countries, setCountries] = useState<IBillingConfigurationCountry[]>([]);
   const [configuration, setConfiguration] = useState<IBillingConfiguration>();
   const [loading, setLoading] = useState(false);
   const [form] = Form.useForm();
-  const fetchCountries = async () => {
+
+  const fetchCountries = useCallback(async () => {
     try {
       const res = await adminCenterApiService.getCountries();
       if (res.done) {
@@ -23,61 +24,85 @@ const Configuration: React.FC = () => {
     } catch (error) {
       logger.error('Error fetching countries:', error);
     }
-  };
+  }, []);
 
-  const fetchConfiguration = async () => {
+  const fetchConfiguration = useCallback(async () => {
     const res = await adminCenterApiService.getBillingConfiguration();
     if (res.done) {
       setConfiguration(res.body);
       form.setFieldsValue(res.body);
     }
-  };
+  }, [form]);
 
   useEffect(() => {
     fetchCountries();
     fetchConfiguration();
-  }, []);
+  }, [fetchCountries, fetchConfiguration]);
 
-  const handleSave = async (values: any) => {
-    try {
-      setLoading(true);
-      const res = await adminCenterApiService.updateBillingConfiguration(values);
-      if (res.done) {
-        fetchConfiguration();
+  const handleSave = useCallback(
+    async (values: any) => {
+      try {
+        setLoading(true);
+        const res = await adminCenterApiService.updateBillingConfiguration(values);
+        if (res.done) {
+          fetchConfiguration();
+        }
+      } catch (error) {
+        logger.error('Error updating configuration:', error);
+      } finally {
+        setLoading(false);
       }
-    } catch (error) {
-      logger.error('Error updating configuration:', error);
-    } finally {
-      setLoading(false);
-    }
-  };
+    },
+    [fetchConfiguration]
+  );
 
-  const countryOptions = countries.map(country => ({
-    label: country.name,
-    value: country.id,
-  }));
+  const countryOptions = useMemo(
+    () =>
+      countries.map(country => ({
+        label: country.name,
+        value: country.id,
+      })),
+    [countries]
+  );
+
+  const titleStyle = useMemo(
+    () => ({
+      color: `${themeMode === 'dark' ? '#ffffffd9' : '#000000d9'}`,
+      fontWeight: 500,
+      fontSize: '16px',
+      display: 'flex',
+      gap: '4px',
+    }),
+    [themeMode]
+  );
+
+  const dividerTitleStyle = useMemo(
+    () => ({
+      color: `${themeMode === 'dark' ? '#ffffffd9' : '#000000d9'}`,
+      fontWeight: 600,
+      fontSize: '16px',
+      display: 'flex',
+      gap: '4px',
+    }),
+    [themeMode]
+  );
+
+  const cardStyle = useMemo(() => ({ marginTop: '16px' }), []);
+  const colStyle = useMemo(() => ({ padding: '0 12px', height: '86px' }), []);
+  const dividerStyle = useMemo(() => ({ margin: '16px 0' }), []);
+  const buttonColStyle = useMemo(() => ({ paddingLeft: '12px' }), []);
+
+  const handlePhoneInput = useCallback((e: React.FormEvent<HTMLInputElement>) => {
+    const input = e.target as HTMLInputElement;
+    input.value = input.value.replace(/[^0-9]/g, '');
+  }, []);
 
   return (
     <div>
-      <Card
-        title={
-          <span
-            style={{
-              color: `${themeMode === 'dark' ? '#ffffffd9' : '#000000d9'}`,
-              fontWeight: 500,
-              fontSize: '16px',
-              display: 'flex',
-              gap: '4px',
-            }}
-          >
-            Billing Details
-          </span>
-        }
-        style={{ marginTop: '16px' }}
-      >
+      <Card title={<span style={titleStyle}>Billing Details</span>} style={cardStyle}>
         <Form form={form} initialValues={configuration} onFinish={handleSave}>
           <Row>
-            <Col span={8} style={{ padding: '0 12px', height: '86px' }}>
+            <Col span={8} style={colStyle}>
               <Form.Item
                 name="name"
                 label="Name"
@@ -88,10 +113,10 @@ const Configuration: React.FC = () => {
                   },
                 ]}
               >
-                <Input placeholder="Name" />
+                <Input placeholder="Name" disabled />
               </Form.Item>
             </Col>
-            <Col span={8} style={{ padding: '0 12px', height: '86px' }}>
+            <Col span={8} style={colStyle}>
               <Form.Item
                 name="email"
                 label="Email Address"
@@ -102,10 +127,10 @@ const Configuration: React.FC = () => {
                   },
                 ]}
               >
-                <Input placeholder="Name" disabled />
+                <Input placeholder="Email Address" disabled />
               </Form.Item>
             </Col>
-            <Col span={8} style={{ padding: '0 12px', height: '86px' }}>
+            <Col span={8} style={colStyle}>
               <Form.Item
                 name="phone"
                 label="Contact Number"
@@ -117,58 +142,34 @@ const Configuration: React.FC = () => {
                   },
                 ]}
               >
-                <Input
-                  placeholder="Phone Number"
-                  maxLength={10}
-                  onInput={e => {
-                    const input = e.target as HTMLInputElement; // Type assertion to access 'value'
-                    input.value = input.value.replace(/[^0-9]/g, ''); // Restrict non-numeric input
-                  }}
-                />
+                <Input placeholder="Phone Number" maxLength={10} onInput={handlePhoneInput} />
               </Form.Item>
             </Col>
           </Row>
 
-          <Divider orientation="left" style={{ margin: '16px 0' }}>
-            <span
-              style={{
-                color: `${themeMode === 'dark' ? '#ffffffd9' : '#000000d9'}`,
-                fontWeight: 600,
-                fontSize: '16px',
-                display: 'flex',
-                gap: '4px',
-              }}
-            >
-              Company Details
-            </span>
+          <Divider orientation="left" style={dividerStyle}>
+            <span style={dividerTitleStyle}>Company Details</span>
           </Divider>
 
           <Row>
-            <Col span={8} style={{ padding: '0 12px', height: '86px' }}>
+            <Col span={8} style={colStyle}>
               <Form.Item name="company_name" label="Company Name" layout="vertical">
                 <Input placeholder="Company Name" />
               </Form.Item>
             </Col>
-            <Col span={8} style={{ padding: '0 12px', height: '86px' }}>
+            <Col span={8} style={colStyle}>
               <Form.Item name="address_line_1" label="Address Line 01" layout="vertical">
                 <Input placeholder="Address Line 01" />
               </Form.Item>
             </Col>
-            <Col span={8} style={{ padding: '0 12px', height: '86px' }}>
+            <Col span={8} style={colStyle}>
               <Form.Item name="address_line_2" label="Address Line 02" layout="vertical">
                 <Input placeholder="Address Line 02" />
               </Form.Item>
             </Col>
           </Row>
           <Row>
-            <Col
-              span={8}
-              style={{
-                padding: '0 12px',
-                height: '86px',
-                scrollbarColor: 'red',
-              }}
-            >
+            <Col span={8} style={colStyle}>
               <Form.Item name="country" label="Country" layout="vertical">
                 <Select
                   dropdownStyle={{ maxHeight: 256, overflow: 'auto' }}
@@ -181,28 +182,28 @@ const Configuration: React.FC = () => {
                 />
               </Form.Item>
             </Col>
-            <Col span={8} style={{ padding: '0 12px', height: '86px' }}>
+            <Col span={8} style={colStyle}>
               <Form.Item name="city" label="City" layout="vertical">
                 <Input placeholder="City" />
               </Form.Item>
             </Col>
-            <Col span={8} style={{ padding: '0 12px', height: '86px' }}>
+            <Col span={8} style={colStyle}>
               <Form.Item name="state" label="State" layout="vertical">
                 <Input placeholder="State" />
               </Form.Item>
             </Col>
           </Row>
           <Row>
-            <Col span={8} style={{ padding: '0 12px', height: '86px' }}>
+            <Col span={8} style={colStyle}>
               <Form.Item name="postal_code" label="Postal Code" layout="vertical">
                 <Input placeholder="Postal Code" />
               </Form.Item>
             </Col>
           </Row>
           <Row>
-            <Col style={{ paddingLeft: '12px' }}>
+            <Col style={buttonColStyle}>
               <Form.Item>
-                <Button type="primary" htmlType="submit">
+                <Button type="primary" htmlType="submit" loading={loading}>
                   Save
                 </Button>
               </Form.Item>
@@ -212,6 +213,8 @@ const Configuration: React.FC = () => {
       </Card>
     </div>
   );
-};
+});
+
+Configuration.displayName = 'Configuration';
 
 export default Configuration;
diff --git a/worklenz-frontend/src/pages/admin-center/billing/billing.tsx b/worklenz-frontend/src/pages/admin-center/billing/billing.tsx
index b4eaa864..bc18dcbb 100644
--- a/worklenz-frontend/src/pages/admin-center/billing/billing.tsx
+++ b/worklenz-frontend/src/pages/admin-center/billing/billing.tsx
@@ -1,32 +1,39 @@
 import { PageHeader } from '@ant-design/pro-components';
-import { Tabs, TabsProps } from 'antd';
-import React from 'react';
+import { Tabs, TabsProps } from '@/shared/antd-imports';
+import React, { useMemo } from 'react';
 import CurrentBill from '@/components/admin-center/billing/current-bill';
 import Configuration from '@/components/admin-center/configuration/configuration';
 import { useTranslation } from 'react-i18next';
 
-const Billing: React.FC = () => {
+const Billing: React.FC = React.memo(() => {
   const { t } = useTranslation('admin-center/current-bill');
 
-  const items: TabsProps['items'] = [
-    {
-      key: '1',
-      label: t('currentBill'),
-      children: <CurrentBill />,
-    },
-    {
-      key: '2',
-      label: t('configuration'),
-      children: <Configuration />,
-    },
-  ];
+  const items: TabsProps['items'] = useMemo(
+    () => [
+      {
+        key: '1',
+        label: t('currentBill'),
+        children: <CurrentBill />,
+      },
+      {
+        key: '2',
+        label: t('configuration'),
+        children: <Configuration />,
+      },
+    ],
+    [t]
+  );
+
+  const pageHeaderStyle = useMemo(() => ({ padding: '16px 0' }), []);
 
   return (
     <div style={{ width: '100%' }}>
-      <PageHeader title={<span>{t('title')}</span>} style={{ padding: '16px 0' }} />
-      <Tabs defaultActiveKey="1" items={items} destroyInactiveTabPane />
+      <PageHeader title={<span>{t('title')}</span>} style={pageHeaderStyle} />
+      <Tabs defaultActiveKey="1" items={items} destroyOnHidden />
     </div>
   );
-};
+});
+
+Billing.displayName = 'Billing';
 
 export default Billing;
diff --git a/worklenz-frontend/src/shared/antd-imports.ts b/worklenz-frontend/src/shared/antd-imports.ts
index bd0b31bd..253ff847 100644
--- a/worklenz-frontend/src/shared/antd-imports.ts
+++ b/worklenz-frontend/src/shared/antd-imports.ts
@@ -50,6 +50,7 @@ import {
   message,
   notification,
   theme,
+  Statistic,
 } from 'antd';
 
 // Icons - Import commonly used ones
@@ -145,6 +146,7 @@ export {
   message,
   notification,
   theme,
+  Statistic,
 };
 
 // TypeScript Types - Import commonly used ones

From edf81dbe5767eeb39e1b50539a245dfb4da04e9b Mon Sep 17 00:00:00 2001
From: chamikaJ <chamika@ceydigital.com>
Date: Wed, 23 Jul 2025 11:05:39 +0530
Subject: [PATCH 2/6] refactor: update Ant Design imports to centralized path

- Replaced direct imports from 'antd' with centralized imports from '@/shared/antd-imports' to align with new import rules and improve maintainability.
---
 .cursor/rules/antd-components.mdc             |  6 ++--
 .../src/components/AuthPageHeader.tsx         |  2 +-
 .../src/components/CustomColordLabel.tsx      |  2 +-
 .../src/components/CustomNumberLabel.tsx      |  2 +-
 .../src/components/CustomSearchbar.tsx        |  2 +-
 .../src/components/CustomTableTitle.tsx       |  2 +-
 .../src/components/EmptyListPlaceholder.tsx   |  2 +-
 .../src/components/ErrorBoundary.tsx          |  2 +-
 .../src/components/ModuleErrorBoundary.tsx    |  2 +-
 .../src/components/PinRouteToNavbarButton.tsx |  2 +-
 .../src/components/PreferenceSelector.tsx     |  2 +-
 .../components/account-setup/members-step.tsx |  4 +--
 .../account-setup/organization-step.tsx       |  2 +-
 .../components/account-setup/project-step.tsx |  2 +-
 .../components/account-setup/tasks-step.tsx   |  2 +-
 .../add-members-dropdown.tsx                  |  2 +-
 .../add-members-dropdown.tsx                  |  2 +-
 .../billing/billing-tables/charges-table.tsx  |  2 +-
 .../billing/billing-tables/invoices-table.tsx |  2 +-
 .../redeem-code-drawer/redeem-code-drawer.tsx |  2 +-
 .../upgrade-plans-lkr/upgrade-plans-lkr.tsx   |  2 +-
 .../drawers/upgrade-plans/upgrade-plans.tsx   | 22 ++++++------
 .../organization-admins-table.tsx             |  2 +-
 .../organization-name/organization-name.tsx   |  2 +-
 .../organization-owner/organization-owner.tsx |  2 +-
 .../teams/add-team-drawer/add-team-drawer.tsx |  2 +-
 .../teams/settings-drawer/settings-drawer.tsx |  2 +-
 .../teams/teams-table/teams-table.tsx         |  2 +-
 .../src/components/avatars/avatars.tsx        |  2 +-
 .../ChangeCategoryDropdown.tsx                |  2 +-
 .../common-members-section.tsx                |  2 +-
 .../common-phase-section.tsx                  |  2 +-
 .../common-priority-section.tsx               |  2 +-
 .../CommonStatusSection.tsx                   |  2 +-
 .../components/board/custom-avatar-group.tsx  |  2 +-
 .../board/custom-due-date-picker.tsx          |  2 +-
 .../board/kanban-group/kanban-group.tsx       |  2 +-
 .../board/subTaskCard/SubTaskCard.tsx         |  2 +-
 .../components/board/taskCard/TaskCard.tsx    |  2 +-
 .../priority-section/priority-section.tsx     |  2 +-
 .../board/taskCreateCard/TaskCreateCard.tsx   |  2 +-
 .../priority-task-create-card.tsx             |  2 +-
 .../calendars/homeCalendar/HomeCalendar.tsx   |  2 +-
 .../components/charts/LazyChartComponents.tsx |  2 +-
 .../src/components/charts/chart-loader.tsx    |  2 +-
 .../invite-team-members.tsx                   |  2 +-
 .../common/single-avatar/single-avatar.tsx    |  2 +-
 .../template-drawer/template-drawer.tsx       |  5 ++-
 .../tooltip-wrapper/tooltip-wrapper.tsx       |  2 +-
 .../enhanced-kanban/EnhancedKanbanBoard.tsx   |  2 +-
 .../EnhancedKanbanCreateSection.tsx           |  2 +-
 .../EnhancedKanbanCreateSubtaskCard.tsx       |  2 +-
 .../EnhancedKanbanCreateTaskCard.tsx          |  2 +-
 .../enhanced-kanban/EnhancedKanbanGroup.tsx   | 12 +++----
 .../EnhancedKanbanTaskCard.tsx                |  6 ++--
 .../home-tasks-status-dropdown.tsx            |  2 +-
 .../taskDatePicker/home-tasks-date-picker.tsx |  2 +-
 .../kanbanGroup.tsx                           |  2 +-
 .../kanbanTaskCard.tsx                        |  2 +-
 .../kanbanTaskListBoard.tsx                   | 11 ++----
 .../notification/notfication-drawer.tsx       |  2 +-
 .../notification/notification-button.tsx      |  2 +-
 .../notification/notification-item.tsx        |  2 +-
 .../notification/notification-template.tsx    |  2 +-
 .../push-notification-template.tsx            |  2 +-
 .../project-group/project-group-list.tsx      |  3 +-
 .../project-list-actions.tsx                  |  3 +-
 .../project-list-category.tsx                 |  2 +-
 .../project-rate-cell.tsx                     |  2 +-
 .../progress-list-progress.tsx                |  2 +-
 .../project-list-updated.tsx                  |  2 +-
 .../project-name/project-name-cell.tsx        |  2 +-
 .../delete-status-drawer.tsx                  |  2 +-
 .../column-configuration-modal.tsx            |  2 +-
 .../members-filter-dropdown.tsx               |  4 +--
 .../priority-filter-dropdown.tsx              |  2 +-
 .../project-create-button.tsx                 |  2 +-
 .../project-basic-info/project-basic-info.tsx |  2 +-
 .../project-category-section.tsx              |  2 +-
 .../project-client-section.tsx                |  2 +-
 .../project-drawer/project-drawer.tsx         |  2 +-
 .../project-health-section.tsx                |  2 +-
 .../project-status-section.tsx                |  2 +-
 .../project-manager-dropdown.tsx              |  2 +-
 .../projects/project-stats-card.tsx           |  2 +-
 .../reporting-overview-members-tab.tsx        |  2 +-
 .../reporting-overview-members-table.tsx      |  2 +-
 .../reports-overview-category-graph.tsx       |  2 +-
 .../reports-overview-project-health-graph.tsx |  2 +-
 .../reports-overview-status-graph.tsx         |  2 +-
 .../overview-team-info-drawer-tabs.tsx        |  2 +-
 .../overview-team-info-drawer.tsx             |  2 +-
 .../reporting-overview-projects-tab.tsx       |  2 +-
 .../reporting-overview-projects-table.tsx     |  2 +-
 .../components/reporting/time-wise-filter.tsx |  2 +-
 .../src/components/schedule-old/team/Team.tsx |  2 +-
 .../grant-chart/day-allocation-cell.tsx       |  2 +-
 .../schedule/grant-chart/grantt-chart.tsx     |  2 +-
 .../grant-chart/grantt-members-table.tsx      |  2 +-
 .../grant-chart/project-timeline-bar.tsx      |  2 +-
 .../schedule/grant-chart/timeline.tsx         |  2 +-
 .../ServiceWorkerStatus.tsx                   |  2 +-
 .../settings/edit-team-name-modal.tsx         |  2 +-
 .../settings/update-member-drawer.tsx         |  2 +-
 .../suspense-fallback/suspense-fallback.tsx   |  2 +-
 .../activity-log/task-drawer-activity-log.tsx |  2 +-
 .../info-tab/attachments/attachments-grid.tsx |  2 +-
 .../attachments/attachments-preview.tsx       |  2 +-
 .../info-tab/comments/task-comments.tsx       |  2 +-
 .../comments/task-view-comment-edit.tsx       |  2 +-
 .../shared/info-tab/dependencies-table.tsx    |  2 +-
 .../task-drawer-due-date.tsx                  |  2 +-
 .../task-drawer-estimation.tsx                |  2 +-
 .../task-drawer-key/task-drawer-key.tsx       |  4 +--
 .../task-drawer-labels/task-drawer-labels.tsx |  2 +-
 .../task-drawer-phase-selector.tsx            |  4 +--
 .../task-drawer-priority-selector.tsx         |  2 +-
 .../task-drawer-progress.tsx                  |  2 +-
 .../task-drawer-recurring-config.tsx          |  2 +-
 .../shared/info-tab/info-tab-footer.tsx       |  2 +-
 .../info-tab/notify-member-selector.tsx       |  2 +-
 .../shared/info-tab/subtask-table.tsx         |  2 +-
 .../shared/info-tab/task-details-form.tsx     |  2 +-
 .../shared/info-tab/task-drawer-info-tab.tsx  |  2 +-
 .../shared/time-log/TaskDrawerTimeLog.tsx     |  2 +-
 .../shared/time-log/task-drawer-time-log.tsx  |  2 +-
 .../shared/time-log/time-log-form.tsx         |  2 +-
 .../shared/time-log/time-log-item.tsx         |  2 +-
 .../shared/time-log/time-log-list.tsx         |  2 +-
 .../task-drawer-header/task-drawer-header.tsx |  2 +-
 .../task-drawer-status-dropdown.tsx           |  2 +-
 .../components/task-drawer/task-drawer.tsx    |  4 +--
 .../task-hierarchy-breadcrumb.tsx             |  2 +-
 .../assigneeSelector/AssigneeSelector.tsx     |  2 +-
 .../labelsSelector/color-changed-label.tsx    |  2 +-
 .../labelsSelector/custom-color-label.tsx     |  2 +-
 .../labelsSelector/custom-number-label.tsx    |  2 +-
 .../labelsSelector/labels-selector.tsx        |  2 +-
 .../phaseDropdown/PhaseDropdown.tsx           |  2 +-
 .../priorityDropdown/priority-dropdown.tsx    |  2 +-
 .../status-dropdown/status-dropdown.tsx       |  2 +-
 .../task-row-due-time.tsx                     |  2 +-
 .../task-row-description.tsx                  |  2 +-
 .../task-row/task-row-name/task-row-name.tsx  |  2 +-
 .../task-row-progress/task-row-progress.tsx   |  2 +-
 .../task-row-time-tracking.tsx                |  2 +-
 .../task-list-v2/GroupProgressBar.tsx         |  2 +-
 .../task-list-v2/TaskGroupHeader.tsx          |  2 +-
 .../task-list-v2/TaskListV2Table.tsx          |  2 +-
 .../task-list-v2/TaskRowWithSubtasks.tsx      |  2 +-
 .../task-list-v2/components/AddTaskRow.tsx    |  2 +-
 .../components/CustomColumnComponents.tsx     |  2 +-
 .../components/DatePickerColumn.tsx           |  2 +-
 .../components/TaskListSkeleton.tsx           |  2 +-
 .../components/TaskRowColumns.tsx             |  4 +--
 .../task-list-v2/components/TitleColumn.tsx   |  4 +--
 .../task-management/CreateTaskModal.tsx       |  4 +--
 .../task-management/ManagePhaseModal.tsx      |  4 +--
 .../task-management/ManageStatusModal.tsx     |  4 +--
 .../lazy-loading-optimizations.tsx            |  2 +-
 .../optimized-bulk-action-bar.tsx             |  2 +-
 .../task-management/performance-analysis.tsx  |  2 +-
 .../task-management/task-list-board.tsx       |  2 +-
 .../task-management/virtualized-task-list.tsx |  2 +-
 .../task-templates/task-template-drawer.tsx   |  2 +-
 .../labelsSelector/CustomColordLabel.old.tsx  |  2 +-
 .../labelsSelector/CustomNumberLabel.tsx      |  2 +-
 .../labelsSelector/LabelsSelector.tsx         |  2 +-
 .../labelsSelector/color-changed-label.tsx    |  2 +-
 .../phase-dropdown/phase-dropdown.tsx         |  2 +-
 .../priorityDropdown/PriorityDropdown.tsx     |  2 +-
 .../statusDropdown/StatusDropdown.tsx         |  2 +-
 .../components/AssigneesDropdown.tsx          |  2 +-
 .../components/LabelsDropdown.tsx             |  2 +-
 .../src/features/i18n/language-selector.tsx   |  2 +-
 .../src/features/navbar/help/HelpButton.tsx   |  2 +-
 .../features/navbar/invite/InviteButton.tsx   |  2 +-
 .../navbar/mobileMenu/MobileMenuButton.tsx    |  2 +-
 .../src/features/navbar/navbar.tsx            |  2 +-
 .../navbar/switchTeam/SwitchTeamButton.tsx    |  2 +-
 .../features/navbar/timers/timer-button.tsx   |  2 +-
 .../navbar/upgradePlan/UpgradePlanButton.tsx  |  2 +-
 .../navbar/user-profile/profile-button.tsx    |  2 +-
 .../bulkActions/BulkTasksActionContainer.tsx  |  2 +-
 .../singleProject/phase/ConfigPhaseButton.tsx |  2 +-
 .../singleProject/phase/PhaseDrawer.tsx       |  2 +-
 .../singleProject/phase/PhaseHeader.tsx       |  2 +-
 .../singleProject/phase/PhaseOptionItem.tsx   |  2 +-
 .../update-project/update-project-drawer.tsx  |  2 +-
 .../activity-log-tab/activity-log-card.tsx    |  2 +-
 .../members-reports-activity-logs-tab.tsx     |  2 +-
 .../members-reports-drawer-tabs.tsx           |  2 +-
 .../members-reports-drawer.tsx                |  2 +-
 .../MembersReportsPriorityGraph.tsx           |  2 +-
 .../MembersReportsProjectGraph.tsx            |  2 +-
 .../overviewTab/MembersReportsStatusGraph.tsx |  2 +-
 ...members-overview-projects-stats-drawer.tsx |  2 +-
 .../members-overview-projects-stats-table.tsx |  2 +-
 .../members-overview-tasks-stats-drawer.tsx   |  2 +-
 .../members-overview-tasks-stats-table.tsx    |  2 +-
 .../overviewTab/members-reports-stat-card.tsx |  2 +-
 .../taskTab/MembersReportsTasksTab.tsx        |  2 +-
 .../taskTab/MembersReportsTasksTable.tsx      |  2 +-
 .../taskTab/ProjectFilter.tsx                 |  2 +-
 .../time-log-tab/billable-filter.tsx          |  2 +-
 .../members-reports-time-logs-tab.tsx         |  2 +-
 .../time-log-tab/time-log-card.tsx            |  2 +-
 .../ProjectReportsDrawer.tsx                  |  2 +-
 .../ProjectReportsDrawerTabs.tsx              |  2 +-
 .../membersTab/ProjectReportsMembersTab.tsx   |  2 +-
 .../membersTab/ProjectReportsMembersTable.tsx |  2 +-
 .../ProjectReportsMembersTaskDrawer.tsx       |  2 +-
 .../ProjectReportsMembersTaskTable.tsx        |  2 +-
 .../ProjectReportsDueDateGraph.tsx            |  2 +-
 .../ProjectReportsPriorityGraph.tsx           |  2 +-
 .../overviewTab/ProjectReportsStatCard.tsx    |  2 +-
 .../overviewTab/ProjectReportsStatusGraph.tsx |  2 +-
 .../tasksTab/ProjectReportsTaskTable.tsx      |  2 +-
 .../tasksTab/ProjectReportsTasksTab.tsx       |  2 +-
 .../tasksTab/group-by-filter.tsx              |  2 +-
 .../schedule-old/ProjectTimelineModal.tsx     |  2 +-
 .../features/schedule-old/ScheduleDrawer.tsx  |  2 +-
 .../schedule-old/ScheduleSettingsDrawer.tsx   |  2 +-
 .../schedule/ProjectTimelineModal.tsx         |  2 +-
 .../src/features/schedule/ScheduleDrawer.tsx  |  2 +-
 .../schedule/ScheduleSettingsDrawer.tsx       |  2 +-
 .../categories/CustomColorsCategoryTag.tsx    |  2 +-
 .../categories/color-changed-category.tsx     |  2 +-
 .../settings/client/CreateClientDrawer.tsx    |  2 +-
 .../settings/client/UpdateClientDrawer.tsx    |  2 +-
 .../settings/job/CreateJobTitlesDrawer.tsx    |  2 +-
 .../settings/job/UpdateJobTitlesDrawer.tsx    |  2 +-
 .../src/features/theme/ThemeWrapper.tsx       |  2 +-
 .../projects/ProjectTimeLogDrawer.tsx         |  2 +-
 worklenz-frontend/src/index.tsx               |  2 +-
 .../src/layouts/AdminCenterLayout.tsx         |  2 +-
 worklenz-frontend/src/layouts/AuthLayout.tsx  |  2 +-
 worklenz-frontend/src/layouts/MainLayout.tsx  |  2 +-
 .../src/layouts/ReportingLayout.tsx           |  2 +-
 .../src/layouts/SettingsLayout.tsx            |  2 +-
 .../src/pages/404-page/404-page.tsx           |  2 +-
 .../pages/admin-center/overview/overview.tsx  |  2 +-
 .../pages/admin-center/projects/projects.tsx  |  2 +-
 .../pages/admin-center/sidebar/sidebar.tsx    |  2 +-
 .../src/pages/admin-center/teams/teams.tsx    |  2 +-
 .../src/pages/admin-center/users/users.tsx    |  2 +-
 .../add-favourite-project-button.tsx          |  2 +-
 .../recent-and-favourite-project-list.tsx     |  2 +-
 .../home/task-list/add-task-inline-form.tsx   |  2 +-
 .../pages/home/task-list/calendar-view.tsx    |  2 +-
 .../src/pages/home/task-list/list-view.tsx    |  2 +-
 .../src/pages/home/task-list/tasks-list.tsx   |  2 +-
 .../pages/license-expired/license-expired.tsx |  2 +-
 .../src/pages/projects/project-list.tsx       |  2 +-
 .../board/project-view-board.tsx              |  2 +-
 .../roadmap/project-view-roadmap.tsx          |  2 +-
 .../roadmap/roadmap-table/roadmap-table.tsx   |  2 +-
 .../roadmap-table/roadmap-task-cell.tsx       |  2 +-
 .../project-view-1/roadmap/time-filter.tsx    |  2 +-
 .../project-view-1/task-list/table-v2.tsx     |  2 +-
 .../task-list-columns/task-list-columns.tsx   |  2 +-
 .../task-list/task-list-custom.tsx            |  2 +-
 .../task-list-header/task-list-header.tsx     |  2 +-
 .../task-list-instant-task-input.tsx          |  2 +-
 .../task-list-table-old.tsx                   |  2 +-
 .../task-list-table-wrapper.tsx               |  2 +-
 .../project-view-1/task-list/task-list.tsx    |  2 +-
 .../taskList/ProjectViewTaskList.tsx          |  2 +-
 .../statusTables/StatusGroupTables.tsx        |  2 +-
 .../taskListFilters/GroupByFilterDropdown.tsx |  2 +-
 .../taskListFilters/LabelsFilterDropdown.tsx  |  2 +-
 .../taskListFilters/MembersFilterDropdown.tsx |  2 +-
 .../PriorityFilterDropdown.tsx                |  2 +-
 .../taskListFilters/SearchDropdown.tsx        |  2 +-
 .../ShowFieldsFilterDropdown.tsx              |  2 +-
 .../taskListFilters/SortFilterDropdown.tsx    |  2 +-
 .../taskListFilters/TaskListFilters.tsx       |  2 +-
 .../taskList/taskListTable/TaskListTable.tsx  |  2 +-
 .../taskListTable/TaskListTableWrapper.tsx    |  3 +-
 .../contextMenu/TaskContextMenu.tsx           |  2 +-
 .../taskListTableCells/TaskCell.tsx           |  2 +-
 .../taskListTableCells/TaskProgress.tsx       |  2 +-
 .../taskListTableCells/TimeTracker.tsx        |  2 +-
 .../taskListTableRows/AddSubTaskListRow.tsx   |  2 +-
 .../taskListTableRows/AddTaskListRow.tsx      |  2 +-
 .../updates/project-view-updates.tsx          |  2 +-
 .../board-create-section-card.tsx             |  2 +-
 .../board-section-card-header.tsx             |  4 +--
 .../board-section-card/board-section-card.tsx |  2 +-
 .../board-section/board-section-container.tsx |  2 +-
 .../board-create-sub-task-card.tsx            |  2 +-
 .../board-sub-task-card.tsx                   |  2 +-
 .../board-view-create-task-card.tsx           |  2 +-
 .../board-task-card/board-view-task-card.tsx  |  2 +-
 .../projectView/files/project-view-files.tsx  |  2 +-
 .../insights-members/insights-members.tsx     |  2 +-
 .../tables/assigned-tasks-list.tsx            |  2 +-
 .../tables/tasks-by-members.tsx               |  2 +-
 .../graphs/priority-overview.tsx              |  2 +-
 .../graphs/status-overview.tsx                |  2 +-
 .../insights-overview/insights-overview.tsx   |  2 +-
 .../tables/last-updated-tasks.tsx             |  2 +-
 .../tables/project-deadline.tsx               |  2 +-
 .../insights-tasks/insights-tasks.tsx         |  2 +-
 .../tables/over-logged-tasks-table.tsx        |  2 +-
 .../tables/overdue-tasks-table.tsx            |  2 +-
 .../tables/task-completed-early-table.tsx     |  2 +-
 .../tables/task-completed-late-table.tsx      |  2 +-
 .../insights/member-stats/member-stats.tsx    |  2 +-
 .../insights/project-stats/project-stats.tsx  |  2 +-
 .../insights/project-view-insights.tsx        |  2 +-
 .../members/project-view-members.tsx          |  2 +-
 .../priorityTables/PriorityGroupTables.tsx    |  2 +-
 .../context-menu/task-context-menu.tsx        |  2 +-
 .../custom-column-label-cell.tsx              |  2 +-
 .../custom-column-selection-cell.tsx          |  2 +-
 .../custom-column-header.tsx                  |  2 +-
 .../add-custom-column-button.tsx              |  2 +-
 .../formula-type-column.tsx                   |  2 +-
 .../key-type-column/key-type-column.tsx       |  2 +-
 .../label-type-column/label-type-column.tsx   |  2 +-
 .../formatted-type-number-column.tsx          |  2 +-
 .../number-type-column/number-type-column.tsx |  2 +-
 .../percentage-type-number-column.tsx         |  2 +-
 .../unformatted-type-number-column.tsx        |  2 +-
 .../with-label-type-number-column.tsx         |  2 +-
 .../selection-type-column.tsx                 |  2 +-
 .../task-list-completed-date-cell.tsx         |  2 +-
 .../task-list-created-date-cell.tsx           |  2 +-
 .../task-list-description-cell.tsx            |  2 +-
 .../task-list-due-date-cell.tsx               |  2 +-
 .../task-list-due-time-cell.tsx               |  2 +-
 .../task-list-estimation-cell.tsx             |  2 +-
 .../task-list-labels-cell.tsx                 |  2 +-
 .../task-list-last-updated-cell.tsx           |  2 +-
 .../task-list-progress-cell.tsx               |  2 +-
 .../task-list-reporter-cell.tsx               |  2 +-
 .../task-list-start-date-cell.tsx             |  2 +-
 .../task-list-task-cell.tsx                   |  4 +--
 .../task-list-task-id-cell.tsx                |  2 +-
 .../add-sub-task-list-row.tsx                 |  2 +-
 .../add-task-list-row.tsx                     |  2 +-
 .../task-list-table/task-list-table.tsx       |  2 +-
 .../updates/ProjectViewUpdates.tsx            |  2 +-
 .../members-reports-table.tsx                 |  2 +-
 .../tablesCells/memberCell/MemberCell.tsx     |  2 +-
 .../tasksProgressCell/TasksProgressCell.tsx   |  2 +-
 .../members-reports/members-reports.tsx       |  2 +-
 .../overview-reports/overview-reports.tsx     |  2 +-
 .../overview-reports/overview-stat-card.tsx   |  2 +-
 .../overview-reports/overview-stats.tsx       |  2 +-
 .../overview-table/overview-reports-table.tsx |  2 +-
 .../project-categories-filter-dropdown.tsx    |  2 +-
 .../project-health-filter-dropdown.tsx        |  2 +-
 .../project-managers-filter-dropdown.tsx      |  2 +-
 .../project-reports-filters.tsx               |  2 +-
 .../project-status-filter-dropdown.tsx        |  2 +-
 .../project-table-show-fields-dropdown.tsx    |  2 +-
 .../projects-reports-table.tsx                |  2 +-
 .../estimated-vs-actual-cell.tsx              |  2 +-
 .../last-activity-cell/last-activity-cell.tsx |  2 +-
 .../project-category-cell.tsx                 |  2 +-
 .../table-cells/project-cell/project-cell.tsx |  2 +-
 .../project-client-cell.tsx                   |  2 +-
 .../project-dates-cell/project-dates-cell.tsx |  2 +-
 .../project-days-left-and-overdue-cell.tsx    |  2 +-
 .../project-health-cell.tsx                   |  2 +-
 .../project-manager-cell.tsx                  |  2 +-
 .../project-status-cell.tsx                   |  2 +-
 .../project-team-cell/project-team-cell.tsx   |  2 +-
 .../project-update-cell.tsx                   |  2 +-
 .../tasks-progress-cell.tsx                   |  2 +-
 .../projects-reports/projects-reports.tsx     |  2 +-
 .../sidebar/reporting-collapsed-button.tsx    |  2 +-
 .../reporting/sidebar/reporting-sider.tsx     |  2 +-
 .../project-time-sheet-chart.tsx              |  2 +-
 .../time-sheet-table/time-sheet-table.tsx     |  2 +-
 .../estimated-vs-actual-time-reports.tsx      |  2 +-
 .../timeReports/members-time-reports.tsx      |  2 +-
 .../timeReports/overview-time-reports.tsx     |  2 +-
 .../timeReports/page-header/billable.tsx      |  2 +-
 .../timeReports/page-header/categories.tsx    |  2 +-
 .../timeReports/page-header/projects.tsx      |  2 +-
 .../timeReports/page-header/team.tsx          |  2 +-
 .../timeReports/projects-time-reports.tsx     |  2 +-
 .../TimeReportingRightHeader.tsx              |  2 +-
 .../src/pages/schedule-old/schedule.tsx       |  2 +-
 .../src/pages/schedule/grant-chart.tsx        |  4 +--
 .../src/pages/schedule/schedule.tsx           |  2 +-
 .../appearance/appearance-settings.tsx        |  2 +-
 .../categories/categories-settings.tsx        |  2 +-
 .../change-password/change-password.tsx       |  2 +-
 .../pages/settings/clients/client-drawer.tsx  |  2 +-
 .../settings/clients/clients-settings.tsx     |  2 +-
 .../settings/job-titles/job-titles-drawer.tsx |  2 +-
 .../job-titles/job-titles-settings.tsx        |  2 +-
 .../pages/settings/labels/labels-settings.tsx |  2 +-
 .../language-and-region-settings.tsx          |  2 +-
 .../settings/profile/profile-settings.tsx     |  2 +-
 .../project-templates-settings.tsx            |  2 +-
 .../ProjectTemplateEditView.tsx               |  2 +-
 .../settings/sidebar/settings-sidebar.tsx     |  2 +-
 .../task-templates-settings.tsx               |  2 +-
 .../team-members/team-members-settings.tsx    |  2 +-
 .../pages/settings/teams/teams-settings.tsx   |  2 +-
 .../src/pages/unauthorized/unauthorized.tsx   |  2 +-
 .../src/services/alerts/alertService.ts       |  2 +-
 .../src/services/alerts/alertSlice.ts         |  2 +-
 worklenz-frontend/src/shared/antd-imports.ts  | 34 +++++++++++++++++--
 .../src/socket/socketContext.tsx              |  2 +-
 410 files changed, 475 insertions(+), 456 deletions(-)

diff --git a/.cursor/rules/antd-components.mdc b/.cursor/rules/antd-components.mdc
index 756179bd..7db5eb05 100644
--- a/.cursor/rules/antd-components.mdc
+++ b/.cursor/rules/antd-components.mdc
@@ -52,14 +52,14 @@ Common icons including: EditOutlined, DeleteOutlined, PlusOutlined, MoreOutlined
 ## Implementation Guidelines
 
 ### When Creating New Components:
-1. **Always** import from `@antd-imports` or `@/shared/antd-imports`
+1. **Always** import from `@/shared/antd-imports`
 2. Use `appMessage` and `appNotification` for user feedback
 3. Apply `antdConfig` for consistent styling
 4. Use `taskManagementAntdConfig` for task-related components
 
 ### When Refactoring Existing Code:
-1. Replace direct 'antd' imports with `@antd-imports`
-2. Replace direct '@ant-design/icons' imports with `@antd-imports`
+1. Replace direct 'antd' imports with `@/shared/antd-imports`
+2. Replace direct '@ant-design/icons' imports with `@/shared/antd-imports`
 3. Update any custom message/notification calls to use the utilities
 
 ### File Location
diff --git a/worklenz-frontend/src/components/AuthPageHeader.tsx b/worklenz-frontend/src/components/AuthPageHeader.tsx
index e48b8ce8..f3ce0d46 100644
--- a/worklenz-frontend/src/components/AuthPageHeader.tsx
+++ b/worklenz-frontend/src/components/AuthPageHeader.tsx
@@ -1,4 +1,4 @@
-import { Flex, Typography } from 'antd';
+import { Flex, Typography } from '@/shared/antd-imports';
 import logo from '@/assets/images/worklenz-light-mode.png';
 import logoDark from '@/assets/images/worklenz-dark-mode.png';
 import { useAppSelector } from '@/hooks/useAppSelector';
diff --git a/worklenz-frontend/src/components/CustomColordLabel.tsx b/worklenz-frontend/src/components/CustomColordLabel.tsx
index 83c25281..23b03bc5 100644
--- a/worklenz-frontend/src/components/CustomColordLabel.tsx
+++ b/worklenz-frontend/src/components/CustomColordLabel.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Tooltip } from 'antd';
+import { Tooltip } from '@/shared/antd-imports';
 import { Label } from '@/types/task-management.types';
 import { ITaskLabel } from '@/types/tasks/taskLabel.types';
 
diff --git a/worklenz-frontend/src/components/CustomNumberLabel.tsx b/worklenz-frontend/src/components/CustomNumberLabel.tsx
index e13289aa..3a302a30 100644
--- a/worklenz-frontend/src/components/CustomNumberLabel.tsx
+++ b/worklenz-frontend/src/components/CustomNumberLabel.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Tooltip } from 'antd';
+import { Tooltip } from '@/shared/antd-imports';
 import { NumbersColorMap } from '@/shared/constants';
 
 interface CustomNumberLabelProps {
diff --git a/worklenz-frontend/src/components/CustomSearchbar.tsx b/worklenz-frontend/src/components/CustomSearchbar.tsx
index 002a052b..cfc18946 100644
--- a/worklenz-frontend/src/components/CustomSearchbar.tsx
+++ b/worklenz-frontend/src/components/CustomSearchbar.tsx
@@ -1,5 +1,5 @@
 import { SearchOutlined } from '@ant-design/icons';
-import { Input } from 'antd';
+import { Input } from '@/shared/antd-imports';
 
 type CustomSearchbarProps = {
   placeholderText: string;
diff --git a/worklenz-frontend/src/components/CustomTableTitle.tsx b/worklenz-frontend/src/components/CustomTableTitle.tsx
index ed45e964..729d0e82 100644
--- a/worklenz-frontend/src/components/CustomTableTitle.tsx
+++ b/worklenz-frontend/src/components/CustomTableTitle.tsx
@@ -1,4 +1,4 @@
-import { Flex, Tooltip, Typography } from 'antd';
+import { Flex, Tooltip, Typography } from '@/shared/antd-imports';
 import { colors } from '../styles/colors';
 import { ExclamationCircleOutlined } from '@ant-design/icons';
 
diff --git a/worklenz-frontend/src/components/EmptyListPlaceholder.tsx b/worklenz-frontend/src/components/EmptyListPlaceholder.tsx
index 58cf691e..cb8840ad 100644
--- a/worklenz-frontend/src/components/EmptyListPlaceholder.tsx
+++ b/worklenz-frontend/src/components/EmptyListPlaceholder.tsx
@@ -1,4 +1,4 @@
-import { Empty, Typography } from 'antd';
+import { Empty, Typography } from '@/shared/antd-imports';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
diff --git a/worklenz-frontend/src/components/ErrorBoundary.tsx b/worklenz-frontend/src/components/ErrorBoundary.tsx
index f624214d..c64abf70 100644
--- a/worklenz-frontend/src/components/ErrorBoundary.tsx
+++ b/worklenz-frontend/src/components/ErrorBoundary.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Button, Result } from 'antd';
+import { Button, Result } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
 import logger from '@/utils/errorLogger';
diff --git a/worklenz-frontend/src/components/ModuleErrorBoundary.tsx b/worklenz-frontend/src/components/ModuleErrorBoundary.tsx
index 64c3809b..7d006bc4 100644
--- a/worklenz-frontend/src/components/ModuleErrorBoundary.tsx
+++ b/worklenz-frontend/src/components/ModuleErrorBoundary.tsx
@@ -1,5 +1,5 @@
 import React, { Component, ErrorInfo, ReactNode } from 'react';
-import { Button, Result } from 'antd';
+import { Button, Result } from '@/shared/antd-imports';
 import CacheCleanup from '@/utils/cache-cleanup';
 
 interface Props {
diff --git a/worklenz-frontend/src/components/PinRouteToNavbarButton.tsx b/worklenz-frontend/src/components/PinRouteToNavbarButton.tsx
index c2e415a9..0f59fc6a 100644
--- a/worklenz-frontend/src/components/PinRouteToNavbarButton.tsx
+++ b/worklenz-frontend/src/components/PinRouteToNavbarButton.tsx
@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import { getJSONFromLocalStorage, saveJSONToLocalStorage } from '../utils/localStorageFunctions';
-import { Button, ConfigProvider, Tooltip } from 'antd';
+import { Button, ConfigProvider, Tooltip } from '@/shared/antd-imports';
 import { PushpinFilled, PushpinOutlined } from '@ant-design/icons';
 import { colors } from '../styles/colors';
 import { navRoutes, NavRoutesType } from '../features/navbar/navRoutes';
diff --git a/worklenz-frontend/src/components/PreferenceSelector.tsx b/worklenz-frontend/src/components/PreferenceSelector.tsx
index b908c247..6c8e4e49 100644
--- a/worklenz-frontend/src/components/PreferenceSelector.tsx
+++ b/worklenz-frontend/src/components/PreferenceSelector.tsx
@@ -1,4 +1,4 @@
-import { FloatButton, Space, Tooltip } from 'antd';
+import { FloatButton, Space, Tooltip } from '@/shared/antd-imports';
 import { FormatPainterOutlined } from '@ant-design/icons';
 // import LanguageSelector from '../features/i18n/language-selector';
 // import ThemeSelector from '../features/theme/ThemeSelector';
diff --git a/worklenz-frontend/src/components/account-setup/members-step.tsx b/worklenz-frontend/src/components/account-setup/members-step.tsx
index 22534f55..a3ca66b0 100644
--- a/worklenz-frontend/src/components/account-setup/members-step.tsx
+++ b/worklenz-frontend/src/components/account-setup/members-step.tsx
@@ -1,8 +1,8 @@
 import React, { useEffect, useRef } from 'react';
-import { Form, Input, Button, List, Alert, message, InputRef } from 'antd';
+import { Form, Input, Button, List, Alert, message, InputRef } from '@/shared/antd-imports';
 import { CloseCircleOutlined, MailOutlined, PlusOutlined } from '@ant-design/icons';
 import { useTranslation } from 'react-i18next';
-import { Typography } from 'antd';
+import { Typography } from '@/shared/antd-imports';
 import { setTeamMembers, setTasks } from '@/features/account-setup/account-setup.slice';
 import { useDispatch, useSelector } from 'react-redux';
 import { RootState } from '@/app/store';
diff --git a/worklenz-frontend/src/components/account-setup/organization-step.tsx b/worklenz-frontend/src/components/account-setup/organization-step.tsx
index c61d1eee..ec69b999 100644
--- a/worklenz-frontend/src/components/account-setup/organization-step.tsx
+++ b/worklenz-frontend/src/components/account-setup/organization-step.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useRef } from 'react';
-import { Form, Input, InputRef, Typography } from 'antd';
+import { Form, Input, InputRef, Typography } from '@/shared/antd-imports';
 import { useDispatch, useSelector } from 'react-redux';
 import { useTranslation } from 'react-i18next';
 import { setOrganizationName } from '@/features/account-setup/account-setup.slice';
diff --git a/worklenz-frontend/src/components/account-setup/project-step.tsx b/worklenz-frontend/src/components/account-setup/project-step.tsx
index 89e86ea9..1447bfd8 100644
--- a/worklenz-frontend/src/components/account-setup/project-step.tsx
+++ b/worklenz-frontend/src/components/account-setup/project-step.tsx
@@ -3,7 +3,7 @@ import { useSelector } from 'react-redux';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
 
-import { Button, Drawer, Form, Input, InputRef, Select, Typography } from 'antd';
+import { Button, Drawer, Form, Input, InputRef, Select, Typography } from '@/shared/antd-imports';
 import TemplateDrawer from '../common/template-drawer/template-drawer';
 
 import { RootState } from '@/app/store';
diff --git a/worklenz-frontend/src/components/account-setup/tasks-step.tsx b/worklenz-frontend/src/components/account-setup/tasks-step.tsx
index 129e4409..fa1b34db 100644
--- a/worklenz-frontend/src/components/account-setup/tasks-step.tsx
+++ b/worklenz-frontend/src/components/account-setup/tasks-step.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useRef } from 'react';
-import { Form, Input, Button, Typography, List, InputRef } from 'antd';
+import { Form, Input, Button, Typography, List, InputRef } from '@/shared/antd-imports';
 import { PlusOutlined, DeleteOutlined, CloseCircleOutlined } from '@ant-design/icons';
 import { useDispatch, useSelector } from 'react-redux';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/components/add-members-dropdown-v2/add-members-dropdown.tsx b/worklenz-frontend/src/components/add-members-dropdown-v2/add-members-dropdown.tsx
index 6bfd98e7..b8924516 100644
--- a/worklenz-frontend/src/components/add-members-dropdown-v2/add-members-dropdown.tsx
+++ b/worklenz-frontend/src/components/add-members-dropdown-v2/add-members-dropdown.tsx
@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { Avatar, Button, Checkbox, Dropdown, Input, Menu, Typography } from 'antd';
+import { Avatar, Button, Checkbox, Dropdown, Input, Menu, Typography } from '@/shared/antd-imports';
 import { UserAddOutlined, UsergroupAddOutlined } from '@ant-design/icons';
 import './add-members-dropdown.css';
 import { useAppSelector } from '@/hooks/useAppSelector';
diff --git a/worklenz-frontend/src/components/add-members-dropdown/add-members-dropdown.tsx b/worklenz-frontend/src/components/add-members-dropdown/add-members-dropdown.tsx
index b2ab8128..38b7004e 100644
--- a/worklenz-frontend/src/components/add-members-dropdown/add-members-dropdown.tsx
+++ b/worklenz-frontend/src/components/add-members-dropdown/add-members-dropdown.tsx
@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { Avatar, Button, Checkbox, Dropdown, Input, Menu, Typography } from 'antd';
+import { Avatar, Button, Checkbox, Dropdown, Input, Menu, Typography } from '@/shared/antd-imports';
 import { PlusOutlined, UsergroupAddOutlined } from '@ant-design/icons';
 import './add-members-dropdown.css';
 import { AvatarNamesMap } from '../../shared/constants';
diff --git a/worklenz-frontend/src/components/admin-center/billing/billing-tables/charges-table.tsx b/worklenz-frontend/src/components/admin-center/billing/billing-tables/charges-table.tsx
index 24a483f8..ef3d918c 100644
--- a/worklenz-frontend/src/components/admin-center/billing/billing-tables/charges-table.tsx
+++ b/worklenz-frontend/src/components/admin-center/billing/billing-tables/charges-table.tsx
@@ -2,7 +2,7 @@ import { adminCenterApiService } from '@/api/admin-center/admin-center.api.servi
 import { IBillingCharge, IBillingChargesResponse } from '@/types/admin-center/admin-center.types';
 import logger from '@/utils/errorLogger';
 import { formatDate } from '@/utils/timeUtils';
-import { Table, TableProps, Tag } from 'antd';
+import { Table, TableProps, Tag } from '@/shared/antd-imports';
 import React, { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
diff --git a/worklenz-frontend/src/components/admin-center/billing/billing-tables/invoices-table.tsx b/worklenz-frontend/src/components/admin-center/billing/billing-tables/invoices-table.tsx
index 56290ed3..0598cff4 100644
--- a/worklenz-frontend/src/components/admin-center/billing/billing-tables/invoices-table.tsx
+++ b/worklenz-frontend/src/components/admin-center/billing/billing-tables/invoices-table.tsx
@@ -3,7 +3,7 @@ import { IBillingTransaction } from '@/types/admin-center/admin-center.types';
 import logger from '@/utils/errorLogger';
 import { formatDate } from '@/utils/timeUtils';
 import { ContainerOutlined } from '@ant-design/icons';
-import { Button, Table, TableProps, Tag, Tooltip } from 'antd';
+import { Button, Table, TableProps, Tag, Tooltip } from '@/shared/antd-imports';
 import React, { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
diff --git a/worklenz-frontend/src/components/admin-center/billing/drawers/redeem-code-drawer/redeem-code-drawer.tsx b/worklenz-frontend/src/components/admin-center/billing/drawers/redeem-code-drawer/redeem-code-drawer.tsx
index c466d24c..b4235b79 100644
--- a/worklenz-frontend/src/components/admin-center/billing/drawers/redeem-code-drawer/redeem-code-drawer.tsx
+++ b/worklenz-frontend/src/components/admin-center/billing/drawers/redeem-code-drawer/redeem-code-drawer.tsx
@@ -1,4 +1,4 @@
-import { Button, Drawer, Form, Input, notification, Typography } from 'antd';
+import { Button, Drawer, Form, Input, notification, Typography } from '@/shared/antd-imports';
 import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useAppSelector } from '@/hooks/useAppSelector';
diff --git a/worklenz-frontend/src/components/admin-center/billing/drawers/upgrade-plans-lkr/upgrade-plans-lkr.tsx b/worklenz-frontend/src/components/admin-center/billing/drawers/upgrade-plans-lkr/upgrade-plans-lkr.tsx
index 2a0595c9..91e2406e 100644
--- a/worklenz-frontend/src/components/admin-center/billing/drawers/upgrade-plans-lkr/upgrade-plans-lkr.tsx
+++ b/worklenz-frontend/src/components/admin-center/billing/drawers/upgrade-plans-lkr/upgrade-plans-lkr.tsx
@@ -1,4 +1,4 @@
-import { Button, Card, Col, Form, Input, notification, Row, Tag, Typography } from 'antd';
+import { Button, Card, Col, Form, Input, notification, Row, Tag, Typography } from '@/shared/antd-imports';
 import React, { useState } from 'react';
 import './upgrade-plans-lkr.css';
 import { CheckCircleFilled } from '@ant-design/icons';
diff --git a/worklenz-frontend/src/components/admin-center/billing/drawers/upgrade-plans/upgrade-plans.tsx b/worklenz-frontend/src/components/admin-center/billing/drawers/upgrade-plans/upgrade-plans.tsx
index c6e148e3..bc592d09 100644
--- a/worklenz-frontend/src/components/admin-center/billing/drawers/upgrade-plans/upgrade-plans.tsx
+++ b/worklenz-frontend/src/components/admin-center/billing/drawers/upgrade-plans/upgrade-plans.tsx
@@ -459,7 +459,7 @@ const UpgradePlans = () => {
             <Card
               style={{ ...isSelected(paddlePlans.MONTHLY), height: '100%' }}
               hoverable
-              title={<span style={cardStyles.title}>{t('monthlyPlan')}</span>}
+              title={<span style={cardStyles.title}>{t('monthlyPlan', 'Monthly Plan')}</span>}
               onClick={() => setSelectedCard(paddlePlans.MONTHLY)}
             >
               <div style={cardStyles.priceContainer}>
@@ -480,16 +480,16 @@ const UpgradePlans = () => {
                   </Typography.Text>
                 </Flex>
                 <Flex justify="center" align="center">
-                  <Typography.Text>{t('billedMonthly')}</Typography.Text>
+                  <Typography.Text>{t('billedMonthly', 'Billed Monthly')}</Typography.Text>
                 </Flex>
               </div>
 
               <div style={cardStyles.featureList}>
-                {renderFeature(t('startupText01'))}
-                {renderFeature(t('startupText02'))}
-                {renderFeature(t('startupText03'))}
-                {renderFeature(t('startupText04'))}
-                {renderFeature(t('startupText05'))}
+                {renderFeature(t('startupText01', 'Unlimited Projects'))}
+                {renderFeature(t('startupText02', 'Unlimited Team Members'))}
+                {renderFeature(t('startupText03', 'Unlimited Storage'))}
+                {renderFeature(t('startupText04', 'Priority Support'))}
+                {renderFeature(t('startupText05', 'Advanced Analytics'))}
               </div>
             </Card>
           </Col>
@@ -520,8 +520,8 @@ const UpgradePlans = () => {
             disabled={billingInfo?.plan_id === plans.annual_plan_id}
           >
             {billingInfo?.status === SUBSCRIPTION_STATUS.ACTIVE
-              ? t('changeToPlan', { plan: t('annualPlan') })
-              : t('continueWith', { plan: t('annualPlan') })}
+              ? t('changeToPlan', 'Change to {{plan}}', { plan: t('annualPlan', 'Annual Plan') })
+              : t('continueWith', 'Continue with {{plan}}', { plan: t('annualPlan', 'Annual Plan') })}
           </Button>
         )}
         {selectedPlan === paddlePlans.MONTHLY && (
@@ -533,8 +533,8 @@ const UpgradePlans = () => {
             disabled={billingInfo?.plan_id === plans.monthly_plan_id}
           >
             {billingInfo?.status === SUBSCRIPTION_STATUS.ACTIVE
-              ? t('changeToPlan', { plan: t('monthlyPlan') })
-              : t('continueWith', { plan: t('monthlyPlan') })}
+              ? t('changeToPlan', 'Change to {{plan}}', { plan: t('monthlyPlan', 'Monthly Plan') })
+              : t('continueWith', 'Continue with {{plan}}', { plan: t('monthlyPlan', 'Monthly Plan') })}
           </Button>
         )}
       </Row>
diff --git a/worklenz-frontend/src/components/admin-center/overview/organization-admins-table/organization-admins-table.tsx b/worklenz-frontend/src/components/admin-center/overview/organization-admins-table/organization-admins-table.tsx
index 4e757d28..b563f9e7 100644
--- a/worklenz-frontend/src/components/admin-center/overview/organization-admins-table/organization-admins-table.tsx
+++ b/worklenz-frontend/src/components/admin-center/overview/organization-admins-table/organization-admins-table.tsx
@@ -1,4 +1,4 @@
-import { Table, TableProps, Typography } from 'antd';
+import { Table, TableProps, Typography } from '@/shared/antd-imports';
 import React, { useMemo } from 'react';
 import { IOrganizationAdmin } from '@/types/admin-center/admin-center.types';
 
diff --git a/worklenz-frontend/src/components/admin-center/overview/organization-name/organization-name.tsx b/worklenz-frontend/src/components/admin-center/overview/organization-name/organization-name.tsx
index 0a4a6b46..41ed592c 100644
--- a/worklenz-frontend/src/components/admin-center/overview/organization-name/organization-name.tsx
+++ b/worklenz-frontend/src/components/admin-center/overview/organization-name/organization-name.tsx
@@ -1,7 +1,7 @@
 import { adminCenterApiService } from '@/api/admin-center/admin-center.api.service';
 import logger from '@/utils/errorLogger';
 import { EnterOutlined, EditOutlined } from '@ant-design/icons';
-import { Card, Button, Tooltip, Typography } from 'antd';
+import { Card, Button, Tooltip, Typography } from '@/shared/antd-imports';
 import TextArea from 'antd/es/input/TextArea';
 import Paragraph from 'antd/es/typography/Paragraph';
 import { TFunction } from 'i18next';
diff --git a/worklenz-frontend/src/components/admin-center/overview/organization-owner/organization-owner.tsx b/worklenz-frontend/src/components/admin-center/overview/organization-owner/organization-owner.tsx
index 505f8f03..de73841c 100644
--- a/worklenz-frontend/src/components/admin-center/overview/organization-owner/organization-owner.tsx
+++ b/worklenz-frontend/src/components/admin-center/overview/organization-owner/organization-owner.tsx
@@ -2,7 +2,7 @@ import { adminCenterApiService } from '@/api/admin-center/admin-center.api.servi
 import { IOrganization } from '@/types/admin-center/admin-center.types';
 import logger from '@/utils/errorLogger';
 import { MailOutlined, PhoneOutlined, EditOutlined } from '@ant-design/icons';
-import { Card, Tooltip, Input, Button, Typography, InputRef } from 'antd';
+import { Card, Tooltip, Input, Button, Typography, InputRef } from '@/shared/antd-imports';
 import { TFunction } from 'i18next';
 import { useEffect, useRef, useState } from 'react';
 
diff --git a/worklenz-frontend/src/components/admin-center/teams/add-team-drawer/add-team-drawer.tsx b/worklenz-frontend/src/components/admin-center/teams/add-team-drawer/add-team-drawer.tsx
index 06a24da3..9626e09b 100644
--- a/worklenz-frontend/src/components/admin-center/teams/add-team-drawer/add-team-drawer.tsx
+++ b/worklenz-frontend/src/components/admin-center/teams/add-team-drawer/add-team-drawer.tsx
@@ -1,5 +1,5 @@
 import React, { useRef, useState } from 'react';
-import { Button, Drawer, Form, Input, InputRef, Typography } from 'antd';
+import { Button, Drawer, Form, Input, InputRef, Typography } from '@/shared/antd-imports';
 import { fetchTeams } from '@features/teams/teamSlice';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/components/admin-center/teams/settings-drawer/settings-drawer.tsx b/worklenz-frontend/src/components/admin-center/teams/settings-drawer/settings-drawer.tsx
index ff8e8bc0..148899b7 100644
--- a/worklenz-frontend/src/components/admin-center/teams/settings-drawer/settings-drawer.tsx
+++ b/worklenz-frontend/src/components/admin-center/teams/settings-drawer/settings-drawer.tsx
@@ -11,7 +11,7 @@ import {
   TableProps,
   Typography,
   Tooltip,
-} from 'antd';
+} from '@/shared/antd-imports';
 import React, { useState } from 'react';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import './settings-drawer.css';
diff --git a/worklenz-frontend/src/components/admin-center/teams/teams-table/teams-table.tsx b/worklenz-frontend/src/components/admin-center/teams/teams-table/teams-table.tsx
index 91748681..d861dd48 100644
--- a/worklenz-frontend/src/components/admin-center/teams/teams-table/teams-table.tsx
+++ b/worklenz-frontend/src/components/admin-center/teams/teams-table/teams-table.tsx
@@ -6,7 +6,7 @@ import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { IOrganizationTeam } from '@/types/admin-center/admin-center.types';
 import logger from '@/utils/errorLogger';
 import { SettingOutlined, DeleteOutlined } from '@ant-design/icons';
-import { Badge, Button, Card, Popconfirm, Table, TableProps, Tooltip, Typography } from 'antd';
+import { Badge, Button, Card, Popconfirm, Table, TableProps, Tooltip, Typography } from '@/shared/antd-imports';
 import { TFunction } from 'i18next';
 import { useState } from 'react';
 import { useMediaQuery } from 'react-responsive';
diff --git a/worklenz-frontend/src/components/avatars/avatars.tsx b/worklenz-frontend/src/components/avatars/avatars.tsx
index bd3b160e..f33cdf6c 100644
--- a/worklenz-frontend/src/components/avatars/avatars.tsx
+++ b/worklenz-frontend/src/components/avatars/avatars.tsx
@@ -1,4 +1,4 @@
-import { Avatar, Tooltip } from 'antd';
+import { Avatar, Tooltip } from '@/shared/antd-imports';
 import React, { useCallback, useMemo } from 'react';
 import { InlineMember } from '@/types/teamMembers/inlineMember.types';
 
diff --git a/worklenz-frontend/src/components/board/changeCategoryDropdown/ChangeCategoryDropdown.tsx b/worklenz-frontend/src/components/board/changeCategoryDropdown/ChangeCategoryDropdown.tsx
index 3e577c2e..0be131a3 100644
--- a/worklenz-frontend/src/components/board/changeCategoryDropdown/ChangeCategoryDropdown.tsx
+++ b/worklenz-frontend/src/components/board/changeCategoryDropdown/ChangeCategoryDropdown.tsx
@@ -1,4 +1,4 @@
-import { Badge, Card, Dropdown, Flex, Menu, MenuProps } from 'antd';
+import { Badge, Card, Dropdown, Flex, Menu, MenuProps } from '@/shared/antd-imports';
 import React from 'react';
 import { TaskStatusType } from '../../../types/task.types';
 import { colors } from '../../../styles/colors';
diff --git a/worklenz-frontend/src/components/board/common-members-section/common-members-section.tsx b/worklenz-frontend/src/components/board/common-members-section/common-members-section.tsx
index b4aca42f..a34fd64c 100644
--- a/worklenz-frontend/src/components/board/common-members-section/common-members-section.tsx
+++ b/worklenz-frontend/src/components/board/common-members-section/common-members-section.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useRef, useState } from 'react';
-import { Button, Dropdown, Input, InputRef, MenuProps, Typography } from 'antd';
+import { Button, Dropdown, Input, InputRef, MenuProps, Typography } from '@/shared/antd-imports';
 import {
   DeleteOutlined,
   EditOutlined,
diff --git a/worklenz-frontend/src/components/board/common-phase-section/common-phase-section.tsx b/worklenz-frontend/src/components/board/common-phase-section/common-phase-section.tsx
index 54e5dd9c..7d241f70 100644
--- a/worklenz-frontend/src/components/board/common-phase-section/common-phase-section.tsx
+++ b/worklenz-frontend/src/components/board/common-phase-section/common-phase-section.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useRef, useState } from 'react';
-import { Button, Dropdown, Input, InputRef, MenuProps, Typography } from 'antd';
+import { Button, Dropdown, Input, InputRef, MenuProps, Typography } from '@/shared/antd-imports';
 import {
   DeleteOutlined,
   EditOutlined,
diff --git a/worklenz-frontend/src/components/board/common-priority-section/common-priority-section.tsx b/worklenz-frontend/src/components/board/common-priority-section/common-priority-section.tsx
index d718acfd..ce1661c6 100644
--- a/worklenz-frontend/src/components/board/common-priority-section/common-priority-section.tsx
+++ b/worklenz-frontend/src/components/board/common-priority-section/common-priority-section.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useRef, useState } from 'react';
-import { Button, Dropdown, Input, InputRef, MenuProps, Typography } from 'antd';
+import { Button, Dropdown, Input, InputRef, MenuProps, Typography } from '@/shared/antd-imports';
 import {
   DeleteOutlined,
   EditOutlined,
diff --git a/worklenz-frontend/src/components/board/commonStatusSection/CommonStatusSection.tsx b/worklenz-frontend/src/components/board/commonStatusSection/CommonStatusSection.tsx
index bcb67b73..a51ba511 100644
--- a/worklenz-frontend/src/components/board/commonStatusSection/CommonStatusSection.tsx
+++ b/worklenz-frontend/src/components/board/commonStatusSection/CommonStatusSection.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useRef, useState } from 'react';
-import { Button, Dropdown, Input, InputRef, MenuProps, Typography } from 'antd';
+import { Button, Dropdown, Input, InputRef, MenuProps, Typography } from '@/shared/antd-imports';
 import {
   DeleteOutlined,
   EditOutlined,
diff --git a/worklenz-frontend/src/components/board/custom-avatar-group.tsx b/worklenz-frontend/src/components/board/custom-avatar-group.tsx
index 74668782..a69133e6 100644
--- a/worklenz-frontend/src/components/board/custom-avatar-group.tsx
+++ b/worklenz-frontend/src/components/board/custom-avatar-group.tsx
@@ -1,4 +1,4 @@
-import { Button, Flex } from 'antd';
+import { Button, Flex } from '@/shared/antd-imports';
 import AddMembersDropdown from '@/components/add-members-dropdown/add-members-dropdown';
 import Avatars from '../avatars/avatars';
 import { IProjectTask } from '@/types/project/projectTasksViewModel.types';
diff --git a/worklenz-frontend/src/components/board/custom-due-date-picker.tsx b/worklenz-frontend/src/components/board/custom-due-date-picker.tsx
index 5f5a25b0..9ca32744 100644
--- a/worklenz-frontend/src/components/board/custom-due-date-picker.tsx
+++ b/worklenz-frontend/src/components/board/custom-due-date-picker.tsx
@@ -1,5 +1,5 @@
 import React, { useState, useRef } from 'react';
-import { DatePicker, Button, Flex } from 'antd';
+import { DatePicker, Button, Flex } from '@/shared/antd-imports';
 import { CalendarOutlined } from '@ant-design/icons';
 import dayjs, { Dayjs } from 'dayjs';
 import { useSocket } from '@/socket/socketContext';
diff --git a/worklenz-frontend/src/components/board/kanban-group/kanban-group.tsx b/worklenz-frontend/src/components/board/kanban-group/kanban-group.tsx
index c9e402b2..0b9b6f9a 100644
--- a/worklenz-frontend/src/components/board/kanban-group/kanban-group.tsx
+++ b/worklenz-frontend/src/components/board/kanban-group/kanban-group.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useRef, useState } from 'react';
-import { Button, Dropdown, Input, InputRef, MenuProps, Typography } from 'antd';
+import { Button, Dropdown, Input, InputRef, MenuProps, Typography } from '@/shared/antd-imports';
 import {
   DeleteOutlined,
   EditOutlined,
diff --git a/worklenz-frontend/src/components/board/subTaskCard/SubTaskCard.tsx b/worklenz-frontend/src/components/board/subTaskCard/SubTaskCard.tsx
index 09adcc50..1076d82e 100644
--- a/worklenz-frontend/src/components/board/subTaskCard/SubTaskCard.tsx
+++ b/worklenz-frontend/src/components/board/subTaskCard/SubTaskCard.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react';
-import { Avatar, Col, DatePicker, Divider, Flex, Row, Tooltip, Typography } from 'antd';
+import { Avatar, Col, DatePicker, Divider, Flex, Row, Tooltip, Typography } from '@/shared/antd-imports';
 import StatusDropdown from '../../taskListCommon/statusDropdown/StatusDropdown';
 import dayjs, { Dayjs } from 'dayjs';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/components/board/taskCard/TaskCard.tsx b/worklenz-frontend/src/components/board/taskCard/TaskCard.tsx
index fe6651f1..6c8475ba 100644
--- a/worklenz-frontend/src/components/board/taskCard/TaskCard.tsx
+++ b/worklenz-frontend/src/components/board/taskCard/TaskCard.tsx
@@ -9,7 +9,7 @@ import {
   Dropdown,
   MenuProps,
   Button,
-} from 'antd';
+} from '@/shared/antd-imports';
 import {
   DoubleRightOutlined,
   PauseOutlined,
diff --git a/worklenz-frontend/src/components/board/taskCard/priority-section/priority-section.tsx b/worklenz-frontend/src/components/board/taskCard/priority-section/priority-section.tsx
index deb1cc7c..754279a7 100644
--- a/worklenz-frontend/src/components/board/taskCard/priority-section/priority-section.tsx
+++ b/worklenz-frontend/src/components/board/taskCard/priority-section/priority-section.tsx
@@ -1,4 +1,4 @@
-import { Flex, Typography } from 'antd';
+import { Flex, Typography } from '@/shared/antd-imports';
 import './priority-section.css';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useState, useEffect, useMemo } from 'react';
diff --git a/worklenz-frontend/src/components/board/taskCreateCard/TaskCreateCard.tsx b/worklenz-frontend/src/components/board/taskCreateCard/TaskCreateCard.tsx
index d7cab6ce..c72efe23 100644
--- a/worklenz-frontend/src/components/board/taskCreateCard/TaskCreateCard.tsx
+++ b/worklenz-frontend/src/components/board/taskCreateCard/TaskCreateCard.tsx
@@ -1,4 +1,4 @@
-import { Avatar, Button, DatePicker, Input, InputRef } from 'antd';
+import { Avatar, Button, DatePicker, Input, InputRef } from '@/shared/antd-imports';
 import React, { forwardRef, useEffect, useRef, useState } from 'react';
 import AddMembersDropdown from '../../add-members-dropdown/add-members-dropdown';
 import dayjs, { Dayjs } from 'dayjs';
diff --git a/worklenz-frontend/src/components/board/taskCreateCard/priority-task-create-card.tsx b/worklenz-frontend/src/components/board/taskCreateCard/priority-task-create-card.tsx
index f7f86a22..fbde3a28 100644
--- a/worklenz-frontend/src/components/board/taskCreateCard/priority-task-create-card.tsx
+++ b/worklenz-frontend/src/components/board/taskCreateCard/priority-task-create-card.tsx
@@ -1,4 +1,4 @@
-import { Avatar, Button, DatePicker, Input, InputRef } from 'antd';
+import { Avatar, Button, DatePicker, Input, InputRef } from '@/shared/antd-imports';
 import React, { forwardRef, useEffect, useRef, useState } from 'react';
 import AddMembersDropdown from '../../add-members-dropdown/add-members-dropdown';
 import dayjs, { Dayjs } from 'dayjs';
diff --git a/worklenz-frontend/src/components/calendars/homeCalendar/HomeCalendar.tsx b/worklenz-frontend/src/components/calendars/homeCalendar/HomeCalendar.tsx
index dcf50dda..44145520 100644
--- a/worklenz-frontend/src/components/calendars/homeCalendar/HomeCalendar.tsx
+++ b/worklenz-frontend/src/components/calendars/homeCalendar/HomeCalendar.tsx
@@ -1,4 +1,4 @@
-import { Calendar } from 'antd';
+import { Calendar } from '@/shared/antd-imports';
 import React, { useEffect } from 'react';
 import type { Dayjs } from 'dayjs';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
diff --git a/worklenz-frontend/src/components/charts/LazyChartComponents.tsx b/worklenz-frontend/src/components/charts/LazyChartComponents.tsx
index 3a170a7b..3a606acb 100644
--- a/worklenz-frontend/src/components/charts/LazyChartComponents.tsx
+++ b/worklenz-frontend/src/components/charts/LazyChartComponents.tsx
@@ -1,5 +1,5 @@
 import { lazy, Suspense } from 'react';
-import { Spin } from 'antd';
+import { Spin } from '@/shared/antd-imports';
 
 // Lazy load Chart.js components
 const LazyBarChart = lazy(() => 
diff --git a/worklenz-frontend/src/components/charts/chart-loader.tsx b/worklenz-frontend/src/components/charts/chart-loader.tsx
index 142b8e2d..85f07765 100644
--- a/worklenz-frontend/src/components/charts/chart-loader.tsx
+++ b/worklenz-frontend/src/components/charts/chart-loader.tsx
@@ -1,5 +1,5 @@
 import React, { Suspense } from 'react';
-import { Spin } from 'antd';
+import { Spin } from '@/shared/antd-imports';
 
 // Lazy load chart components to reduce initial bundle size
 const LazyBar = React.lazy(() =>
diff --git a/worklenz-frontend/src/components/common/invite-team-members/invite-team-members.tsx b/worklenz-frontend/src/components/common/invite-team-members/invite-team-members.tsx
index b71e4d65..da36593d 100644
--- a/worklenz-frontend/src/components/common/invite-team-members/invite-team-members.tsx
+++ b/worklenz-frontend/src/components/common/invite-team-members/invite-team-members.tsx
@@ -1,4 +1,4 @@
-import { AutoComplete, Button, Drawer, Flex, Form, message, Select, Spin, Typography } from 'antd';
+import { AutoComplete, Button, Drawer, Flex, Form, message, Select, Spin, Typography } from '@/shared/antd-imports';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import {
diff --git a/worklenz-frontend/src/components/common/single-avatar/single-avatar.tsx b/worklenz-frontend/src/components/common/single-avatar/single-avatar.tsx
index d6886d7f..b9d0447d 100644
--- a/worklenz-frontend/src/components/common/single-avatar/single-avatar.tsx
+++ b/worklenz-frontend/src/components/common/single-avatar/single-avatar.tsx
@@ -1,5 +1,5 @@
 import { AvatarNamesMap } from '@/shared/constants';
-import { Avatar, Flex, Space } from 'antd';
+import { Avatar, Flex, Space } from '@/shared/antd-imports';
 
 interface SingleAvatarProps {
   avatarUrl?: string;
diff --git a/worklenz-frontend/src/components/common/template-drawer/template-drawer.tsx b/worklenz-frontend/src/components/common/template-drawer/template-drawer.tsx
index 3dd9dd75..e6afa440 100644
--- a/worklenz-frontend/src/components/common/template-drawer/template-drawer.tsx
+++ b/worklenz-frontend/src/components/common/template-drawer/template-drawer.tsx
@@ -1,4 +1,4 @@
-import type { MenuProps } from 'antd';
+import type { MenuProps } from '@/shared/antd-imports';
 import {
   Empty,
   List,
@@ -10,8 +10,7 @@ import {
   Image,
   Input,
   Flex,
-  Button,
-} from 'antd';
+} from '@/shared/antd-imports';
 import React, { useEffect, useState } from 'react';
 import { useSelector } from 'react-redux';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/components/common/tooltip-wrapper/tooltip-wrapper.tsx b/worklenz-frontend/src/components/common/tooltip-wrapper/tooltip-wrapper.tsx
index ab9d1504..83c55127 100644
--- a/worklenz-frontend/src/components/common/tooltip-wrapper/tooltip-wrapper.tsx
+++ b/worklenz-frontend/src/components/common/tooltip-wrapper/tooltip-wrapper.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Tooltip, TooltipProps } from 'antd';
+import { Tooltip, TooltipProps } from '@/shared/antd-imports';
 
 interface TooltipWrapperProps extends Omit<TooltipProps, 'children'> {
   children: React.ReactElement;
diff --git a/worklenz-frontend/src/components/enhanced-kanban/EnhancedKanbanBoard.tsx b/worklenz-frontend/src/components/enhanced-kanban/EnhancedKanbanBoard.tsx
index b048744e..e98073f9 100644
--- a/worklenz-frontend/src/components/enhanced-kanban/EnhancedKanbanBoard.tsx
+++ b/worklenz-frontend/src/components/enhanced-kanban/EnhancedKanbanBoard.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useState, useMemo } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
-import { Card, Spin, Empty } from 'antd';
+import { Card, Spin, Empty } from '@/shared/antd-imports';
 import {
   DndContext,
   DragOverlay,
diff --git a/worklenz-frontend/src/components/enhanced-kanban/EnhancedKanbanCreateSection.tsx b/worklenz-frontend/src/components/enhanced-kanban/EnhancedKanbanCreateSection.tsx
index eb9b87cc..530ee0c6 100644
--- a/worklenz-frontend/src/components/enhanced-kanban/EnhancedKanbanCreateSection.tsx
+++ b/worklenz-frontend/src/components/enhanced-kanban/EnhancedKanbanCreateSection.tsx
@@ -1,5 +1,5 @@
 import React, { useState, useRef, useEffect, useMemo } from 'react';
-import { Button, Flex } from 'antd';
+import { Button, Flex } from '@/shared/antd-imports';
 import { PlusOutlined } from '@ant-design/icons';
 import { useTranslation } from 'react-i18next';
 import { nanoid } from '@reduxjs/toolkit';
diff --git a/worklenz-frontend/src/components/enhanced-kanban/EnhancedKanbanCreateSubtaskCard.tsx b/worklenz-frontend/src/components/enhanced-kanban/EnhancedKanbanCreateSubtaskCard.tsx
index e15044b9..43440a2a 100644
--- a/worklenz-frontend/src/components/enhanced-kanban/EnhancedKanbanCreateSubtaskCard.tsx
+++ b/worklenz-frontend/src/components/enhanced-kanban/EnhancedKanbanCreateSubtaskCard.tsx
@@ -1,4 +1,4 @@
-import { Flex, Input, InputRef } from 'antd';
+import { Flex, Input, InputRef } from '@/shared/antd-imports';
 import React, { useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
diff --git a/worklenz-frontend/src/components/enhanced-kanban/EnhancedKanbanCreateTaskCard.tsx b/worklenz-frontend/src/components/enhanced-kanban/EnhancedKanbanCreateTaskCard.tsx
index f677c4bc..f3147149 100644
--- a/worklenz-frontend/src/components/enhanced-kanban/EnhancedKanbanCreateTaskCard.tsx
+++ b/worklenz-frontend/src/components/enhanced-kanban/EnhancedKanbanCreateTaskCard.tsx
@@ -1,5 +1,5 @@
 import React, { useRef, useState, useEffect } from 'react';
-import { Button, Flex, Input, InputRef } from 'antd';
+import { Button, Flex, Input, InputRef } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 import { nanoid } from '@reduxjs/toolkit';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
diff --git a/worklenz-frontend/src/components/enhanced-kanban/EnhancedKanbanGroup.tsx b/worklenz-frontend/src/components/enhanced-kanban/EnhancedKanbanGroup.tsx
index 86b98521..d9e5d24a 100644
--- a/worklenz-frontend/src/components/enhanced-kanban/EnhancedKanbanGroup.tsx
+++ b/worklenz-frontend/src/components/enhanced-kanban/EnhancedKanbanGroup.tsx
@@ -12,7 +12,7 @@ import EnhancedKanbanTaskCard from './EnhancedKanbanTaskCard';
 import VirtualizedTaskList from './VirtualizedTaskList';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import './EnhancedKanbanGroup.css';
-import { Badge, Flex, InputRef, MenuProps, Popconfirm } from 'antd';
+import { Badge, Flex, InputRef, MenuProps, Popconfirm } from '@/shared/antd-imports';
 import { themeWiseColor } from '@/utils/themeWiseColor';
 import useIsProjectManager from '@/hooks/useIsProjectManager';
 import { useAuthService } from '@/hooks/useAuth';
@@ -25,11 +25,11 @@ import {
   MoreOutlined,
 } from '@ant-design/icons/lib/icons';
 import { colors } from '@/styles/colors';
-import { Input } from 'antd';
-import { Tooltip } from 'antd';
-import { Typography } from 'antd';
-import { Dropdown } from 'antd';
-import { Button } from 'antd';
+import { Input } from '@/shared/antd-imports';
+import { Tooltip } from '@/shared/antd-imports';
+import { Typography } from '@/shared/antd-imports';
+import { Dropdown } from '@/shared/antd-imports';
+import { Button } from '@/shared/antd-imports';
 import { PlusOutlined } from '@ant-design/icons/lib/icons';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/components/enhanced-kanban/EnhancedKanbanTaskCard.tsx b/worklenz-frontend/src/components/enhanced-kanban/EnhancedKanbanTaskCard.tsx
index c431b321..0fa3f73a 100644
--- a/worklenz-frontend/src/components/enhanced-kanban/EnhancedKanbanTaskCard.tsx
+++ b/worklenz-frontend/src/components/enhanced-kanban/EnhancedKanbanTaskCard.tsx
@@ -23,9 +23,9 @@ import {
   fetchBoardSubTasks,
   toggleTaskExpansion,
 } from '@/features/enhanced-kanban/enhanced-kanban.slice';
-import { Divider } from 'antd';
-import { List } from 'antd';
-import { Skeleton } from 'antd';
+import { Divider } from '@/shared/antd-imports';
+import { List } from '@/shared/antd-imports';
+import { Skeleton } from '@/shared/antd-imports';
 import { PlusOutlined } from '@ant-design/icons';
 import BoardSubTaskCard from '@/pages/projects/projectView/board/board-section/board-sub-task-card/board-sub-task-card';
 import BoardCreateSubtaskCard from '@/pages/projects/projectView/board/board-section/board-sub-task-card/board-create-sub-task-card';
diff --git a/worklenz-frontend/src/components/home-tasks/statusDropdown/home-tasks-status-dropdown.tsx b/worklenz-frontend/src/components/home-tasks/statusDropdown/home-tasks-status-dropdown.tsx
index 424d3388..245dfbe6 100644
--- a/worklenz-frontend/src/components/home-tasks/statusDropdown/home-tasks-status-dropdown.tsx
+++ b/worklenz-frontend/src/components/home-tasks/statusDropdown/home-tasks-status-dropdown.tsx
@@ -1,4 +1,4 @@
-import { Badge, Flex, Select } from 'antd';
+import { Badge, Flex, Select } from '@/shared/antd-imports';
 import './home-tasks-status-dropdown.css';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/components/home-tasks/taskDatePicker/home-tasks-date-picker.tsx b/worklenz-frontend/src/components/home-tasks/taskDatePicker/home-tasks-date-picker.tsx
index 37f4d5a3..3e1ff724 100644
--- a/worklenz-frontend/src/components/home-tasks/taskDatePicker/home-tasks-date-picker.tsx
+++ b/worklenz-frontend/src/components/home-tasks/taskDatePicker/home-tasks-date-picker.tsx
@@ -1,6 +1,6 @@
 import { useSocket } from '@/socket/socketContext';
 import { IProjectTask } from '@/types/project/projectTasksViewModel.types';
-import { DatePicker } from 'antd';
+import { DatePicker } from '@/shared/antd-imports';
 import dayjs from 'dayjs';
 import calendar from 'dayjs/plugin/calendar';
 import { SocketEvents } from '@/shared/socket-events';
diff --git a/worklenz-frontend/src/components/kanban-board-management-v2/kanbanGroup.tsx b/worklenz-frontend/src/components/kanban-board-management-v2/kanbanGroup.tsx
index 98f57505..3e8ce29d 100644
--- a/worklenz-frontend/src/components/kanban-board-management-v2/kanbanGroup.tsx
+++ b/worklenz-frontend/src/components/kanban-board-management-v2/kanbanGroup.tsx
@@ -1,7 +1,7 @@
 import React, { useState } from 'react';
 import { useDroppable } from '@dnd-kit/core';
 import { SortableContext, verticalListSortingStrategy } from '@dnd-kit/sortable';
-import { Button, Typography } from 'antd';
+import { Button, Typography } from '@/shared/antd-imports';
 import { PlusOutlined, MenuOutlined } from '@ant-design/icons';
 import { ITaskListGroup } from '@/types/tasks/taskList.types';
 import { IGroupBy } from '@/features/tasks/tasks.slice';
diff --git a/worklenz-frontend/src/components/kanban-board-management-v2/kanbanTaskCard.tsx b/worklenz-frontend/src/components/kanban-board-management-v2/kanbanTaskCard.tsx
index 766fbfce..1356e3ae 100644
--- a/worklenz-frontend/src/components/kanban-board-management-v2/kanbanTaskCard.tsx
+++ b/worklenz-frontend/src/components/kanban-board-management-v2/kanbanTaskCard.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { useSortable } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
-import { Avatar, Tag, Progress, Typography, Button, Tooltip, Space } from 'antd';
+import { Avatar, Tag, Progress, Typography, Button, Tooltip, Space } from '@/shared/antd-imports';
 import {
   HolderOutlined,
   MessageOutlined,
diff --git a/worklenz-frontend/src/components/kanban-board-management-v2/kanbanTaskListBoard.tsx b/worklenz-frontend/src/components/kanban-board-management-v2/kanbanTaskListBoard.tsx
index 314f0f72..9ea40133 100644
--- a/worklenz-frontend/src/components/kanban-board-management-v2/kanbanTaskListBoard.tsx
+++ b/worklenz-frontend/src/components/kanban-board-management-v2/kanbanTaskListBoard.tsx
@@ -17,18 +17,13 @@ import {
   SortableContext,
   sortableKeyboardCoordinates,
 } from '@dnd-kit/sortable';
-import { Card, Spin, Empty, Flex } from 'antd';
+import { Card, Spin, Empty } from '@/shared/antd-imports';
 import { RootState } from '@/app/store';
-import { IGroupBy, setGroup, fetchTaskGroups, reorderTasks } from '@/features/tasks/tasks.slice';
+import { fetchTaskGroups, reorderTasks } from '@/features/tasks/tasks.slice';
 import { IProjectTask } from '@/types/project/projectTasksViewModel.types';
 import { AppDispatch } from '@/app/store';
-import BoardSectionCard from '@/pages/projects/projectView/board/board-section/board-section-card/board-section-card';
-import BoardCreateSectionCard from '@/pages/projects/projectView/board/board-section/board-section-card/board-create-section-card';
-import { useAuthService } from '@/hooks/useAuth';
+import { useAuthService } from '@/hooks/useAuth'; 
 import useIsProjectManager from '@/hooks/useIsProjectManager';
-import BoardViewTaskCard from '@/pages/projects/projectView/board/board-section/board-task-card/board-view-task-card';
-import TaskGroup from '../task-management/TaskGroup';
-import TaskRow from '../task-management/TaskRow';
 import KanbanGroup from './kanbanGroup';
 import KanbanTaskCard from './kanbanTaskCard';
 import SortableKanbanGroup from './SortableKanbanGroup';
diff --git a/worklenz-frontend/src/components/navbar/notifications/notifications-drawer/notification/notfication-drawer.tsx b/worklenz-frontend/src/components/navbar/notifications/notifications-drawer/notification/notfication-drawer.tsx
index 4f6d7201..44c761db 100644
--- a/worklenz-frontend/src/components/navbar/notifications/notifications-drawer/notification/notfication-drawer.tsx
+++ b/worklenz-frontend/src/components/navbar/notifications/notifications-drawer/notification/notfication-drawer.tsx
@@ -1,4 +1,4 @@
-import { Drawer, Empty, Segmented, Typography, Spin, Button, Flex } from 'antd';
+import { Drawer, Empty, Segmented, Typography, Spin, Button, Flex } from '@/shared/antd-imports';
 import { useEffect, useState } from 'react';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
diff --git a/worklenz-frontend/src/components/navbar/notifications/notifications-drawer/notification/notification-button.tsx b/worklenz-frontend/src/components/navbar/notifications/notifications-drawer/notification/notification-button.tsx
index c78731c4..43a5c621 100644
--- a/worklenz-frontend/src/components/navbar/notifications/notifications-drawer/notification/notification-button.tsx
+++ b/worklenz-frontend/src/components/navbar/notifications/notifications-drawer/notification/notification-button.tsx
@@ -1,5 +1,5 @@
 import { BellOutlined } from '@ant-design/icons';
-import { Badge, Button, Tooltip } from 'antd';
+import { Badge, Button, Tooltip } from '@/shared/antd-imports';
 import { toggleDrawer } from '@features/navbar/notificationSlice';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/components/navbar/notifications/notifications-drawer/notification/notification-item.tsx b/worklenz-frontend/src/components/navbar/notifications/notifications-drawer/notification/notification-item.tsx
index abbc0721..e6591ab7 100644
--- a/worklenz-frontend/src/components/navbar/notifications/notifications-drawer/notification/notification-item.tsx
+++ b/worklenz-frontend/src/components/navbar/notifications/notifications-drawer/notification/notification-item.tsx
@@ -1,6 +1,6 @@
 import { IWorklenzNotification } from '@/types/notifications/notifications.types';
 import { BankOutlined } from '@ant-design/icons';
-import { Button, Tag, Typography, theme } from 'antd';
+import { Button, Tag, Typography, theme } from '@/shared/antd-imports';
 import DOMPurify from 'dompurify';
 import React, { useState } from 'react';
 import { fromNow } from '@/utils/dateUtils';
diff --git a/worklenz-frontend/src/components/navbar/notifications/notifications-drawer/notification/notification-template.tsx b/worklenz-frontend/src/components/navbar/notifications/notifications-drawer/notification/notification-template.tsx
index 17b7fe91..bbbe03e2 100644
--- a/worklenz-frontend/src/components/navbar/notifications/notifications-drawer/notification/notification-template.tsx
+++ b/worklenz-frontend/src/components/navbar/notifications/notifications-drawer/notification/notification-template.tsx
@@ -1,4 +1,4 @@
-import { Button, Typography, Tag } from 'antd';
+import { Button, Typography, Tag } from '@/shared/antd-imports';
 import { BankOutlined } from '@ant-design/icons';
 import { IWorklenzNotification } from '@/types/notifications/notifications.types';
 import { useNavigate } from 'react-router-dom';
diff --git a/worklenz-frontend/src/components/navbar/notifications/notifications-drawer/notification/push-notification-template.tsx b/worklenz-frontend/src/components/navbar/notifications/notifications-drawer/notification/push-notification-template.tsx
index 05575285..7465ff26 100644
--- a/worklenz-frontend/src/components/navbar/notifications/notifications-drawer/notification/push-notification-template.tsx
+++ b/worklenz-frontend/src/components/navbar/notifications/notifications-drawer/notification/push-notification-template.tsx
@@ -1,4 +1,4 @@
-import { notification } from 'antd';
+import { notification } from '@/shared/antd-imports';
 import { IWorklenzNotification } from '@/types/notifications/notifications.types';
 import { teamsApiService } from '@/api/teams/teams.api.service';
 import { toQueryString } from '@/utils/toQueryString';
diff --git a/worklenz-frontend/src/components/project-list/project-group/project-group-list.tsx b/worklenz-frontend/src/components/project-list/project-group/project-group-list.tsx
index bb07669d..208802d8 100644
--- a/worklenz-frontend/src/components/project-list/project-group/project-group-list.tsx
+++ b/worklenz-frontend/src/components/project-list/project-group/project-group-list.tsx
@@ -10,10 +10,9 @@ import {
   Tooltip,
   Badge,
   Space,
-  Avatar,
   theme,
   Divider,
-} from 'antd';
+} from '@/shared/antd-imports';
 import {
   ClockCircleOutlined,
   TeamOutlined,
diff --git a/worklenz-frontend/src/components/project-list/project-list-table/project-list-actions/project-list-actions.tsx b/worklenz-frontend/src/components/project-list/project-list-table/project-list-actions/project-list-actions.tsx
index c447ddeb..fe69580a 100644
--- a/worklenz-frontend/src/components/project-list/project-list-table/project-list-actions/project-list-actions.tsx
+++ b/worklenz-frontend/src/components/project-list/project-list-table/project-list-actions/project-list-actions.tsx
@@ -11,11 +11,10 @@ import {
 } from '@/features/projects/projectsSlice';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import useIsProjectManager from '@/hooks/useIsProjectManager';
-import { useAuthService } from '@/hooks/useAuth';
 import { IProjectViewModel } from '@/types/project/projectViewModel.types';
 import logger from '@/utils/errorLogger';
 import { SettingOutlined, InboxOutlined } from '@ant-design/icons';
-import { Tooltip, Button, Popconfirm, Space } from 'antd';
+import { Tooltip, Button, Popconfirm, Space } from '@/shared/antd-imports';
 import {
   evt_projects_archive,
   evt_projects_archive_all,
diff --git a/worklenz-frontend/src/components/project-list/project-list-table/project-list-category/project-list-category.tsx b/worklenz-frontend/src/components/project-list/project-list-table/project-list-category/project-list-category.tsx
index 240267b9..07bc22b5 100644
--- a/worklenz-frontend/src/components/project-list/project-list-table/project-list-category/project-list-category.tsx
+++ b/worklenz-frontend/src/components/project-list/project-list-table/project-list-category/project-list-category.tsx
@@ -1,5 +1,5 @@
 import { IProjectViewModel } from '@/types/project/projectViewModel.types';
-import { Tooltip, Tag } from 'antd';
+import { Tooltip, Tag } from '@/shared/antd-imports';
 import { TFunction } from 'i18next';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { setFilteredCategories, setRequestParams } from '@/features/projects/projectsSlice';
diff --git a/worklenz-frontend/src/components/project-list/project-list-table/project-list-favorite/project-rate-cell.tsx b/worklenz-frontend/src/components/project-list/project-list-table/project-list-favorite/project-rate-cell.tsx
index c7e9ff89..64723387 100644
--- a/worklenz-frontend/src/components/project-list/project-list-table/project-list-favorite/project-rate-cell.tsx
+++ b/worklenz-frontend/src/components/project-list/project-list-table/project-list-favorite/project-rate-cell.tsx
@@ -8,7 +8,7 @@ import { useAppSelector } from '@/hooks/useAppSelector';
 import { colors } from '@/styles/colors';
 import { IProjectViewModel } from '@/types/project/projectViewModel.types';
 import { StarFilled } from '@ant-design/icons';
-import { Button, ConfigProvider, Tooltip } from 'antd';
+import { Button, ConfigProvider, Tooltip } from '@/shared/antd-imports';
 import { TFunction } from 'i18next';
 import { useCallback, useMemo } from 'react';
 
diff --git a/worklenz-frontend/src/components/project-list/project-list-table/project-list-progress/progress-list-progress.tsx b/worklenz-frontend/src/components/project-list/project-list-table/project-list-progress/progress-list-progress.tsx
index 1be0b55d..7f2ce1bd 100644
--- a/worklenz-frontend/src/components/project-list/project-list-table/project-list-progress/progress-list-progress.tsx
+++ b/worklenz-frontend/src/components/project-list/project-list-table/project-list-progress/progress-list-progress.tsx
@@ -1,6 +1,6 @@
 import { IProjectViewModel } from '@/types/project/projectViewModel.types';
 import { getTaskProgressTitle } from '@/utils/project-list-utils';
-import { Tooltip, Progress } from 'antd';
+import { Tooltip, Progress } from '@/shared/antd-imports';
 
 export const ProgressListProgress: React.FC<{ record: IProjectViewModel }> = ({ record }) => {
   return (
diff --git a/worklenz-frontend/src/components/project-list/project-list-table/project-list-updated-at/project-list-updated.tsx b/worklenz-frontend/src/components/project-list/project-list-table/project-list-updated-at/project-list-updated.tsx
index bd0c7b5a..51257d84 100644
--- a/worklenz-frontend/src/components/project-list/project-list-table/project-list-updated-at/project-list-updated.tsx
+++ b/worklenz-frontend/src/components/project-list/project-list-table/project-list-updated-at/project-list-updated.tsx
@@ -1,7 +1,7 @@
 import { IProjectViewModel } from '@/types/project/projectViewModel.types';
 import { calculateTimeDifference } from '@/utils/calculate-time-difference';
 import { formatDateTimeWithLocale } from '@/utils/format-date-time-with-locale';
-import { Tooltip } from 'antd';
+import { Tooltip } from '@/shared/antd-imports';
 
 export const ProjectListUpdatedAt: React.FC<{ record: IProjectViewModel }> = ({ record }) => {
   return (
diff --git a/worklenz-frontend/src/components/project-list/project-list-table/project-name/project-name-cell.tsx b/worklenz-frontend/src/components/project-list/project-list-table/project-name/project-name-cell.tsx
index 25a948ae..27a66287 100644
--- a/worklenz-frontend/src/components/project-list/project-list-table/project-name/project-name-cell.tsx
+++ b/worklenz-frontend/src/components/project-list/project-list-table/project-name/project-name-cell.tsx
@@ -7,7 +7,7 @@ import { useAppSelector } from '@/hooks/useAppSelector';
 import { IProjectViewModel } from '@/types/project/projectViewModel.types';
 import { formatDateRange } from '@/utils/project-list-utils';
 import { CalendarOutlined } from '@ant-design/icons';
-import { Badge, Tooltip } from 'antd';
+import { Badge, Tooltip } from '@/shared/antd-imports';
 import { TFunction } from 'i18next';
 import { NavigateFunction } from 'react-router-dom';
 
diff --git a/worklenz-frontend/src/components/project-task-filters/delete-status-drawer/delete-status-drawer.tsx b/worklenz-frontend/src/components/project-task-filters/delete-status-drawer/delete-status-drawer.tsx
index 0dd5015c..bc28501b 100644
--- a/worklenz-frontend/src/components/project-task-filters/delete-status-drawer/delete-status-drawer.tsx
+++ b/worklenz-frontend/src/components/project-task-filters/delete-status-drawer/delete-status-drawer.tsx
@@ -9,7 +9,7 @@ import useTabSearchParam from '@/hooks/useTabSearchParam';
 import { fetchTaskGroups } from '@/features/tasks/tasks.slice';
 
 import { deleteStatusToggleDrawer } from '@/features/projects/status/DeleteStatusSlice';
-import { Drawer, Alert, Card, Select, Button, Typography, Badge } from 'antd';
+import { Drawer, Alert, Card, Select, Button, Typography, Badge } from '@/shared/antd-imports';
 import { DownOutlined } from '@ant-design/icons';
 import { useSelector } from 'react-redux';
 import {
diff --git a/worklenz-frontend/src/components/project-task-filters/filter-dropdowns/column-configuration-modal.tsx b/worklenz-frontend/src/components/project-task-filters/filter-dropdowns/column-configuration-modal.tsx
index 34b317a4..147c1277 100644
--- a/worklenz-frontend/src/components/project-task-filters/filter-dropdowns/column-configuration-modal.tsx
+++ b/worklenz-frontend/src/components/project-task-filters/filter-dropdowns/column-configuration-modal.tsx
@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Modal, Checkbox, Button, Flex, Typography, Space, Divider, message } from 'antd';
+import { Modal, Checkbox, Button, Flex, Typography, Space, Divider, message } from '@/shared/antd-imports';
 import { SettingOutlined, UpOutlined, DownOutlined } from '@ant-design/icons';
 import { useTranslation } from 'react-i18next';
 
diff --git a/worklenz-frontend/src/components/project-task-filters/filter-dropdowns/members-filter-dropdown.tsx b/worklenz-frontend/src/components/project-task-filters/filter-dropdowns/members-filter-dropdown.tsx
index 41c920c0..755cbdf3 100644
--- a/worklenz-frontend/src/components/project-task-filters/filter-dropdowns/members-filter-dropdown.tsx
+++ b/worklenz-frontend/src/components/project-task-filters/filter-dropdowns/members-filter-dropdown.tsx
@@ -13,8 +13,8 @@ import {
   List,
   Space,
   Typography,
-} from 'antd';
-import type { InputRef } from 'antd';
+  InputRef
+} from '@/shared/antd-imports';
 
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { useAppSelector } from '@/hooks/useAppSelector';
diff --git a/worklenz-frontend/src/components/project-task-filters/filter-dropdowns/priority-filter-dropdown.tsx b/worklenz-frontend/src/components/project-task-filters/filter-dropdowns/priority-filter-dropdown.tsx
index 094771dd..79858de2 100644
--- a/worklenz-frontend/src/components/project-task-filters/filter-dropdowns/priority-filter-dropdown.tsx
+++ b/worklenz-frontend/src/components/project-task-filters/filter-dropdowns/priority-filter-dropdown.tsx
@@ -2,7 +2,7 @@ import { CaretDownFilled } from '@ant-design/icons';
 import { useMemo, useEffect, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { Badge, Button, Card, Checkbox, Dropdown, List, Space } from 'antd';
+import { Badge, Button, Card, Checkbox, Dropdown, List, Space } from '@/shared/antd-imports';
 
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { colors } from '@/styles/colors';
diff --git a/worklenz-frontend/src/components/projects/project-create-button/project-create-button.tsx b/worklenz-frontend/src/components/projects/project-create-button/project-create-button.tsx
index 5386ce0c..bdde03c9 100644
--- a/worklenz-frontend/src/components/projects/project-create-button/project-create-button.tsx
+++ b/worklenz-frontend/src/components/projects/project-create-button/project-create-button.tsx
@@ -1,4 +1,4 @@
-import { Button, Drawer, Dropdown } from 'antd';
+import { Button, Drawer, Dropdown } from '@/shared/antd-imports';
 import { useEffect, useState } from 'react';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { DownOutlined, EditOutlined, ImportOutlined } from '@ant-design/icons';
diff --git a/worklenz-frontend/src/components/projects/project-drawer/project-basic-info/project-basic-info.tsx b/worklenz-frontend/src/components/projects/project-drawer/project-basic-info/project-basic-info.tsx
index c01b8c70..63c512ed 100644
--- a/worklenz-frontend/src/components/projects/project-drawer/project-basic-info/project-basic-info.tsx
+++ b/worklenz-frontend/src/components/projects/project-drawer/project-basic-info/project-basic-info.tsx
@@ -1,4 +1,4 @@
-import { ColorPicker, Form, FormInstance, Input } from 'antd';
+import { ColorPicker, Form, FormInstance, Input } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 
 import { IProjectViewModel } from '@/types/project/projectViewModel.types';
diff --git a/worklenz-frontend/src/components/projects/project-drawer/project-category-section/project-category-section.tsx b/worklenz-frontend/src/components/projects/project-drawer/project-category-section/project-category-section.tsx
index 984c9b96..ccf1a647 100644
--- a/worklenz-frontend/src/components/projects/project-drawer/project-category-section/project-category-section.tsx
+++ b/worklenz-frontend/src/components/projects/project-drawer/project-category-section/project-category-section.tsx
@@ -10,7 +10,7 @@ import {
   InputRef,
   Select,
   Typography,
-} from 'antd';
+} from '@/shared/antd-imports';
 import { PlusOutlined } from '@ant-design/icons';
 
 import { useAppDispatch } from '@/hooks/useAppDispatch';
diff --git a/worklenz-frontend/src/components/projects/project-drawer/project-client-section/project-client-section.tsx b/worklenz-frontend/src/components/projects/project-drawer/project-client-section/project-client-section.tsx
index 426f8002..67f8daa9 100644
--- a/worklenz-frontend/src/components/projects/project-drawer/project-client-section/project-client-section.tsx
+++ b/worklenz-frontend/src/components/projects/project-drawer/project-client-section/project-client-section.tsx
@@ -3,7 +3,7 @@ import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { IClientsViewModel } from '@/types/client.types';
 import { IProjectViewModel } from '@/types/project/projectViewModel.types';
 import { QuestionCircleOutlined } from '@ant-design/icons';
-import { AutoComplete, Flex, Form, FormInstance, Spin, Tooltip, Typography } from 'antd';
+import { AutoComplete, Flex, Form, FormInstance, Spin, Tooltip, Typography } from '@/shared/antd-imports';
 import { TFunction } from 'i18next';
 import { useState } from 'react';
 
diff --git a/worklenz-frontend/src/components/projects/project-drawer/project-drawer.tsx b/worklenz-frontend/src/components/projects/project-drawer/project-drawer.tsx
index f6519cb9..2b6ef0c0 100644
--- a/worklenz-frontend/src/components/projects/project-drawer/project-drawer.tsx
+++ b/worklenz-frontend/src/components/projects/project-drawer/project-drawer.tsx
@@ -17,7 +17,7 @@ import {
   Switch,
   Tooltip,
   Typography,
-} from 'antd';
+} from '@/shared/antd-imports';
 import dayjs from 'dayjs';
 
 import { fetchClients } from '@/features/settings/client/clientSlice';
diff --git a/worklenz-frontend/src/components/projects/project-drawer/project-health-section/project-health-section.tsx b/worklenz-frontend/src/components/projects/project-drawer/project-health-section/project-health-section.tsx
index 95e1001e..83f3573a 100644
--- a/worklenz-frontend/src/components/projects/project-drawer/project-health-section/project-health-section.tsx
+++ b/worklenz-frontend/src/components/projects/project-drawer/project-health-section/project-health-section.tsx
@@ -1,5 +1,5 @@
 import { TFunction } from 'i18next';
-import { Badge, Form, FormInstance, Select, Typography } from 'antd';
+import { Badge, Form, FormInstance, Select, Typography } from '@/shared/antd-imports';
 
 import { IProjectHealth } from '@/types/project/projectHealth.types';
 
diff --git a/worklenz-frontend/src/components/projects/project-drawer/project-status-section/project-status-section.tsx b/worklenz-frontend/src/components/projects/project-drawer/project-status-section/project-status-section.tsx
index d8e59933..10d1b12a 100644
--- a/worklenz-frontend/src/components/projects/project-drawer/project-status-section/project-status-section.tsx
+++ b/worklenz-frontend/src/components/projects/project-drawer/project-status-section/project-status-section.tsx
@@ -1,4 +1,4 @@
-import { Form, FormInstance, Select, Typography } from 'antd';
+import { Form, FormInstance, Select, Typography } from '@/shared/antd-imports';
 import { TFunction } from 'i18next';
 
 import { IProjectStatus } from '@/types/project/projectStatus.types';
diff --git a/worklenz-frontend/src/components/projects/project-manager-dropdown/project-manager-dropdown.tsx b/worklenz-frontend/src/components/projects/project-manager-dropdown/project-manager-dropdown.tsx
index dd43960f..8c2ca57b 100644
--- a/worklenz-frontend/src/components/projects/project-manager-dropdown/project-manager-dropdown.tsx
+++ b/worklenz-frontend/src/components/projects/project-manager-dropdown/project-manager-dropdown.tsx
@@ -4,7 +4,7 @@ import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { ITeamMemberViewModel } from '@/types/teamMembers/teamMembersGetResponse.types';
 import { CloseCircleFilled, PlusCircleOutlined } from '@ant-design/icons';
-import { Button, Dropdown, Flex, Input, InputRef, theme, Typography } from 'antd';
+import { Button, Dropdown, Flex, Input, InputRef, theme, Typography } from '@/shared/antd-imports';
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import './project-manager-dropdown.css';
diff --git a/worklenz-frontend/src/components/projects/project-stats-card.tsx b/worklenz-frontend/src/components/projects/project-stats-card.tsx
index 68e539e5..45226ed7 100644
--- a/worklenz-frontend/src/components/projects/project-stats-card.tsx
+++ b/worklenz-frontend/src/components/projects/project-stats-card.tsx
@@ -1,5 +1,5 @@
 import { ReactNode } from 'react';
-import { Card, Flex, Skeleton, Tooltip, Typography } from 'antd';
+import { Card, Flex, Skeleton, Tooltip, Typography } from '@/shared/antd-imports';
 import { ExclamationCircleOutlined } from '@ant-design/icons';
 import { colors } from '@/styles/colors';
 
diff --git a/worklenz-frontend/src/components/reporting/drawers/overview-team-info/members-tab/reporting-overview-members-tab.tsx b/worklenz-frontend/src/components/reporting/drawers/overview-team-info/members-tab/reporting-overview-members-tab.tsx
index 7a98303e..13ae06e0 100644
--- a/worklenz-frontend/src/components/reporting/drawers/overview-team-info/members-tab/reporting-overview-members-tab.tsx
+++ b/worklenz-frontend/src/components/reporting/drawers/overview-team-info/members-tab/reporting-overview-members-tab.tsx
@@ -1,4 +1,4 @@
-import { Flex, Skeleton } from 'antd';
+import { Flex, Skeleton } from '@/shared/antd-imports';
 import React, { useEffect, useMemo, useState } from 'react';
 import CustomSearchbar from '../../../../CustomSearchbar';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/components/reporting/drawers/overview-team-info/members-tab/reporting-overview-members-table.tsx b/worklenz-frontend/src/components/reporting/drawers/overview-team-info/members-tab/reporting-overview-members-table.tsx
index 4318bc04..f3a9f914 100644
--- a/worklenz-frontend/src/components/reporting/drawers/overview-team-info/members-tab/reporting-overview-members-table.tsx
+++ b/worklenz-frontend/src/components/reporting/drawers/overview-team-info/members-tab/reporting-overview-members-table.tsx
@@ -1,5 +1,5 @@
 import React, { memo, useEffect, useMemo, useState } from 'react';
-import { ConfigProvider, Table, TableColumnsType } from 'antd';
+import { ConfigProvider, Table, TableColumnsType } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import CustomTableTitle from '../../../../CustomTableTitle';
diff --git a/worklenz-frontend/src/components/reporting/drawers/overview-team-info/overview-tab/reports-overview-category-graph.tsx b/worklenz-frontend/src/components/reporting/drawers/overview-team-info/overview-tab/reports-overview-category-graph.tsx
index ccb0ff60..96a442cc 100644
--- a/worklenz-frontend/src/components/reporting/drawers/overview-team-info/overview-tab/reports-overview-category-graph.tsx
+++ b/worklenz-frontend/src/components/reporting/drawers/overview-team-info/overview-tab/reports-overview-category-graph.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Doughnut } from 'react-chartjs-2';
 import { Chart, ArcElement, Tooltip, ChartOptions } from 'chart.js';
-import { Badge, Card, Flex, Typography } from 'antd';
+import { Badge, Card, Flex, Typography } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 import { IRPTOverviewTeamChartData } from '@/types/reporting/reporting.types';
 
diff --git a/worklenz-frontend/src/components/reporting/drawers/overview-team-info/overview-tab/reports-overview-project-health-graph.tsx b/worklenz-frontend/src/components/reporting/drawers/overview-team-info/overview-tab/reports-overview-project-health-graph.tsx
index 9ca3b4b6..ce9eb541 100644
--- a/worklenz-frontend/src/components/reporting/drawers/overview-team-info/overview-tab/reports-overview-project-health-graph.tsx
+++ b/worklenz-frontend/src/components/reporting/drawers/overview-team-info/overview-tab/reports-overview-project-health-graph.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Doughnut } from 'react-chartjs-2';
 import { Chart, ArcElement, Tooltip, ChartOptions } from 'chart.js';
-import { Badge, Card, Flex, Typography } from 'antd';
+import { Badge, Card, Flex, Typography } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 import {
   IRPTOverviewTeamByHealth,
diff --git a/worklenz-frontend/src/components/reporting/drawers/overview-team-info/overview-tab/reports-overview-status-graph.tsx b/worklenz-frontend/src/components/reporting/drawers/overview-team-info/overview-tab/reports-overview-status-graph.tsx
index 862945ad..dde25b74 100644
--- a/worklenz-frontend/src/components/reporting/drawers/overview-team-info/overview-tab/reports-overview-status-graph.tsx
+++ b/worklenz-frontend/src/components/reporting/drawers/overview-team-info/overview-tab/reports-overview-status-graph.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Doughnut } from 'react-chartjs-2';
 import { Chart, ArcElement, Tooltip, ChartOptions } from 'chart.js';
-import { Badge, Card, Flex, Typography } from 'antd';
+import { Badge, Card, Flex, Typography } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 import { IRPTOverviewTeamByStatus, IRPTOverviewTeamInfo } from '@/types/reporting/reporting.types';
 import { ALPHA_CHANNEL } from '@/shared/constants';
diff --git a/worklenz-frontend/src/components/reporting/drawers/overview-team-info/overview-team-info-drawer-tabs.tsx b/worklenz-frontend/src/components/reporting/drawers/overview-team-info/overview-team-info-drawer-tabs.tsx
index a285e3cf..60d0ea0a 100644
--- a/worklenz-frontend/src/components/reporting/drawers/overview-team-info/overview-team-info-drawer-tabs.tsx
+++ b/worklenz-frontend/src/components/reporting/drawers/overview-team-info/overview-team-info-drawer-tabs.tsx
@@ -1,4 +1,4 @@
-import { Tabs } from 'antd';
+import { Tabs } from '@/shared/antd-imports';
 import { TabsProps } from 'antd/lib';
 import { useTranslation } from 'react-i18next';
 import OverviewReportsOverviewTab from './overview-tab/reports-overview-tab';
diff --git a/worklenz-frontend/src/components/reporting/drawers/overview-team-info/overview-team-info-drawer.tsx b/worklenz-frontend/src/components/reporting/drawers/overview-team-info/overview-team-info-drawer.tsx
index d838a561..c3eabdca 100644
--- a/worklenz-frontend/src/components/reporting/drawers/overview-team-info/overview-team-info-drawer.tsx
+++ b/worklenz-frontend/src/components/reporting/drawers/overview-team-info/overview-team-info-drawer.tsx
@@ -1,4 +1,4 @@
-import { Drawer, Typography, Flex, Button, Dropdown } from 'antd';
+import { Drawer, Typography, Flex, Button, Dropdown } from '@/shared/antd-imports';
 import React, { useState } from 'react';
 import { useAppSelector } from '../../../../hooks/useAppSelector';
 import { useAppDispatch } from '../../../../hooks/useAppDispatch';
diff --git a/worklenz-frontend/src/components/reporting/drawers/overview-team-info/projects-tab/reporting-overview-projects-tab.tsx b/worklenz-frontend/src/components/reporting/drawers/overview-team-info/projects-tab/reporting-overview-projects-tab.tsx
index 2ea591ed..556649e4 100644
--- a/worklenz-frontend/src/components/reporting/drawers/overview-team-info/projects-tab/reporting-overview-projects-tab.tsx
+++ b/worklenz-frontend/src/components/reporting/drawers/overview-team-info/projects-tab/reporting-overview-projects-tab.tsx
@@ -1,4 +1,4 @@
-import { Flex } from 'antd';
+import { Flex } from '@/shared/antd-imports';
 import { useState } from 'react';
 import CustomSearchbar from '@components/CustomSearchbar';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/components/reporting/drawers/overview-team-info/projects-tab/reporting-overview-projects-table.tsx b/worklenz-frontend/src/components/reporting/drawers/overview-team-info/projects-tab/reporting-overview-projects-table.tsx
index 641ce9e7..c712b0dc 100644
--- a/worklenz-frontend/src/components/reporting/drawers/overview-team-info/projects-tab/reporting-overview-projects-table.tsx
+++ b/worklenz-frontend/src/components/reporting/drawers/overview-team-info/projects-tab/reporting-overview-projects-table.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useState, useMemo } from 'react';
-import { Button, ConfigProvider, Flex, PaginationProps, Table, TableColumnsType } from 'antd';
+import { Button, ConfigProvider, Flex, PaginationProps, Table, TableColumnsType } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 import { createPortal } from 'react-dom';
 import { ExpandAltOutlined } from '@ant-design/icons';
diff --git a/worklenz-frontend/src/components/reporting/time-wise-filter.tsx b/worklenz-frontend/src/components/reporting/time-wise-filter.tsx
index 8819d207..f9e7c72d 100644
--- a/worklenz-frontend/src/components/reporting/time-wise-filter.tsx
+++ b/worklenz-frontend/src/components/reporting/time-wise-filter.tsx
@@ -1,5 +1,5 @@
 import { CaretDownFilled, DownOutlined } from '@ant-design/icons';
-import { Button, Card, DatePicker, Divider, Dropdown, Flex, List, Typography } from 'antd';
+import { Button, Card, DatePicker, Divider, Dropdown, Flex, List, Typography } from '@/shared/antd-imports';
 import { useState, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import dayjs from 'dayjs';
diff --git a/worklenz-frontend/src/components/schedule-old/team/Team.tsx b/worklenz-frontend/src/components/schedule-old/team/Team.tsx
index 75d93d09..4cffd0d3 100644
--- a/worklenz-frontend/src/components/schedule-old/team/Team.tsx
+++ b/worklenz-frontend/src/components/schedule-old/team/Team.tsx
@@ -1,7 +1,7 @@
 import React, { useEffect, useState } from 'react';
 import { AvatarNamesMap } from '@/shared/constants';
 import { Member } from '@/types/schedule/schedule.types';
-import { Avatar, Badge, Button, Col, Flex, Popover, Row, Tooltip } from 'antd';
+import { Avatar, Badge, Button, Col, Flex, Popover, Row, Tooltip } from '@/shared/antd-imports';
 import { CaretDownOutlined, CaretRightFilled } from '@ant-design/icons';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import './Team.css';
diff --git a/worklenz-frontend/src/components/schedule/grant-chart/day-allocation-cell.tsx b/worklenz-frontend/src/components/schedule/grant-chart/day-allocation-cell.tsx
index 1054b569..86ae9d24 100644
--- a/worklenz-frontend/src/components/schedule/grant-chart/day-allocation-cell.tsx
+++ b/worklenz-frontend/src/components/schedule/grant-chart/day-allocation-cell.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Tooltip } from 'antd';
+import { Tooltip } from '@/shared/antd-imports';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { toggleScheduleDrawer } from '../../../features/schedule/scheduleSlice';
 
diff --git a/worklenz-frontend/src/components/schedule/grant-chart/grantt-chart.tsx b/worklenz-frontend/src/components/schedule/grant-chart/grantt-chart.tsx
index a6170c50..790695cc 100644
--- a/worklenz-frontend/src/components/schedule/grant-chart/grantt-chart.tsx
+++ b/worklenz-frontend/src/components/schedule/grant-chart/grantt-chart.tsx
@@ -5,7 +5,7 @@ import { fetchDateList, fetchTeamData } from '../../../features/schedule/schedul
 import { themeWiseColor } from '../../../utils/themeWiseColor';
 import GranttMembersTable from './grantt-members-table';
 import { CELL_WIDTH } from '../../../shared/constants';
-import { Flex, Popover } from 'antd';
+import { Flex, Popover } from '@/shared/antd-imports';
 import DayAllocationCell from './day-allocation-cell';
 import ProjectTimelineBar from './project-timeline-bar';
 import ProjectTimelineModal from '@/features/schedule/ProjectTimelineModal';
diff --git a/worklenz-frontend/src/components/schedule/grant-chart/grantt-members-table.tsx b/worklenz-frontend/src/components/schedule/grant-chart/grantt-members-table.tsx
index 6a402b88..8882decc 100644
--- a/worklenz-frontend/src/components/schedule/grant-chart/grantt-members-table.tsx
+++ b/worklenz-frontend/src/components/schedule/grant-chart/grantt-members-table.tsx
@@ -1,4 +1,4 @@
-import { Badge, Button, Flex, Tooltip } from 'antd';
+import { Badge, Button, Flex, Tooltip } from '@/shared/antd-imports';
 import React, { useCallback } from 'react';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import CustomAvatar from '../../CustomAvatar';
diff --git a/worklenz-frontend/src/components/schedule/grant-chart/project-timeline-bar.tsx b/worklenz-frontend/src/components/schedule/grant-chart/project-timeline-bar.tsx
index f51e2556..57331b97 100644
--- a/worklenz-frontend/src/components/schedule/grant-chart/project-timeline-bar.tsx
+++ b/worklenz-frontend/src/components/schedule/grant-chart/project-timeline-bar.tsx
@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { Flex, Popover, Typography } from 'antd';
+import { Flex, Popover, Typography } from '@/shared/antd-imports';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { useTranslation } from 'react-i18next';
 import { useAppSelector } from '@/hooks/useAppSelector';
diff --git a/worklenz-frontend/src/components/schedule/grant-chart/timeline.tsx b/worklenz-frontend/src/components/schedule/grant-chart/timeline.tsx
index c68c9d4a..f458f932 100644
--- a/worklenz-frontend/src/components/schedule/grant-chart/timeline.tsx
+++ b/worklenz-frontend/src/components/schedule/grant-chart/timeline.tsx
@@ -1,5 +1,5 @@
 import React, { useMemo, useState } from 'react';
-import { Flex, Typography } from 'antd';
+import { Flex, Typography } from '@/shared/antd-imports';
 import { Member } from '../../../types/schedule/schedule.types';
 import DayAllocationCell from './day-allocation-cell';
 import { CELL_WIDTH } from '../../../shared/constants';
diff --git a/worklenz-frontend/src/components/service-worker-status/ServiceWorkerStatus.tsx b/worklenz-frontend/src/components/service-worker-status/ServiceWorkerStatus.tsx
index 90c7f589..d5f20839 100644
--- a/worklenz-frontend/src/components/service-worker-status/ServiceWorkerStatus.tsx
+++ b/worklenz-frontend/src/components/service-worker-status/ServiceWorkerStatus.tsx
@@ -2,7 +2,7 @@
 // Shows offline status and provides cache management controls
 
 import React from 'react';
-import { Badge, Button, Space, Tooltip, message } from 'antd';
+import { Badge, Button, Space, Tooltip, message } from '@/shared/antd-imports';
 import { WifiOutlined, DisconnectOutlined, ReloadOutlined, DeleteOutlined } from '@ant-design/icons';
 import { useServiceWorker } from '../../utils/serviceWorkerRegistration';
 
diff --git a/worklenz-frontend/src/components/settings/edit-team-name-modal.tsx b/worklenz-frontend/src/components/settings/edit-team-name-modal.tsx
index 243a6146..fa4c8d9e 100644
--- a/worklenz-frontend/src/components/settings/edit-team-name-modal.tsx
+++ b/worklenz-frontend/src/components/settings/edit-team-name-modal.tsx
@@ -1,4 +1,4 @@
-import { Divider, Form, Input, message, Modal, Typography } from 'antd';
+import { Divider, Form, Input, message, Modal, Typography } from '@/shared/antd-imports';
 import { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
diff --git a/worklenz-frontend/src/components/settings/update-member-drawer.tsx b/worklenz-frontend/src/components/settings/update-member-drawer.tsx
index 1af06fcc..5be63897 100644
--- a/worklenz-frontend/src/components/settings/update-member-drawer.tsx
+++ b/worklenz-frontend/src/components/settings/update-member-drawer.tsx
@@ -11,7 +11,7 @@ import {
   Spin,
   Tooltip,
   Typography,
-} from 'antd';
+} from '@/shared/antd-imports';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useAuthService } from '@/hooks/useAuth';
diff --git a/worklenz-frontend/src/components/suspense-fallback/suspense-fallback.tsx b/worklenz-frontend/src/components/suspense-fallback/suspense-fallback.tsx
index 377ba150..98077c97 100644
--- a/worklenz-frontend/src/components/suspense-fallback/suspense-fallback.tsx
+++ b/worklenz-frontend/src/components/suspense-fallback/suspense-fallback.tsx
@@ -1,5 +1,5 @@
 import React, { memo } from 'react';
-import { Skeleton } from 'antd';
+import { Skeleton } from '@/shared/antd-imports';
 
 // Lightweight loading component with skeleton animation
 export const SuspenseFallback = memo(() => {
diff --git a/worklenz-frontend/src/components/task-drawer/shared/activity-log/task-drawer-activity-log.tsx b/worklenz-frontend/src/components/task-drawer/shared/activity-log/task-drawer-activity-log.tsx
index 7b23a596..d0d1a7c3 100644
--- a/worklenz-frontend/src/components/task-drawer/shared/activity-log/task-drawer-activity-log.tsx
+++ b/worklenz-frontend/src/components/task-drawer/shared/activity-log/task-drawer-activity-log.tsx
@@ -1,4 +1,4 @@
-import { Timeline, Typography, Flex, ConfigProvider, Tag, Tooltip, Skeleton } from 'antd';
+import { Timeline, Typography, Flex, ConfigProvider, Tag, Tooltip, Skeleton } from '@/shared/antd-imports';
 import { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { ArrowRightOutlined } from '@ant-design/icons';
diff --git a/worklenz-frontend/src/components/task-drawer/shared/info-tab/attachments/attachments-grid.tsx b/worklenz-frontend/src/components/task-drawer/shared/info-tab/attachments/attachments-grid.tsx
index 7145a556..bc5d30fc 100644
--- a/worklenz-frontend/src/components/task-drawer/shared/info-tab/attachments/attachments-grid.tsx
+++ b/worklenz-frontend/src/components/task-drawer/shared/info-tab/attachments/attachments-grid.tsx
@@ -4,7 +4,7 @@ import './attachments-preview.css';
 import type { RcFile, UploadProps } from 'antd/es/upload';
 import { TFunction } from 'i18next';
 import { ReloadOutlined } from '@ant-design/icons';
-import { message } from 'antd';
+import { message } from '@/shared/antd-imports';
 import AttachmentsUpload from './attachments-upload';
 
 interface AttachmentsGridProps {
diff --git a/worklenz-frontend/src/components/task-drawer/shared/info-tab/attachments/attachments-preview.tsx b/worklenz-frontend/src/components/task-drawer/shared/info-tab/attachments/attachments-preview.tsx
index ad9b8aba..6ca6bfb5 100644
--- a/worklenz-frontend/src/components/task-drawer/shared/info-tab/attachments/attachments-preview.tsx
+++ b/worklenz-frontend/src/components/task-drawer/shared/info-tab/attachments/attachments-preview.tsx
@@ -1,6 +1,6 @@
 import { useState } from 'react';
 import { ITaskAttachmentViewModel } from '@/types/tasks/task-attachment-view-model';
-import { Button, Modal, Spin, Tooltip, Typography, Popconfirm, message } from 'antd';
+import { Button, Modal, Spin, Tooltip, Typography, Popconfirm, message } from '@/shared/antd-imports';
 import {
   EyeOutlined,
   DownloadOutlined,
diff --git a/worklenz-frontend/src/components/task-drawer/shared/info-tab/comments/task-comments.tsx b/worklenz-frontend/src/components/task-drawer/shared/info-tab/comments/task-comments.tsx
index 95e636fc..2da440e7 100644
--- a/worklenz-frontend/src/components/task-drawer/shared/info-tab/comments/task-comments.tsx
+++ b/worklenz-frontend/src/components/task-drawer/shared/info-tab/comments/task-comments.tsx
@@ -1,5 +1,5 @@
 import { useState, useEffect, useRef, useCallback } from 'react';
-import { Skeleton, Avatar, Tooltip, Popconfirm } from 'antd';
+import { Skeleton, Avatar, Tooltip, Popconfirm } from '@/shared/antd-imports';
 import { Comment } from '@ant-design/compatible';
 import dayjs from 'dayjs';
 
diff --git a/worklenz-frontend/src/components/task-drawer/shared/info-tab/comments/task-view-comment-edit.tsx b/worklenz-frontend/src/components/task-drawer/shared/info-tab/comments/task-view-comment-edit.tsx
index e215ad99..1c4348f6 100644
--- a/worklenz-frontend/src/components/task-drawer/shared/info-tab/comments/task-view-comment-edit.tsx
+++ b/worklenz-frontend/src/components/task-drawer/shared/info-tab/comments/task-view-comment-edit.tsx
@@ -1,5 +1,5 @@
 import { useState, useEffect } from 'react';
-import { Button, Form, Input, Space } from 'antd';
+import { Button, Form, Input, Space } from '@/shared/antd-imports';
 import { ITaskCommentViewModel } from '@/types/tasks/task-comments.types';
 import taskCommentsApiService from '@/api/tasks/task-comments.api.service';
 import logger from '@/utils/errorLogger';
diff --git a/worklenz-frontend/src/components/task-drawer/shared/info-tab/dependencies-table.tsx b/worklenz-frontend/src/components/task-drawer/shared/info-tab/dependencies-table.tsx
index 28568a38..14028a1b 100644
--- a/worklenz-frontend/src/components/task-drawer/shared/info-tab/dependencies-table.tsx
+++ b/worklenz-frontend/src/components/task-drawer/shared/info-tab/dependencies-table.tsx
@@ -10,7 +10,7 @@ import {
   TableProps,
   Tag,
   Typography,
-} from 'antd';
+} from '@/shared/antd-imports';
 import React, { useState, useEffect } from 'react';
 import { DeleteOutlined, ExclamationCircleFilled } from '@ant-design/icons';
 import { useAppSelector } from '@/hooks/useAppSelector';
diff --git a/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-due-date/task-drawer-due-date.tsx b/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-due-date/task-drawer-due-date.tsx
index b6a03690..0c8325b7 100644
--- a/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-due-date/task-drawer-due-date.tsx
+++ b/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-due-date/task-drawer-due-date.tsx
@@ -1,5 +1,5 @@
 import { useState } from 'react';
-import { Flex, DatePicker, Typography, Button, Form, FormInstance } from 'antd';
+import { Flex, DatePicker, Typography, Button, Form, FormInstance } from '@/shared/antd-imports';
 import { t, TFunction } from 'i18next';
 import dayjs, { Dayjs } from 'dayjs';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-estimation/task-drawer-estimation.tsx b/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-estimation/task-drawer-estimation.tsx
index ed204673..37bc6f55 100644
--- a/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-estimation/task-drawer-estimation.tsx
+++ b/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-estimation/task-drawer-estimation.tsx
@@ -2,7 +2,7 @@ import { SocketEvents } from '@/shared/socket-events';
 import { useSocket } from '@/socket/socketContext';
 import { colors } from '@/styles/colors';
 import { ITaskViewModel } from '@/types/tasks/task.types';
-import { Flex, Form, FormInstance, InputNumber, Typography } from 'antd';
+import { Flex, Form, FormInstance, InputNumber, Typography } from '@/shared/antd-imports';
 import { TFunction } from 'i18next';
 import { useState } from 'react';
 
diff --git a/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-key/task-drawer-key.tsx b/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-key/task-drawer-key.tsx
index 659f39b9..d884c832 100644
--- a/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-key/task-drawer-key.tsx
+++ b/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-key/task-drawer-key.tsx
@@ -1,7 +1,7 @@
 import { ITaskFormViewModel } from '@/types/tasks/task.types';
-import { Tag } from 'antd';
+import { Tag } from '@/shared/antd-imports';
 
-import { Form } from 'antd';
+import { Form } from '@/shared/antd-imports';
 
 interface TaskDrawerKeyProps {
   taskKey: string;
diff --git a/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-labels/task-drawer-labels.tsx b/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-labels/task-drawer-labels.tsx
index 55f957b3..f93e8236 100644
--- a/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-labels/task-drawer-labels.tsx
+++ b/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-labels/task-drawer-labels.tsx
@@ -12,7 +12,7 @@ import {
   List,
   Tag,
   Typography,
-} from 'antd';
+} from '@/shared/antd-imports';
 import { useEffect, useMemo, useRef, useState } from 'react';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { colors } from '@/styles/colors';
diff --git a/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-phase-selector/task-drawer-phase-selector.tsx b/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-phase-selector/task-drawer-phase-selector.tsx
index e7504761..2588d078 100644
--- a/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-phase-selector/task-drawer-phase-selector.tsx
+++ b/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-phase-selector/task-drawer-phase-selector.tsx
@@ -1,8 +1,8 @@
 import { useSocket } from '@/socket/socketContext';
 import { ITaskPhase } from '@/types/tasks/taskPhase.types';
-import { Select } from 'antd';
+import { Select } from '@/shared/antd-imports';
 
-import { Form } from 'antd';
+import { Form } from '@/shared/antd-imports';
 import { SocketEvents } from '@/shared/socket-events';
 import { ITaskViewModel } from '@/types/tasks/task.types';
 
diff --git a/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-priority-selector/task-drawer-priority-selector.tsx b/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-priority-selector/task-drawer-priority-selector.tsx
index 6436dfd9..e2b71e49 100644
--- a/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-priority-selector/task-drawer-priority-selector.tsx
+++ b/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-priority-selector/task-drawer-priority-selector.tsx
@@ -1,4 +1,4 @@
-import { Flex, Select, Typography } from 'antd';
+import { Flex, Select, Typography } from '@/shared/antd-imports';
 import './priority-dropdown.css';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useState, useEffect, useMemo } from 'react';
diff --git a/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-progress/task-drawer-progress.tsx b/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-progress/task-drawer-progress.tsx
index c8600ed9..dc157fa1 100644
--- a/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-progress/task-drawer-progress.tsx
+++ b/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-progress/task-drawer-progress.tsx
@@ -1,4 +1,4 @@
-import { Form, InputNumber, Tooltip, Modal } from 'antd';
+import { Form, InputNumber, Tooltip, Modal } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 import { QuestionCircleOutlined } from '@ant-design/icons';
 import { useAppSelector } from '@/hooks/useAppSelector';
diff --git a/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-recurring-config/task-drawer-recurring-config.tsx b/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-recurring-config/task-drawer-recurring-config.tsx
index 1d12c480..f1568f21 100644
--- a/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-recurring-config/task-drawer-recurring-config.tsx
+++ b/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-recurring-config/task-drawer-recurring-config.tsx
@@ -11,7 +11,7 @@ import {
   Skeleton,
   Row,
   Col,
-} from 'antd';
+} from '@/shared/antd-imports';
 import { SettingOutlined } from '@ant-design/icons';
 import { useSocket } from '@/socket/socketContext';
 import { SocketEvents } from '@/shared/socket-events';
diff --git a/worklenz-frontend/src/components/task-drawer/shared/info-tab/info-tab-footer.tsx b/worklenz-frontend/src/components/task-drawer/shared/info-tab/info-tab-footer.tsx
index 0bfabd28..b4abacc2 100644
--- a/worklenz-frontend/src/components/task-drawer/shared/info-tab/info-tab-footer.tsx
+++ b/worklenz-frontend/src/components/task-drawer/shared/info-tab/info-tab-footer.tsx
@@ -1,4 +1,4 @@
-import { Button, Flex, Form, Mentions, Space, Tooltip, Typography, message } from 'antd';
+import { Button, Flex, Form, Mentions, Space, Tooltip, Typography, message } from '@/shared/antd-imports';
 import { useCallback, useEffect, useRef, useState, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { PaperClipOutlined, DeleteOutlined, PlusOutlined } from '@ant-design/icons';
diff --git a/worklenz-frontend/src/components/task-drawer/shared/info-tab/notify-member-selector.tsx b/worklenz-frontend/src/components/task-drawer/shared/info-tab/notify-member-selector.tsx
index cde137d9..cf6e0deb 100644
--- a/worklenz-frontend/src/components/task-drawer/shared/info-tab/notify-member-selector.tsx
+++ b/worklenz-frontend/src/components/task-drawer/shared/info-tab/notify-member-selector.tsx
@@ -10,7 +10,7 @@ import {
   InputRef,
   List,
   Typography,
-} from 'antd';
+} from '@/shared/antd-imports';
 import { useEffect, useMemo, useRef, useState } from 'react';
 import { TFunction } from 'i18next';
 
diff --git a/worklenz-frontend/src/components/task-drawer/shared/info-tab/subtask-table.tsx b/worklenz-frontend/src/components/task-drawer/shared/info-tab/subtask-table.tsx
index d8ca806b..2ed6015c 100644
--- a/worklenz-frontend/src/components/task-drawer/shared/info-tab/subtask-table.tsx
+++ b/worklenz-frontend/src/components/task-drawer/shared/info-tab/subtask-table.tsx
@@ -1,4 +1,4 @@
-import { Button, Flex, Input, Popconfirm, Progress, Table, Tag, Tooltip } from 'antd';
+import { Button, Flex, Input, Popconfirm, Progress, Table, Tag, Tooltip } from '@/shared/antd-imports';
 import { useState, useMemo, useEffect } from 'react';
 import { DeleteOutlined, EditOutlined, ExclamationCircleFilled } from '@ant-design/icons';
 import { nanoid } from '@reduxjs/toolkit';
diff --git a/worklenz-frontend/src/components/task-drawer/shared/info-tab/task-details-form.tsx b/worklenz-frontend/src/components/task-drawer/shared/info-tab/task-details-form.tsx
index 23dac128..8e960674 100644
--- a/worklenz-frontend/src/components/task-drawer/shared/info-tab/task-details-form.tsx
+++ b/worklenz-frontend/src/components/task-drawer/shared/info-tab/task-details-form.tsx
@@ -9,7 +9,7 @@ import {
   Button,
   ConfigProvider,
   Flex,
-} from 'antd';
+} from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 import { colors } from '@/styles/colors';
 import { ITaskFormViewModel, ITaskViewModel } from '@/types/tasks/task.types';
diff --git a/worklenz-frontend/src/components/task-drawer/shared/info-tab/task-drawer-info-tab.tsx b/worklenz-frontend/src/components/task-drawer/shared/info-tab/task-drawer-info-tab.tsx
index e90c9cce..d99da5e9 100644
--- a/worklenz-frontend/src/components/task-drawer/shared/info-tab/task-drawer-info-tab.tsx
+++ b/worklenz-frontend/src/components/task-drawer/shared/info-tab/task-drawer-info-tab.tsx
@@ -1,4 +1,4 @@
-import { Button, Collapse, CollapseProps, Flex, Skeleton, Tooltip, Typography, Upload } from 'antd';
+import { Button, Collapse, CollapseProps, Flex, Skeleton, Tooltip, Typography, Upload } from '@/shared/antd-imports';
 import React, { useEffect, useState, useRef } from 'react';
 import { ReloadOutlined } from '@ant-design/icons';
 import DescriptionEditor from './description-editor';
diff --git a/worklenz-frontend/src/components/task-drawer/shared/time-log/TaskDrawerTimeLog.tsx b/worklenz-frontend/src/components/task-drawer/shared/time-log/TaskDrawerTimeLog.tsx
index 02e073d8..d8c49a45 100644
--- a/worklenz-frontend/src/components/task-drawer/shared/time-log/TaskDrawerTimeLog.tsx
+++ b/worklenz-frontend/src/components/task-drawer/shared/time-log/TaskDrawerTimeLog.tsx
@@ -1,5 +1,5 @@
 import { DownloadOutlined, PlusOutlined } from '@ant-design/icons';
-import { Button, Divider, Flex, Skeleton, Typography } from 'antd';
+import { Button, Divider, Flex, Skeleton, Typography } from '@/shared/antd-imports';
 import { useEffect, useState } from 'react';
 
 import EmptyListPlaceholder from '@/components/EmptyListPlaceholder';
diff --git a/worklenz-frontend/src/components/task-drawer/shared/time-log/task-drawer-time-log.tsx b/worklenz-frontend/src/components/task-drawer/shared/time-log/task-drawer-time-log.tsx
index 97daf8b5..1bb388cc 100644
--- a/worklenz-frontend/src/components/task-drawer/shared/time-log/task-drawer-time-log.tsx
+++ b/worklenz-frontend/src/components/task-drawer/shared/time-log/task-drawer-time-log.tsx
@@ -1,5 +1,5 @@
 import { DownloadOutlined, PlayCircleFilled, PlusOutlined } from '@ant-design/icons';
-import { Button, Divider, Flex, Skeleton, Typography } from 'antd';
+import { Button, Divider, Flex, Skeleton, Typography } from '@/shared/antd-imports';
 import { useEffect, useState, useCallback } from 'react';
 import { TFunction } from 'i18next';
 
diff --git a/worklenz-frontend/src/components/task-drawer/shared/time-log/time-log-form.tsx b/worklenz-frontend/src/components/task-drawer/shared/time-log/time-log-form.tsx
index 91463e6b..4bda050c 100644
--- a/worklenz-frontend/src/components/task-drawer/shared/time-log/time-log-form.tsx
+++ b/worklenz-frontend/src/components/task-drawer/shared/time-log/time-log-form.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Button, DatePicker, Form, Input, TimePicker, Flex } from 'antd';
+import { Button, DatePicker, Form, Input, TimePicker, Flex } from '@/shared/antd-imports';
 import { ClockCircleOutlined } from '@ant-design/icons';
 import { useTranslation } from 'react-i18next';
 import dayjs from 'dayjs';
diff --git a/worklenz-frontend/src/components/task-drawer/shared/time-log/time-log-item.tsx b/worklenz-frontend/src/components/task-drawer/shared/time-log/time-log-item.tsx
index a7d88fe6..8e1fcbe9 100644
--- a/worklenz-frontend/src/components/task-drawer/shared/time-log/time-log-item.tsx
+++ b/worklenz-frontend/src/components/task-drawer/shared/time-log/time-log-item.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Button, Divider, Flex, Popconfirm, Typography, Space } from 'antd';
+import { Button, Divider, Flex, Popconfirm, Typography, Space } from '@/shared/antd-imports';
 import { colors } from '@/styles/colors';
 import { ITaskLogViewModel } from '@/types/tasks/task-log-view.types';
 import SingleAvatar from '@/components/common/single-avatar/single-avatar';
diff --git a/worklenz-frontend/src/components/task-drawer/shared/time-log/time-log-list.tsx b/worklenz-frontend/src/components/task-drawer/shared/time-log/time-log-list.tsx
index 192d6990..05ff540a 100644
--- a/worklenz-frontend/src/components/task-drawer/shared/time-log/time-log-list.tsx
+++ b/worklenz-frontend/src/components/task-drawer/shared/time-log/time-log-list.tsx
@@ -1,4 +1,4 @@
-import { Flex } from 'antd';
+import { Flex } from '@/shared/antd-imports';
 import React, { useState } from 'react';
 import TimeLogItem from './time-log-item';
 import { ITaskLogViewModel } from '@/types/tasks/task-log-view.types';
diff --git a/worklenz-frontend/src/components/task-drawer/task-drawer-header/task-drawer-header.tsx b/worklenz-frontend/src/components/task-drawer/task-drawer-header/task-drawer-header.tsx
index 40de65e8..e5937e6e 100644
--- a/worklenz-frontend/src/components/task-drawer/task-drawer-header/task-drawer-header.tsx
+++ b/worklenz-frontend/src/components/task-drawer/task-drawer-header/task-drawer-header.tsx
@@ -1,4 +1,4 @@
-import { Button, Dropdown, Flex, Input, InputRef, MenuProps, Tooltip } from 'antd';
+import { Button, Dropdown, Flex, Input, InputRef, MenuProps, Tooltip } from '@/shared/antd-imports';
 import React, { ChangeEvent, useEffect, useRef, useState } from 'react';
 import { EllipsisOutlined } from '@ant-design/icons';
 import { TFunction } from 'i18next';
diff --git a/worklenz-frontend/src/components/task-drawer/task-drawer-status-dropdown/task-drawer-status-dropdown.tsx b/worklenz-frontend/src/components/task-drawer/task-drawer-status-dropdown/task-drawer-status-dropdown.tsx
index a7460e0a..e965d6a3 100644
--- a/worklenz-frontend/src/components/task-drawer/task-drawer-status-dropdown/task-drawer-status-dropdown.tsx
+++ b/worklenz-frontend/src/components/task-drawer/task-drawer-status-dropdown/task-drawer-status-dropdown.tsx
@@ -11,7 +11,7 @@ import { ITaskListStatusChangeResponse } from '@/types/tasks/task-list-status.ty
 import { ITaskViewModel } from '@/types/tasks/task.types';
 import { ITaskStatus } from '@/types/tasks/taskStatus.types';
 import { checkTaskDependencyStatus } from '@/utils/check-task-dependency-status';
-import { Select } from 'antd';
+import { Select } from '@/shared/antd-imports';
 import { useMemo } from 'react';
 import { updateEnhancedKanbanTaskStatus } from '@/features/enhanced-kanban/enhanced-kanban.slice';
 
diff --git a/worklenz-frontend/src/components/task-drawer/task-drawer.tsx b/worklenz-frontend/src/components/task-drawer/task-drawer.tsx
index de80fb4f..8f6bf924 100644
--- a/worklenz-frontend/src/components/task-drawer/task-drawer.tsx
+++ b/worklenz-frontend/src/components/task-drawer/task-drawer.tsx
@@ -1,4 +1,4 @@
-import { TabsProps, Tabs, Button } from 'antd';
+import { TabsProps, Tabs, Button } from '@/shared/antd-imports';
 import Drawer from 'antd/es/drawer';
 import { InputRef } from 'antd/es/input';
 import { useTranslation } from 'react-i18next';
@@ -25,7 +25,7 @@ import TimeLogForm from './shared/time-log/time-log-form';
 import { DEFAULT_TASK_NAME } from '@/shared/constants';
 import useTaskDrawerUrlSync from '@/hooks/useTaskDrawerUrlSync';
 import InfoTabFooter from './shared/info-tab/info-tab-footer';
-import { Flex } from 'antd';
+import { Flex } from '@/shared/antd-imports';
 
 const TaskDrawer = () => {
   const { t } = useTranslation('task-drawer/task-drawer');
diff --git a/worklenz-frontend/src/components/task-drawer/task-hierarchy-breadcrumb/task-hierarchy-breadcrumb.tsx b/worklenz-frontend/src/components/task-drawer/task-hierarchy-breadcrumb/task-hierarchy-breadcrumb.tsx
index 792b4347..c77afc71 100644
--- a/worklenz-frontend/src/components/task-drawer/task-hierarchy-breadcrumb/task-hierarchy-breadcrumb.tsx
+++ b/worklenz-frontend/src/components/task-drawer/task-hierarchy-breadcrumb/task-hierarchy-breadcrumb.tsx
@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Breadcrumb, Button, Typography, Tooltip } from 'antd';
+import { Breadcrumb, Button, Typography, Tooltip } from '@/shared/antd-imports';
 import { HomeOutlined } from '@ant-design/icons';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
diff --git a/worklenz-frontend/src/components/task-list-common/assigneeSelector/AssigneeSelector.tsx b/worklenz-frontend/src/components/task-list-common/assigneeSelector/AssigneeSelector.tsx
index 256e7eb6..9e53b949 100644
--- a/worklenz-frontend/src/components/task-list-common/assigneeSelector/AssigneeSelector.tsx
+++ b/worklenz-frontend/src/components/task-list-common/assigneeSelector/AssigneeSelector.tsx
@@ -11,7 +11,7 @@ import {
   InputRef,
   List,
   Typography,
-} from 'antd';
+} from '@/shared/antd-imports';
 import React, { useMemo, useRef, useState } from 'react';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
diff --git a/worklenz-frontend/src/components/task-list-common/labelsSelector/color-changed-label.tsx b/worklenz-frontend/src/components/task-list-common/labelsSelector/color-changed-label.tsx
index f76e9d8d..ce708d81 100644
--- a/worklenz-frontend/src/components/task-list-common/labelsSelector/color-changed-label.tsx
+++ b/worklenz-frontend/src/components/task-list-common/labelsSelector/color-changed-label.tsx
@@ -1,4 +1,4 @@
-import { Select, Tag, Tooltip } from 'antd';
+import { Select, Tag, Tooltip } from '@/shared/antd-imports';
 import { PhaseColorCodes } from '../../../shared/constants';
 import { useTranslation } from 'react-i18next';
 import { ITaskLabel } from '@/types/tasks/taskLabel.types';
diff --git a/worklenz-frontend/src/components/task-list-common/labelsSelector/custom-color-label.tsx b/worklenz-frontend/src/components/task-list-common/labelsSelector/custom-color-label.tsx
index 29f582dc..aff1f4c4 100644
--- a/worklenz-frontend/src/components/task-list-common/labelsSelector/custom-color-label.tsx
+++ b/worklenz-frontend/src/components/task-list-common/labelsSelector/custom-color-label.tsx
@@ -1,4 +1,4 @@
-import { Tag, Typography } from 'antd';
+import { Tag, Typography } from '@/shared/antd-imports';
 import { colors } from '@/styles/colors';
 import { ITaskLabel } from '@/types/tasks/taskLabel.types';
 import { ALPHA_CHANNEL } from '@/shared/constants';
diff --git a/worklenz-frontend/src/components/task-list-common/labelsSelector/custom-number-label.tsx b/worklenz-frontend/src/components/task-list-common/labelsSelector/custom-number-label.tsx
index 9e8505af..d354ca72 100644
--- a/worklenz-frontend/src/components/task-list-common/labelsSelector/custom-number-label.tsx
+++ b/worklenz-frontend/src/components/task-list-common/labelsSelector/custom-number-label.tsx
@@ -1,4 +1,4 @@
-import { Tag, Tooltip } from 'antd';
+import { Tag, Tooltip } from '@/shared/antd-imports';
 import { ITaskLabel } from '@/types/tasks/taskLabel.types';
 
 const CustomNumberLabel = ({ labelList }: { labelList: ITaskLabel[] | null }) => {
diff --git a/worklenz-frontend/src/components/task-list-common/labelsSelector/labels-selector.tsx b/worklenz-frontend/src/components/task-list-common/labelsSelector/labels-selector.tsx
index 554236b5..49235697 100644
--- a/worklenz-frontend/src/components/task-list-common/labelsSelector/labels-selector.tsx
+++ b/worklenz-frontend/src/components/task-list-common/labelsSelector/labels-selector.tsx
@@ -12,7 +12,7 @@ import {
   InputRef,
   List,
   Typography,
-} from 'antd';
+} from '@/shared/antd-imports';
 import React, { useMemo, useRef, useState } from 'react';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { colors } from '@/styles/colors';
diff --git a/worklenz-frontend/src/components/task-list-common/phaseDropdown/PhaseDropdown.tsx b/worklenz-frontend/src/components/task-list-common/phaseDropdown/PhaseDropdown.tsx
index 468f2e24..100e1ffc 100644
--- a/worklenz-frontend/src/components/task-list-common/phaseDropdown/PhaseDropdown.tsx
+++ b/worklenz-frontend/src/components/task-list-common/phaseDropdown/PhaseDropdown.tsx
@@ -1,4 +1,4 @@
-import { Badge, Flex, Select, Typography } from 'antd';
+import { Badge, Flex, Select, Typography } from '@/shared/antd-imports';
 import React, { useState } from 'react';
 // custom css file
 import './phaseDropdown.css';
diff --git a/worklenz-frontend/src/components/task-list-common/priorityDropdown/priority-dropdown.tsx b/worklenz-frontend/src/components/task-list-common/priorityDropdown/priority-dropdown.tsx
index 7e7ee9c7..16460876 100644
--- a/worklenz-frontend/src/components/task-list-common/priorityDropdown/priority-dropdown.tsx
+++ b/worklenz-frontend/src/components/task-list-common/priorityDropdown/priority-dropdown.tsx
@@ -1,4 +1,4 @@
-import { Flex, Select, Typography } from 'antd';
+import { Flex, Select, Typography } from '@/shared/antd-imports';
 import './priority-dropdown.css';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useState, useEffect, useMemo } from 'react';
diff --git a/worklenz-frontend/src/components/task-list-common/status-dropdown/status-dropdown.tsx b/worklenz-frontend/src/components/task-list-common/status-dropdown/status-dropdown.tsx
index 09f27c8b..92a38e9d 100644
--- a/worklenz-frontend/src/components/task-list-common/status-dropdown/status-dropdown.tsx
+++ b/worklenz-frontend/src/components/task-list-common/status-dropdown/status-dropdown.tsx
@@ -1,4 +1,4 @@
-import { Flex, Select } from 'antd';
+import { Flex, Select } from '@/shared/antd-imports';
 import './status-dropdown.css';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useMemo } from 'react';
diff --git a/worklenz-frontend/src/components/task-list-common/task-row/task-list-due-time-cell/task-row-due-time.tsx b/worklenz-frontend/src/components/task-list-common/task-row/task-list-due-time-cell/task-row-due-time.tsx
index 3cdb9a45..7898cf20 100644
--- a/worklenz-frontend/src/components/task-list-common/task-row/task-list-due-time-cell/task-row-due-time.tsx
+++ b/worklenz-frontend/src/components/task-list-common/task-row/task-list-due-time-cell/task-row-due-time.tsx
@@ -1,4 +1,4 @@
-import { TimePicker, TimePickerProps } from 'antd';
+import { TimePicker, TimePickerProps } from '@/shared/antd-imports';
 
 type TaskRowDueTimeProps = {
   dueTime: string;
diff --git a/worklenz-frontend/src/components/task-list-common/task-row/task-row-description/task-row-description.tsx b/worklenz-frontend/src/components/task-list-common/task-row/task-row-description/task-row-description.tsx
index 3deffddc..e90ff63e 100644
--- a/worklenz-frontend/src/components/task-list-common/task-row/task-row-description/task-row-description.tsx
+++ b/worklenz-frontend/src/components/task-list-common/task-row/task-row-description/task-row-description.tsx
@@ -1,4 +1,4 @@
-import { Typography } from 'antd';
+import { Typography } from '@/shared/antd-imports';
 
 const TaskRowDescription = ({ description }: { description: string }) => {
   return (
diff --git a/worklenz-frontend/src/components/task-list-common/task-row/task-row-name/task-row-name.tsx b/worklenz-frontend/src/components/task-list-common/task-row/task-row-name/task-row-name.tsx
index 11ee8514..373a1410 100644
--- a/worklenz-frontend/src/components/task-list-common/task-row/task-row-name/task-row-name.tsx
+++ b/worklenz-frontend/src/components/task-list-common/task-row/task-row-name/task-row-name.tsx
@@ -1,6 +1,6 @@
 // TaskNameCell.tsx
 import React, { useCallback } from 'react';
-import { Flex, Typography, Button } from 'antd';
+import { Flex, Typography, Button } from '@/shared/antd-imports';
 import {
   DoubleRightOutlined,
   DownOutlined,
diff --git a/worklenz-frontend/src/components/task-list-common/task-row/task-row-progress/task-row-progress.tsx b/worklenz-frontend/src/components/task-list-common/task-row/task-row-progress/task-row-progress.tsx
index 6bfaa7fb..564d0c23 100644
--- a/worklenz-frontend/src/components/task-list-common/task-row/task-row-progress/task-row-progress.tsx
+++ b/worklenz-frontend/src/components/task-list-common/task-row/task-row-progress/task-row-progress.tsx
@@ -1,4 +1,4 @@
-import { Progress, Tooltip } from 'antd';
+import { Progress, Tooltip } from '@/shared/antd-imports';
 import './task-row-progress.css';
 import React from 'react';
 
diff --git a/worklenz-frontend/src/components/task-list-common/task-row/task-row-time-tracking/task-row-time-tracking.tsx b/worklenz-frontend/src/components/task-list-common/task-row/task-row-time-tracking/task-row-time-tracking.tsx
index 2d4f7395..f7f6cdb3 100644
--- a/worklenz-frontend/src/components/task-list-common/task-row/task-row-time-tracking/task-row-time-tracking.tsx
+++ b/worklenz-frontend/src/components/task-list-common/task-row/task-row-time-tracking/task-row-time-tracking.tsx
@@ -1,5 +1,5 @@
 import React, { useMemo } from 'react';
-import { Divider, Empty, Flex, Popover, Typography } from 'antd';
+import { Divider, Empty, Flex, Popover, Typography } from '@/shared/antd-imports';
 import { PlayCircleFilled } from '@ant-design/icons';
 import { colors } from '@/styles/colors';
 import CustomAvatar from '@components/CustomAvatar';
diff --git a/worklenz-frontend/src/components/task-list-v2/GroupProgressBar.tsx b/worklenz-frontend/src/components/task-list-v2/GroupProgressBar.tsx
index 0d17c779..10a89f84 100644
--- a/worklenz-frontend/src/components/task-list-v2/GroupProgressBar.tsx
+++ b/worklenz-frontend/src/components/task-list-v2/GroupProgressBar.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { Tooltip } from 'antd';
+import { Tooltip } from '@/shared/antd-imports';
 
 interface GroupProgressBarProps {
   todoProgress: number;
diff --git a/worklenz-frontend/src/components/task-list-v2/TaskGroupHeader.tsx b/worklenz-frontend/src/components/task-list-v2/TaskGroupHeader.tsx
index 27adf3be..32a19dd4 100644
--- a/worklenz-frontend/src/components/task-list-v2/TaskGroupHeader.tsx
+++ b/worklenz-frontend/src/components/task-list-v2/TaskGroupHeader.tsx
@@ -8,7 +8,7 @@ import {
   PencilIcon,
   ArrowPathIcon,
 } from '@heroicons/react/24/outline';
-import { Checkbox, Dropdown, Menu, Input, Modal, Badge, Flex } from 'antd';
+import { Checkbox, Dropdown, Menu, Input, Modal, Badge, Flex } from '@/shared/antd-imports';
 import GroupProgressBar from './GroupProgressBar';
 import { useTranslation } from 'react-i18next';
 import { getContrastColor } from '@/utils/colorUtils';
diff --git a/worklenz-frontend/src/components/task-list-v2/TaskListV2Table.tsx b/worklenz-frontend/src/components/task-list-v2/TaskListV2Table.tsx
index 4991cc3b..a336aad4 100644
--- a/worklenz-frontend/src/components/task-list-v2/TaskListV2Table.tsx
+++ b/worklenz-frontend/src/components/task-list-v2/TaskListV2Table.tsx
@@ -19,7 +19,7 @@ import {
 import { useTranslation } from 'react-i18next';
 import { useParams } from 'react-router-dom';
 import { createPortal } from 'react-dom';
-import { Skeleton } from 'antd';
+import { Skeleton } from '@/shared/antd-imports';
 import { HolderOutlined } from '@ant-design/icons';
 
 // Redux hooks and selectors
diff --git a/worklenz-frontend/src/components/task-list-v2/TaskRowWithSubtasks.tsx b/worklenz-frontend/src/components/task-list-v2/TaskRowWithSubtasks.tsx
index f6c35cfc..c3535101 100644
--- a/worklenz-frontend/src/components/task-list-v2/TaskRowWithSubtasks.tsx
+++ b/worklenz-frontend/src/components/task-list-v2/TaskRowWithSubtasks.tsx
@@ -5,7 +5,7 @@ import { selectTaskById, createSubtask, selectSubtaskLoading } from '@/features/
 import TaskRow from './TaskRow';
 import SubtaskLoadingSkeleton from './SubtaskLoadingSkeleton';
 import { Task } from '@/types/task-management.types';
-import { Input, Button } from 'antd';
+import { Input, Button } from '@/shared/antd-imports';
 import { PlusOutlined } from '@ant-design/icons';
 import { useSocket } from '@/socket/socketContext';
 import { SocketEvents } from '@/shared/socket-events';
diff --git a/worklenz-frontend/src/components/task-list-v2/components/AddTaskRow.tsx b/worklenz-frontend/src/components/task-list-v2/components/AddTaskRow.tsx
index 43dfa7f5..b4275b49 100644
--- a/worklenz-frontend/src/components/task-list-v2/components/AddTaskRow.tsx
+++ b/worklenz-frontend/src/components/task-list-v2/components/AddTaskRow.tsx
@@ -1,5 +1,5 @@
 import React, { useState, useCallback, memo, useRef, useEffect } from 'react';
-import { Input } from 'antd';
+import { Input } from '@/shared/antd-imports';
 import { PlusOutlined } from '@ant-design/icons';
 import { useTranslation } from 'react-i18next';
 import { useSocket } from '@/socket/socketContext';
diff --git a/worklenz-frontend/src/components/task-list-v2/components/CustomColumnComponents.tsx b/worklenz-frontend/src/components/task-list-v2/components/CustomColumnComponents.tsx
index a79839ac..5133679a 100644
--- a/worklenz-frontend/src/components/task-list-v2/components/CustomColumnComponents.tsx
+++ b/worklenz-frontend/src/components/task-list-v2/components/CustomColumnComponents.tsx
@@ -1,5 +1,5 @@
 import React, { useState, useCallback, useMemo, memo, useEffect } from 'react';
-import { Button, Tooltip, Flex, Dropdown, DatePicker, Input } from 'antd';
+import { Button, Tooltip, Flex, Dropdown, DatePicker, Input } from '@/shared/antd-imports';
 import { PlusOutlined, SettingOutlined, UsergroupAddOutlined } from '@ant-design/icons';
 import { useTranslation } from 'react-i18next';
 import { useAppSelector } from '@/hooks/useAppSelector';
diff --git a/worklenz-frontend/src/components/task-list-v2/components/DatePickerColumn.tsx b/worklenz-frontend/src/components/task-list-v2/components/DatePickerColumn.tsx
index 22e90ed4..f41de431 100644
--- a/worklenz-frontend/src/components/task-list-v2/components/DatePickerColumn.tsx
+++ b/worklenz-frontend/src/components/task-list-v2/components/DatePickerColumn.tsx
@@ -1,5 +1,5 @@
 import React, { memo, useCallback, useState } from 'react';
-import { DatePicker, Tooltip } from 'antd';
+import { DatePicker, Tooltip } from '@/shared/antd-imports';
 import { CloseOutlined } from '@ant-design/icons';
 import { dayjs, taskManagementAntdConfig } from '@/shared/antd-imports';
 import { Task } from '@/types/task-management.types';
diff --git a/worklenz-frontend/src/components/task-list-v2/components/TaskListSkeleton.tsx b/worklenz-frontend/src/components/task-list-v2/components/TaskListSkeleton.tsx
index 54351f60..e363deb1 100644
--- a/worklenz-frontend/src/components/task-list-v2/components/TaskListSkeleton.tsx
+++ b/worklenz-frontend/src/components/task-list-v2/components/TaskListSkeleton.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Skeleton } from 'antd';
+import { Skeleton } from '@/shared/antd-imports';
 import ImprovedTaskFilters from '@/components/task-management/improved-task-filters';
 
 interface TaskListSkeletonProps {
diff --git a/worklenz-frontend/src/components/task-list-v2/components/TaskRowColumns.tsx b/worklenz-frontend/src/components/task-list-v2/components/TaskRowColumns.tsx
index 78548f50..62f36984 100644
--- a/worklenz-frontend/src/components/task-list-v2/components/TaskRowColumns.tsx
+++ b/worklenz-frontend/src/components/task-list-v2/components/TaskRowColumns.tsx
@@ -1,7 +1,7 @@
 import React, { memo, useCallback, useState, useRef } from 'react';
 import { CheckCircleOutlined, HolderOutlined, CloseOutlined, DownOutlined, RightOutlined, DoubleRightOutlined, ArrowsAltOutlined, CommentOutlined, EyeOutlined, PaperClipOutlined, MinusCircleOutlined, RetweetOutlined } from '@ant-design/icons';
-import { Checkbox, DatePicker, Tooltip, Input } from 'antd';
-import type { InputRef } from 'antd';
+import { Checkbox, DatePicker, Tooltip, Input } from '@/shared/antd-imports';
+import type { InputRef } from '@/shared/antd-imports';
 import { dayjs, taskManagementAntdConfig } from '@/shared/antd-imports';
 import { Task } from '@/types/task-management.types';
 import { InlineMember } from '@/types/teamMembers/inlineMember.types';
diff --git a/worklenz-frontend/src/components/task-list-v2/components/TitleColumn.tsx b/worklenz-frontend/src/components/task-list-v2/components/TitleColumn.tsx
index 990b4a16..860a4df8 100644
--- a/worklenz-frontend/src/components/task-list-v2/components/TitleColumn.tsx
+++ b/worklenz-frontend/src/components/task-list-v2/components/TitleColumn.tsx
@@ -1,7 +1,7 @@
 import React, { memo, useCallback, useState, useRef, useEffect } from 'react';
 import { RightOutlined, DoubleRightOutlined, ArrowsAltOutlined, CommentOutlined, EyeOutlined, PaperClipOutlined, MinusCircleOutlined, RetweetOutlined } from '@ant-design/icons';
-import { Input, Tooltip } from 'antd';
-import type { InputRef } from 'antd';
+import { Input, Tooltip } from '@/shared/antd-imports';
+import type { InputRef } from '@/shared/antd-imports';
 import { createPortal } from 'react-dom';
 import { Task } from '@/types/task-management.types';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
diff --git a/worklenz-frontend/src/components/task-management/CreateTaskModal.tsx b/worklenz-frontend/src/components/task-management/CreateTaskModal.tsx
index c69aad5d..4be8402a 100644
--- a/worklenz-frontend/src/components/task-management/CreateTaskModal.tsx
+++ b/worklenz-frontend/src/components/task-management/CreateTaskModal.tsx
@@ -1,5 +1,5 @@
 import React, { useState, useCallback, useRef, useEffect } from 'react';
-import { Modal, Form, Input, Button, Tabs, Space, Divider, Typography, Flex, DatePicker, Select } from 'antd';
+import { Modal, Form, Input, Button, Tabs, Space, Divider, Typography, Flex, DatePicker, Select } from '@/shared/antd-imports';
 import { PlusOutlined, DragOutlined } from '@ant-design/icons';
 import { useTranslation } from 'react-i18next';
 import { DndContext, DragEndEvent, PointerSensor, useSensor, useSensors } from '@dnd-kit/core';
@@ -14,7 +14,7 @@ import LabelsSelector from '@/components/LabelsSelector';
 import { createStatus, fetchStatuses, fetchStatusesCategories } from '@/features/taskAttributes/taskStatusSlice';
 import { statusApiService } from '@/api/taskAttributes/status/status.api.service';
 import { ITaskStatusUpdateModel } from '@/types/tasks/task-status-update-model.types';
-import { Modal as AntModal } from 'antd';
+import { Modal as AntModal } from '@/shared/antd-imports';
 import { useSocket } from '@/socket/socketContext';
 import { SocketEvents } from '@/shared/socket-events';
 import { useAuthService } from '@/hooks/useAuth';
diff --git a/worklenz-frontend/src/components/task-management/ManagePhaseModal.tsx b/worklenz-frontend/src/components/task-management/ManagePhaseModal.tsx
index e746851c..61d2746f 100644
--- a/worklenz-frontend/src/components/task-management/ManagePhaseModal.tsx
+++ b/worklenz-frontend/src/components/task-management/ManagePhaseModal.tsx
@@ -1,5 +1,5 @@
 import React, { useState, useCallback, useRef, useEffect } from 'react';
-import { Modal, Form, Input, Button, Space, Divider, Typography, Flex, ColorPicker, Tooltip } from 'antd';
+import { Modal, Form, Input, Button, Space, Divider, Typography, Flex, ColorPicker, Tooltip } from '@/shared/antd-imports';
 import { PlusOutlined, HolderOutlined, EditOutlined, DeleteOutlined } from '@ant-design/icons';
 import { useTranslation } from 'react-i18next';
 import { DndContext, DragEndEvent, PointerSensor, useSensor, useSensors } from '@dnd-kit/core';
@@ -20,7 +20,7 @@ import {
 } from '@/features/projects/singleProject/phase/phases.slice';
 import { updatePhaseLabel } from '@/features/project/project.slice';
 import { ITaskPhase } from '@/types/tasks/taskPhase.types';
-import { Modal as AntModal } from 'antd';
+import { Modal as AntModal } from '@/shared/antd-imports';
 import { fetchTasksV3 } from '@/features/task-management/task-management.slice';
 import { fetchEnhancedKanbanGroups } from '@/features/enhanced-kanban/enhanced-kanban.slice';
 import { PhaseColorCodes } from '@/shared/constants';
diff --git a/worklenz-frontend/src/components/task-management/ManageStatusModal.tsx b/worklenz-frontend/src/components/task-management/ManageStatusModal.tsx
index 8c24c88b..4b678d79 100644
--- a/worklenz-frontend/src/components/task-management/ManageStatusModal.tsx
+++ b/worklenz-frontend/src/components/task-management/ManageStatusModal.tsx
@@ -1,5 +1,5 @@
 import React, { useState, useCallback, useRef, useEffect } from 'react';
-import { Modal, Form, Input, Button, Space, Divider, Typography, Flex, Select, Tooltip } from 'antd';
+import { Modal, Form, Input, Button, Space, Divider, Typography, Flex, Select, Tooltip } from '@/shared/antd-imports';
 import { PlusOutlined, HolderOutlined, EditOutlined, DeleteOutlined } from '@ant-design/icons';
 import { useTranslation } from 'react-i18next';
 import { DndContext, DragEndEvent, PointerSensor, useSensor, useSensors, DragOverEvent, useDroppable, closestCenter, DragOverlay } from '@dnd-kit/core';
@@ -12,7 +12,7 @@ import { createStatus, fetchStatuses, fetchStatusesCategories } from '@/features
 import { statusApiService } from '@/api/taskAttributes/status/status.api.service';
 import { ITaskStatusUpdateModel } from '@/types/tasks/task-status-update-model.types';
 import { IKanbanTaskStatus } from '@/types/tasks/taskStatus.types';
-import { Modal as AntModal } from 'antd';
+import { Modal as AntModal } from '@/shared/antd-imports';
 import { fetchTasksV3 } from '@/features/task-management/task-management.slice';
 import { fetchEnhancedKanbanGroups } from '@/features/enhanced-kanban/enhanced-kanban.slice';
 import './ManageStatusModal.css';
diff --git a/worklenz-frontend/src/components/task-management/lazy-loading-optimizations.tsx b/worklenz-frontend/src/components/task-management/lazy-loading-optimizations.tsx
index afdf83bb..259fe7a0 100644
--- a/worklenz-frontend/src/components/task-management/lazy-loading-optimizations.tsx
+++ b/worklenz-frontend/src/components/task-management/lazy-loading-optimizations.tsx
@@ -1,5 +1,5 @@
 import React, { lazy, Suspense, ComponentType, ReactNode } from 'react';
-import { Skeleton, Spin } from 'antd';
+import { Skeleton, Spin } from '@/shared/antd-imports';
 
 // Enhanced lazy loading with error boundary and retry logic
 export function createOptimizedLazy<T extends ComponentType<any>>(
diff --git a/worklenz-frontend/src/components/task-management/optimized-bulk-action-bar.tsx b/worklenz-frontend/src/components/task-management/optimized-bulk-action-bar.tsx
index 0797783f..28ea3e83 100644
--- a/worklenz-frontend/src/components/task-management/optimized-bulk-action-bar.tsx
+++ b/worklenz-frontend/src/components/task-management/optimized-bulk-action-bar.tsx
@@ -1,6 +1,6 @@
 import React, { useMemo, useCallback, useState, useEffect, useRef } from 'react';
 import { createPortal } from 'react-dom';
-import { Button, Typography, Dropdown, Popconfirm, Tooltip, Space, Badge, Divider } from 'antd';
+import { Button, Typography, Dropdown, Popconfirm, Tooltip, Space, Badge, Divider } from '@/shared/antd-imports';
 import {
   DeleteOutlined,
   CloseOutlined,
diff --git a/worklenz-frontend/src/components/task-management/performance-analysis.tsx b/worklenz-frontend/src/components/task-management/performance-analysis.tsx
index 9e30789b..60499469 100644
--- a/worklenz-frontend/src/components/task-management/performance-analysis.tsx
+++ b/worklenz-frontend/src/components/task-management/performance-analysis.tsx
@@ -1,5 +1,5 @@
 import React, { useState, useEffect, useCallback } from 'react';
-import { Card, Button, Table, Progress, Alert, Space, Typography, Divider } from 'antd';
+import { Card, Button, Table, Progress, Alert, Space, Typography, Divider } from '@/shared/antd-imports';
 import { performanceMonitor } from '@/utils/performance-monitor';
 
 const { Title, Text } = Typography;
diff --git a/worklenz-frontend/src/components/task-management/task-list-board.tsx b/worklenz-frontend/src/components/task-management/task-list-board.tsx
index ad2421f6..563986e5 100644
--- a/worklenz-frontend/src/components/task-management/task-list-board.tsx
+++ b/worklenz-frontend/src/components/task-management/task-list-board.tsx
@@ -14,7 +14,7 @@ import {
   useSensors,
 } from '@dnd-kit/core';
 import { sortableKeyboardCoordinates } from '@dnd-kit/sortable';
-import { Card, Spin, Empty, Alert } from 'antd';
+import { Card, Spin, Empty, Alert } from '@/shared/antd-imports';
 import { RootState } from '@/app/store';
 import {
   selectAllTasks,
diff --git a/worklenz-frontend/src/components/task-management/virtualized-task-list.tsx b/worklenz-frontend/src/components/task-management/virtualized-task-list.tsx
index 0304c3a1..b6c25932 100644
--- a/worklenz-frontend/src/components/task-management/virtualized-task-list.tsx
+++ b/worklenz-frontend/src/components/task-management/virtualized-task-list.tsx
@@ -3,7 +3,7 @@ import { FixedSizeList as List, FixedSizeList } from 'react-window';
 import { SortableContext, verticalListSortingStrategy } from '@dnd-kit/sortable';
 import { useSelector, useDispatch } from 'react-redux';
 import { useTranslation } from 'react-i18next';
-import { Empty, Button, Input } from 'antd';
+import { Empty, Button, Input } from '@/shared/antd-imports';
 import { RightOutlined, DownOutlined } from '@ant-design/icons';
 import {
   taskManagementSelectors,
diff --git a/worklenz-frontend/src/components/task-templates/task-template-drawer.tsx b/worklenz-frontend/src/components/task-templates/task-template-drawer.tsx
index 881157db..4fca590a 100644
--- a/worklenz-frontend/src/components/task-templates/task-template-drawer.tsx
+++ b/worklenz-frontend/src/components/task-templates/task-template-drawer.tsx
@@ -1,5 +1,5 @@
 import { useState } from 'react';
-import { Button, Drawer, Form, Input, List, Typography } from 'antd';
+import { Button, Drawer, Form, Input, List, Typography } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 
 import { useAppDispatch } from '@/hooks/useAppDispatch';
diff --git a/worklenz-frontend/src/components/taskListCommon/labelsSelector/CustomColordLabel.old.tsx b/worklenz-frontend/src/components/taskListCommon/labelsSelector/CustomColordLabel.old.tsx
index f31da318..b073dd21 100644
--- a/worklenz-frontend/src/components/taskListCommon/labelsSelector/CustomColordLabel.old.tsx
+++ b/worklenz-frontend/src/components/taskListCommon/labelsSelector/CustomColordLabel.old.tsx
@@ -1,4 +1,4 @@
-import { Tag, Tooltip } from 'antd';
+import { Tag, Tooltip } from '@/shared/antd-imports';
 import { ITaskLabel } from '@/types/tasks/taskLabel.types';
 
 interface ICustomColordLabelProps {
diff --git a/worklenz-frontend/src/components/taskListCommon/labelsSelector/CustomNumberLabel.tsx b/worklenz-frontend/src/components/taskListCommon/labelsSelector/CustomNumberLabel.tsx
index 976fe2e6..f898bf89 100644
--- a/worklenz-frontend/src/components/taskListCommon/labelsSelector/CustomNumberLabel.tsx
+++ b/worklenz-frontend/src/components/taskListCommon/labelsSelector/CustomNumberLabel.tsx
@@ -1,4 +1,4 @@
-import { Tag, Tooltip } from 'antd';
+import { Tag, Tooltip } from '@/shared/antd-imports';
 
 interface ICustomNumberLabelProps {
   labelList: string[];
diff --git a/worklenz-frontend/src/components/taskListCommon/labelsSelector/LabelsSelector.tsx b/worklenz-frontend/src/components/taskListCommon/labelsSelector/LabelsSelector.tsx
index 6b47cedc..64bd330e 100644
--- a/worklenz-frontend/src/components/taskListCommon/labelsSelector/LabelsSelector.tsx
+++ b/worklenz-frontend/src/components/taskListCommon/labelsSelector/LabelsSelector.tsx
@@ -10,7 +10,7 @@ import {
   InputRef,
   List,
   Typography,
-} from 'antd';
+} from '@/shared/antd-imports';
 import { useEffect, useMemo, useRef, useState } from 'react';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { colors } from '@/styles/colors';
diff --git a/worklenz-frontend/src/components/taskListCommon/labelsSelector/color-changed-label.tsx b/worklenz-frontend/src/components/taskListCommon/labelsSelector/color-changed-label.tsx
index 059b313f..0622bbb6 100644
--- a/worklenz-frontend/src/components/taskListCommon/labelsSelector/color-changed-label.tsx
+++ b/worklenz-frontend/src/components/taskListCommon/labelsSelector/color-changed-label.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { LabelType } from '../../../types/label.type';
-import { Select, Tag, Tooltip } from 'antd';
+import { Select, Tag, Tooltip } from '@/shared/antd-imports';
 import { PhaseColorCodes } from '../../../shared/constants';
 import { useTranslation } from 'react-i18next';
 
diff --git a/worklenz-frontend/src/components/taskListCommon/phase-dropdown/phase-dropdown.tsx b/worklenz-frontend/src/components/taskListCommon/phase-dropdown/phase-dropdown.tsx
index 307b3a5e..1e000d85 100644
--- a/worklenz-frontend/src/components/taskListCommon/phase-dropdown/phase-dropdown.tsx
+++ b/worklenz-frontend/src/components/taskListCommon/phase-dropdown/phase-dropdown.tsx
@@ -1,4 +1,4 @@
-import { Badge, Flex, Select, Tooltip, Typography } from 'antd';
+import { Badge, Flex, Select, Tooltip, Typography } from '@/shared/antd-imports';
 
 import './phase-dropdown.css';
 import { useAppSelector } from '@/hooks/useAppSelector';
diff --git a/worklenz-frontend/src/components/taskListCommon/priorityDropdown/PriorityDropdown.tsx b/worklenz-frontend/src/components/taskListCommon/priorityDropdown/PriorityDropdown.tsx
index 940bdecf..60b5c68f 100644
--- a/worklenz-frontend/src/components/taskListCommon/priorityDropdown/PriorityDropdown.tsx
+++ b/worklenz-frontend/src/components/taskListCommon/priorityDropdown/PriorityDropdown.tsx
@@ -1,4 +1,4 @@
-import { Card, Dropdown, Flex, Menu, MenuProps, Typography } from 'antd';
+import { Card, Dropdown, Flex, Menu, MenuProps, Typography } from '@/shared/antd-imports';
 import React, { useState } from 'react';
 import { DoubleLeftOutlined, DownOutlined, MinusOutlined, PauseOutlined } from '@ant-design/icons';
 // custom css file
diff --git a/worklenz-frontend/src/components/taskListCommon/statusDropdown/StatusDropdown.tsx b/worklenz-frontend/src/components/taskListCommon/statusDropdown/StatusDropdown.tsx
index 49a5a0d8..d85fe078 100644
--- a/worklenz-frontend/src/components/taskListCommon/statusDropdown/StatusDropdown.tsx
+++ b/worklenz-frontend/src/components/taskListCommon/statusDropdown/StatusDropdown.tsx
@@ -1,4 +1,4 @@
-import { Badge, Card, Dropdown, Flex, Menu, MenuProps, Typography } from 'antd';
+import { Badge, Card, Dropdown, Flex, Menu, MenuProps, Typography } from '@/shared/antd-imports';
 import React, { useEffect, useState } from 'react';
 import { DownOutlined } from '@ant-design/icons';
 import './statusDropdown.css';
diff --git a/worklenz-frontend/src/components/taskListCommon/task-list-bulk-actions-bar/components/AssigneesDropdown.tsx b/worklenz-frontend/src/components/taskListCommon/task-list-bulk-actions-bar/components/AssigneesDropdown.tsx
index 8b02eb4b..bf459284 100644
--- a/worklenz-frontend/src/components/taskListCommon/task-list-bulk-actions-bar/components/AssigneesDropdown.tsx
+++ b/worklenz-frontend/src/components/taskListCommon/task-list-bulk-actions-bar/components/AssigneesDropdown.tsx
@@ -1,4 +1,4 @@
-import { Button, Card, Checkbox, Flex, List, Typography } from 'antd';
+import { Button, Card, Checkbox, Flex, List, Typography } from '@/shared/antd-imports';
 import { CheckboxChangeEvent } from 'antd/es/checkbox';
 import { ITeamMemberViewModel } from '@/types/teamMembers/teamMembersGetResponse.types';
 import SingleAvatar from '@/components/common/single-avatar/single-avatar';
diff --git a/worklenz-frontend/src/components/taskListCommon/task-list-bulk-actions-bar/components/LabelsDropdown.tsx b/worklenz-frontend/src/components/taskListCommon/task-list-bulk-actions-bar/components/LabelsDropdown.tsx
index c069a987..c4692b3d 100644
--- a/worklenz-frontend/src/components/taskListCommon/task-list-bulk-actions-bar/components/LabelsDropdown.tsx
+++ b/worklenz-frontend/src/components/taskListCommon/task-list-bulk-actions-bar/components/LabelsDropdown.tsx
@@ -1,4 +1,4 @@
-import { Badge, Button, Card, Checkbox, Empty, Flex, Input, List, Typography } from 'antd';
+import { Badge, Button, Card, Checkbox, Empty, Flex, Input, List, Typography } from '@/shared/antd-imports';
 import { CheckboxChangeEvent } from 'antd/es/checkbox';
 import { ITaskLabel } from '@/types/tasks/taskLabel.types';
 import { InputRef } from 'antd/es/input';
diff --git a/worklenz-frontend/src/features/i18n/language-selector.tsx b/worklenz-frontend/src/features/i18n/language-selector.tsx
index fd61c8c0..36c88757 100644
--- a/worklenz-frontend/src/features/i18n/language-selector.tsx
+++ b/worklenz-frontend/src/features/i18n/language-selector.tsx
@@ -1,4 +1,4 @@
-import { Button, Dropdown } from 'antd';
+import { Button, Dropdown } from '@/shared/antd-imports';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { ILanguageType, setLanguage } from './localesSlice';
diff --git a/worklenz-frontend/src/features/navbar/help/HelpButton.tsx b/worklenz-frontend/src/features/navbar/help/HelpButton.tsx
index 6796c595..72b2d90a 100644
--- a/worklenz-frontend/src/features/navbar/help/HelpButton.tsx
+++ b/worklenz-frontend/src/features/navbar/help/HelpButton.tsx
@@ -1,5 +1,5 @@
 import { QuestionCircleOutlined } from '@ant-design/icons';
-import { Button, Tooltip } from 'antd';
+import { Button, Tooltip } from '@/shared/antd-imports';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import './HelpButton.css';
diff --git a/worklenz-frontend/src/features/navbar/invite/InviteButton.tsx b/worklenz-frontend/src/features/navbar/invite/InviteButton.tsx
index f9bf0248..2db618ef 100644
--- a/worklenz-frontend/src/features/navbar/invite/InviteButton.tsx
+++ b/worklenz-frontend/src/features/navbar/invite/InviteButton.tsx
@@ -1,5 +1,5 @@
 import { UsergroupAddOutlined } from '@ant-design/icons';
-import { Button, Tooltip } from 'antd';
+import { Button, Tooltip } from '@/shared/antd-imports';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { colors } from '../../../styles/colors';
diff --git a/worklenz-frontend/src/features/navbar/mobileMenu/MobileMenuButton.tsx b/worklenz-frontend/src/features/navbar/mobileMenu/MobileMenuButton.tsx
index 93611545..1d82cb3b 100644
--- a/worklenz-frontend/src/features/navbar/mobileMenu/MobileMenuButton.tsx
+++ b/worklenz-frontend/src/features/navbar/mobileMenu/MobileMenuButton.tsx
@@ -6,7 +6,7 @@ import {
   QuestionCircleOutlined,
   ReadOutlined,
 } from '@ant-design/icons';
-import { Button, Card, Dropdown, Flex, MenuProps, Space, Typography } from 'antd';
+import { Button, Card, Dropdown, Flex, MenuProps, Space, Typography } from '@/shared/antd-imports';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { colors } from '../../../styles/colors';
diff --git a/worklenz-frontend/src/features/navbar/navbar.tsx b/worklenz-frontend/src/features/navbar/navbar.tsx
index fb67f6ee..1630c25e 100644
--- a/worklenz-frontend/src/features/navbar/navbar.tsx
+++ b/worklenz-frontend/src/features/navbar/navbar.tsx
@@ -1,7 +1,7 @@
 import React, { useEffect, useState, useMemo } from 'react';
 import { Link, useLocation } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
-import { Col, ConfigProvider, Flex, Menu, MenuProps, Alert } from 'antd';
+import { Col, ConfigProvider, Flex, Menu, MenuProps, Alert } from '@/shared/antd-imports';
 import { createPortal } from 'react-dom';
 
 import InviteTeamMembers from '../../components/common/invite-team-members/invite-team-members';
diff --git a/worklenz-frontend/src/features/navbar/switchTeam/SwitchTeamButton.tsx b/worklenz-frontend/src/features/navbar/switchTeam/SwitchTeamButton.tsx
index c017b23b..f3da6cb5 100644
--- a/worklenz-frontend/src/features/navbar/switchTeam/SwitchTeamButton.tsx
+++ b/worklenz-frontend/src/features/navbar/switchTeam/SwitchTeamButton.tsx
@@ -2,7 +2,7 @@
 import { BankOutlined, CaretDownFilled, CheckCircleFilled } from '@ant-design/icons';
 
 // Ant Design Components
-import { Card, Divider, Dropdown, Flex, Tooltip, Typography } from 'antd';
+import { Card, Divider, Dropdown, Flex, Tooltip, Typography } from '@/shared/antd-imports';
 
 // Redux Hooks
 import { useAppDispatch } from '@/hooks/useAppDispatch';
diff --git a/worklenz-frontend/src/features/navbar/timers/timer-button.tsx b/worklenz-frontend/src/features/navbar/timers/timer-button.tsx
index 6c1b031b..06a852e3 100644
--- a/worklenz-frontend/src/features/navbar/timers/timer-button.tsx
+++ b/worklenz-frontend/src/features/navbar/timers/timer-button.tsx
@@ -1,5 +1,5 @@
 import { ClockCircleOutlined, StopOutlined } from '@ant-design/icons';
-import { Badge, Button, Dropdown, List, Tooltip, Typography, Space, Divider, theme } from 'antd';
+import { Badge, Button, Dropdown, List, Tooltip, Typography, Space, Divider, theme } from '@/shared/antd-imports';
 import React, { useEffect, useState, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { taskTimeLogsApiService, IRunningTimer } from '@/api/tasks/task-time-logs.api.service';
diff --git a/worklenz-frontend/src/features/navbar/upgradePlan/UpgradePlanButton.tsx b/worklenz-frontend/src/features/navbar/upgradePlan/UpgradePlanButton.tsx
index f09457cd..16c1332c 100644
--- a/worklenz-frontend/src/features/navbar/upgradePlan/UpgradePlanButton.tsx
+++ b/worklenz-frontend/src/features/navbar/upgradePlan/UpgradePlanButton.tsx
@@ -1,4 +1,4 @@
-import { Button, Tooltip } from 'antd';
+import { Button, Tooltip } from '@/shared/antd-imports';
 import React from 'react';
 import { colors } from '../../../styles/colors';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/features/navbar/user-profile/profile-button.tsx b/worklenz-frontend/src/features/navbar/user-profile/profile-button.tsx
index 1be5c3e4..18c153a6 100644
--- a/worklenz-frontend/src/features/navbar/user-profile/profile-button.tsx
+++ b/worklenz-frontend/src/features/navbar/user-profile/profile-button.tsx
@@ -1,5 +1,5 @@
 import { UserOutlined } from '@ant-design/icons';
-import { Button, Card, Dropdown, Flex, MenuProps, Tooltip, Typography } from 'antd';
+import { Button, Card, Dropdown, Flex, MenuProps, Tooltip, Typography } from '@/shared/antd-imports';
 
 import { Link } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/features/projects/bulkActions/BulkTasksActionContainer.tsx b/worklenz-frontend/src/features/projects/bulkActions/BulkTasksActionContainer.tsx
index c0c3e27e..6b5187ae 100644
--- a/worklenz-frontend/src/features/projects/bulkActions/BulkTasksActionContainer.tsx
+++ b/worklenz-frontend/src/features/projects/bulkActions/BulkTasksActionContainer.tsx
@@ -8,7 +8,7 @@ import {
   UserAddOutlined,
   UsergroupAddOutlined,
 } from '@ant-design/icons';
-import { Button, Flex, Tooltip, Typography } from 'antd';
+import { Button, Flex, Tooltip, Typography } from '@/shared/antd-imports';
 import { colors } from '../../../styles/colors';
 
 type BulkTasksActionProps = {
diff --git a/worklenz-frontend/src/features/projects/singleProject/phase/ConfigPhaseButton.tsx b/worklenz-frontend/src/features/projects/singleProject/phase/ConfigPhaseButton.tsx
index 23e6773d..c35664d0 100644
--- a/worklenz-frontend/src/features/projects/singleProject/phase/ConfigPhaseButton.tsx
+++ b/worklenz-frontend/src/features/projects/singleProject/phase/ConfigPhaseButton.tsx
@@ -1,5 +1,5 @@
 import { SettingOutlined } from '@ant-design/icons';
-import { Button, Tooltip } from 'antd';
+import { Button, Tooltip } from '@/shared/antd-imports';
 import React from 'react';
 import { useAppDispatch } from '../../../../hooks/useAppDispatch';
 import { toggleDrawer } from './phases.slice';
diff --git a/worklenz-frontend/src/features/projects/singleProject/phase/PhaseDrawer.tsx b/worklenz-frontend/src/features/projects/singleProject/phase/PhaseDrawer.tsx
index 3b9d8f52..49de1ac3 100644
--- a/worklenz-frontend/src/features/projects/singleProject/phase/PhaseDrawer.tsx
+++ b/worklenz-frontend/src/features/projects/singleProject/phase/PhaseDrawer.tsx
@@ -1,4 +1,4 @@
-import { Button, Drawer, Flex, Input, Skeleton, Spin, Typography } from 'antd';
+import { Button, Drawer, Flex, Input, Skeleton, Spin, Typography } from '@/shared/antd-imports';
 import { useState } from 'react';
 import { useAppSelector } from '../../../../hooks/useAppSelector';
 import { useAppDispatch } from '../../../../hooks/useAppDispatch';
diff --git a/worklenz-frontend/src/features/projects/singleProject/phase/PhaseHeader.tsx b/worklenz-frontend/src/features/projects/singleProject/phase/PhaseHeader.tsx
index e10df057..5b36cbde 100644
--- a/worklenz-frontend/src/features/projects/singleProject/phase/PhaseHeader.tsx
+++ b/worklenz-frontend/src/features/projects/singleProject/phase/PhaseHeader.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { useAppSelector } from '../../../../hooks/useAppSelector';
-import { Flex } from 'antd';
+import { Flex } from '@/shared/antd-imports';
 import ConfigPhaseButton from './ConfigPhaseButton';
 import { colors } from '../../../../styles/colors';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/features/projects/singleProject/phase/PhaseOptionItem.tsx b/worklenz-frontend/src/features/projects/singleProject/phase/PhaseOptionItem.tsx
index 091ebb6f..e27e8e1f 100644
--- a/worklenz-frontend/src/features/projects/singleProject/phase/PhaseOptionItem.tsx
+++ b/worklenz-frontend/src/features/projects/singleProject/phase/PhaseOptionItem.tsx
@@ -1,4 +1,4 @@
-import { Button, ColorPicker, ConfigProvider, Flex, Input } from 'antd';
+import { Button, ColorPicker, ConfigProvider, Flex, Input } from '@/shared/antd-imports';
 import { CloseCircleOutlined, HolderOutlined } from '@ant-design/icons';
 import { nanoid } from '@reduxjs/toolkit';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
diff --git a/worklenz-frontend/src/features/projects/update-project/update-project-drawer.tsx b/worklenz-frontend/src/features/projects/update-project/update-project-drawer.tsx
index 9c323992..d0028a95 100644
--- a/worklenz-frontend/src/features/projects/update-project/update-project-drawer.tsx
+++ b/worklenz-frontend/src/features/projects/update-project/update-project-drawer.tsx
@@ -11,7 +11,7 @@ import {
   Select,
   Tag,
   Typography,
-} from 'antd';
+} from '@/shared/antd-imports';
 import React, { useRef, useState } from 'react';
 import {
   healthStatusData,
diff --git a/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/activity-log-tab/activity-log-card.tsx b/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/activity-log-tab/activity-log-card.tsx
index f5434c06..47137776 100644
--- a/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/activity-log-tab/activity-log-card.tsx
+++ b/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/activity-log-tab/activity-log-card.tsx
@@ -1,4 +1,4 @@
-import { Card, ConfigProvider, Tag, Timeline, Typography } from 'antd';
+import { Card, ConfigProvider, Tag, Timeline, Typography } from '@/shared/antd-imports';
 import { simpleDateFormat } from '@/utils/simpleDateFormat';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { colors } from '../../../../../styles/colors';
diff --git a/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/activity-log-tab/members-reports-activity-logs-tab.tsx b/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/activity-log-tab/members-reports-activity-logs-tab.tsx
index b933164b..cfc3164c 100644
--- a/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/activity-log-tab/members-reports-activity-logs-tab.tsx
+++ b/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/activity-log-tab/members-reports-activity-logs-tab.tsx
@@ -1,4 +1,4 @@
-import { Flex, Skeleton } from 'antd';
+import { Flex, Skeleton } from '@/shared/antd-imports';
 import React, { useEffect, useMemo, useState } from 'react';
 import EmptyListPlaceholder from '@/components/EmptyListPlaceholder';
 import ActivityLogCard from './activity-log-card';
diff --git a/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/members-reports-drawer-tabs.tsx b/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/members-reports-drawer-tabs.tsx
index 209c5a7b..9bb22c5e 100644
--- a/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/members-reports-drawer-tabs.tsx
+++ b/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/members-reports-drawer-tabs.tsx
@@ -1,4 +1,4 @@
-import { Tabs } from 'antd';
+import { Tabs } from '@/shared/antd-imports';
 import { TabsProps } from 'antd/lib';
 import React from 'react';
 import MembersReportsOverviewTab from './overviewTab/MembersReportsOverviewTab';
diff --git a/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/members-reports-drawer.tsx b/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/members-reports-drawer.tsx
index 9262dd61..fca70984 100644
--- a/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/members-reports-drawer.tsx
+++ b/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/members-reports-drawer.tsx
@@ -1,4 +1,4 @@
-import { Drawer, Typography, Flex, Button, Space, Dropdown } from 'antd';
+import { Drawer, Typography, Flex, Button, Space, Dropdown } from '@/shared/antd-imports';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { toggleMembersReportsDrawer } from '../membersReportsSlice';
diff --git a/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/overviewTab/MembersReportsPriorityGraph.tsx b/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/overviewTab/MembersReportsPriorityGraph.tsx
index d2155d75..6cedb1f6 100644
--- a/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/overviewTab/MembersReportsPriorityGraph.tsx
+++ b/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/overviewTab/MembersReportsPriorityGraph.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Doughnut } from 'react-chartjs-2';
 import { Chart, ArcElement, Tooltip } from 'chart.js';
-import { Badge, Card, Flex, Typography } from 'antd';
+import { Badge, Card, Flex, Typography } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 import { IRPTOverviewMemberChartData } from '@/types/reporting/reporting.types';
 
diff --git a/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/overviewTab/MembersReportsProjectGraph.tsx b/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/overviewTab/MembersReportsProjectGraph.tsx
index d7732d51..210ebb42 100644
--- a/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/overviewTab/MembersReportsProjectGraph.tsx
+++ b/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/overviewTab/MembersReportsProjectGraph.tsx
@@ -1,6 +1,6 @@
 import { Doughnut } from 'react-chartjs-2';
 import { Chart, ArcElement, Tooltip } from 'chart.js';
-import { Badge, Card, Flex, Typography, Tooltip as AntTooltip } from 'antd';
+import { Badge, Card, Flex, Typography, Tooltip as AntTooltip } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 import { IRPTOverviewMemberChartData } from '@/types/reporting/reporting.types';
 
diff --git a/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/overviewTab/MembersReportsStatusGraph.tsx b/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/overviewTab/MembersReportsStatusGraph.tsx
index eeed8eab..b2bf6752 100644
--- a/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/overviewTab/MembersReportsStatusGraph.tsx
+++ b/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/overviewTab/MembersReportsStatusGraph.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Doughnut } from 'react-chartjs-2';
 import { Chart, ArcElement, Tooltip } from 'chart.js';
-import { Badge, Card, Flex, Typography } from 'antd';
+import { Badge, Card, Flex, Typography } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 import { IRPTOverviewMemberChartData } from '@/types/reporting/reporting.types';
 
diff --git a/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/overviewTab/members-overview-projects-stats-drawer/members-overview-projects-stats-drawer.tsx b/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/overviewTab/members-overview-projects-stats-drawer/members-overview-projects-stats-drawer.tsx
index 78032d30..a14354b2 100644
--- a/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/overviewTab/members-overview-projects-stats-drawer/members-overview-projects-stats-drawer.tsx
+++ b/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/overviewTab/members-overview-projects-stats-drawer/members-overview-projects-stats-drawer.tsx
@@ -1,4 +1,4 @@
-import { Drawer, Typography } from 'antd';
+import { Drawer, Typography } from '@/shared/antd-imports';
 import React, { useEffect, useState } from 'react';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
diff --git a/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/overviewTab/members-overview-projects-stats-drawer/members-overview-projects-stats-table.tsx b/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/overviewTab/members-overview-projects-stats-drawer/members-overview-projects-stats-table.tsx
index c17d0733..89f1ee1f 100644
--- a/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/overviewTab/members-overview-projects-stats-drawer/members-overview-projects-stats-table.tsx
+++ b/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/overviewTab/members-overview-projects-stats-drawer/members-overview-projects-stats-table.tsx
@@ -1,5 +1,5 @@
 import { memo } from 'react';
-import { ConfigProvider, Flex, Skeleton, Spin, Table, TableColumnsType, Typography } from 'antd';
+import { ConfigProvider, Flex, Skeleton, Spin, Table, TableColumnsType, Typography } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 import CustomTableTitle from '@components/CustomTableTitle';
 import { simpleDateFormat } from '@/utils/simpleDateFormat';
diff --git a/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/overviewTab/members-overview-tasks-stats-drawer/members-overview-tasks-stats-drawer.tsx b/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/overviewTab/members-overview-tasks-stats-drawer/members-overview-tasks-stats-drawer.tsx
index 0a574fd7..e9443187 100644
--- a/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/overviewTab/members-overview-tasks-stats-drawer/members-overview-tasks-stats-drawer.tsx
+++ b/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/overviewTab/members-overview-tasks-stats-drawer/members-overview-tasks-stats-drawer.tsx
@@ -1,4 +1,4 @@
-import { Drawer, Typography } from 'antd';
+import { Drawer, Typography } from '@/shared/antd-imports';
 import React, { useMemo, useState } from 'react';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
diff --git a/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/overviewTab/members-overview-tasks-stats-drawer/members-overview-tasks-stats-table.tsx b/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/overviewTab/members-overview-tasks-stats-drawer/members-overview-tasks-stats-table.tsx
index 75d05303..b740d8aa 100644
--- a/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/overviewTab/members-overview-tasks-stats-drawer/members-overview-tasks-stats-table.tsx
+++ b/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/overviewTab/members-overview-tasks-stats-drawer/members-overview-tasks-stats-table.tsx
@@ -1,4 +1,4 @@
-import { Badge, Collapse, Flex, Table, TableColumnsType, Tag, Typography } from 'antd';
+import { Badge, Collapse, Flex, Table, TableColumnsType, Tag, Typography } from '@/shared/antd-imports';
 import CustomTableTitle from '@components/CustomTableTitle';
 import { colors } from '@/styles/colors';
 import dayjs from 'dayjs';
diff --git a/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/overviewTab/members-reports-stat-card.tsx b/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/overviewTab/members-reports-stat-card.tsx
index a4735fdd..34737c4d 100644
--- a/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/overviewTab/members-reports-stat-card.tsx
+++ b/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/overviewTab/members-reports-stat-card.tsx
@@ -3,7 +3,7 @@ import {
   ExclamationCircleOutlined,
   FileExcelOutlined,
 } from '@ant-design/icons';
-import { Button, Card, Flex } from 'antd';
+import { Button, Card, Flex } from '@/shared/antd-imports';
 import React, { ReactNode } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
diff --git a/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/taskTab/MembersReportsTasksTab.tsx b/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/taskTab/MembersReportsTasksTab.tsx
index 9ea4dbac..362a6f80 100644
--- a/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/taskTab/MembersReportsTasksTab.tsx
+++ b/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/taskTab/MembersReportsTasksTab.tsx
@@ -1,4 +1,4 @@
-import { Flex } from 'antd';
+import { Flex } from '@/shared/antd-imports';
 import React, { useEffect, useMemo, useState } from 'react';
 import CustomSearchbar from '../../../../../components/CustomSearchbar';
 import { fetchData } from '@/utils/fetchData';
diff --git a/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/taskTab/MembersReportsTasksTable.tsx b/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/taskTab/MembersReportsTasksTable.tsx
index 7ca70cc8..cfd9928f 100644
--- a/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/taskTab/MembersReportsTasksTable.tsx
+++ b/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/taskTab/MembersReportsTasksTable.tsx
@@ -1,4 +1,4 @@
-import { Badge, Flex, Table, TableColumnsType, Tag, Typography } from 'antd';
+import { Badge, Flex, Table, TableColumnsType, Tag, Typography } from '@/shared/antd-imports';
 import React from 'react';
 import dayjs from 'dayjs';
 import { DoubleRightOutlined } from '@ant-design/icons';
diff --git a/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/taskTab/ProjectFilter.tsx b/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/taskTab/ProjectFilter.tsx
index b0a7c4f4..d242b8ea 100644
--- a/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/taskTab/ProjectFilter.tsx
+++ b/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/taskTab/ProjectFilter.tsx
@@ -1,5 +1,5 @@
 import { IRPTOverviewProject } from '@/types/reporting/reporting.types';
-import { Flex, Select, Typography } from 'antd';
+import { Flex, Select, Typography } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 
 type ProjectFilterProps = {
diff --git a/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/time-log-tab/billable-filter.tsx b/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/time-log-tab/billable-filter.tsx
index c0521146..1612a4fc 100644
--- a/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/time-log-tab/billable-filter.tsx
+++ b/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/time-log-tab/billable-filter.tsx
@@ -1,5 +1,5 @@
 import { CaretDownFilled } from '@ant-design/icons';
-import { Button, Card, Checkbox, Dropdown, List, Space } from 'antd';
+import { Button, Card, Checkbox, Dropdown, List, Space } from '@/shared/antd-imports';
 import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
diff --git a/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/time-log-tab/members-reports-time-logs-tab.tsx b/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/time-log-tab/members-reports-time-logs-tab.tsx
index 67bac8f8..c6516291 100644
--- a/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/time-log-tab/members-reports-time-logs-tab.tsx
+++ b/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/time-log-tab/members-reports-time-logs-tab.tsx
@@ -1,4 +1,4 @@
-import { Flex, Skeleton } from 'antd';
+import { Flex, Skeleton } from '@/shared/antd-imports';
 import React, { useEffect, useState } from 'react';
 import BillableFilter from './billable-filter';
 import { fetchData } from '@/utils/fetchData';
diff --git a/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/time-log-tab/time-log-card.tsx b/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/time-log-tab/time-log-card.tsx
index 1d64bab4..a44ca056 100644
--- a/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/time-log-tab/time-log-card.tsx
+++ b/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/time-log-tab/time-log-card.tsx
@@ -1,4 +1,4 @@
-import { Card, ConfigProvider, Tag, Timeline, Typography } from 'antd';
+import { Card, ConfigProvider, Tag, Timeline, Typography } from '@/shared/antd-imports';
 import { simpleDateFormat } from '@/utils/simpleDateFormat';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/ProjectReportsDrawer.tsx b/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/ProjectReportsDrawer.tsx
index 37fa99b7..49a71ecd 100644
--- a/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/ProjectReportsDrawer.tsx
+++ b/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/ProjectReportsDrawer.tsx
@@ -1,4 +1,4 @@
-import { Drawer, Typography, Flex, Button, Dropdown } from 'antd';
+import { Drawer, Typography, Flex, Button, Dropdown } from '@/shared/antd-imports';
 import React, { useState } from 'react';
 import { useAppSelector } from '../../../../hooks/useAppSelector';
 import { useAppDispatch } from '../../../../hooks/useAppDispatch';
diff --git a/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/ProjectReportsDrawerTabs.tsx b/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/ProjectReportsDrawerTabs.tsx
index 6cf0083d..804f49e2 100644
--- a/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/ProjectReportsDrawerTabs.tsx
+++ b/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/ProjectReportsDrawerTabs.tsx
@@ -1,4 +1,4 @@
-import { Tabs } from 'antd';
+import { Tabs } from '@/shared/antd-imports';
 import { TabsProps } from 'antd/lib';
 import { useTranslation } from 'react-i18next';
 
diff --git a/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/membersTab/ProjectReportsMembersTab.tsx b/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/membersTab/ProjectReportsMembersTab.tsx
index 620ef912..cf9ba654 100644
--- a/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/membersTab/ProjectReportsMembersTab.tsx
+++ b/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/membersTab/ProjectReportsMembersTab.tsx
@@ -1,4 +1,4 @@
-import { Flex } from 'antd';
+import { Flex } from '@/shared/antd-imports';
 import { useEffect, useMemo, useState } from 'react';
 import CustomSearchbar from '../../../../../components/CustomSearchbar';
 import ProjectReportsMembersTable from './ProjectReportsMembersTable';
diff --git a/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/membersTab/ProjectReportsMembersTable.tsx b/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/membersTab/ProjectReportsMembersTable.tsx
index eb675eef..0ad20740 100644
--- a/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/membersTab/ProjectReportsMembersTable.tsx
+++ b/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/membersTab/ProjectReportsMembersTable.tsx
@@ -1,4 +1,4 @@
-import { Progress, Table, TableColumnsType } from 'antd';
+import { Progress, Table, TableColumnsType } from '@/shared/antd-imports';
 import React from 'react';
 import CustomTableTitle from '../../../../../components/CustomTableTitle';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
diff --git a/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/membersTab/projectReportsMembersTaskDrawer/ProjectReportsMembersTaskDrawer.tsx b/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/membersTab/projectReportsMembersTaskDrawer/ProjectReportsMembersTaskDrawer.tsx
index 432c0ae0..4059fe3b 100644
--- a/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/membersTab/projectReportsMembersTaskDrawer/ProjectReportsMembersTaskDrawer.tsx
+++ b/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/membersTab/projectReportsMembersTaskDrawer/ProjectReportsMembersTaskDrawer.tsx
@@ -1,4 +1,4 @@
-import { Drawer, Typography, Flex, Button } from 'antd';
+import { Drawer, Typography, Flex, Button } from '@/shared/antd-imports';
 import React, { useMemo, useState } from 'react';
 import { FileOutlined } from '@ant-design/icons';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/membersTab/projectReportsMembersTaskDrawer/ProjectReportsMembersTaskTable.tsx b/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/membersTab/projectReportsMembersTaskDrawer/ProjectReportsMembersTaskTable.tsx
index 5905b121..06c5da9f 100644
--- a/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/membersTab/projectReportsMembersTaskDrawer/ProjectReportsMembersTaskTable.tsx
+++ b/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/membersTab/projectReportsMembersTaskDrawer/ProjectReportsMembersTaskTable.tsx
@@ -1,7 +1,7 @@
 import { useTranslation } from 'react-i18next';
 import React from 'react';
 import { createPortal } from 'react-dom';
-import { Badge, Flex, Table, TableColumnsType, Tag, Typography } from 'antd';
+import { Badge, Flex, Table, TableColumnsType, Tag, Typography } from '@/shared/antd-imports';
 import dayjs from 'dayjs';
 import { DoubleRightOutlined } from '@ant-design/icons';
 
diff --git a/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/overviewTab/ProjectReportsDueDateGraph.tsx b/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/overviewTab/ProjectReportsDueDateGraph.tsx
index 2acdc99c..494407e2 100644
--- a/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/overviewTab/ProjectReportsDueDateGraph.tsx
+++ b/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/overviewTab/ProjectReportsDueDateGraph.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Doughnut } from 'react-chartjs-2';
 import { Chart, ArcElement, Tooltip } from 'chart.js';
-import { Badge, Card, Flex, Typography } from 'antd';
+import { Badge, Card, Flex, Typography } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 import { IRPTOverviewProjectTasksByDue } from '@/types/reporting/reporting.types';
 
diff --git a/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/overviewTab/ProjectReportsPriorityGraph.tsx b/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/overviewTab/ProjectReportsPriorityGraph.tsx
index cbaa0d77..a97860cb 100644
--- a/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/overviewTab/ProjectReportsPriorityGraph.tsx
+++ b/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/overviewTab/ProjectReportsPriorityGraph.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Doughnut } from 'react-chartjs-2';
 import { Chart, ArcElement, Tooltip } from 'chart.js';
-import { Badge, Card, Flex, Typography } from 'antd';
+import { Badge, Card, Flex, Typography } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 import { IRPTOverviewProjectTasksByPriority } from '@/types/reporting/reporting.types';
 
diff --git a/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/overviewTab/ProjectReportsStatCard.tsx b/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/overviewTab/ProjectReportsStatCard.tsx
index 9d43214b..fb9cf3ad 100644
--- a/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/overviewTab/ProjectReportsStatCard.tsx
+++ b/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/overviewTab/ProjectReportsStatCard.tsx
@@ -4,7 +4,7 @@ import {
   ExclamationCircleOutlined,
   FileExcelOutlined,
 } from '@ant-design/icons';
-import { Card, Flex, Typography } from 'antd';
+import { Card, Flex, Typography } from '@/shared/antd-imports';
 import React, { ReactNode } from 'react';
 import { colors } from '../../../../../styles/colors';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/overviewTab/ProjectReportsStatusGraph.tsx b/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/overviewTab/ProjectReportsStatusGraph.tsx
index bf08d1d5..8cdee581 100644
--- a/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/overviewTab/ProjectReportsStatusGraph.tsx
+++ b/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/overviewTab/ProjectReportsStatusGraph.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Doughnut } from 'react-chartjs-2';
 import { Chart, ArcElement, Tooltip } from 'chart.js';
-import { Badge, Card, Flex, Typography } from 'antd';
+import { Badge, Card, Flex, Typography } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 import { IRPTOverviewProjectTasksByStatus } from '@/types/reporting/reporting.types';
 
diff --git a/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/tasksTab/ProjectReportsTaskTable.tsx b/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/tasksTab/ProjectReportsTaskTable.tsx
index 7afed0bb..3fc58c66 100644
--- a/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/tasksTab/ProjectReportsTaskTable.tsx
+++ b/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/tasksTab/ProjectReportsTaskTable.tsx
@@ -1,4 +1,4 @@
-import { Badge, Collapse, Flex, Table, TableColumnsType, Tag, Typography } from 'antd';
+import { Badge, Collapse, Flex, Table, TableColumnsType, Tag, Typography } from '@/shared/antd-imports';
 import { useEffect } from 'react';
 import CustomTableTitle from '@/components/CustomTableTitle';
 import { colors } from '@/styles/colors';
diff --git a/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/tasksTab/ProjectReportsTasksTab.tsx b/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/tasksTab/ProjectReportsTasksTab.tsx
index 1df6ac9b..f9976dd3 100644
--- a/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/tasksTab/ProjectReportsTasksTab.tsx
+++ b/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/tasksTab/ProjectReportsTasksTab.tsx
@@ -1,4 +1,4 @@
-import { Flex } from 'antd';
+import { Flex } from '@/shared/antd-imports';
 import React, { useEffect, useMemo, useState } from 'react';
 import CustomSearchbar from '@components/CustomSearchbar';
 import GroupByFilter from './group-by-filter';
diff --git a/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/tasksTab/group-by-filter.tsx b/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/tasksTab/group-by-filter.tsx
index f11f0a70..fd6dfda1 100644
--- a/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/tasksTab/group-by-filter.tsx
+++ b/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/tasksTab/group-by-filter.tsx
@@ -1,6 +1,6 @@
 import { IGroupBy } from '@/features/board/board-slice';
 import { CaretDownFilled } from '@ant-design/icons';
-import { Flex, Select } from 'antd';
+import { Flex, Select } from '@/shared/antd-imports';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
diff --git a/worklenz-frontend/src/features/schedule-old/ProjectTimelineModal.tsx b/worklenz-frontend/src/features/schedule-old/ProjectTimelineModal.tsx
index fa613baa..937cca67 100644
--- a/worklenz-frontend/src/features/schedule-old/ProjectTimelineModal.tsx
+++ b/worklenz-frontend/src/features/schedule-old/ProjectTimelineModal.tsx
@@ -1,4 +1,4 @@
-import { Button, Col, DatePicker, Flex, Input, Row } from 'antd';
+import { Button, Col, DatePicker, Flex, Input, Row } from '@/shared/antd-imports';
 import React from 'react';
 import { useDispatch } from 'react-redux';
 import { toggleModal } from './scheduleSlice';
diff --git a/worklenz-frontend/src/features/schedule-old/ScheduleDrawer.tsx b/worklenz-frontend/src/features/schedule-old/ScheduleDrawer.tsx
index b9753d34..9ecd9765 100644
--- a/worklenz-frontend/src/features/schedule-old/ScheduleDrawer.tsx
+++ b/worklenz-frontend/src/features/schedule-old/ScheduleDrawer.tsx
@@ -1,4 +1,4 @@
-import { Avatar, Drawer, Tabs, TabsProps } from 'antd';
+import { Avatar, Drawer, Tabs, TabsProps } from '@/shared/antd-imports';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { toggleScheduleDrawer } from './scheduleSlice';
diff --git a/worklenz-frontend/src/features/schedule-old/ScheduleSettingsDrawer.tsx b/worklenz-frontend/src/features/schedule-old/ScheduleSettingsDrawer.tsx
index 65a126b3..cbe93b88 100644
--- a/worklenz-frontend/src/features/schedule-old/ScheduleSettingsDrawer.tsx
+++ b/worklenz-frontend/src/features/schedule-old/ScheduleSettingsDrawer.tsx
@@ -1,4 +1,4 @@
-import { Button, Checkbox, Col, Drawer, Form, Input, Row } from 'antd';
+import { Button, Checkbox, Col, Drawer, Form, Input, Row } from '@/shared/antd-imports';
 import React, { ReactHTMLElement, useState } from 'react';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { toggleSettingsDrawer, updateSettings } from './scheduleSlice';
diff --git a/worklenz-frontend/src/features/schedule/ProjectTimelineModal.tsx b/worklenz-frontend/src/features/schedule/ProjectTimelineModal.tsx
index 079d2e90..ce0b7532 100644
--- a/worklenz-frontend/src/features/schedule/ProjectTimelineModal.tsx
+++ b/worklenz-frontend/src/features/schedule/ProjectTimelineModal.tsx
@@ -1,6 +1,6 @@
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { ScheduleData } from '@/types/schedule/schedule-v2.types';
-import { Button, Col, DatePicker, Flex, Form, Input, Row } from 'antd';
+import { Button, Col, DatePicker, Flex, Form, Input, Row } from '@/shared/antd-imports';
 import React, { useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import { createSchedule, fetchTeamData } from './scheduleSlice';
diff --git a/worklenz-frontend/src/features/schedule/ScheduleDrawer.tsx b/worklenz-frontend/src/features/schedule/ScheduleDrawer.tsx
index 7f21a2af..a8604051 100644
--- a/worklenz-frontend/src/features/schedule/ScheduleDrawer.tsx
+++ b/worklenz-frontend/src/features/schedule/ScheduleDrawer.tsx
@@ -1,4 +1,4 @@
-import { Avatar, Drawer, Tabs, TabsProps } from 'antd';
+import { Avatar, Drawer, Tabs, TabsProps } from '@/shared/antd-imports';
 import React from 'react';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
diff --git a/worklenz-frontend/src/features/schedule/ScheduleSettingsDrawer.tsx b/worklenz-frontend/src/features/schedule/ScheduleSettingsDrawer.tsx
index 63ce9643..3b3d06c4 100644
--- a/worklenz-frontend/src/features/schedule/ScheduleSettingsDrawer.tsx
+++ b/worklenz-frontend/src/features/schedule/ScheduleSettingsDrawer.tsx
@@ -1,4 +1,4 @@
-import { Button, Checkbox, Col, Drawer, Form, Input, Row } from 'antd';
+import { Button, Checkbox, Col, Drawer, Form, Input, Row } from '@/shared/antd-imports';
 import React, { ReactHTMLElement, useEffect, useState } from 'react';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import {
diff --git a/worklenz-frontend/src/features/settings/categories/CustomColorsCategoryTag.tsx b/worklenz-frontend/src/features/settings/categories/CustomColorsCategoryTag.tsx
index 060cb189..b0588e1a 100644
--- a/worklenz-frontend/src/features/settings/categories/CustomColorsCategoryTag.tsx
+++ b/worklenz-frontend/src/features/settings/categories/CustomColorsCategoryTag.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Tag, Typography } from 'antd';
+import { Tag, Typography } from '@/shared/antd-imports';
 import { colors } from '@/styles/colors';
 import { IProjectCategory } from '@/types/project/projectCategory.types';
 
diff --git a/worklenz-frontend/src/features/settings/categories/color-changed-category.tsx b/worklenz-frontend/src/features/settings/categories/color-changed-category.tsx
index f0de1ae1..9d97ff6d 100644
--- a/worklenz-frontend/src/features/settings/categories/color-changed-category.tsx
+++ b/worklenz-frontend/src/features/settings/categories/color-changed-category.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Select, Tag, Tooltip } from 'antd';
+import { Select, Tag, Tooltip } from '@/shared/antd-imports';
 import { CategoryType } from '../../../types/categories.types';
 import { useTranslation } from 'react-i18next';
 import { PhaseColorCodes } from '../../../shared/constants';
diff --git a/worklenz-frontend/src/features/settings/client/CreateClientDrawer.tsx b/worklenz-frontend/src/features/settings/client/CreateClientDrawer.tsx
index 7c5e911f..5e3ca781 100644
--- a/worklenz-frontend/src/features/settings/client/CreateClientDrawer.tsx
+++ b/worklenz-frontend/src/features/settings/client/CreateClientDrawer.tsx
@@ -1,4 +1,4 @@
-import { Button, Drawer, Form, Input, message, Typography } from 'antd';
+import { Button, Drawer, Form, Input, message, Typography } from '@/shared/antd-imports';
 import React from 'react';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
diff --git a/worklenz-frontend/src/features/settings/client/UpdateClientDrawer.tsx b/worklenz-frontend/src/features/settings/client/UpdateClientDrawer.tsx
index d23a0960..076b7800 100644
--- a/worklenz-frontend/src/features/settings/client/UpdateClientDrawer.tsx
+++ b/worklenz-frontend/src/features/settings/client/UpdateClientDrawer.tsx
@@ -1,4 +1,4 @@
-import { Button, Drawer, Form, Input, message, Typography } from 'antd';
+import { Button, Drawer, Form, Input, message, Typography } from '@/shared/antd-imports';
 import React, { useEffect } from 'react';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
diff --git a/worklenz-frontend/src/features/settings/job/CreateJobTitlesDrawer.tsx b/worklenz-frontend/src/features/settings/job/CreateJobTitlesDrawer.tsx
index 713e7c18..379d9315 100644
--- a/worklenz-frontend/src/features/settings/job/CreateJobTitlesDrawer.tsx
+++ b/worklenz-frontend/src/features/settings/job/CreateJobTitlesDrawer.tsx
@@ -1,4 +1,4 @@
-import { Button, Drawer, Form, Input, message, Typography } from 'antd';
+import { Button, Drawer, Form, Input, message, Typography } from '@/shared/antd-imports';
 import React from 'react';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
diff --git a/worklenz-frontend/src/features/settings/job/UpdateJobTitlesDrawer.tsx b/worklenz-frontend/src/features/settings/job/UpdateJobTitlesDrawer.tsx
index b03d3da3..e2d5f9ab 100644
--- a/worklenz-frontend/src/features/settings/job/UpdateJobTitlesDrawer.tsx
+++ b/worklenz-frontend/src/features/settings/job/UpdateJobTitlesDrawer.tsx
@@ -1,4 +1,4 @@
-import { Button, Drawer, Form, Input, message, Typography } from 'antd';
+import { Button, Drawer, Form, Input, message, Typography } from '@/shared/antd-imports';
 import React, { useEffect } from 'react';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
diff --git a/worklenz-frontend/src/features/theme/ThemeWrapper.tsx b/worklenz-frontend/src/features/theme/ThemeWrapper.tsx
index e32ea424..e6783f1e 100644
--- a/worklenz-frontend/src/features/theme/ThemeWrapper.tsx
+++ b/worklenz-frontend/src/features/theme/ThemeWrapper.tsx
@@ -1,4 +1,4 @@
-import { ConfigProvider, theme } from 'antd';
+import { ConfigProvider, theme } from '@/shared/antd-imports';
 import React, { useEffect, useRef, memo, useMemo, useCallback } from 'react';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
diff --git a/worklenz-frontend/src/features/timeReport/projects/ProjectTimeLogDrawer.tsx b/worklenz-frontend/src/features/timeReport/projects/ProjectTimeLogDrawer.tsx
index 1580138b..b6d4a732 100644
--- a/worklenz-frontend/src/features/timeReport/projects/ProjectTimeLogDrawer.tsx
+++ b/worklenz-frontend/src/features/timeReport/projects/ProjectTimeLogDrawer.tsx
@@ -1,4 +1,4 @@
-import { Avatar, Button, Card, Divider, Drawer, Tag, Timeline, Typography } from 'antd';
+import { Avatar, Button, Card, Divider, Drawer, Tag, Timeline, Typography } from '@/shared/antd-imports';
 import React, { useState, useEffect } from 'react';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
diff --git a/worklenz-frontend/src/index.tsx b/worklenz-frontend/src/index.tsx
index c8cf3b99..08956ec1 100644
--- a/worklenz-frontend/src/index.tsx
+++ b/worklenz-frontend/src/index.tsx
@@ -8,7 +8,7 @@ import './i18n';
 import { Provider } from 'react-redux';
 import { store } from './app/store';
 import { applyCssVariables } from './styles/colors';
-import { ConfigProvider, theme } from 'antd';
+import { ConfigProvider, theme } from '@/shared/antd-imports';
 import { colors } from './styles/colors';
 import { getInitialTheme } from './utils/get-initial-theme';
 import { initializePerformanceMonitoring } from './utils/enhanced-performance-monitoring';
diff --git a/worklenz-frontend/src/layouts/AdminCenterLayout.tsx b/worklenz-frontend/src/layouts/AdminCenterLayout.tsx
index 4addfd3c..d46595b9 100644
--- a/worklenz-frontend/src/layouts/AdminCenterLayout.tsx
+++ b/worklenz-frontend/src/layouts/AdminCenterLayout.tsx
@@ -1,4 +1,4 @@
-import { Flex, Typography } from 'antd';
+import { Flex, Typography } from '@/shared/antd-imports';
 import React from 'react';
 import { Outlet } from 'react-router-dom';
 import { useMediaQuery } from 'react-responsive';
diff --git a/worklenz-frontend/src/layouts/AuthLayout.tsx b/worklenz-frontend/src/layouts/AuthLayout.tsx
index 925bca19..c3a197c3 100644
--- a/worklenz-frontend/src/layouts/AuthLayout.tsx
+++ b/worklenz-frontend/src/layouts/AuthLayout.tsx
@@ -1,4 +1,4 @@
-import { ConfigProvider, Flex, Layout } from 'antd';
+import { ConfigProvider, Flex, Layout } from '@/shared/antd-imports';
 import React from 'react';
 import { Outlet } from 'react-router-dom';
 import { useAppSelector } from '../hooks/useAppSelector';
diff --git a/worklenz-frontend/src/layouts/MainLayout.tsx b/worklenz-frontend/src/layouts/MainLayout.tsx
index 8e3cc66b..d861be23 100644
--- a/worklenz-frontend/src/layouts/MainLayout.tsx
+++ b/worklenz-frontend/src/layouts/MainLayout.tsx
@@ -1,4 +1,4 @@
-import { Col, ConfigProvider, Layout } from 'antd';
+import { Col, ConfigProvider, Layout } from '@/shared/antd-imports';
 import { Outlet, useNavigate } from 'react-router-dom';
 import { memo, useMemo, useEffect, useRef } from 'react';
 import { useMediaQuery } from 'react-responsive';
diff --git a/worklenz-frontend/src/layouts/ReportingLayout.tsx b/worklenz-frontend/src/layouts/ReportingLayout.tsx
index 09f8c6b2..c9538390 100644
--- a/worklenz-frontend/src/layouts/ReportingLayout.tsx
+++ b/worklenz-frontend/src/layouts/ReportingLayout.tsx
@@ -1,4 +1,4 @@
-import { Col, ConfigProvider, Layout } from 'antd';
+import { Col, ConfigProvider, Layout } from '@/shared/antd-imports';
 import { useEffect, useState } from 'react';
 import Navbar from '../features/navbar/navbar';
 import { useAppSelector } from '../hooks/useAppSelector';
diff --git a/worklenz-frontend/src/layouts/SettingsLayout.tsx b/worklenz-frontend/src/layouts/SettingsLayout.tsx
index 87f0f525..84e050f6 100644
--- a/worklenz-frontend/src/layouts/SettingsLayout.tsx
+++ b/worklenz-frontend/src/layouts/SettingsLayout.tsx
@@ -1,4 +1,4 @@
-import { Flex, Typography } from 'antd';
+import { Flex, Typography } from '@/shared/antd-imports';
 import SettingsSidebar from '../pages/settings/sidebar/settings-sidebar';
 import { Outlet, useNavigate } from 'react-router-dom';
 import { useMediaQuery } from 'react-responsive';
diff --git a/worklenz-frontend/src/pages/404-page/404-page.tsx b/worklenz-frontend/src/pages/404-page/404-page.tsx
index e651dc2c..130ad3ef 100644
--- a/worklenz-frontend/src/pages/404-page/404-page.tsx
+++ b/worklenz-frontend/src/pages/404-page/404-page.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import notFoundImg from '../../assets/images/not-found-img.png';
-import { Button, Flex, Layout, Typography } from 'antd';
+import { Button, Flex, Layout, Typography } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 
 const NotFoundPage = () => {
diff --git a/worklenz-frontend/src/pages/admin-center/overview/overview.tsx b/worklenz-frontend/src/pages/admin-center/overview/overview.tsx
index e20d103c..077b23ff 100644
--- a/worklenz-frontend/src/pages/admin-center/overview/overview.tsx
+++ b/worklenz-frontend/src/pages/admin-center/overview/overview.tsx
@@ -1,6 +1,6 @@
 import { EditOutlined, MailOutlined, PhoneOutlined } from '@ant-design/icons';
 import { PageHeader } from '@ant-design/pro-components';
-import { Button, Card, Input, Space, Tooltip, Typography } from 'antd';
+import { Button, Card, Input, Space, Tooltip, Typography } from '@/shared/antd-imports';
 import React, { useEffect, useState } from 'react';
 import OrganizationAdminsTable from '@/components/admin-center/overview/organization-admins-table/organization-admins-table';
 import { useAppSelector } from '@/hooks/useAppSelector';
diff --git a/worklenz-frontend/src/pages/admin-center/projects/projects.tsx b/worklenz-frontend/src/pages/admin-center/projects/projects.tsx
index 41d92db8..e76d04bd 100644
--- a/worklenz-frontend/src/pages/admin-center/projects/projects.tsx
+++ b/worklenz-frontend/src/pages/admin-center/projects/projects.tsx
@@ -21,7 +21,7 @@ import {
   TableProps,
   Tooltip,
   Typography,
-} from 'antd';
+} from '@/shared/antd-imports';
 import { DeleteOutlined, SearchOutlined, SyncOutlined } from '@ant-design/icons';
 import { PageHeader } from '@ant-design/pro-components';
 import { projectsApiService } from '@/api/projects/projects.api.service';
diff --git a/worklenz-frontend/src/pages/admin-center/sidebar/sidebar.tsx b/worklenz-frontend/src/pages/admin-center/sidebar/sidebar.tsx
index 0a893d02..480cb210 100644
--- a/worklenz-frontend/src/pages/admin-center/sidebar/sidebar.tsx
+++ b/worklenz-frontend/src/pages/admin-center/sidebar/sidebar.tsx
@@ -1,5 +1,5 @@
 import { RightOutlined } from '@ant-design/icons';
-import { ConfigProvider, Flex, Menu, MenuProps } from 'antd';
+import { ConfigProvider, Flex, Menu, MenuProps } from '@/shared/antd-imports';
 import React from 'react';
 import { Link, useLocation } from 'react-router-dom';
 import { colors } from '../../../styles/colors';
diff --git a/worklenz-frontend/src/pages/admin-center/teams/teams.tsx b/worklenz-frontend/src/pages/admin-center/teams/teams.tsx
index db4522c8..da2d9eeb 100644
--- a/worklenz-frontend/src/pages/admin-center/teams/teams.tsx
+++ b/worklenz-frontend/src/pages/admin-center/teams/teams.tsx
@@ -1,6 +1,6 @@
 import { SearchOutlined, SyncOutlined } from '@ant-design/icons';
 import { PageHeader } from '@ant-design/pro-components';
-import { Button, Flex, Input, Tooltip } from 'antd';
+import { Button, Flex, Input, Tooltip } from '@/shared/antd-imports';
 
 import React, { useEffect, useState } from 'react';
 
diff --git a/worklenz-frontend/src/pages/admin-center/users/users.tsx b/worklenz-frontend/src/pages/admin-center/users/users.tsx
index 2795a30e..f6b298e5 100644
--- a/worklenz-frontend/src/pages/admin-center/users/users.tsx
+++ b/worklenz-frontend/src/pages/admin-center/users/users.tsx
@@ -1,6 +1,6 @@
 import { SearchOutlined, SyncOutlined } from '@ant-design/icons';
 import { PageHeader } from '@ant-design/pro-components';
-import { Button, Card, Flex, Input, Table, TableProps, Tooltip, Typography } from 'antd';
+import { Button, Card, Flex, Input, Table, TableProps, Tooltip, Typography } from '@/shared/antd-imports';
 import React, { useEffect, useState } from 'react';
 import { RootState } from '@/app/store';
 import { useAppSelector } from '@/hooks/useAppSelector';
diff --git a/worklenz-frontend/src/pages/home/recent-and-favourite-project-list/add-favourite-project-button.tsx b/worklenz-frontend/src/pages/home/recent-and-favourite-project-list/add-favourite-project-button.tsx
index 43262a78..410b5b01 100644
--- a/worklenz-frontend/src/pages/home/recent-and-favourite-project-list/add-favourite-project-button.tsx
+++ b/worklenz-frontend/src/pages/home/recent-and-favourite-project-list/add-favourite-project-button.tsx
@@ -1,5 +1,5 @@
 import { StarFilled } from '@ant-design/icons';
-import { Button, ConfigProvider, Tooltip } from 'antd';
+import { Button, ConfigProvider, Tooltip } from '@/shared/antd-imports';
 import { useMemo } from 'react';
 import { colors } from '@/styles/colors';
 import { IProjectViewModel } from '@/types/project/projectViewModel.types';
diff --git a/worklenz-frontend/src/pages/home/recent-and-favourite-project-list/recent-and-favourite-project-list.tsx b/worklenz-frontend/src/pages/home/recent-and-favourite-project-list/recent-and-favourite-project-list.tsx
index ff7d70cc..548b9e99 100644
--- a/worklenz-frontend/src/pages/home/recent-and-favourite-project-list/recent-and-favourite-project-list.tsx
+++ b/worklenz-frontend/src/pages/home/recent-and-favourite-project-list/recent-and-favourite-project-list.tsx
@@ -10,7 +10,7 @@ import {
   TableProps,
   Tooltip,
   Typography,
-} from 'antd';
+} from '@/shared/antd-imports';
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
diff --git a/worklenz-frontend/src/pages/home/task-list/add-task-inline-form.tsx b/worklenz-frontend/src/pages/home/task-list/add-task-inline-form.tsx
index caff5f7f..8e806fe2 100644
--- a/worklenz-frontend/src/pages/home/task-list/add-task-inline-form.tsx
+++ b/worklenz-frontend/src/pages/home/task-list/add-task-inline-form.tsx
@@ -1,4 +1,4 @@
-import { Alert, DatePicker, Flex, Form, Input, InputRef, Select, Typography } from 'antd';
+import { Alert, DatePicker, Flex, Form, Input, InputRef, Select, Typography } from '@/shared/antd-imports';
 import { useEffect, useRef, useState } from 'react';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { TFunction } from 'i18next';
diff --git a/worklenz-frontend/src/pages/home/task-list/calendar-view.tsx b/worklenz-frontend/src/pages/home/task-list/calendar-view.tsx
index c0bfac8f..4c70ea4e 100644
--- a/worklenz-frontend/src/pages/home/task-list/calendar-view.tsx
+++ b/worklenz-frontend/src/pages/home/task-list/calendar-view.tsx
@@ -1,5 +1,5 @@
 import HomeCalendar from '../../../components/calendars/homeCalendar/HomeCalendar';
-import { Tag, Typography } from 'antd';
+import { Tag, Typography } from '@/shared/antd-imports';
 import { ClockCircleOutlined } from '@ant-design/icons';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import AddTaskInlineForm from './add-task-inline-form';
diff --git a/worklenz-frontend/src/pages/home/task-list/list-view.tsx b/worklenz-frontend/src/pages/home/task-list/list-view.tsx
index 255a650c..cef270c5 100644
--- a/worklenz-frontend/src/pages/home/task-list/list-view.tsx
+++ b/worklenz-frontend/src/pages/home/task-list/list-view.tsx
@@ -1,4 +1,4 @@
-import { Tabs } from 'antd';
+import { Tabs } from '@/shared/antd-imports';
 import AddTaskInlineForm from './add-task-inline-form';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/pages/home/task-list/tasks-list.tsx b/worklenz-frontend/src/pages/home/task-list/tasks-list.tsx
index 17ba17dd..1f8e10ec 100644
--- a/worklenz-frontend/src/pages/home/task-list/tasks-list.tsx
+++ b/worklenz-frontend/src/pages/home/task-list/tasks-list.tsx
@@ -12,7 +12,7 @@ import {
   Tooltip,
   Typography,
   Pagination,
-} from 'antd';
+} from '@/shared/antd-imports';
 import React, { useState, useMemo, useCallback, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useMediaQuery } from 'react-responsive';
diff --git a/worklenz-frontend/src/pages/license-expired/license-expired.tsx b/worklenz-frontend/src/pages/license-expired/license-expired.tsx
index 37f8b596..6b724bb5 100644
--- a/worklenz-frontend/src/pages/license-expired/license-expired.tsx
+++ b/worklenz-frontend/src/pages/license-expired/license-expired.tsx
@@ -1,4 +1,4 @@
-import { Button, Result } from 'antd';
+import { Button, Result } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
 import { useAuthService } from '@/hooks/useAuth';
diff --git a/worklenz-frontend/src/pages/projects/project-list.tsx b/worklenz-frontend/src/pages/projects/project-list.tsx
index 38729c17..b11c331d 100644
--- a/worklenz-frontend/src/pages/projects/project-list.tsx
+++ b/worklenz-frontend/src/pages/projects/project-list.tsx
@@ -16,7 +16,7 @@ import {
   Table,
   TablePaginationConfig,
   Tooltip,
-} from 'antd';
+} from '@/shared/antd-imports';
 import { PageHeader } from '@ant-design/pro-components';
 import {
   SearchOutlined,
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/board/project-view-board.tsx b/worklenz-frontend/src/pages/projects/project-view-1/board/project-view-board.tsx
index b9d407e4..e0acc2ac 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/board/project-view-board.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/board/project-view-board.tsx
@@ -10,7 +10,7 @@ import {
 
 import { useAppSelector } from '@/hooks/useAppSelector';
 import TaskListFilters from '../taskList/taskListFilters/TaskListFilters';
-import { Button, Skeleton } from 'antd';
+import { Button, Skeleton } from '@/shared/antd-imports';
 import { PlusOutlined } from '@ant-design/icons';
 import { useDispatch } from 'react-redux';
 import { toggleDrawer } from '@/features/projects/status/StatusSlice';
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/roadmap/project-view-roadmap.tsx b/worklenz-frontend/src/pages/projects/project-view-1/roadmap/project-view-roadmap.tsx
index ec256f67..cb7ca914 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/roadmap/project-view-roadmap.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/roadmap/project-view-roadmap.tsx
@@ -2,7 +2,7 @@ import { useState } from 'react';
 import { ViewMode } from 'gantt-task-react';
 import 'gantt-task-react/dist/index.css';
 import './project-view-roadmap.css';
-import { Flex } from 'antd';
+import { Flex } from '@/shared/antd-imports';
 import { useAppSelector } from '../../../../hooks/useAppSelector';
 import { TimeFilter } from './time-filter';
 import RoadmapTable from './roadmap-table/roadmap-table';
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/roadmap/roadmap-table/roadmap-table.tsx b/worklenz-frontend/src/pages/projects/project-view-1/roadmap/roadmap-table/roadmap-table.tsx
index 96991e6c..f81b03f1 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/roadmap/roadmap-table/roadmap-table.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/roadmap/roadmap-table/roadmap-table.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { DatePicker, Typography } from 'antd';
+import { DatePicker, Typography } from '@/shared/antd-imports';
 import dayjs, { Dayjs } from 'dayjs';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/roadmap/roadmap-table/roadmap-task-cell.tsx b/worklenz-frontend/src/pages/projects/project-view-1/roadmap/roadmap-table/roadmap-task-cell.tsx
index d56d809a..c92bf49a 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/roadmap/roadmap-table/roadmap-task-cell.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/roadmap/roadmap-table/roadmap-task-cell.tsx
@@ -1,4 +1,4 @@
-import { Flex, Typography, Button, Tooltip } from 'antd';
+import { Flex, Typography, Button, Tooltip } from '@/shared/antd-imports';
 import {
   DoubleRightOutlined,
   DownOutlined,
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/roadmap/time-filter.tsx b/worklenz-frontend/src/pages/projects/project-view-1/roadmap/time-filter.tsx
index ff1461f1..bf26e722 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/roadmap/time-filter.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/roadmap/time-filter.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import 'gantt-task-react/dist/index.css';
 import { ViewMode } from 'gantt-task-react';
-import { Flex, Select } from 'antd';
+import { Flex, Select } from '@/shared/antd-imports';
 type TimeFilterProps = {
   onViewModeChange: (viewMode: ViewMode) => void;
 };
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/task-list/table-v2.tsx b/worklenz-frontend/src/pages/projects/project-view-1/task-list/table-v2.tsx
index 7f756485..ce722a19 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/task-list/table-v2.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/task-list/table-v2.tsx
@@ -1,5 +1,5 @@
 import { useCallback, useMemo, useRef, useState } from 'react';
-import { Checkbox, Flex, Tag, Tooltip } from 'antd';
+import { Checkbox, Flex, Tag, Tooltip } from '@/shared/antd-imports';
 import { HolderOutlined } from '@ant-design/icons';
 import {
   DndContext,
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/task-list/task-list-columns/task-list-columns.tsx b/worklenz-frontend/src/pages/projects/project-view-1/task-list/task-list-columns/task-list-columns.tsx
index 773b683a..20728257 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/task-list/task-list-columns/task-list-columns.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/task-list/task-list-columns/task-list-columns.tsx
@@ -1,4 +1,4 @@
-import { Avatar, Checkbox, DatePicker, Flex, Select, Tag } from 'antd';
+import { Avatar, Checkbox, DatePicker, Flex, Select, Tag } from '@/shared/antd-imports';
 import { createColumnHelper, ColumnDef } from '@tanstack/react-table';
 import { IProjectTask } from '@/types/project/projectTasksViewModel.types';
 import { HolderOutlined, PlusOutlined } from '@ant-design/icons';
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/task-list/task-list-custom.tsx b/worklenz-frontend/src/pages/projects/project-view-1/task-list/task-list-custom.tsx
index da30ca2f..ebdbe404 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/task-list/task-list-custom.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/task-list/task-list-custom.tsx
@@ -1,5 +1,5 @@
 import { useCallback, useMemo, useRef, useState } from 'react';
-import { Checkbox, theme } from 'antd';
+import { Checkbox, theme } from '@/shared/antd-imports';
 import {
   useReactTable,
   getCoreRowModel,
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/task-list/task-list-header/task-list-header.tsx b/worklenz-frontend/src/pages/projects/project-view-1/task-list/task-list-header/task-list-header.tsx
index 12043805..358a3a85 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/task-list/task-list-header/task-list-header.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/task-list/task-list-header/task-list-header.tsx
@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { Button, Dropdown, Input, Menu, Badge, Tooltip } from 'antd';
+import { Button, Dropdown, Input, Menu, Badge, Tooltip } from '@/shared/antd-imports';
 import {
   RightOutlined,
   LoadingOutlined,
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/task-list/task-list-instant-task-input/task-list-instant-task-input.tsx b/worklenz-frontend/src/pages/projects/project-view-1/task-list/task-list-instant-task-input/task-list-instant-task-input.tsx
index d41534cd..0c726f36 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/task-list/task-list-instant-task-input/task-list-instant-task-input.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/task-list/task-list-instant-task-input/task-list-instant-task-input.tsx
@@ -1,4 +1,4 @@
-import { Input, InputRef, theme } from 'antd';
+import { Input, InputRef, theme } from '@/shared/antd-imports';
 import React, { useState, useMemo, useRef } from 'react';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { colors } from '@/styles/colors';
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/task-list/task-list-table-old/task-list-table-old.tsx b/worklenz-frontend/src/pages/projects/project-view-1/task-list/task-list-table-old/task-list-table-old.tsx
index 5972a489..6cc52e12 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/task-list/task-list-table-old/task-list-table-old.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/task-list/task-list-table-old/task-list-table-old.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react';
-import { Avatar, Checkbox, DatePicker, Flex, Tag, Tooltip, Typography } from 'antd';
+import { Avatar, Checkbox, DatePicker, Flex, Tag, Tooltip, Typography } from '@/shared/antd-imports';
 
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { columnList } from '@/pages/projects/project-view-1/taskList/taskListTable/columns/columnList';
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/task-list/task-list-table-wrapper/task-list-table-wrapper.tsx b/worklenz-frontend/src/pages/projects/project-view-1/task-list/task-list-table-wrapper/task-list-table-wrapper.tsx
index e3ec231f..edc63353 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/task-list/task-list-table-wrapper/task-list-table-wrapper.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/task-list/task-list-table-wrapper/task-list-table-wrapper.tsx
@@ -1,4 +1,4 @@
-import { Badge, Button, Collapse, ConfigProvider, Dropdown, Flex, Input, Typography } from 'antd';
+import { Badge, Button, Collapse, ConfigProvider, Dropdown, Flex, Input, Typography } from '@/shared/antd-imports';
 import { useState } from 'react';
 import { TaskType } from '@/types/task.types';
 import { EditOutlined, EllipsisOutlined, RetweetOutlined, RightOutlined } from '@ant-design/icons';
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/task-list/task-list.tsx b/worklenz-frontend/src/pages/projects/project-view-1/task-list/task-list.tsx
index a5ad9f85..928ad63e 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/task-list/task-list.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/task-list/task-list.tsx
@@ -1,5 +1,5 @@
 import { useEffect } from 'react';
-import { Flex, Skeleton } from 'antd';
+import { Flex, Skeleton } from '@/shared/antd-imports';
 import TaskListFilters from '@/pages/projects/project-view-1/taskList/taskListFilters/TaskListFilters';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { ITaskListConfigV2, ITaskListGroup } from '@/types/tasks/taskList.types';
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/taskList/ProjectViewTaskList.tsx b/worklenz-frontend/src/pages/projects/project-view-1/taskList/ProjectViewTaskList.tsx
index 676a7dbe..0d70c695 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/taskList/ProjectViewTaskList.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/taskList/ProjectViewTaskList.tsx
@@ -1,5 +1,5 @@
 import { useEffect } from 'react';
-import { Flex } from 'antd';
+import { Flex } from '@/shared/antd-imports';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { fetchStatusesCategories } from '@/features/taskAttributes/taskStatusSlice';
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/taskList/statusTables/StatusGroupTables.tsx b/worklenz-frontend/src/pages/projects/project-view-1/taskList/statusTables/StatusGroupTables.tsx
index 4c74ca4a..b433323b 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/taskList/statusTables/StatusGroupTables.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/taskList/statusTables/StatusGroupTables.tsx
@@ -1,6 +1,6 @@
 import { TaskType } from '@/types/task.types';
 import { useAppSelector } from '@/hooks/useAppSelector';
-import { Flex } from 'antd';
+import { Flex } from '@/shared/antd-imports';
 import TaskListTableWrapper from '@/pages/projects/project-view-1/taskList/taskListTable/TaskListTableWrapper';
 import { createPortal } from 'react-dom';
 import BulkTasksActionContainer from '@/features/projects/bulkActions/BulkTasksActionContainer';
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/GroupByFilterDropdown.tsx b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/GroupByFilterDropdown.tsx
index bdc87e82..ebd5ddd8 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/GroupByFilterDropdown.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/GroupByFilterDropdown.tsx
@@ -1,5 +1,5 @@
 import { CaretDownFilled } from '@ant-design/icons';
-import { ConfigProvider, Flex, Select } from 'antd';
+import { ConfigProvider, Flex, Select } from '@/shared/antd-imports';
 import React, { useState } from 'react';
 import { colors } from '@/styles/colors';
 import ConfigPhaseButton from '@features/projects/singleProject/phase/ConfigPhaseButton';
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/LabelsFilterDropdown.tsx b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/LabelsFilterDropdown.tsx
index afa395d4..53f83fdb 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/LabelsFilterDropdown.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/LabelsFilterDropdown.tsx
@@ -11,7 +11,7 @@ import {
   InputRef,
   List,
   Space,
-} from 'antd';
+} from '@/shared/antd-imports';
 import { useEffect, useRef, useState } from 'react';
 import { colors } from '@/styles/colors';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/MembersFilterDropdown.tsx b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/MembersFilterDropdown.tsx
index ea59bd1b..0af08d0e 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/MembersFilterDropdown.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/MembersFilterDropdown.tsx
@@ -13,7 +13,7 @@ import {
   List,
   Space,
   Typography,
-} from 'antd';
+} from '@/shared/antd-imports';
 import { useMemo, useRef, useState } from 'react';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { colors } from '@/styles/colors';
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/PriorityFilterDropdown.tsx b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/PriorityFilterDropdown.tsx
index dafc5af2..834f0498 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/PriorityFilterDropdown.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/PriorityFilterDropdown.tsx
@@ -1,5 +1,5 @@
 import { CaretDownFilled } from '@ant-design/icons';
-import { Badge, Button, Card, Checkbox, Dropdown, List, Space } from 'antd';
+import { Badge, Button, Card, Checkbox, Dropdown, List, Space } from '@/shared/antd-imports';
 import { useState } from 'react';
 
 import { colors } from '@/styles/colors';
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/SearchDropdown.tsx b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/SearchDropdown.tsx
index 8eb0d3b0..3480b4f4 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/SearchDropdown.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/SearchDropdown.tsx
@@ -1,5 +1,5 @@
 import { SearchOutlined } from '@ant-design/icons';
-import { Button, Card, Dropdown, Flex, Input, InputRef, Space } from 'antd';
+import { Button, Card, Dropdown, Flex, Input, InputRef, Space } from '@/shared/antd-imports';
 import { useRef } from 'react';
 import { useTranslation } from 'react-i18next';
 
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/ShowFieldsFilterDropdown.tsx b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/ShowFieldsFilterDropdown.tsx
index f98b6c3c..301399d4 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/ShowFieldsFilterDropdown.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/ShowFieldsFilterDropdown.tsx
@@ -1,5 +1,5 @@
 import { MoreOutlined } from '@ant-design/icons';
-import { Button, Card, Checkbox, Dropdown, List, Space } from 'antd';
+import { Button, Card, Checkbox, Dropdown, List, Space } from '@/shared/antd-imports';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import {
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/SortFilterDropdown.tsx b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/SortFilterDropdown.tsx
index 85c2cfd5..fa3a202b 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/SortFilterDropdown.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/SortFilterDropdown.tsx
@@ -1,5 +1,5 @@
 import { CaretDownFilled, SortAscendingOutlined, SortDescendingOutlined } from '@ant-design/icons';
-import { Badge, Button, Card, Checkbox, Dropdown, List, Space } from 'antd';
+import { Badge, Button, Card, Checkbox, Dropdown, List, Space } from '@/shared/antd-imports';
 import React, { useState } from 'react';
 import { colors } from '../../../../../styles/colors';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/TaskListFilters.tsx b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/TaskListFilters.tsx
index d794c414..e1bfad6a 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/TaskListFilters.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/TaskListFilters.tsx
@@ -1,4 +1,4 @@
-import { Checkbox, Flex, Typography } from 'antd';
+import { Checkbox, Flex, Typography } from '@/shared/antd-imports';
 import SearchDropdown from './SearchDropdown';
 import SortFilterDropdown from './SortFilterDropdown';
 import LabelsFilterDropdown from './LabelsFilterDropdown';
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/TaskListTable.tsx b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/TaskListTable.tsx
index 1acd6c30..257252b1 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/TaskListTable.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/TaskListTable.tsx
@@ -1,7 +1,7 @@
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { columnList } from './columns/columnList';
 import AddTaskListRow from './taskListTableRows/AddTaskListRow';
-import { Checkbox, Flex, Tag, Tooltip } from 'antd';
+import { Checkbox, Flex, Tag, Tooltip } from '@/shared/antd-imports';
 import React, { useEffect, useState } from 'react';
 import { useSelectedProject } from '@/hooks/useSelectedProject';
 import TaskCell from './taskListTableCells/TaskCell';
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/TaskListTableWrapper.tsx b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/TaskListTableWrapper.tsx
index b71ba97c..ad8d6e6f 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/TaskListTableWrapper.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/TaskListTableWrapper.tsx
@@ -1,6 +1,5 @@
-import { Badge, Button, Collapse, ConfigProvider, Dropdown, Flex, Input, Typography } from 'antd';
+import { Badge, Button, Collapse, ConfigProvider, Dropdown, Flex, Input, Typography } from '@/shared/antd-imports';
 import { useState } from 'react';
-import { TaskType } from '../../../../../types/task.types';
 import { EditOutlined, EllipsisOutlined, RetweetOutlined, RightOutlined } from '@ant-design/icons';
 import { colors } from '../../../../../styles/colors';
 import './taskListTableWrapper.css';
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/contextMenu/TaskContextMenu.tsx b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/contextMenu/TaskContextMenu.tsx
index 757570b2..88054503 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/contextMenu/TaskContextMenu.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/contextMenu/TaskContextMenu.tsx
@@ -5,7 +5,7 @@ import {
   RetweetOutlined,
   UserAddOutlined,
 } from '@ant-design/icons';
-import { Badge, Dropdown, Flex, Typography } from 'antd';
+import { Badge, Dropdown, Flex, Typography } from '@/shared/antd-imports';
 import { MenuProps } from 'antd/lib';
 import React from 'react';
 import { useAppSelector } from '@/hooks/useAppSelector';
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/taskListTableCells/TaskCell.tsx b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/taskListTableCells/TaskCell.tsx
index b5e53016..a9dccbfa 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/taskListTableCells/TaskCell.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/taskListTableCells/TaskCell.tsx
@@ -1,6 +1,6 @@
 // TaskNameCell.tsx
 import React from 'react';
-import { Flex, Typography, Button } from 'antd';
+import { Flex, Typography, Button } from '@/shared/antd-imports';
 import {
   DoubleRightOutlined,
   DownOutlined,
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/taskListTableCells/TaskProgress.tsx b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/taskListTableCells/TaskProgress.tsx
index 24df83f9..0f15bd5a 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/taskListTableCells/TaskProgress.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/taskListTableCells/TaskProgress.tsx
@@ -1,4 +1,4 @@
-import { Progress, Tooltip } from 'antd';
+import { Progress, Tooltip } from '@/shared/antd-imports';
 import React from 'react';
 import './TaskProgress.css';
 
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/taskListTableCells/TimeTracker.tsx b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/taskListTableCells/TimeTracker.tsx
index 03496d0a..f4832223 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/taskListTableCells/TimeTracker.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/taskListTableCells/TimeTracker.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Divider, Empty, Flex, Popover, Typography } from 'antd';
+import { Divider, Empty, Flex, Popover, Typography } from '@/shared/antd-imports';
 import { PlayCircleFilled } from '@ant-design/icons';
 import { colors } from '../../../../../../styles/colors';
 import CustomAvatar from '../../../../../../components/CustomAvatar';
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/taskListTableRows/AddSubTaskListRow.tsx b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/taskListTableRows/AddSubTaskListRow.tsx
index 5fc71fdf..1c5cdea9 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/taskListTableRows/AddSubTaskListRow.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/taskListTableRows/AddSubTaskListRow.tsx
@@ -1,4 +1,4 @@
-import { Input } from 'antd';
+import { Input } from '@/shared/antd-imports';
 import React, { useState } from 'react';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { colors } from '@/styles/colors';
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/taskListTableRows/AddTaskListRow.tsx b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/taskListTableRows/AddTaskListRow.tsx
index fa7e9f85..17258412 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/taskListTableRows/AddTaskListRow.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/taskListTableRows/AddTaskListRow.tsx
@@ -1,4 +1,4 @@
-import { Input } from 'antd';
+import { Input } from '@/shared/antd-imports';
 import React, { useState } from 'react';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { colors } from '@/styles/colors';
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/updates/project-view-updates.tsx b/worklenz-frontend/src/pages/projects/project-view-1/updates/project-view-updates.tsx
index c432b766..b46a735d 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/updates/project-view-updates.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/updates/project-view-updates.tsx
@@ -11,7 +11,7 @@ import {
   Dropdown,
   Menu,
   Popconfirm,
-} from 'antd';
+} from '@/shared/antd-imports';
 import { useEffect, useState, useCallback, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import DOMPurify from 'dompurify';
diff --git a/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-section-card/board-create-section-card.tsx b/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-section-card/board-create-section-card.tsx
index 7e61385e..dbe56678 100644
--- a/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-section-card/board-create-section-card.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-section-card/board-create-section-card.tsx
@@ -1,4 +1,4 @@
-import { Button, Flex } from 'antd';
+import { Button, Flex } from '@/shared/antd-imports';
 import { PlusOutlined } from '@ant-design/icons';
 import { useTranslation } from 'react-i18next';
 import { nanoid } from '@reduxjs/toolkit';
diff --git a/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-section-card/board-section-card-header.tsx b/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-section-card/board-section-card-header.tsx
index 3c6ec55d..3e5483f6 100644
--- a/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-section-card/board-section-card-header.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-section-card/board-section-card-header.tsx
@@ -9,7 +9,7 @@ import {
   Popconfirm,
   Tooltip,
   Typography,
-} from 'antd';
+} from '@/shared/antd-imports';
 import {
   DeleteOutlined,
   EditOutlined,
@@ -19,7 +19,7 @@ import {
   PlusOutlined,
   RetweetOutlined,
 } from '@ant-design/icons';
-import { MenuProps } from 'antd';
+import { MenuProps } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 
 import ChangeCategoryDropdown from '@/components/board/changeCategoryDropdown/ChangeCategoryDropdown';
diff --git a/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-section-card/board-section-card.tsx b/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-section-card/board-section-card.tsx
index 6bf60f80..5a037f9e 100644
--- a/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-section-card/board-section-card.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-section-card/board-section-card.tsx
@@ -1,4 +1,4 @@
-import { Button, Flex } from 'antd';
+import { Button, Flex } from '@/shared/antd-imports';
 import { useEffect, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useDroppable } from '@dnd-kit/core';
diff --git a/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-section-container.tsx b/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-section-container.tsx
index bb9d41b3..45e4a9e0 100644
--- a/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-section-container.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-section-container.tsx
@@ -1,4 +1,4 @@
-import { Flex } from 'antd';
+import { Flex } from '@/shared/antd-imports';
 import { SortableContext, horizontalListSortingStrategy } from '@dnd-kit/sortable';
 import BoardSectionCard from './board-section-card/board-section-card';
 import BoardCreateSectionCard from './board-section-card/board-create-section-card';
diff --git a/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-sub-task-card/board-create-sub-task-card.tsx b/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-sub-task-card/board-create-sub-task-card.tsx
index f26a0136..4773be40 100644
--- a/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-sub-task-card/board-create-sub-task-card.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-sub-task-card/board-create-sub-task-card.tsx
@@ -1,4 +1,4 @@
-import { Flex, Input, InputRef } from 'antd';
+import { Flex, Input, InputRef } from '@/shared/antd-imports';
 import React, { useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
diff --git a/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-sub-task-card/board-sub-task-card.tsx b/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-sub-task-card/board-sub-task-card.tsx
index d3b074d7..a0af1cdc 100644
--- a/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-sub-task-card/board-sub-task-card.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-sub-task-card/board-sub-task-card.tsx
@@ -1,6 +1,6 @@
 import { useCallback, useState } from 'react';
 import dayjs, { Dayjs } from 'dayjs';
-import { Col, Flex, Typography, List, Dropdown, MenuProps, Popconfirm } from 'antd';
+import { Col, Flex, Typography, List, Dropdown, MenuProps, Popconfirm } from '@/shared/antd-imports';
 import {
   UserAddOutlined,
   DeleteOutlined,
diff --git a/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-task-card/board-view-create-task-card.tsx b/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-task-card/board-view-create-task-card.tsx
index 4b628d1b..b7612b1c 100644
--- a/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-task-card/board-view-create-task-card.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-task-card/board-view-create-task-card.tsx
@@ -1,4 +1,4 @@
-import { Button, Flex, Input, InputRef } from 'antd';
+import { Button, Flex, Input, InputRef } from '@/shared/antd-imports';
 import React, { useRef, useState, useEffect } from 'react';
 import { Dayjs } from 'dayjs';
 import { nanoid } from '@reduxjs/toolkit';
diff --git a/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-task-card/board-view-task-card.tsx b/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-task-card/board-view-task-card.tsx
index 542d3796..a067c16f 100644
--- a/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-task-card/board-view-task-card.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-task-card/board-view-task-card.tsx
@@ -12,7 +12,7 @@ import {
   Divider,
   Popconfirm,
   Skeleton,
-} from 'antd';
+} from '@/shared/antd-imports';
 import {
   DoubleRightOutlined,
   PauseOutlined,
diff --git a/worklenz-frontend/src/pages/projects/projectView/files/project-view-files.tsx b/worklenz-frontend/src/pages/projects/projectView/files/project-view-files.tsx
index 358c5122..f4593fa2 100644
--- a/worklenz-frontend/src/pages/projects/projectView/files/project-view-files.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/files/project-view-files.tsx
@@ -8,7 +8,7 @@ import {
   TableProps,
   Tooltip,
   Typography,
-} from 'antd';
+} from '@/shared/antd-imports';
 import { useEffect, useState } from 'react';
 import { colors } from '@/styles/colors';
 import {
diff --git a/worklenz-frontend/src/pages/projects/projectView/insights/insights-members/insights-members.tsx b/worklenz-frontend/src/pages/projects/projectView/insights/insights-members/insights-members.tsx
index 45361236..59408d4f 100644
--- a/worklenz-frontend/src/pages/projects/projectView/insights/insights-members/insights-members.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/insights/insights-members/insights-members.tsx
@@ -1,4 +1,4 @@
-import { Card, Flex, Typography } from 'antd';
+import { Card, Flex, Typography } from '@/shared/antd-imports';
 import TaskByMembersTable from './tables/tasks-by-members';
 
 import MemberStats from '../member-stats/member-stats';
diff --git a/worklenz-frontend/src/pages/projects/projectView/insights/insights-members/tables/assigned-tasks-list.tsx b/worklenz-frontend/src/pages/projects/projectView/insights/insights-members/tables/assigned-tasks-list.tsx
index d78f9797..2d07951c 100644
--- a/worklenz-frontend/src/pages/projects/projectView/insights/insights-members/tables/assigned-tasks-list.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/insights/insights-members/tables/assigned-tasks-list.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react';
-import { Flex, Tooltip, Typography } from 'antd';
+import { Flex, Tooltip, Typography } from '@/shared/antd-imports';
 
 import { projectInsightsApiService } from '@/api/projects/insights/project-insights.api.service';
 import { useAppSelector } from '@/hooks/useAppSelector';
diff --git a/worklenz-frontend/src/pages/projects/projectView/insights/insights-members/tables/tasks-by-members.tsx b/worklenz-frontend/src/pages/projects/projectView/insights/insights-members/tables/tasks-by-members.tsx
index dad92582..d4408bff 100644
--- a/worklenz-frontend/src/pages/projects/projectView/insights/insights-members/tables/tasks-by-members.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/insights/insights-members/tables/tasks-by-members.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react';
-import { Flex, Progress } from 'antd';
+import { Flex, Progress } from '@/shared/antd-imports';
 import { colors } from '@/styles/colors';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { themeWiseColor } from '@/utils/themeWiseColor';
diff --git a/worklenz-frontend/src/pages/projects/projectView/insights/insights-overview/graphs/priority-overview.tsx b/worklenz-frontend/src/pages/projects/projectView/insights/insights-overview/graphs/priority-overview.tsx
index 2c822b94..58aa56b9 100644
--- a/worklenz-frontend/src/pages/projects/projectView/insights/insights-overview/graphs/priority-overview.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/insights/insights-overview/graphs/priority-overview.tsx
@@ -1,7 +1,7 @@
 import { Bar } from 'react-chartjs-2';
 import { Chart, ArcElement, Tooltip, CategoryScale, LinearScale, BarElement } from 'chart.js';
 import { ChartOptions } from 'chart.js';
-import { Flex } from 'antd';
+import { Flex } from '@/shared/antd-imports';
 import { ITaskPriorityCounts } from '@/types/project/project-insights.types';
 import { useEffect, useState } from 'react';
 import { projectInsightsApiService } from '@/api/projects/insights/project-insights.api.service';
diff --git a/worklenz-frontend/src/pages/projects/projectView/insights/insights-overview/graphs/status-overview.tsx b/worklenz-frontend/src/pages/projects/projectView/insights/insights-overview/graphs/status-overview.tsx
index 450cfecb..65503fc0 100644
--- a/worklenz-frontend/src/pages/projects/projectView/insights/insights-overview/graphs/status-overview.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/insights/insights-overview/graphs/status-overview.tsx
@@ -1,7 +1,7 @@
 import React, { useEffect, useState } from 'react';
 import { Doughnut } from 'react-chartjs-2';
 import { Chart, ArcElement } from 'chart.js';
-import { Badge, Flex, Tooltip, Typography, Spin } from 'antd';
+import { Badge, Flex, Tooltip, Typography, Spin } from '@/shared/antd-imports';
 import { ChartOptions } from 'chart.js';
 import { projectInsightsApiService } from '@/api/projects/insights/project-insights.api.service';
 import { ITaskStatusCounts } from '@/types/project/project-insights.types';
diff --git a/worklenz-frontend/src/pages/projects/projectView/insights/insights-overview/insights-overview.tsx b/worklenz-frontend/src/pages/projects/projectView/insights/insights-overview/insights-overview.tsx
index edb51aa3..d089136d 100644
--- a/worklenz-frontend/src/pages/projects/projectView/insights/insights-overview/insights-overview.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/insights/insights-overview/insights-overview.tsx
@@ -1,4 +1,4 @@
-import { Button, Card, Flex, Typography } from 'antd';
+import { Button, Card, Flex, Typography } from '@/shared/antd-imports';
 
 import StatusOverview from './graphs/status-overview';
 import PriorityOverview from './graphs/priority-overview';
diff --git a/worklenz-frontend/src/pages/projects/projectView/insights/insights-overview/tables/last-updated-tasks.tsx b/worklenz-frontend/src/pages/projects/projectView/insights/insights-overview/tables/last-updated-tasks.tsx
index ad438cc1..8b96c6e0 100644
--- a/worklenz-frontend/src/pages/projects/projectView/insights/insights-overview/tables/last-updated-tasks.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/insights/insights-overview/tables/last-updated-tasks.tsx
@@ -1,4 +1,4 @@
-import { Flex, Table, Tooltip, Typography } from 'antd';
+import { Flex, Table, Tooltip, Typography } from '@/shared/antd-imports';
 import { useEffect, useState } from 'react';
 import { colors } from '@/styles/colors';
 import { TableProps } from 'antd/lib';
diff --git a/worklenz-frontend/src/pages/projects/projectView/insights/insights-overview/tables/project-deadline.tsx b/worklenz-frontend/src/pages/projects/projectView/insights/insights-overview/tables/project-deadline.tsx
index 4475ad12..dc346a89 100644
--- a/worklenz-frontend/src/pages/projects/projectView/insights/insights-overview/tables/project-deadline.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/insights/insights-overview/tables/project-deadline.tsx
@@ -1,4 +1,4 @@
-import { Card, Flex, Skeleton, Table, Typography } from 'antd';
+import { Card, Flex, Skeleton, Table, Typography } from '@/shared/antd-imports';
 import { useEffect, useState } from 'react';
 import { colors } from '@/styles/colors';
 import { TableProps } from 'antd/lib';
diff --git a/worklenz-frontend/src/pages/projects/projectView/insights/insights-tasks/insights-tasks.tsx b/worklenz-frontend/src/pages/projects/projectView/insights/insights-tasks/insights-tasks.tsx
index 48ab18e2..1dd2c3d7 100644
--- a/worklenz-frontend/src/pages/projects/projectView/insights/insights-tasks/insights-tasks.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/insights/insights-tasks/insights-tasks.tsx
@@ -1,4 +1,4 @@
-import { Button, Card, Flex, Tooltip, Typography } from 'antd';
+import { Button, Card, Flex, Tooltip, Typography } from '@/shared/antd-imports';
 import { ExclamationCircleOutlined } from '@ant-design/icons';
 import { colors } from '@/styles/colors';
 import OverdueTasksTable from './tables/overdue-tasks-table';
diff --git a/worklenz-frontend/src/pages/projects/projectView/insights/insights-tasks/tables/over-logged-tasks-table.tsx b/worklenz-frontend/src/pages/projects/projectView/insights/insights-tasks/tables/over-logged-tasks-table.tsx
index 95dd1986..3cc9c390 100644
--- a/worklenz-frontend/src/pages/projects/projectView/insights/insights-tasks/tables/over-logged-tasks-table.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/insights/insights-tasks/tables/over-logged-tasks-table.tsx
@@ -1,4 +1,4 @@
-import { Avatar, Button, Flex, Table, Typography } from 'antd';
+import { Avatar, Button, Flex, Table, Typography } from '@/shared/antd-imports';
 import { useState, useEffect } from 'react';
 import { colors } from '@/styles/colors';
 import { TableProps } from 'antd/lib';
diff --git a/worklenz-frontend/src/pages/projects/projectView/insights/insights-tasks/tables/overdue-tasks-table.tsx b/worklenz-frontend/src/pages/projects/projectView/insights/insights-tasks/tables/overdue-tasks-table.tsx
index 6e36cbae..4d5c9ffa 100644
--- a/worklenz-frontend/src/pages/projects/projectView/insights/insights-tasks/tables/overdue-tasks-table.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/insights/insights-tasks/tables/overdue-tasks-table.tsx
@@ -1,4 +1,4 @@
-import { Flex, Table, Typography } from 'antd';
+import { Flex, Table, Typography } from '@/shared/antd-imports';
 import { useEffect, useState } from 'react';
 import { colors } from '@/styles/colors';
 import { TableProps } from 'antd/lib';
diff --git a/worklenz-frontend/src/pages/projects/projectView/insights/insights-tasks/tables/task-completed-early-table.tsx b/worklenz-frontend/src/pages/projects/projectView/insights/insights-tasks/tables/task-completed-early-table.tsx
index 75b0d1d3..56749587 100644
--- a/worklenz-frontend/src/pages/projects/projectView/insights/insights-tasks/tables/task-completed-early-table.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/insights/insights-tasks/tables/task-completed-early-table.tsx
@@ -1,4 +1,4 @@
-import { Flex, Table, Typography } from 'antd';
+import { Flex, Table, Typography } from '@/shared/antd-imports';
 import { TableProps } from 'antd/lib';
 import { useEffect, useState } from 'react';
 
diff --git a/worklenz-frontend/src/pages/projects/projectView/insights/insights-tasks/tables/task-completed-late-table.tsx b/worklenz-frontend/src/pages/projects/projectView/insights/insights-tasks/tables/task-completed-late-table.tsx
index 764d0e21..27c2ea35 100644
--- a/worklenz-frontend/src/pages/projects/projectView/insights/insights-tasks/tables/task-completed-late-table.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/insights/insights-tasks/tables/task-completed-late-table.tsx
@@ -1,4 +1,4 @@
-import { Flex, Table, Typography } from 'antd';
+import { Flex, Table, Typography } from '@/shared/antd-imports';
 import { useEffect, useState } from 'react';
 import { colors } from '@/styles/colors';
 import { TableProps } from 'antd/lib';
diff --git a/worklenz-frontend/src/pages/projects/projectView/insights/member-stats/member-stats.tsx b/worklenz-frontend/src/pages/projects/projectView/insights/member-stats/member-stats.tsx
index 2f897cc4..ab3a2078 100644
--- a/worklenz-frontend/src/pages/projects/projectView/insights/member-stats/member-stats.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/insights/member-stats/member-stats.tsx
@@ -1,5 +1,5 @@
 import ProjectStatsCard from '@/components/projects/project-stats-card';
-import { Flex } from 'antd';
+import { Flex } from '@/shared/antd-imports';
 import groupIcon from '@/assets/icons/insightsIcons/group.png';
 import warningIcon from '@/assets/icons/insightsIcons/warning.png';
 import unassignedIcon from '@/assets/icons/insightsIcons/block-user.png';
diff --git a/worklenz-frontend/src/pages/projects/projectView/insights/project-stats/project-stats.tsx b/worklenz-frontend/src/pages/projects/projectView/insights/project-stats/project-stats.tsx
index cbee0f5b..99d655c7 100644
--- a/worklenz-frontend/src/pages/projects/projectView/insights/project-stats/project-stats.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/insights/project-stats/project-stats.tsx
@@ -1,5 +1,5 @@
 import ProjectStatsCard from '@/components/projects/project-stats-card';
-import { Flex, Tooltip } from 'antd';
+import { Flex, Tooltip } from '@/shared/antd-imports';
 import checkIcon from '@assets/icons/insightsIcons/insights-check.png';
 import clipboardIcon from '@assets/icons/insightsIcons/clipboard.png';
 import clockIcon from '@assets/icons/insightsIcons/clock-green.png';
diff --git a/worklenz-frontend/src/pages/projects/projectView/insights/project-view-insights.tsx b/worklenz-frontend/src/pages/projects/projectView/insights/project-view-insights.tsx
index 81b7c717..ad3c5766 100644
--- a/worklenz-frontend/src/pages/projects/projectView/insights/project-view-insights.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/insights/project-view-insights.tsx
@@ -1,5 +1,5 @@
 import { DownloadOutlined } from '@ant-design/icons';
-import { Badge, Button, Checkbox, Flex, Segmented } from 'antd';
+import { Badge, Button, Checkbox, Flex, Segmented } from '@/shared/antd-imports';
 import { useEffect, useRef, useState } from 'react';
 import { useParams } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/pages/projects/projectView/members/project-view-members.tsx b/worklenz-frontend/src/pages/projects/projectView/members/project-view-members.tsx
index 5393ea95..2592aa15 100644
--- a/worklenz-frontend/src/pages/projects/projectView/members/project-view-members.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/members/project-view-members.tsx
@@ -11,7 +11,7 @@ import {
   TableProps,
   Tooltip,
   Typography,
-} from 'antd';
+} from '@/shared/antd-imports';
 
 // Icons
 import { DeleteOutlined, ExclamationCircleFilled, SyncOutlined } from '@ant-design/icons';
diff --git a/worklenz-frontend/src/pages/projects/projectView/taskList/groupTables/priorityTables/PriorityGroupTables.tsx b/worklenz-frontend/src/pages/projects/projectView/taskList/groupTables/priorityTables/PriorityGroupTables.tsx
index d72929be..9d8fd153 100644
--- a/worklenz-frontend/src/pages/projects/projectView/taskList/groupTables/priorityTables/PriorityGroupTables.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/taskList/groupTables/priorityTables/PriorityGroupTables.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { TaskPriorityType, TaskType } from '../../../../../../types/task.types';
-import { Flex } from 'antd';
+import { Flex } from '@/shared/antd-imports';
 import TaskListTableWrapper from '../../task-list-table/task-list-table-wrapper/task-list-table-wrapper';
 import { useAppSelector } from '../../../../../../hooks/useAppSelector';
 import { getPriorityColor } from '../../../../../../utils/getPriorityColors';
diff --git a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/context-menu/task-context-menu.tsx b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/context-menu/task-context-menu.tsx
index eaab7cf5..7e18428f 100644
--- a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/context-menu/task-context-menu.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/context-menu/task-context-menu.tsx
@@ -6,7 +6,7 @@ import {
   RetweetOutlined,
   UserAddOutlined,
 } from '@ant-design/icons';
-import { Badge, Dropdown, Flex, Typography, Modal } from 'antd';
+import { Badge, Dropdown, Flex, Typography, Modal } from '@/shared/antd-imports';
 import { MenuProps } from 'antd/lib';
 import { useState } from 'react';
 import { TFunction } from 'i18next';
diff --git a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-cells/custom-column-label-cell/custom-column-label-cell.tsx b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-cells/custom-column-label-cell/custom-column-label-cell.tsx
index 2985a352..ad9c32d0 100644
--- a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-cells/custom-column-label-cell/custom-column-label-cell.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-cells/custom-column-label-cell/custom-column-label-cell.tsx
@@ -1,4 +1,4 @@
-import { Badge, Card, Dropdown, Empty, Flex, Menu, MenuProps, Typography } from 'antd';
+import { Badge, Card, Dropdown, Empty, Flex, Menu, MenuProps, Typography } from '@/shared/antd-imports';
 import React, { useState, useEffect } from 'react';
 import { DownOutlined } from '@ant-design/icons';
 // custom css file
diff --git a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-cells/custom-column-selection-cell/custom-column-selection-cell.tsx b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-cells/custom-column-selection-cell/custom-column-selection-cell.tsx
index 6d200fc1..833fd61b 100644
--- a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-cells/custom-column-selection-cell/custom-column-selection-cell.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-cells/custom-column-selection-cell/custom-column-selection-cell.tsx
@@ -1,4 +1,4 @@
-import { Badge, Card, Dropdown, Empty, Flex, Menu, MenuProps, Typography } from 'antd';
+import { Badge, Card, Dropdown, Empty, Flex, Menu, MenuProps, Typography } from '@/shared/antd-imports';
 import React, { useState, useEffect } from 'react';
 import { DownOutlined } from '@ant-design/icons';
 // custom css file
diff --git a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-header/custom-column-header.tsx b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-header/custom-column-header.tsx
index 20ab7316..1aa9b695 100644
--- a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-header/custom-column-header.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-header/custom-column-header.tsx
@@ -1,5 +1,5 @@
 import { SettingOutlined } from '@ant-design/icons';
-import { Button, Flex, Tooltip, Typography } from 'antd';
+import { Button, Flex, Tooltip, Typography } from '@/shared/antd-imports';
 import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import CustomColumnModal from '../custom-column-modal/custom-column-modal';
diff --git a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/add-custom-column-button.tsx b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/add-custom-column-button.tsx
index 738971b4..fb088dba 100644
--- a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/add-custom-column-button.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/add-custom-column-button.tsx
@@ -1,5 +1,5 @@
 import { PlusOutlined } from '@ant-design/icons';
-import { Button, Tooltip } from 'antd';
+import { Button, Tooltip } from '@/shared/antd-imports';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import {
   setCustomColumnModalAttributes,
diff --git a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/formula-type-column/formula-type-column.tsx b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/formula-type-column/formula-type-column.tsx
index c5022639..bc1825a7 100644
--- a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/formula-type-column/formula-type-column.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/formula-type-column/formula-type-column.tsx
@@ -1,4 +1,4 @@
-import { Flex, Form, Select, Typography } from 'antd';
+import { Flex, Form, Select, Typography } from '@/shared/antd-imports';
 import React from 'react';
 import { themeWiseColor } from '../../../../../../../../utils/themeWiseColor';
 import { useAppSelector } from '../../../../../../../../hooks/useAppSelector';
diff --git a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/key-type-column/key-type-column.tsx b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/key-type-column/key-type-column.tsx
index 963605a7..6b729943 100644
--- a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/key-type-column/key-type-column.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/key-type-column/key-type-column.tsx
@@ -1,4 +1,4 @@
-import { Flex, Form, Input, Typography } from 'antd';
+import { Flex, Form, Input, Typography } from '@/shared/antd-imports';
 import React, { useState } from 'react';
 
 const KeyTypeColumn = () => {
diff --git a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/label-type-column/label-type-column.tsx b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/label-type-column/label-type-column.tsx
index ec5a0093..736096f1 100644
--- a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/label-type-column/label-type-column.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/label-type-column/label-type-column.tsx
@@ -1,7 +1,7 @@
 import React, { useState, useEffect } from 'react';
 import { nanoid } from 'nanoid';
 import { PhaseColorCodes } from '../../../../../../../../shared/constants';
-import { Button, Flex, Input, Select, Tag, Typography } from 'antd';
+import { Button, Flex, Input, Select, Tag, Typography } from '@/shared/antd-imports';
 import { CloseCircleOutlined, HolderOutlined } from '@ant-design/icons';
 import { useAppDispatch } from '../../../../../../../../hooks/useAppDispatch';
 import { useAppSelector } from '../../../../../../../../hooks/useAppSelector';
diff --git a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/number-type-column/formatted-type-number-column.tsx b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/number-type-column/formatted-type-number-column.tsx
index a4091030..629c1fe8 100644
--- a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/number-type-column/formatted-type-number-column.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/number-type-column/formatted-type-number-column.tsx
@@ -1,4 +1,4 @@
-import { Form, Select, Typography } from 'antd';
+import { Form, Select, Typography } from '@/shared/antd-imports';
 import React from 'react';
 import { useAppSelector } from '../../../../../../../../hooks/useAppSelector';
 import { themeWiseColor } from '../../../../../../../../utils/themeWiseColor';
diff --git a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/number-type-column/number-type-column.tsx b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/number-type-column/number-type-column.tsx
index ba56f7ec..e628d322 100644
--- a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/number-type-column/number-type-column.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/number-type-column/number-type-column.tsx
@@ -1,4 +1,4 @@
-import { Form, Select, Typography } from 'antd';
+import { Form, Select, Typography } from '@/shared/antd-imports';
 import React from 'react';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { themeWiseColor } from '@/utils/themeWiseColor';
diff --git a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/number-type-column/percentage-type-number-column.tsx b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/number-type-column/percentage-type-number-column.tsx
index 590befb9..62f75358 100644
--- a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/number-type-column/percentage-type-number-column.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/number-type-column/percentage-type-number-column.tsx
@@ -1,4 +1,4 @@
-import { Form, Select, Typography } from 'antd';
+import { Form, Select, Typography } from '@/shared/antd-imports';
 import React from 'react';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { themeWiseColor } from '@/utils/themeWiseColor';
diff --git a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/number-type-column/unformatted-type-number-column.tsx b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/number-type-column/unformatted-type-number-column.tsx
index 2287b584..37d21f4d 100644
--- a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/number-type-column/unformatted-type-number-column.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/number-type-column/unformatted-type-number-column.tsx
@@ -1,4 +1,4 @@
-import { Form, Typography } from 'antd';
+import { Form, Typography } from '@/shared/antd-imports';
 import React from 'react';
 import { useAppSelector } from '../../../../../../../../hooks/useAppSelector';
 
diff --git a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/number-type-column/with-label-type-number-column.tsx b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/number-type-column/with-label-type-number-column.tsx
index ff86e95f..da592df0 100644
--- a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/number-type-column/with-label-type-number-column.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/number-type-column/with-label-type-number-column.tsx
@@ -1,4 +1,4 @@
-import { Form, Input, Select, Typography } from 'antd';
+import { Form, Input, Select, Typography } from '@/shared/antd-imports';
 import React from 'react';
 import { useAppSelector } from '../../../../../../../../hooks/useAppSelector';
 import { themeWiseColor } from '../../../../../../../../utils/themeWiseColor';
diff --git a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/selection-type-column/selection-type-column.tsx b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/selection-type-column/selection-type-column.tsx
index 415d58ca..79d0ce6b 100644
--- a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/selection-type-column/selection-type-column.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/selection-type-column/selection-type-column.tsx
@@ -1,7 +1,7 @@
 import React, { useState, useEffect } from 'react';
 import { nanoid } from 'nanoid';
 import { PhaseColorCodes } from '../../../../../../../../shared/constants';
-import { Button, Flex, Input, Select, Tag, Typography } from 'antd';
+import { Button, Flex, Input, Select, Tag, Typography } from '@/shared/antd-imports';
 import { CloseCircleOutlined, HolderOutlined } from '@ant-design/icons';
 
 import { useAppDispatch } from '../../../../../../../../hooks/useAppDispatch';
diff --git a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-completed-date-cell/task-list-completed-date-cell.tsx b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-completed-date-cell/task-list-completed-date-cell.tsx
index 92c625d1..4a7dcdd4 100644
--- a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-completed-date-cell/task-list-completed-date-cell.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-completed-date-cell/task-list-completed-date-cell.tsx
@@ -1,4 +1,4 @@
-import { Tooltip, Typography } from 'antd';
+import { Tooltip, Typography } from '@/shared/antd-imports';
 import React from 'react';
 import { durationDateFormat } from '@/utils/durationDateFormat';
 import { formatDate } from '@/utils/timeUtils';
diff --git a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-created-date-cell/task-list-created-date-cell.tsx b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-created-date-cell/task-list-created-date-cell.tsx
index 2b843aa2..b79ab97f 100644
--- a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-created-date-cell/task-list-created-date-cell.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-created-date-cell/task-list-created-date-cell.tsx
@@ -1,4 +1,4 @@
-import { Tooltip, Typography } from 'antd';
+import { Tooltip, Typography } from '@/shared/antd-imports';
 import { durationDateFormat } from '@/utils/durationDateFormat';
 import { formatDate } from '@/utils/timeUtils';
 
diff --git a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-description-cell/task-list-description-cell.tsx b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-description-cell/task-list-description-cell.tsx
index 1ee5c921..fd1be167 100644
--- a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-description-cell/task-list-description-cell.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-description-cell/task-list-description-cell.tsx
@@ -1,4 +1,4 @@
-import { Typography } from 'antd';
+import { Typography } from '@/shared/antd-imports';
 import DOMPurify from 'dompurify';
 
 const TaskListDescriptionCell = ({ description }: { description: string }) => {
diff --git a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-due-date-cell/task-list-due-date-cell.tsx b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-due-date-cell/task-list-due-date-cell.tsx
index 9e584d3a..e8cb18d5 100644
--- a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-due-date-cell/task-list-due-date-cell.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-due-date-cell/task-list-due-date-cell.tsx
@@ -1,4 +1,4 @@
-import { DatePicker } from 'antd';
+import { DatePicker } from '@/shared/antd-imports';
 import { colors } from '@/styles/colors';
 import dayjs, { Dayjs } from 'dayjs';
 import { useSocket } from '@/socket/socketContext';
diff --git a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-due-time-cell/task-list-due-time-cell.tsx b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-due-time-cell/task-list-due-time-cell.tsx
index a6fe9516..a479c47d 100644
--- a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-due-time-cell/task-list-due-time-cell.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-due-time-cell/task-list-due-time-cell.tsx
@@ -1,4 +1,4 @@
-import { TimePicker, TimePickerProps } from 'antd';
+import { TimePicker, TimePickerProps } from '@/shared/antd-imports';
 import React from 'react';
 // import dayjs from 'dayjs';
 
diff --git a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-estimation-cell/task-list-estimation-cell.tsx b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-estimation-cell/task-list-estimation-cell.tsx
index ffd04062..fd57d903 100644
--- a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-estimation-cell/task-list-estimation-cell.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-estimation-cell/task-list-estimation-cell.tsx
@@ -1,5 +1,5 @@
 import { IProjectTask } from '@/types/project/projectTasksViewModel.types';
-import { Typography } from 'antd';
+import { Typography } from '@/shared/antd-imports';
 import React from 'react';
 
 interface ITaskListEstimationCellProps {
diff --git a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-labels-cell/task-list-labels-cell.tsx b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-labels-cell/task-list-labels-cell.tsx
index 1104e7b6..b64aa311 100644
--- a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-labels-cell/task-list-labels-cell.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-labels-cell/task-list-labels-cell.tsx
@@ -1,4 +1,4 @@
-import { Flex } from 'antd';
+import { Flex } from '@/shared/antd-imports';
 import CustomNumberLabel from '@/components/taskListCommon/labelsSelector/CustomNumberLabel';
 import LabelsSelector from '@/components/taskListCommon/labelsSelector/LabelsSelector';
 import { IProjectTask } from '@/types/project/projectTasksViewModel.types';
diff --git a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-last-updated-cell/task-list-last-updated-cell.tsx b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-last-updated-cell/task-list-last-updated-cell.tsx
index c040550e..13b99e62 100644
--- a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-last-updated-cell/task-list-last-updated-cell.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-last-updated-cell/task-list-last-updated-cell.tsx
@@ -1,4 +1,4 @@
-import { Tooltip, Typography } from 'antd';
+import { Tooltip, Typography } from '@/shared/antd-imports';
 import { durationDateFormat } from '@/utils/durationDateFormat';
 import { formatDate } from '@/utils/timeUtils';
 
diff --git a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-progress-cell/task-list-progress-cell.tsx b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-progress-cell/task-list-progress-cell.tsx
index d4099e73..b37098a4 100644
--- a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-progress-cell/task-list-progress-cell.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-progress-cell/task-list-progress-cell.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Progress, Tooltip } from 'antd';
+import { Progress, Tooltip } from '@/shared/antd-imports';
 import './task-list-progress-cell.css';
 import { IProjectTask } from '@/types/project/projectTasksViewModel.types';
 import { useAppSelector } from '@/hooks/useAppSelector';
diff --git a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-reporter-cell/task-list-reporter-cell.tsx b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-reporter-cell/task-list-reporter-cell.tsx
index 1930650e..bffb3463 100644
--- a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-reporter-cell/task-list-reporter-cell.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-reporter-cell/task-list-reporter-cell.tsx
@@ -1,5 +1,5 @@
 import { IProjectTask } from '@/types/project/projectTasksViewModel.types';
-import { Typography } from 'antd';
+import { Typography } from '@/shared/antd-imports';
 
 const TaskListReporterCell = ({ task }: { task: IProjectTask }) => {
   return <Typography.Text>{task?.reporter}</Typography.Text>;
diff --git a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-start-date-cell/task-list-start-date-cell.tsx b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-start-date-cell/task-list-start-date-cell.tsx
index 53f40cbe..d101e875 100644
--- a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-start-date-cell/task-list-start-date-cell.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-start-date-cell/task-list-start-date-cell.tsx
@@ -1,4 +1,4 @@
-import { DatePicker } from 'antd';
+import { DatePicker } from '@/shared/antd-imports';
 import { colors } from '@/styles/colors';
 import dayjs, { Dayjs } from 'dayjs';
 import { useSocket } from '@/socket/socketContext';
diff --git a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-task-cell/task-list-task-cell.tsx b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-task-cell/task-list-task-cell.tsx
index 2c313d79..72410be7 100644
--- a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-task-cell/task-list-task-cell.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-task-cell/task-list-task-cell.tsx
@@ -1,5 +1,5 @@
-import { Flex, Typography, Button, Input, Tooltip } from 'antd';
-import type { InputRef } from 'antd';
+import { Flex, Typography, Button, Input, Tooltip } from '@/shared/antd-imports';
+import type { InputRef } from '@/shared/antd-imports';
 import {
   DoubleRightOutlined,
   DownOutlined,
diff --git a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-task-id-cell/task-list-task-id-cell.tsx b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-task-id-cell/task-list-task-id-cell.tsx
index b7cdf949..37e24d06 100644
--- a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-task-id-cell/task-list-task-id-cell.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-task-id-cell/task-list-task-id-cell.tsx
@@ -1,4 +1,4 @@
-import { Tag, Tooltip } from 'antd';
+import { Tag, Tooltip } from '@/shared/antd-imports';
 import React from 'react';
 
 const TaskListTaskIdCell = ({ taskId }: { taskId: string | null }) => {
diff --git a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-rows/add-sub-task-list-row.tsx b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-rows/add-sub-task-list-row.tsx
index 260b6c2e..6b9c13e6 100644
--- a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-rows/add-sub-task-list-row.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-rows/add-sub-task-list-row.tsx
@@ -1,4 +1,4 @@
-import { Input, Button } from 'antd';
+import { Input, Button } from '@/shared/antd-imports';
 import React, { useRef, useEffect, useState } from 'react';
 import { useAppSelector } from '../../../../../../hooks/useAppSelector';
 import { colors } from '../../../../../../styles/colors';
diff --git a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-rows/add-task-list-row.tsx b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-rows/add-task-list-row.tsx
index 01f2dc96..a3761009 100644
--- a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-rows/add-task-list-row.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-rows/add-task-list-row.tsx
@@ -1,6 +1,6 @@
 import Input, { InputRef } from 'antd/es/input';
 import { useMemo, useRef, useState, useEffect } from 'react';
-import { Spin } from 'antd';
+import { Spin } from '@/shared/antd-imports';
 import { LoadingOutlined } from '@ant-design/icons';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { colors } from '@/styles/colors';
diff --git a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table.tsx b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table.tsx
index 255bbf78..013dccbd 100644
--- a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table.tsx
@@ -33,7 +33,7 @@ import {
 } from '@dnd-kit/sortable';
 import { createPortal } from 'react-dom';
 import { DragOverEvent } from '@dnd-kit/core';
-import { List, Card, Avatar, Dropdown, Empty, Divider, Button } from 'antd';
+import { List, Card, Avatar, Dropdown, Empty, Divider, Button } from '@/shared/antd-imports';
 import dayjs from 'dayjs';
 
 import { useAppSelector } from '@/hooks/useAppSelector';
diff --git a/worklenz-frontend/src/pages/projects/projectView/updates/ProjectViewUpdates.tsx b/worklenz-frontend/src/pages/projects/projectView/updates/ProjectViewUpdates.tsx
index 608bfd94..dae57f95 100644
--- a/worklenz-frontend/src/pages/projects/projectView/updates/ProjectViewUpdates.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/updates/ProjectViewUpdates.tsx
@@ -1,4 +1,4 @@
-import { Button, ConfigProvider, Flex, Form, Mentions, Space, Tooltip, Typography } from 'antd';
+import { Button, ConfigProvider, Flex, Form, Mentions, Space, Tooltip, Typography } from '@/shared/antd-imports';
 import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useAppSelector } from '../../../../hooks/useAppSelector';
diff --git a/worklenz-frontend/src/pages/reporting/members-reports/members-reports-table/members-reports-table.tsx b/worklenz-frontend/src/pages/reporting/members-reports/members-reports-table/members-reports-table.tsx
index 5a59feb7..fa349e2b 100644
--- a/worklenz-frontend/src/pages/reporting/members-reports/members-reports-table/members-reports-table.tsx
+++ b/worklenz-frontend/src/pages/reporting/members-reports/members-reports-table/members-reports-table.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react';
-import { ConfigProvider, Table, TableColumnsType } from 'antd';
+import { ConfigProvider, Table, TableColumnsType } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 
 import { useAppDispatch } from '@/hooks/useAppDispatch';
diff --git a/worklenz-frontend/src/pages/reporting/members-reports/members-reports-table/tablesCells/memberCell/MemberCell.tsx b/worklenz-frontend/src/pages/reporting/members-reports/members-reports-table/tablesCells/memberCell/MemberCell.tsx
index 869b2161..8b600a58 100644
--- a/worklenz-frontend/src/pages/reporting/members-reports/members-reports-table/tablesCells/memberCell/MemberCell.tsx
+++ b/worklenz-frontend/src/pages/reporting/members-reports/members-reports-table/tablesCells/memberCell/MemberCell.tsx
@@ -1,4 +1,4 @@
-import { Avatar, Flex, Typography } from 'antd';
+import { Avatar, Flex, Typography } from '@/shared/antd-imports';
 import CustomAvatar from '@components/CustomAvatar';
 
 type ProjectMangerCellProps = {
diff --git a/worklenz-frontend/src/pages/reporting/members-reports/members-reports-table/tablesCells/tasksProgressCell/TasksProgressCell.tsx b/worklenz-frontend/src/pages/reporting/members-reports/members-reports-table/tablesCells/tasksProgressCell/TasksProgressCell.tsx
index 3c9514af..9acfcd0b 100644
--- a/worklenz-frontend/src/pages/reporting/members-reports/members-reports-table/tablesCells/tasksProgressCell/TasksProgressCell.tsx
+++ b/worklenz-frontend/src/pages/reporting/members-reports/members-reports-table/tablesCells/tasksProgressCell/TasksProgressCell.tsx
@@ -1,4 +1,4 @@
-import { Flex, Tooltip, Typography } from 'antd';
+import { Flex, Tooltip, Typography } from '@/shared/antd-imports';
 import { colors } from '@/styles/colors';
 import { useTranslation } from 'react-i18next';
 
diff --git a/worklenz-frontend/src/pages/reporting/members-reports/members-reports.tsx b/worklenz-frontend/src/pages/reporting/members-reports/members-reports.tsx
index eddfd3fd..8ef5d8fb 100644
--- a/worklenz-frontend/src/pages/reporting/members-reports/members-reports.tsx
+++ b/worklenz-frontend/src/pages/reporting/members-reports/members-reports.tsx
@@ -1,4 +1,4 @@
-import { Button, Card, Checkbox, Dropdown, Flex, Skeleton, Space, Typography } from 'antd';
+import { Button, Card, Checkbox, Dropdown, Flex, Skeleton, Space, Typography } from '@/shared/antd-imports';
 import { DownOutlined } from '@ant-design/icons';
 import MembersReportsTable from './members-reports-table/members-reports-table';
 import TimeWiseFilter from '@/components/reporting/time-wise-filter';
diff --git a/worklenz-frontend/src/pages/reporting/overview-reports/overview-reports.tsx b/worklenz-frontend/src/pages/reporting/overview-reports/overview-reports.tsx
index 0bb76d1d..d55e900e 100644
--- a/worklenz-frontend/src/pages/reporting/overview-reports/overview-reports.tsx
+++ b/worklenz-frontend/src/pages/reporting/overview-reports/overview-reports.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useCallback, useMemo } from 'react';
-import { Button, Card, Checkbox, Flex, Typography } from 'antd';
+import { Button, Card, Checkbox, Flex, Typography } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 import { useDocumentTitle } from '@/hooks/useDoumentTItle';
 import { useMixpanelTracking } from '@/hooks/useMixpanelTracking';
diff --git a/worklenz-frontend/src/pages/reporting/overview-reports/overview-stat-card.tsx b/worklenz-frontend/src/pages/reporting/overview-reports/overview-stat-card.tsx
index d1f3491d..e7145ccb 100644
--- a/worklenz-frontend/src/pages/reporting/overview-reports/overview-stat-card.tsx
+++ b/worklenz-frontend/src/pages/reporting/overview-reports/overview-stat-card.tsx
@@ -1,4 +1,4 @@
-import { Card, Flex, Typography, theme } from 'antd';
+import { Card, Flex, Typography, theme } from '@/shared/antd-imports';
 import React, { useMemo } from 'react';
 
 interface InsightCardProps {
diff --git a/worklenz-frontend/src/pages/reporting/overview-reports/overview-stats.tsx b/worklenz-frontend/src/pages/reporting/overview-reports/overview-stats.tsx
index 3b359d17..8fb7f3fc 100644
--- a/worklenz-frontend/src/pages/reporting/overview-reports/overview-stats.tsx
+++ b/worklenz-frontend/src/pages/reporting/overview-reports/overview-stats.tsx
@@ -1,4 +1,4 @@
-import { Flex, Typography, theme } from 'antd';
+import { Flex, Typography, theme } from '@/shared/antd-imports';
 import React, { useEffect, useState, useCallback, useMemo } from 'react';
 import OverviewStatCard from './overview-stat-card';
 import { BankOutlined, FileOutlined, UsergroupAddOutlined } from '@ant-design/icons';
diff --git a/worklenz-frontend/src/pages/reporting/overview-reports/overview-table/overview-reports-table.tsx b/worklenz-frontend/src/pages/reporting/overview-reports/overview-table/overview-reports-table.tsx
index a49215e0..2442f2b6 100644
--- a/worklenz-frontend/src/pages/reporting/overview-reports/overview-table/overview-reports-table.tsx
+++ b/worklenz-frontend/src/pages/reporting/overview-reports/overview-table/overview-reports-table.tsx
@@ -1,5 +1,5 @@
 import { memo, useEffect, useState, useCallback, useMemo } from 'react';
-import { ConfigProvider, Table, TableColumnsType } from 'antd';
+import { ConfigProvider, Table, TableColumnsType } from '@/shared/antd-imports';
 import { useAppDispatch } from '../../../../hooks/useAppDispatch';
 import CustomTableTitle from '../../../../components/CustomTableTitle';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-filters/project-categories-filter-dropdown.tsx b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-filters/project-categories-filter-dropdown.tsx
index 10968817..2a918aa4 100644
--- a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-filters/project-categories-filter-dropdown.tsx
+++ b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-filters/project-categories-filter-dropdown.tsx
@@ -5,7 +5,7 @@ import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { IProjectCategoryViewModel } from '@/types/project/projectCategory.types';
 import { CaretDownFilled } from '@ant-design/icons';
-import { Badge, Button, Card, Checkbox, Dropdown, Empty, Flex, Input, InputRef, List } from 'antd';
+import { Badge, Button, Card, Checkbox, Dropdown, Empty, Flex, Input, InputRef, List } from '@/shared/antd-imports';
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
diff --git a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-filters/project-health-filter-dropdown.tsx b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-filters/project-health-filter-dropdown.tsx
index 274edaaf..74f68631 100644
--- a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-filters/project-health-filter-dropdown.tsx
+++ b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-filters/project-health-filter-dropdown.tsx
@@ -7,7 +7,7 @@ import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { IProjectHealth } from '@/types/project/projectHealth.types';
 import { CaretDownFilled } from '@ant-design/icons';
-import { Button, Card, Checkbox, Dropdown, List, Space } from 'antd';
+import { Button, Card, Checkbox, Dropdown, List, Space } from '@/shared/antd-imports';
 import React, { useEffect, useState, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import debounce from 'lodash/debounce'; // Install lodash if not already present
diff --git a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-filters/project-managers-filter-dropdown.tsx b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-filters/project-managers-filter-dropdown.tsx
index 433c65eb..f875a042 100644
--- a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-filters/project-managers-filter-dropdown.tsx
+++ b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-filters/project-managers-filter-dropdown.tsx
@@ -4,7 +4,7 @@ import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { IProjectManager } from '@/types/project/projectManager.types';
 import { CaretDownFilled } from '@ant-design/icons';
-import { Button, Card, Checkbox, Dropdown, Empty, Flex, Input, InputRef, List } from 'antd';
+import { Button, Card, Checkbox, Dropdown, Empty, Flex, Input, InputRef, List } from '@/shared/antd-imports';
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
diff --git a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-filters/project-reports-filters.tsx b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-filters/project-reports-filters.tsx
index 05473501..efb3ed92 100644
--- a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-filters/project-reports-filters.tsx
+++ b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-filters/project-reports-filters.tsx
@@ -1,4 +1,4 @@
-import { Flex } from 'antd';
+import { Flex } from '@/shared/antd-imports';
 import { useMemo, useCallback, memo } from 'react';
 import { useTranslation } from 'react-i18next';
 import ProjectStatusFilterDropdown from './project-status-filter-dropdown';
diff --git a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-filters/project-status-filter-dropdown.tsx b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-filters/project-status-filter-dropdown.tsx
index f9a59440..ad51539b 100644
--- a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-filters/project-status-filter-dropdown.tsx
+++ b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-filters/project-status-filter-dropdown.tsx
@@ -7,7 +7,7 @@ import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { IProjectStatus } from '@/types/project/projectStatus.types';
 import { CaretDownFilled } from '@ant-design/icons';
-import { Button, Card, Checkbox, Dropdown, List, Space } from 'antd';
+import { Button, Card, Checkbox, Dropdown, List, Space } from '@/shared/antd-imports';
 import { debounce } from 'lodash';
 import React, { useCallback, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-filters/project-table-show-fields-dropdown.tsx b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-filters/project-table-show-fields-dropdown.tsx
index 7de0fb89..73349556 100644
--- a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-filters/project-table-show-fields-dropdown.tsx
+++ b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-filters/project-table-show-fields-dropdown.tsx
@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import { MoreOutlined } from '@ant-design/icons';
-import { Button, Card, Checkbox, Dropdown, List, Space } from 'antd';
+import { Button, Card, Checkbox, Dropdown, List, Space } from '@/shared/antd-imports';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { toggleColumnHidden } from '@/features/reporting/projectReports/project-reports-table-column-slice/project-reports-table-column-slice';
diff --git a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/projects-reports-table.tsx b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/projects-reports-table.tsx
index 10570e65..d55452fc 100644
--- a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/projects-reports-table.tsx
+++ b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/projects-reports-table.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useState, useMemo, useCallback, memo } from 'react';
-import { Button, ConfigProvider, Flex, PaginationProps, Table, TableColumnsType } from 'antd';
+import { Button, ConfigProvider, Flex, PaginationProps, Table, TableColumnsType } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 import { createPortal } from 'react-dom';
 import { ExpandAltOutlined } from '@ant-design/icons';
diff --git a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/estimated-vs-actual-cell/estimated-vs-actual-cell.tsx b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/estimated-vs-actual-cell/estimated-vs-actual-cell.tsx
index 07499c88..60b5c5bb 100644
--- a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/estimated-vs-actual-cell/estimated-vs-actual-cell.tsx
+++ b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/estimated-vs-actual-cell/estimated-vs-actual-cell.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { Bar } from 'react-chartjs-2';
 import { Chart, BarElement, CategoryScale, LinearScale } from 'chart.js';
 import { ChartOptions } from 'chart.js';
-import { Typography } from 'antd';
+import { Typography } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 
 Chart.register(BarElement, CategoryScale, LinearScale);
diff --git a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/last-activity-cell/last-activity-cell.tsx b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/last-activity-cell/last-activity-cell.tsx
index bc3c2c20..72a55235 100644
--- a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/last-activity-cell/last-activity-cell.tsx
+++ b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/last-activity-cell/last-activity-cell.tsx
@@ -1,4 +1,4 @@
-import { Tooltip, Typography } from 'antd';
+import { Tooltip, Typography } from '@/shared/antd-imports';
 import React from 'react';
 
 const LastActivityCell = ({ activity }: { activity: string }) => {
diff --git a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/project-category-cell/project-category-cell.tsx b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/project-category-cell/project-category-cell.tsx
index 9b68baa9..90a6104c 100644
--- a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/project-category-cell/project-category-cell.tsx
+++ b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/project-category-cell/project-category-cell.tsx
@@ -1,6 +1,6 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 import { DownOutlined } from '@ant-design/icons';
-import { Badge, Card, Dropdown, Flex, Input, InputRef, Menu, MenuProps, Typography } from 'antd';
+import { Badge, Card, Dropdown, Flex, Input, InputRef, Menu, MenuProps, Typography } from '@/shared/antd-imports';
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { colors } from '@/styles/colors';
diff --git a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/project-cell/project-cell.tsx b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/project-cell/project-cell.tsx
index ff6c6bca..e7ac7508 100644
--- a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/project-cell/project-cell.tsx
+++ b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/project-cell/project-cell.tsx
@@ -1,4 +1,4 @@
-import { Badge, Flex, Space, Tooltip, Typography } from 'antd';
+import { Badge, Flex, Space, Tooltip, Typography } from '@/shared/antd-imports';
 import React from 'react';
 
 type ProjectCellProps = {
diff --git a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/project-client-cell/project-client-cell.tsx b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/project-client-cell/project-client-cell.tsx
index a921cdfe..a55a3cde 100644
--- a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/project-client-cell/project-client-cell.tsx
+++ b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/project-client-cell/project-client-cell.tsx
@@ -1,4 +1,4 @@
-import { Typography } from 'antd';
+import { Typography } from '@/shared/antd-imports';
 import React from 'react';
 
 const ProjectClientCell = ({ client }: { client: string }) => {
diff --git a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/project-dates-cell/project-dates-cell.tsx b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/project-dates-cell/project-dates-cell.tsx
index 1f9d283e..79962636 100644
--- a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/project-dates-cell/project-dates-cell.tsx
+++ b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/project-dates-cell/project-dates-cell.tsx
@@ -1,4 +1,4 @@
-import { DatePicker, Flex, Typography } from 'antd';
+import { DatePicker, Flex, Typography } from '@/shared/antd-imports';
 import { useEffect } from 'react';
 import { colors } from '@/styles/colors';
 import dayjs, { Dayjs } from 'dayjs';
diff --git a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/project-days-left-and-overdue-cell/project-days-left-and-overdue-cell.tsx b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/project-days-left-and-overdue-cell/project-days-left-and-overdue-cell.tsx
index 87406690..7c617ef0 100644
--- a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/project-days-left-and-overdue-cell/project-days-left-and-overdue-cell.tsx
+++ b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/project-days-left-and-overdue-cell/project-days-left-and-overdue-cell.tsx
@@ -1,4 +1,4 @@
-import { Typography } from 'antd';
+import { Typography } from '@/shared/antd-imports';
 import React from 'react';
 import { colors } from '../../../../../../styles/colors';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/project-health-cell/project-health-cell.tsx b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/project-health-cell/project-health-cell.tsx
index c2dfe5a9..b09e5f5b 100644
--- a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/project-health-cell/project-health-cell.tsx
+++ b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/project-health-cell/project-health-cell.tsx
@@ -1,4 +1,4 @@
-import { Badge, Card, Dropdown, Flex, Menu, MenuProps, Typography } from 'antd';
+import { Badge, Card, Dropdown, Flex, Menu, MenuProps, Typography } from '@/shared/antd-imports';
 import { useEffect, useState } from 'react';
 import { DownOutlined } from '@ant-design/icons';
 import { colors } from '@/styles/colors';
diff --git a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/project-manager-cell/project-manager-cell.tsx b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/project-manager-cell/project-manager-cell.tsx
index 3066159f..b4ddc86e 100644
--- a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/project-manager-cell/project-manager-cell.tsx
+++ b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/project-manager-cell/project-manager-cell.tsx
@@ -1,4 +1,4 @@
-import { Avatar, Flex, Typography } from 'antd';
+import { Avatar, Flex, Typography } from '@/shared/antd-imports';
 import CustomAvatar from '@components/CustomAvatar';
 import { ITeamMemberViewModel } from '@/types/teamMembers/teamMembersGetResponse.types';
 import SingleAvatar from '@/components/common/single-avatar/single-avatar';
diff --git a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/project-status-cell/project-status-cell.tsx b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/project-status-cell/project-status-cell.tsx
index aa7e581d..4757746b 100644
--- a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/project-status-cell/project-status-cell.tsx
+++ b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/project-status-cell/project-status-cell.tsx
@@ -1,4 +1,4 @@
-import { ConfigProvider, Select, Typography } from 'antd';
+import { ConfigProvider, Select, Typography } from '@/shared/antd-imports';
 import { colors } from '@/styles/colors';
 import { useTranslation } from 'react-i18next';
 import { useAppSelector } from '@/hooks/useAppSelector';
diff --git a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/project-team-cell/project-team-cell.tsx b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/project-team-cell/project-team-cell.tsx
index c6f1bf34..d9fe1024 100644
--- a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/project-team-cell/project-team-cell.tsx
+++ b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/project-team-cell/project-team-cell.tsx
@@ -1,4 +1,4 @@
-import { Tag } from 'antd';
+import { Tag } from '@/shared/antd-imports';
 import React from 'react';
 import { colors } from '../../../../../../styles/colors';
 
diff --git a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/project-update-cell/project-update-cell.tsx b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/project-update-cell/project-update-cell.tsx
index d61a3b43..81ce5ec1 100644
--- a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/project-update-cell/project-update-cell.tsx
+++ b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/project-update-cell/project-update-cell.tsx
@@ -1,4 +1,4 @@
-import { Typography } from 'antd';
+import { Typography } from '@/shared/antd-imports';
 import React from 'react';
 
 type ProjectUpdateCellProps = {
diff --git a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/tasks-progress-cell/tasks-progress-cell.tsx b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/tasks-progress-cell/tasks-progress-cell.tsx
index 751b5979..c6608fe9 100644
--- a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/tasks-progress-cell/tasks-progress-cell.tsx
+++ b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/tasks-progress-cell/tasks-progress-cell.tsx
@@ -1,4 +1,4 @@
-import { Flex, Tooltip, Typography } from 'antd';
+import { Flex, Tooltip, Typography } from '@/shared/antd-imports';
 import React from 'react';
 import { colors } from '../../../../../../styles/colors';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports.tsx b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports.tsx
index c2451d72..d92c270e 100644
--- a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports.tsx
+++ b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports.tsx
@@ -1,4 +1,4 @@
-import { Button, Card, Checkbox, Dropdown, Flex, Space, Typography } from 'antd';
+import { Button, Card, Checkbox, Dropdown, Flex, Space, Typography } from '@/shared/antd-imports';
 import { useMemo, useCallback, memo } from 'react';
 import CustomPageHeader from '@/pages/reporting/page-header/custom-page-header';
 import { DownOutlined } from '@ant-design/icons';
diff --git a/worklenz-frontend/src/pages/reporting/sidebar/reporting-collapsed-button.tsx b/worklenz-frontend/src/pages/reporting/sidebar/reporting-collapsed-button.tsx
index e0c17085..e6befefa 100644
--- a/worklenz-frontend/src/pages/reporting/sidebar/reporting-collapsed-button.tsx
+++ b/worklenz-frontend/src/pages/reporting/sidebar/reporting-collapsed-button.tsx
@@ -1,7 +1,7 @@
 import { GlobalOutlined, LeftCircleOutlined, RightCircleOutlined } from '@ant-design/icons';
 import React, { useEffect, useState } from 'react';
 import { colors } from '@/styles/colors';
-import { Button, Flex, Tooltip, Typography } from 'antd';
+import { Button, Flex, Tooltip, Typography } from '@/shared/antd-imports';
 import { themeWiseColor } from '@utils/themeWiseColor';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/pages/reporting/sidebar/reporting-sider.tsx b/worklenz-frontend/src/pages/reporting/sidebar/reporting-sider.tsx
index 46cb2beb..33272c12 100644
--- a/worklenz-frontend/src/pages/reporting/sidebar/reporting-sider.tsx
+++ b/worklenz-frontend/src/pages/reporting/sidebar/reporting-sider.tsx
@@ -1,4 +1,4 @@
-import { ConfigProvider, Flex, Menu, MenuProps } from 'antd';
+import { ConfigProvider, Flex, Menu, MenuProps } from '@/shared/antd-imports';
 import { Link, useLocation } from 'react-router-dom';
 import { colors } from '@/styles/colors';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/pages/reporting/time-reports/project-time-sheet/project-time-sheet-chart.tsx b/worklenz-frontend/src/pages/reporting/time-reports/project-time-sheet/project-time-sheet-chart.tsx
index 6881c702..4eadccc0 100644
--- a/worklenz-frontend/src/pages/reporting/time-reports/project-time-sheet/project-time-sheet-chart.tsx
+++ b/worklenz-frontend/src/pages/reporting/time-reports/project-time-sheet/project-time-sheet-chart.tsx
@@ -16,7 +16,7 @@ import { useAppSelector } from '../../../../hooks/useAppSelector';
 import { useTranslation } from 'react-i18next';
 import { reportingTimesheetApiService } from '@/api/reporting/reporting.timesheet.api.service';
 import { IRPTTimeProject } from '@/types/reporting/reporting.types';
-import { Empty, Spin } from 'antd';
+import { Empty, Spin } from '@/shared/antd-imports';
 import logger from '@/utils/errorLogger';
 
 // Lazy load the Bar chart component
diff --git a/worklenz-frontend/src/pages/reporting/time-reports/time-sheet-table/time-sheet-table.tsx b/worklenz-frontend/src/pages/reporting/time-reports/time-sheet-table/time-sheet-table.tsx
index 8a7ee8e7..ff74a6f4 100644
--- a/worklenz-frontend/src/pages/reporting/time-reports/time-sheet-table/time-sheet-table.tsx
+++ b/worklenz-frontend/src/pages/reporting/time-reports/time-sheet-table/time-sheet-table.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from 'react';
 import { MemberLoggedTimeType } from '@/types/timeSheet/project.types';
-import { Empty, Progress, Spin } from 'antd';
+import { Empty, Progress, Spin } from '@/shared/antd-imports';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useTranslation } from 'react-i18next';
 import { reportingTimesheetApiService } from '@/api/reporting/reporting.timesheet.api.service';
diff --git a/worklenz-frontend/src/pages/reporting/timeReports/estimated-vs-actual-time-reports.tsx b/worklenz-frontend/src/pages/reporting/timeReports/estimated-vs-actual-time-reports.tsx
index 9a9deb4c..8bcf649c 100644
--- a/worklenz-frontend/src/pages/reporting/timeReports/estimated-vs-actual-time-reports.tsx
+++ b/worklenz-frontend/src/pages/reporting/timeReports/estimated-vs-actual-time-reports.tsx
@@ -1,4 +1,4 @@
-import { Card, Flex, Segmented } from 'antd';
+import { Card, Flex, Segmented } from '@/shared/antd-imports';
 import TimeReportPageHeader from '@/pages/reporting/timeReports/page-header/time-report-page-header';
 import EstimatedVsActualTimeSheet, {
   EstimatedVsActualTimeSheetRef,
diff --git a/worklenz-frontend/src/pages/reporting/timeReports/members-time-reports.tsx b/worklenz-frontend/src/pages/reporting/timeReports/members-time-reports.tsx
index 2c0d87de..351f46c2 100644
--- a/worklenz-frontend/src/pages/reporting/timeReports/members-time-reports.tsx
+++ b/worklenz-frontend/src/pages/reporting/timeReports/members-time-reports.tsx
@@ -1,4 +1,4 @@
-import { Card, Flex } from 'antd';
+import { Card, Flex } from '@/shared/antd-imports';
 import TimeReportPageHeader from '@/pages/reporting/timeReports/page-header/time-report-page-header';
 import MembersTimeSheet, {
   MembersTimeSheetRef,
diff --git a/worklenz-frontend/src/pages/reporting/timeReports/overview-time-reports.tsx b/worklenz-frontend/src/pages/reporting/timeReports/overview-time-reports.tsx
index bc899835..7219ce5a 100644
--- a/worklenz-frontend/src/pages/reporting/timeReports/overview-time-reports.tsx
+++ b/worklenz-frontend/src/pages/reporting/timeReports/overview-time-reports.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import TimeReportPageHeader from '@/pages/reporting/timeReports/page-header/time-report-page-header';
-import { Flex } from 'antd';
+import { Flex } from '@/shared/antd-imports';
 import TimeSheetTable from '@/pages/reporting/time-reports/time-sheet-table/time-sheet-table';
 import TimeReportingRightHeader from './timeReportingRightHeader/TimeReportingRightHeader';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/pages/reporting/timeReports/page-header/billable.tsx b/worklenz-frontend/src/pages/reporting/timeReports/page-header/billable.tsx
index ffb15f59..5b2bd1c3 100644
--- a/worklenz-frontend/src/pages/reporting/timeReports/page-header/billable.tsx
+++ b/worklenz-frontend/src/pages/reporting/timeReports/page-header/billable.tsx
@@ -2,7 +2,7 @@ import { setSelectOrDeselectBillable } from '@/features/reporting/time-reports/t
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { CaretDownFilled } from '@ant-design/icons';
-import { Button, Checkbox, Dropdown, MenuProps } from 'antd';
+import { Button, Checkbox, Dropdown, MenuProps } from '@/shared/antd-imports';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
diff --git a/worklenz-frontend/src/pages/reporting/timeReports/page-header/categories.tsx b/worklenz-frontend/src/pages/reporting/timeReports/page-header/categories.tsx
index c35aa873..5f0c673e 100644
--- a/worklenz-frontend/src/pages/reporting/timeReports/page-header/categories.tsx
+++ b/worklenz-frontend/src/pages/reporting/timeReports/page-header/categories.tsx
@@ -7,7 +7,7 @@ import {
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { CaretDownFilled } from '@ant-design/icons';
-import { Button, Card, Checkbox, Divider, Dropdown, Input, theme } from 'antd';
+import { Button, Card, Checkbox, Divider, Dropdown, Input, theme } from '@/shared/antd-imports';
 import { CheckboxChangeEvent } from 'antd/es/checkbox';
 import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/pages/reporting/timeReports/page-header/projects.tsx b/worklenz-frontend/src/pages/reporting/timeReports/page-header/projects.tsx
index 48d83ce6..1b5b564d 100644
--- a/worklenz-frontend/src/pages/reporting/timeReports/page-header/projects.tsx
+++ b/worklenz-frontend/src/pages/reporting/timeReports/page-header/projects.tsx
@@ -26,7 +26,7 @@ import {
   Space,
   Tooltip,
   Empty,
-} from 'antd';
+} from '@/shared/antd-imports';
 import { CheckboxChangeEvent } from 'antd/es/checkbox';
 import React, { useState, useMemo, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/pages/reporting/timeReports/page-header/team.tsx b/worklenz-frontend/src/pages/reporting/timeReports/page-header/team.tsx
index 76aea69c..cac788ca 100644
--- a/worklenz-frontend/src/pages/reporting/timeReports/page-header/team.tsx
+++ b/worklenz-frontend/src/pages/reporting/timeReports/page-header/team.tsx
@@ -1,5 +1,5 @@
 import { CaretDownFilled } from '@ant-design/icons';
-import { Button, Checkbox, Divider, Dropdown, Input, theme } from 'antd';
+import { Button, Checkbox, Divider, Dropdown, Input, theme } from '@/shared/antd-imports';
 import React, { useEffect, useState } from 'react';
 import type { CheckboxChangeEvent } from 'antd/es/checkbox';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/pages/reporting/timeReports/projects-time-reports.tsx b/worklenz-frontend/src/pages/reporting/timeReports/projects-time-reports.tsx
index d5dd13f5..45b829b3 100644
--- a/worklenz-frontend/src/pages/reporting/timeReports/projects-time-reports.tsx
+++ b/worklenz-frontend/src/pages/reporting/timeReports/projects-time-reports.tsx
@@ -1,4 +1,4 @@
-import { Card, Flex } from 'antd';
+import { Card, Flex } from '@/shared/antd-imports';
 import TimeReportPageHeader from '@/pages/reporting/timeReports/page-header/time-report-page-header';
 import ProjectTimeSheetChart, {
   ProjectTimeSheetChartRef,
diff --git a/worklenz-frontend/src/pages/reporting/timeReports/timeReportingRightHeader/TimeReportingRightHeader.tsx b/worklenz-frontend/src/pages/reporting/timeReports/timeReportingRightHeader/TimeReportingRightHeader.tsx
index d2594db0..36b1ae81 100644
--- a/worklenz-frontend/src/pages/reporting/timeReports/timeReportingRightHeader/TimeReportingRightHeader.tsx
+++ b/worklenz-frontend/src/pages/reporting/timeReports/timeReportingRightHeader/TimeReportingRightHeader.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Button, Checkbox, Dropdown, Space, Typography } from 'antd';
+import { Button, Checkbox, Dropdown, Space, Typography } from '@/shared/antd-imports';
 import { DownOutlined } from '@ant-design/icons';
 import { useTranslation } from 'react-i18next';
 import CustomPageHeader from '../../page-header/custom-page-header';
diff --git a/worklenz-frontend/src/pages/schedule-old/schedule.tsx b/worklenz-frontend/src/pages/schedule-old/schedule.tsx
index 45c5885f..cdd6599d 100644
--- a/worklenz-frontend/src/pages/schedule-old/schedule.tsx
+++ b/worklenz-frontend/src/pages/schedule-old/schedule.tsx
@@ -1,4 +1,4 @@
-import { Button, DatePicker, DatePickerProps, Select, Space } from 'antd';
+import { Button, DatePicker, DatePickerProps, Select, Space } from '@/shared/antd-imports';
 import React, { Suspense, useState } from 'react';
 import Team from '../../components/schedule-old/team/Team';
 import { SettingOutlined } from '@ant-design/icons';
diff --git a/worklenz-frontend/src/pages/schedule/grant-chart.tsx b/worklenz-frontend/src/pages/schedule/grant-chart.tsx
index 4f93090e..ccf89d53 100644
--- a/worklenz-frontend/src/pages/schedule/grant-chart.tsx
+++ b/worklenz-frontend/src/pages/schedule/grant-chart.tsx
@@ -10,7 +10,7 @@
 //   Row,
 //   Tooltip,
 //   Typography,
-// } from 'antd';
+// } from '@/shared/antd-imports';
 // import { avatarNamesMap } from '../../../shared/constants';
 // import { CaretDownOutlined, CaretRightFilled } from '@ant-design/icons';
 // import { useAppSelector } from '@/hooks/useAppSelector';
@@ -563,7 +563,7 @@ export default Grant;
 //   useState,
 // } from 'react';
 // import { Member } from '../../../../types/schedule/schedule.types';
-// import { Col, Flex, Row, Typography } from 'antd';
+// import { Col, Flex, Row, Typography } from '@/shared/antd-imports';
 // import { useAppSelector } from '../../../../hooks/useAppSelector';
 // import { useDispatch } from 'react-redux';
 // import { toggleScheduleDrawer } from '../../../../features/schedule/scheduleSlice';
diff --git a/worklenz-frontend/src/pages/schedule/schedule.tsx b/worklenz-frontend/src/pages/schedule/schedule.tsx
index d1d013fe..b6f54ead 100644
--- a/worklenz-frontend/src/pages/schedule/schedule.tsx
+++ b/worklenz-frontend/src/pages/schedule/schedule.tsx
@@ -1,4 +1,4 @@
-import { Button, DatePicker, DatePickerProps, Flex, Select, Space } from 'antd';
+import { Button, DatePicker, DatePickerProps, Flex, Select, Space } from '@/shared/antd-imports';
 import React, { useRef, useState } from 'react';
 import { SettingOutlined } from '@ant-design/icons';
 import { useDispatch } from 'react-redux';
diff --git a/worklenz-frontend/src/pages/settings/appearance/appearance-settings.tsx b/worklenz-frontend/src/pages/settings/appearance/appearance-settings.tsx
index 89d6970b..a0f50758 100644
--- a/worklenz-frontend/src/pages/settings/appearance/appearance-settings.tsx
+++ b/worklenz-frontend/src/pages/settings/appearance/appearance-settings.tsx
@@ -1,4 +1,4 @@
-import { Card, Divider, Flex, Switch, Typography } from 'antd';
+import { Card, Flex, Switch, Typography } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { useAppSelector } from '@/hooks/useAppSelector';
diff --git a/worklenz-frontend/src/pages/settings/categories/categories-settings.tsx b/worklenz-frontend/src/pages/settings/categories/categories-settings.tsx
index f583ce0b..4ac631b4 100644
--- a/worklenz-frontend/src/pages/settings/categories/categories-settings.tsx
+++ b/worklenz-frontend/src/pages/settings/categories/categories-settings.tsx
@@ -9,7 +9,7 @@ import {
   TableProps,
   Tooltip,
   Typography,
-} from 'antd';
+} from '@/shared/antd-imports';
 import { useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { colors } from '@/styles/colors';
diff --git a/worklenz-frontend/src/pages/settings/change-password/change-password.tsx b/worklenz-frontend/src/pages/settings/change-password/change-password.tsx
index e7187fff..5086279b 100644
--- a/worklenz-frontend/src/pages/settings/change-password/change-password.tsx
+++ b/worklenz-frontend/src/pages/settings/change-password/change-password.tsx
@@ -1,5 +1,5 @@
 import { EyeInvisibleOutlined, EyeOutlined } from '@ant-design/icons';
-import { Button, Card, Form, Input, notification, Row, Typography } from 'antd';
+import { Button, Card, Form, Input, notification, Row, Typography } from '@/shared/antd-imports';
 import React, { useState } from 'react';
 import { useDocumentTitle } from '@/hooks/useDoumentTItle';
 import { profileSettingsApiService } from '@/api/settings/profile/profile-settings.api.service';
diff --git a/worklenz-frontend/src/pages/settings/clients/client-drawer.tsx b/worklenz-frontend/src/pages/settings/clients/client-drawer.tsx
index a0003f7e..d27f16b2 100644
--- a/worklenz-frontend/src/pages/settings/clients/client-drawer.tsx
+++ b/worklenz-frontend/src/pages/settings/clients/client-drawer.tsx
@@ -1,4 +1,4 @@
-import { Button, Drawer, Form, Input, message, Typography } from 'antd';
+import { Button, Drawer, Form, Input, message, Typography } from '@/shared/antd-imports';
 import { useEffect } from 'react';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
diff --git a/worklenz-frontend/src/pages/settings/clients/clients-settings.tsx b/worklenz-frontend/src/pages/settings/clients/clients-settings.tsx
index b4466838..dc468067 100644
--- a/worklenz-frontend/src/pages/settings/clients/clients-settings.tsx
+++ b/worklenz-frontend/src/pages/settings/clients/clients-settings.tsx
@@ -14,7 +14,7 @@ import {
   TableProps,
   Tooltip,
   Typography,
-} from 'antd';
+} from '@/shared/antd-imports';
 import { useEffect, useMemo, useState } from 'react';
 import { colors } from '@/styles/colors';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
diff --git a/worklenz-frontend/src/pages/settings/job-titles/job-titles-drawer.tsx b/worklenz-frontend/src/pages/settings/job-titles/job-titles-drawer.tsx
index de1d7227..8f3b5f41 100644
--- a/worklenz-frontend/src/pages/settings/job-titles/job-titles-drawer.tsx
+++ b/worklenz-frontend/src/pages/settings/job-titles/job-titles-drawer.tsx
@@ -1,4 +1,4 @@
-import { Button, Drawer, Form, Input, message, Typography } from 'antd';
+import { Button, Drawer, Form, Input, message, Typography } from '@/shared/antd-imports';
 import { useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import { jobTitlesApiService } from '@/api/settings/job-titles/job-titles.api.service';
diff --git a/worklenz-frontend/src/pages/settings/job-titles/job-titles-settings.tsx b/worklenz-frontend/src/pages/settings/job-titles/job-titles-settings.tsx
index ae47ca01..0db03cf9 100644
--- a/worklenz-frontend/src/pages/settings/job-titles/job-titles-settings.tsx
+++ b/worklenz-frontend/src/pages/settings/job-titles/job-titles-settings.tsx
@@ -22,7 +22,7 @@ import {
   TableProps,
   Tooltip,
   Typography,
-} from 'antd';
+} from '@/shared/antd-imports';
 import { useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import JobTitleDrawer from './job-titles-drawer';
diff --git a/worklenz-frontend/src/pages/settings/labels/labels-settings.tsx b/worklenz-frontend/src/pages/settings/labels/labels-settings.tsx
index 4deb4540..21687cd5 100644
--- a/worklenz-frontend/src/pages/settings/labels/labels-settings.tsx
+++ b/worklenz-frontend/src/pages/settings/labels/labels-settings.tsx
@@ -8,7 +8,7 @@ import {
   TableProps,
   Tooltip,
   Typography,
-} from 'antd';
+} from '@/shared/antd-imports';
 import { useEffect, useMemo, useState } from 'react';
 
 import PinRouteToNavbarButton from '../../../components/PinRouteToNavbarButton';
diff --git a/worklenz-frontend/src/pages/settings/language-and-region/language-and-region-settings.tsx b/worklenz-frontend/src/pages/settings/language-and-region/language-and-region-settings.tsx
index 4dc0191c..9e860b46 100644
--- a/worklenz-frontend/src/pages/settings/language-and-region/language-and-region-settings.tsx
+++ b/worklenz-frontend/src/pages/settings/language-and-region/language-and-region-settings.tsx
@@ -1,4 +1,4 @@
-import { Button, Card, Flex, Form, Select, Skeleton, Typography } from 'antd';
+import { Button, Card, Flex, Form, Select, Skeleton, Typography } from '@/shared/antd-imports';
 import { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
diff --git a/worklenz-frontend/src/pages/settings/profile/profile-settings.tsx b/worklenz-frontend/src/pages/settings/profile/profile-settings.tsx
index cd8950e1..d590a27f 100644
--- a/worklenz-frontend/src/pages/settings/profile/profile-settings.tsx
+++ b/worklenz-frontend/src/pages/settings/profile/profile-settings.tsx
@@ -9,7 +9,7 @@ import {
   Typography,
   Spin,
   Skeleton,
-} from 'antd';
+} from '@/shared/antd-imports';
 import { useEffect, useState, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
 import { changeUserName, setUser } from '@features/user/userSlice';
diff --git a/worklenz-frontend/src/pages/settings/project-templates/project-templates-settings.tsx b/worklenz-frontend/src/pages/settings/project-templates/project-templates-settings.tsx
index 2d8b60f1..5cf69782 100644
--- a/worklenz-frontend/src/pages/settings/project-templates/project-templates-settings.tsx
+++ b/worklenz-frontend/src/pages/settings/project-templates/project-templates-settings.tsx
@@ -1,4 +1,4 @@
-import { Button, Card, Popconfirm, Table, TableProps, Tooltip, Typography } from 'antd';
+import { Button, Card, Popconfirm, Table, TableProps, Tooltip, Typography } from '@/shared/antd-imports';
 import React, { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useAppSelector } from '@/hooks/useAppSelector';
diff --git a/worklenz-frontend/src/pages/settings/project-templates/projectTemplateEditView/ProjectTemplateEditView.tsx b/worklenz-frontend/src/pages/settings/project-templates/projectTemplateEditView/ProjectTemplateEditView.tsx
index de56a6e8..3c5c75d5 100644
--- a/worklenz-frontend/src/pages/settings/project-templates/projectTemplateEditView/ProjectTemplateEditView.tsx
+++ b/worklenz-frontend/src/pages/settings/project-templates/projectTemplateEditView/ProjectTemplateEditView.tsx
@@ -1,4 +1,4 @@
-import { Button, Flex, Select, Typography } from 'antd';
+import { Button, Flex, Select, Typography } from '@/shared/antd-imports';
 import { useState } from 'react';
 import StatusGroupTables from '../../../projects/project-view-1/taskList/statusTables/StatusGroupTables';
 import { TaskType } from '../../../../types/task.types';
diff --git a/worklenz-frontend/src/pages/settings/sidebar/settings-sidebar.tsx b/worklenz-frontend/src/pages/settings/sidebar/settings-sidebar.tsx
index 61f67a94..4936c2f1 100644
--- a/worklenz-frontend/src/pages/settings/sidebar/settings-sidebar.tsx
+++ b/worklenz-frontend/src/pages/settings/sidebar/settings-sidebar.tsx
@@ -1,5 +1,5 @@
 import { RightOutlined } from '@ant-design/icons';
-import { ConfigProvider, Flex, Menu, MenuProps } from 'antd';
+import { ConfigProvider, Flex, Menu, MenuProps } from '@/shared/antd-imports';
 import { Link, useLocation } from 'react-router-dom';
 import { colors } from '@/styles/colors';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/pages/settings/task-templates/task-templates-settings.tsx b/worklenz-frontend/src/pages/settings/task-templates/task-templates-settings.tsx
index 82ef4736..7e55c711 100644
--- a/worklenz-frontend/src/pages/settings/task-templates/task-templates-settings.tsx
+++ b/worklenz-frontend/src/pages/settings/task-templates/task-templates-settings.tsx
@@ -1,4 +1,4 @@
-import { Button, Card, Popconfirm, Table, TableProps, Tooltip, Typography } from 'antd';
+import { Button, Card, Popconfirm, Table, TableProps, Tooltip, Typography } from '@/shared/antd-imports';
 import { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import './task-templates-settings.css';
diff --git a/worklenz-frontend/src/pages/settings/team-members/team-members-settings.tsx b/worklenz-frontend/src/pages/settings/team-members/team-members-settings.tsx
index f7656c6f..f7cce8f9 100644
--- a/worklenz-frontend/src/pages/settings/team-members/team-members-settings.tsx
+++ b/worklenz-frontend/src/pages/settings/team-members/team-members-settings.tsx
@@ -18,7 +18,7 @@ import {
   TableProps,
   Tooltip,
   Typography,
-} from 'antd';
+} from '@/shared/antd-imports';
 import { createPortal } from 'react-dom';
 import { useEffect, useState, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/pages/settings/teams/teams-settings.tsx b/worklenz-frontend/src/pages/settings/teams/teams-settings.tsx
index 5c21fb0c..3a94cb5a 100644
--- a/worklenz-frontend/src/pages/settings/teams/teams-settings.tsx
+++ b/worklenz-frontend/src/pages/settings/teams/teams-settings.tsx
@@ -1,4 +1,4 @@
-import { Button, Card, Flex, Table, TableProps, Tooltip, Typography } from 'antd';
+import { Button, Card, Flex, Table, TableProps, Tooltip, Typography } from '@/shared/antd-imports';
 import PinRouteToNavbarButton from '@components/PinRouteToNavbarButton';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { durationDateFormat } from '@utils/durationDateFormat';
diff --git a/worklenz-frontend/src/pages/unauthorized/unauthorized.tsx b/worklenz-frontend/src/pages/unauthorized/unauthorized.tsx
index 7be795bf..ee31c5bf 100644
--- a/worklenz-frontend/src/pages/unauthorized/unauthorized.tsx
+++ b/worklenz-frontend/src/pages/unauthorized/unauthorized.tsx
@@ -1,5 +1,5 @@
 import { useDocumentTitle } from '@/hooks/useDoumentTItle';
-import { Button, Result } from 'antd';
+import { Button, Result } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
 
diff --git a/worklenz-frontend/src/services/alerts/alertService.ts b/worklenz-frontend/src/services/alerts/alertService.ts
index df4d2865..4de3f663 100644
--- a/worklenz-frontend/src/services/alerts/alertService.ts
+++ b/worklenz-frontend/src/services/alerts/alertService.ts
@@ -1,6 +1,6 @@
 import { AlertType } from '@/types/alert.types';
 import DOMPurify from 'dompurify';
-import { notification } from 'antd';
+import { notification } from '@/shared/antd-imports';
 class AlertService {
   private static instance: AlertService;
   private activeAlerts: Set<string> = new Set();
diff --git a/worklenz-frontend/src/services/alerts/alertSlice.ts b/worklenz-frontend/src/services/alerts/alertSlice.ts
index f7dd324d..94332ff0 100644
--- a/worklenz-frontend/src/services/alerts/alertSlice.ts
+++ b/worklenz-frontend/src/services/alerts/alertSlice.ts
@@ -1,6 +1,6 @@
 import { AlertConfig, AlertState, AlertType } from '@/types/alert.types';
 import { createSlice, PayloadAction } from '@reduxjs/toolkit';
-import { notification } from 'antd';
+import { notification } from '@/shared/antd-imports';
 import DOMPurify from 'dompurify';
 
 const initialState: AlertState = {
diff --git a/worklenz-frontend/src/shared/antd-imports.ts b/worklenz-frontend/src/shared/antd-imports.ts
index 253ff847..680d6e58 100644
--- a/worklenz-frontend/src/shared/antd-imports.ts
+++ b/worklenz-frontend/src/shared/antd-imports.ts
@@ -12,6 +12,7 @@ import React from 'react';
 
 // Import Ant Design components using the standard method for better context sharing
 import {
+  AutoComplete,
   Button,
   Input,
   Select,
@@ -51,7 +52,20 @@ import {
   notification,
   theme,
   Statistic,
-} from 'antd';
+  Segmented,
+  Switch,
+  Calendar,
+  FloatButton,
+  Pagination,
+  ColorPicker,
+  Popover,
+  Image,
+  Collapse,
+  Breadcrumb,
+  Timeline,
+  Mentions,
+  Radio,
+} from 'antd/es';
 
 // Icons - Import commonly used ones
 export {
@@ -102,12 +116,13 @@ export {
   DoubleRightOutlined,
   UserAddOutlined,
   ArrowsAltOutlined,
-  EllipsisOutlined
+  EllipsisOutlined,
 } from '@ant-design/icons';
 
 // Re-export all components with React
 export {
   React,
+  AutoComplete,
   Button,
   Input,
   Select,
@@ -147,6 +162,19 @@ export {
   notification,
   theme,
   Statistic,
+  Segmented,
+  Switch,
+  Calendar,
+  FloatButton,
+  Pagination,
+  ColorPicker,
+  Popover,
+  Image,
+  Collapse,
+  Breadcrumb,
+  Timeline,
+  Mentions,
+  Radio
 };
 
 // TypeScript Types - Import commonly used ones
@@ -167,7 +195,7 @@ export type {
   TabsProps,
   TableProps,
   TableColumnsType,
-} from 'antd';
+} from 'antd/es';
 
 // Dayjs
 export { default as dayjs } from 'dayjs';
diff --git a/worklenz-frontend/src/socket/socketContext.tsx b/worklenz-frontend/src/socket/socketContext.tsx
index c20d676c..c0bf99af 100644
--- a/worklenz-frontend/src/socket/socketContext.tsx
+++ b/worklenz-frontend/src/socket/socketContext.tsx
@@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next';
 
 import { SOCKET_CONFIG } from './config';
 import logger from '@/utils/errorLogger';
-import { Modal, message } from 'antd';
+import { Modal, message } from '@/shared/antd-imports';
 import { SocketEvents } from '@/shared/socket-events';
 import { getUserSession } from '@/utils/session-helper';
 

From a6863d8280653d11e18eb4107904fd329571d147 Mon Sep 17 00:00:00 2001
From: chamikaJ <chamika@ceydigital.com>
Date: Wed, 23 Jul 2025 12:07:48 +0530
Subject: [PATCH 3/6] refactor: update code to use centralized Ant Design
 imports

- Replaced direct import of '@ant-design/icons' with centralized import from '@/shared/antd-imports'
---
 .../src/components/AssigneeSelector.tsx       |  2 +-
 .../src/components/CustomSearchbar.tsx        |  2 +-
 .../src/components/CustomTableTitle.tsx       |  2 +-
 .../src/components/LabelsSelector.tsx         |  2 +-
 .../src/components/PinRouteToNavbarButton.tsx |  2 +-
 .../src/components/PreferenceSelector.tsx     |  2 +-
 .../components/account-setup/members-step.tsx |  2 +-
 .../components/account-setup/tasks-step.tsx   |  2 +-
 .../add-members-dropdown.tsx                  |  2 +-
 .../add-members-dropdown.tsx                  |  2 +-
 .../billing/billing-tables/invoices-table.tsx |  2 +-
 .../admin-center/billing/current-bill.tsx     |  2 +-
 .../current-plan-details.tsx                  |  2 +-
 .../upgrade-plans-lkr/upgrade-plans-lkr.tsx   |  2 +-
 .../drawers/upgrade-plans/upgrade-plans.tsx   |  2 +-
 .../organization-name/organization-name.tsx   |  3 +-
 .../organization-owner/organization-owner.tsx |  2 +-
 .../teams/teams-table/teams-table.tsx         |  2 +-
 .../board-assignee-selector.tsx               |  2 +-
 .../ChangeCategoryDropdown.tsx                |  2 +-
 .../common-members-section.tsx                |  2 +-
 .../common-phase-section.tsx                  |  2 +-
 .../common-priority-section.tsx               |  2 +-
 .../CommonStatusSection.tsx                   |  2 +-
 .../board/custom-due-date-picker.tsx          |  2 +-
 .../board/kanban-group/kanban-group.tsx       |  2 +-
 .../components/board/taskCard/TaskCard.tsx    |  2 +-
 .../priority-section/priority-section.tsx     |  2 +-
 .../common/people-dropdown/PeopleDropdown.tsx |  2 +-
 .../project-status-icon.tsx                   |  2 +-
 .../template-drawer/template-drawer.tsx       |  2 +-
 .../EnhancedKanbanCreateSection.tsx           |  4 +-
 .../EnhancedKanbanTaskCard.tsx                |  6 +-
 .../kanbanGroup.tsx                           |  2 +-
 .../kanbanTaskCard.tsx                        |  2 +-
 .../notification/notification-button.tsx      |  2 +-
 .../notification/notification-item.tsx        |  2 +-
 .../notification/notification-template.tsx    |  2 +-
 .../push-notification-template.tsx            |  2 +-
 .../project-group/project-group-list.tsx      |  3 +-
 .../project-list-actions.tsx                  |  2 +-
 .../project-rate-cell.tsx                     |  2 +-
 .../project-name/project-name-cell.tsx        |  2 +-
 .../create-status-button.tsx                  |  2 +-
 .../delete-status-drawer.tsx                  |  2 +-
 .../column-configuration-modal.tsx            |  2 +-
 .../group-by-filter-dropdown.tsx              |  2 +-
 .../labels-filter-dropdown.tsx                |  2 +-
 .../members-filter-dropdown.tsx               |  2 +-
 .../priority-filter-dropdown.tsx              |  2 +-
 .../filter-dropdowns/search-dropdown.tsx      |  2 +-
 .../show-fields-filter-dropdown.tsx           |  2 +-
 .../filter-dropdowns/sort-filter-dropdown.tsx |  2 +-
 .../project-create-button.tsx                 |  2 +-
 .../project-category-section.tsx              |  2 +-
 .../project-client-section.tsx                |  2 +-
 .../project-manager-dropdown.tsx              |  2 +-
 .../project-member-invite-drawer.tsx          |  2 +-
 .../projects/project-stats-card.tsx           |  2 +-
 .../overview-team-info-drawer.tsx             |  5 +-
 .../reporting-overview-projects-table.tsx     |  2 +-
 .../components/reporting/time-wise-filter.tsx |  2 +-
 .../src/components/schedule-old/team/Team.tsx |  2 +-
 .../grant-chart/grantt-members-table.tsx      |  2 +-
 .../grant-chart/project-timeline-bar.tsx      |  2 +-
 .../ServiceWorkerStatus.tsx                   |  2 +-
 .../activity-log/task-drawer-activity-log.tsx |  2 +-
 .../info-tab/attachments/attachments-grid.tsx |  2 -
 .../attachments/attachments-preview.tsx       |  3 +-
 .../attachments/attachments-upload.tsx        |  2 +-
 .../info-tab/comments/task-comments.tsx       |  2 +-
 .../shared/info-tab/dependencies-table.tsx    |  2 +-
 .../task-drawer-assignee-selector.tsx         |  2 +-
 .../task-drawer-labels/task-drawer-labels.tsx |  2 +-
 .../task-drawer-priority-selector.tsx         |  2 +-
 .../task-drawer-progress.tsx                  |  2 +-
 .../task-drawer-recurring-config.tsx          |  2 +-
 .../shared/info-tab/info-tab-footer.tsx       |  2 +-
 .../info-tab/notify-member-selector.tsx       |  2 +-
 .../shared/info-tab/subtask-table.tsx         |  2 +-
 .../shared/info-tab/task-drawer-info-tab.tsx  |  4 +-
 .../shared/time-log/TaskDrawerTimeLog.tsx     |  2 +-
 .../shared/time-log/task-drawer-time-log.tsx  |  2 +-
 .../shared/time-log/time-log-form.tsx         |  2 +-
 .../task-drawer-header/task-drawer-header.tsx |  2 +-
 .../components/task-drawer/task-drawer.tsx    |  2 +-
 .../task-hierarchy-breadcrumb.tsx             |  2 +-
 .../assigneeSelector/AssigneeSelector.tsx     |  2 +-
 .../convert-to-subtask-drawer.tsx             |  2 +-
 .../labelsSelector/labels-selector.tsx        |  2 +-
 .../priorityDropdown/priority-dropdown.tsx    |  2 +-
 .../task-row/task-row-name/task-row-name.tsx  |  2 +-
 .../task-row-time-tracking.tsx                |  2 +-
 .../task-list-v2/TaskListV2Table.tsx          |  3 +-
 .../task-list-v2/TaskRowWithSubtasks.tsx      |  2 +-
 .../task-list-v2/components/AddTaskRow.tsx    |  2 +-
 .../components/CustomColumnComponents.tsx     |  4 +-
 .../components/DatePickerColumn.tsx           |  2 +-
 .../components/TaskContextMenu.tsx            |  2 +-
 .../components/TaskRowColumns.tsx             | 12 +---
 .../task-list-v2/components/TitleColumn.tsx   |  2 +-
 .../task-management/CreateTaskModal.tsx       |  2 +-
 .../task-management/ManagePhaseModal.tsx      |  2 +-
 .../task-management/ManageStatusModal.tsx     |  2 +-
 .../lazy-assignee-selector.tsx                |  2 +-
 .../optimized-bulk-action-bar.tsx             |  2 +-
 .../task-management/task-phase-dropdown.tsx   |  2 +-
 .../task-priority-dropdown.tsx                |  2 +-
 .../task-management/virtualized-task-list.tsx |  2 +-
 .../assignee-selector/assignee-selector.tsx   |  2 +-
 .../labelsSelector/LabelsSelector.tsx         |  2 +-
 .../priorityDropdown/PriorityDropdown.tsx     |  2 +-
 .../statusDropdown/StatusDropdown.tsx         |  2 +-
 .../task-list-bulk-actions-bar.tsx            |  2 +-
 .../taskListCommon/task-timer/task-timer.tsx  |  3 +-
 .../src/features/navbar/help/HelpButton.tsx   |  2 +-
 .../features/navbar/invite/InviteButton.tsx   |  2 +-
 .../navbar/mobileMenu/MobileMenuButton.tsx    |  2 +-
 .../navbar/switchTeam/SwitchTeamButton.tsx    |  2 +-
 .../features/navbar/timers/timer-button.tsx   |  2 +-
 .../navbar/user-profile/profile-button.tsx    |  2 +-
 .../bulkActions/BulkTasksActionContainer.tsx  |  2 +-
 .../singleProject/phase/ConfigPhaseButton.tsx |  9 ++-
 .../singleProject/phase/PhaseDrawer.tsx       |  4 +-
 .../singleProject/phase/PhaseOptionItem.tsx   |  2 +-
 .../update-project/update-project-drawer.tsx  |  2 +-
 .../members-reports-drawer.tsx                |  2 +-
 .../members-overview-tasks-stats-table.tsx    |  2 +-
 .../overviewTab/members-reports-stat-card.tsx |  2 +-
 .../taskTab/MembersReportsTasksTable.tsx      |  2 +-
 .../time-log-tab/billable-filter.tsx          |  2 +-
 .../ProjectReportsDrawer.tsx                  |  2 +-
 .../ProjectReportsMembersTaskDrawer.tsx       |  2 +-
 .../ProjectReportsMembersTaskTable.tsx        |  2 +-
 .../overviewTab/ProjectReportsStatCard.tsx    |  2 +-
 .../tasksTab/ProjectReportsTaskTable.tsx      |  2 +-
 .../tasksTab/group-by-filter.tsx              |  2 +-
 .../projects/ProjectTimeLogDrawer.tsx         |  2 +-
 .../src/lib/settings/settings-constants.ts    |  2 +-
 .../admin-center/admin-center-constants.ts    |  2 +-
 .../pages/admin-center/overview/overview.tsx  |  2 +-
 .../pages/admin-center/projects/projects.tsx  |  2 +-
 .../pages/admin-center/sidebar/sidebar.tsx    |  2 +-
 .../src/pages/admin-center/teams/teams.tsx    |  2 +-
 .../src/pages/admin-center/users/users.tsx    |  2 +-
 .../src/pages/auth/ForgotPasswordPage.tsx     |  2 +-
 .../src/pages/auth/LoginPage.tsx              |  2 +-
 .../src/pages/auth/SignupPage.tsx             |  4 +-
 .../src/pages/auth/VerifyResetEmailPage.tsx   |  4 +-
 .../add-favourite-project-button.tsx          |  2 +-
 .../recent-and-favourite-project-list.tsx     |  2 +-
 .../pages/home/task-list/calendar-view.tsx    |  2 +-
 .../src/pages/home/task-list/tasks-list.tsx   |  2 +-
 .../pages/home/todo-list/todo-done-button.tsx |  2 +-
 .../src/pages/home/todo-list/todo-list.tsx    |  2 +-
 .../src/pages/projects/project-list.tsx       |  2 +-
 .../board/project-view-board.tsx              |  2 +-
 .../roadmap-table/roadmap-task-cell.tsx       |  2 +-
 .../project-view-1/task-list/table-v2.tsx     |  2 +-
 .../task-list-columns/task-list-columns.tsx   |  2 +-
 .../task-list-header/task-list-header.tsx     |  2 +-
 .../task-list-table-wrapper.tsx               |  2 +-
 .../taskListFilters/GroupByFilterDropdown.tsx |  2 +-
 .../taskListFilters/LabelsFilterDropdown.tsx  |  2 +-
 .../taskListFilters/MembersFilterDropdown.tsx |  2 +-
 .../PriorityFilterDropdown.tsx                |  2 +-
 .../taskListFilters/SearchDropdown.tsx        |  2 +-
 .../ShowFieldsFilterDropdown.tsx              |  2 +-
 .../taskListFilters/SortFilterDropdown.tsx    |  2 +-
 .../taskList/taskListTable/TaskListTable.tsx  |  2 +-
 .../taskListTable/TaskListTableWrapper.tsx    |  2 +-
 .../contextMenu/TaskContextMenu.tsx           |  2 +-
 .../taskListTableCells/TaskCell.tsx           |  2 +-
 .../taskListTableCells/TimeTracker.tsx        |  2 +-
 .../updates/project-view-updates.tsx          |  2 +-
 .../board-create-section-card.tsx             |  2 +-
 .../board-section-card-header.tsx             |  2 +-
 .../board-section-card/board-section-card.tsx |  2 +-
 .../board-sub-task-card.tsx                   |  2 +-
 .../board-task-card/board-view-task-card.tsx  |  2 +-
 .../projectView/files/project-view-files.tsx  |  2 +-
 .../tables/tasks-by-members.tsx               |  2 +-
 .../insights-tasks/insights-tasks.tsx         |  2 +-
 .../tables/over-logged-tasks-table.tsx        |  2 +-
 .../insights/project-view-insights.tsx        |  2 +-
 .../members/project-view-members.tsx          |  2 +-
 .../projectView/project-view-header.tsx       |  2 +-
 .../projects/projectView/project-view.tsx     |  2 -
 .../components/task-group/task-group.tsx      |  2 +-
 .../taskList/groupTables/TaskGroupList.tsx    |  2 +-
 .../context-menu/task-context-menu.tsx        |  2 +-
 .../custom-column-label-cell.tsx              |  2 +-
 .../custom-column-selection-cell.tsx          |  2 +-
 .../custom-column-header.tsx                  |  2 +-
 .../add-custom-column-button.tsx              |  2 +-
 .../custom-column-modal.tsx                   |  2 +-
 .../label-type-column/label-type-column.tsx   |  2 +-
 .../selection-type-column.tsx                 |  2 +-
 .../task-list-task-cell.tsx                   |  2 +-
 .../add-task-list-row.tsx                     |  2 +-
 .../task-list-table-wrapper.tsx               |  2 +-
 .../task-list-table/task-list-table.tsx       |  2 +-
 .../members-reports/members-reports.tsx       |  2 +-
 .../overview-reports/overview-stats.tsx       |  2 +-
 .../project-categories-filter-dropdown.tsx    |  2 +-
 .../project-health-filter-dropdown.tsx        |  2 +-
 .../project-managers-filter-dropdown.tsx      |  2 +-
 .../project-status-filter-dropdown.tsx        |  2 +-
 .../project-table-show-fields-dropdown.tsx    |  2 +-
 .../projects-reports-table.tsx                |  2 +-
 .../project-category-cell.tsx                 |  2 +-
 .../project-health-cell.tsx                   |  2 +-
 .../projects-reports/projects-reports.tsx     |  2 +-
 .../sidebar/reporting-collapsed-button.tsx    |  2 +-
 .../timeReports/page-header/billable.tsx      |  2 +-
 .../timeReports/page-header/categories.tsx    |  2 +-
 .../timeReports/page-header/projects.tsx      |  2 +-
 .../timeReports/page-header/team.tsx          |  9 +--
 .../TimeReportingRightHeader.tsx              |  2 +-
 .../src/pages/schedule-old/schedule.tsx       |  2 +-
 .../src/pages/schedule/schedule.tsx           |  2 +-
 .../appearance/appearance-settings.tsx        |  2 +-
 .../categories/categories-settings.tsx        |  3 +-
 .../change-password/change-password.tsx       |  2 +-
 .../settings/clients/clients-settings.tsx     |  2 +-
 .../job-titles/job-titles-settings.tsx        |  2 +-
 .../pages/settings/labels/labels-settings.tsx |  2 +-
 .../settings/profile/profile-settings.tsx     |  2 +-
 .../project-templates-settings.tsx            |  4 +-
 .../ProjectTemplateEditView.tsx               |  2 +-
 .../settings/sidebar/settings-sidebar.tsx     |  2 +-
 .../task-templates-settings.tsx               |  2 +-
 .../team-members/team-members-settings.tsx    |  2 +-
 .../pages/settings/teams/teams-settings.tsx   |  2 +-
 worklenz-frontend/src/shared/antd-imports.ts  | 70 ++++++++++++++++++-
 worklenz-frontend/src/shared/constants.ts     |  2 +-
 .../src/types/project/project.types.ts        |  2 +-
 237 files changed, 319 insertions(+), 274 deletions(-)

diff --git a/worklenz-frontend/src/components/AssigneeSelector.tsx b/worklenz-frontend/src/components/AssigneeSelector.tsx
index f9d8fd1f..7a489885 100644
--- a/worklenz-frontend/src/components/AssigneeSelector.tsx
+++ b/worklenz-frontend/src/components/AssigneeSelector.tsx
@@ -1,7 +1,7 @@
 import React, { useState, useRef, useEffect, useMemo, useCallback } from 'react';
 import { createPortal } from 'react-dom';
 import { useSelector } from 'react-redux';
-import { PlusOutlined, UserAddOutlined } from '@ant-design/icons';
+import { PlusOutlined, UserAddOutlined } from '@/shared/antd-imports';
 import { RootState } from '@/app/store';
 import { IProjectTask } from '@/types/project/projectTasksViewModel.types';
 import { ITeamMembersViewModel } from '@/types/teamMembers/teamMembersViewModel.types';
diff --git a/worklenz-frontend/src/components/CustomSearchbar.tsx b/worklenz-frontend/src/components/CustomSearchbar.tsx
index cfc18946..a4e5be92 100644
--- a/worklenz-frontend/src/components/CustomSearchbar.tsx
+++ b/worklenz-frontend/src/components/CustomSearchbar.tsx
@@ -1,4 +1,4 @@
-import { SearchOutlined } from '@ant-design/icons';
+import { SearchOutlined } from '@/shared/antd-imports';
 import { Input } from '@/shared/antd-imports';
 
 type CustomSearchbarProps = {
diff --git a/worklenz-frontend/src/components/CustomTableTitle.tsx b/worklenz-frontend/src/components/CustomTableTitle.tsx
index 729d0e82..635293c5 100644
--- a/worklenz-frontend/src/components/CustomTableTitle.tsx
+++ b/worklenz-frontend/src/components/CustomTableTitle.tsx
@@ -1,6 +1,6 @@
 import { Flex, Tooltip, Typography } from '@/shared/antd-imports';
 import { colors } from '../styles/colors';
-import { ExclamationCircleOutlined } from '@ant-design/icons';
+import { ExclamationCircleOutlined } from '@/shared/antd-imports';
 
 // this custom table title used when the typography font weigh 500 needed
 const CustomTableTitle = ({ title, tooltip }: { title: string; tooltip?: string | null }) => {
diff --git a/worklenz-frontend/src/components/LabelsSelector.tsx b/worklenz-frontend/src/components/LabelsSelector.tsx
index 350e5aad..0faf6ec3 100644
--- a/worklenz-frontend/src/components/LabelsSelector.tsx
+++ b/worklenz-frontend/src/components/LabelsSelector.tsx
@@ -1,7 +1,7 @@
 import React, { useState, useRef, useEffect, useMemo, useCallback } from 'react';
 import { createPortal } from 'react-dom';
 import { useSelector } from 'react-redux';
-import { PlusOutlined, TagOutlined } from '@ant-design/icons';
+import { PlusOutlined, TagOutlined } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 import { RootState } from '@/app/store';
 import { IProjectTask } from '@/types/project/projectTasksViewModel.types';
diff --git a/worklenz-frontend/src/components/PinRouteToNavbarButton.tsx b/worklenz-frontend/src/components/PinRouteToNavbarButton.tsx
index 0f59fc6a..4e8f8dc1 100644
--- a/worklenz-frontend/src/components/PinRouteToNavbarButton.tsx
+++ b/worklenz-frontend/src/components/PinRouteToNavbarButton.tsx
@@ -1,7 +1,7 @@
 import React, { useState } from 'react';
 import { getJSONFromLocalStorage, saveJSONToLocalStorage } from '../utils/localStorageFunctions';
 import { Button, ConfigProvider, Tooltip } from '@/shared/antd-imports';
-import { PushpinFilled, PushpinOutlined } from '@ant-design/icons';
+import { PushpinFilled, PushpinOutlined } from '@/shared/antd-imports';
 import { colors } from '../styles/colors';
 import { navRoutes, NavRoutesType } from '../features/navbar/navRoutes';
 
diff --git a/worklenz-frontend/src/components/PreferenceSelector.tsx b/worklenz-frontend/src/components/PreferenceSelector.tsx
index 6c8e4e49..bece4825 100644
--- a/worklenz-frontend/src/components/PreferenceSelector.tsx
+++ b/worklenz-frontend/src/components/PreferenceSelector.tsx
@@ -1,5 +1,5 @@
 import { FloatButton, Space, Tooltip } from '@/shared/antd-imports';
-import { FormatPainterOutlined } from '@ant-design/icons';
+import { FormatPainterOutlined } from '@/shared/antd-imports';
 // import LanguageSelector from '../features/i18n/language-selector';
 // import ThemeSelector from '../features/theme/ThemeSelector';
 
diff --git a/worklenz-frontend/src/components/account-setup/members-step.tsx b/worklenz-frontend/src/components/account-setup/members-step.tsx
index a3ca66b0..d3feedc1 100644
--- a/worklenz-frontend/src/components/account-setup/members-step.tsx
+++ b/worklenz-frontend/src/components/account-setup/members-step.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useRef } from 'react';
 import { Form, Input, Button, List, Alert, message, InputRef } from '@/shared/antd-imports';
-import { CloseCircleOutlined, MailOutlined, PlusOutlined } from '@ant-design/icons';
+import { CloseCircleOutlined, MailOutlined, PlusOutlined } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 import { Typography } from '@/shared/antd-imports';
 import { setTeamMembers, setTasks } from '@/features/account-setup/account-setup.slice';
diff --git a/worklenz-frontend/src/components/account-setup/tasks-step.tsx b/worklenz-frontend/src/components/account-setup/tasks-step.tsx
index fa1b34db..5feb3552 100644
--- a/worklenz-frontend/src/components/account-setup/tasks-step.tsx
+++ b/worklenz-frontend/src/components/account-setup/tasks-step.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useRef } from 'react';
 import { Form, Input, Button, Typography, List, InputRef } from '@/shared/antd-imports';
-import { PlusOutlined, DeleteOutlined, CloseCircleOutlined } from '@ant-design/icons';
+import { PlusOutlined, DeleteOutlined, CloseCircleOutlined } from '@/shared/antd-imports';
 import { useDispatch, useSelector } from 'react-redux';
 import { useTranslation } from 'react-i18next';
 import { RootState } from '@/app/store';
diff --git a/worklenz-frontend/src/components/add-members-dropdown-v2/add-members-dropdown.tsx b/worklenz-frontend/src/components/add-members-dropdown-v2/add-members-dropdown.tsx
index b8924516..bacefba2 100644
--- a/worklenz-frontend/src/components/add-members-dropdown-v2/add-members-dropdown.tsx
+++ b/worklenz-frontend/src/components/add-members-dropdown-v2/add-members-dropdown.tsx
@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import { Avatar, Button, Checkbox, Dropdown, Input, Menu, Typography } from '@/shared/antd-imports';
-import { UserAddOutlined, UsergroupAddOutlined } from '@ant-design/icons';
+import { UserAddOutlined, UsergroupAddOutlined } from '@/shared/antd-imports';
 import './add-members-dropdown.css';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { AvatarNamesMap } from '@/shared/constants';
diff --git a/worklenz-frontend/src/components/add-members-dropdown/add-members-dropdown.tsx b/worklenz-frontend/src/components/add-members-dropdown/add-members-dropdown.tsx
index 38b7004e..816ecc81 100644
--- a/worklenz-frontend/src/components/add-members-dropdown/add-members-dropdown.tsx
+++ b/worklenz-frontend/src/components/add-members-dropdown/add-members-dropdown.tsx
@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import { Avatar, Button, Checkbox, Dropdown, Input, Menu, Typography } from '@/shared/antd-imports';
-import { PlusOutlined, UsergroupAddOutlined } from '@ant-design/icons';
+import { PlusOutlined, UsergroupAddOutlined } from '@/shared/antd-imports';
 import './add-members-dropdown.css';
 import { AvatarNamesMap } from '../../shared/constants';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
diff --git a/worklenz-frontend/src/components/admin-center/billing/billing-tables/invoices-table.tsx b/worklenz-frontend/src/components/admin-center/billing/billing-tables/invoices-table.tsx
index 0598cff4..015b3c7d 100644
--- a/worklenz-frontend/src/components/admin-center/billing/billing-tables/invoices-table.tsx
+++ b/worklenz-frontend/src/components/admin-center/billing/billing-tables/invoices-table.tsx
@@ -2,7 +2,7 @@ import { adminCenterApiService } from '@/api/admin-center/admin-center.api.servi
 import { IBillingTransaction } from '@/types/admin-center/admin-center.types';
 import logger from '@/utils/errorLogger';
 import { formatDate } from '@/utils/timeUtils';
-import { ContainerOutlined } from '@ant-design/icons';
+import { ContainerOutlined } from '@/shared/antd-imports';
 import { Button, Table, TableProps, Tag, Tooltip } from '@/shared/antd-imports';
 import React, { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/components/admin-center/billing/current-bill.tsx b/worklenz-frontend/src/components/admin-center/billing/current-bill.tsx
index e255d00b..891368b5 100644
--- a/worklenz-frontend/src/components/admin-center/billing/current-bill.tsx
+++ b/worklenz-frontend/src/components/admin-center/billing/current-bill.tsx
@@ -1,7 +1,7 @@
 import { Card, Col, Row, Tooltip } from '@/shared/antd-imports';
 import React, { useEffect, useMemo, useCallback } from 'react';
 import './current-bill.css';
-import { InfoCircleTwoTone } from '@ant-design/icons';
+import { InfoCircleTwoTone } from '@/shared/antd-imports';
 import ChargesTable from './billing-tables/charges-table';
 import InvoicesTable from './billing-tables/invoices-table';
 
diff --git a/worklenz-frontend/src/components/admin-center/billing/current-plan-details/current-plan-details.tsx b/worklenz-frontend/src/components/admin-center/billing/current-plan-details/current-plan-details.tsx
index ba2e09b0..28ec12ce 100644
--- a/worklenz-frontend/src/components/admin-center/billing/current-plan-details/current-plan-details.tsx
+++ b/worklenz-frontend/src/components/admin-center/billing/current-plan-details/current-plan-details.tsx
@@ -29,7 +29,7 @@ import {
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { useTranslation } from 'react-i18next';
-import { WarningTwoTone, PlusOutlined } from '@ant-design/icons';
+import { WarningTwoTone, PlusOutlined } from '@/shared/antd-imports';
 import { calculateTimeGap } from '@/utils/calculate-time-gap';
 import { formatDate } from '@/utils/timeUtils';
 import UpgradePlansLKR from '../drawers/upgrade-plans-lkr/upgrade-plans-lkr';
diff --git a/worklenz-frontend/src/components/admin-center/billing/drawers/upgrade-plans-lkr/upgrade-plans-lkr.tsx b/worklenz-frontend/src/components/admin-center/billing/drawers/upgrade-plans-lkr/upgrade-plans-lkr.tsx
index 91e2406e..892bf833 100644
--- a/worklenz-frontend/src/components/admin-center/billing/drawers/upgrade-plans-lkr/upgrade-plans-lkr.tsx
+++ b/worklenz-frontend/src/components/admin-center/billing/drawers/upgrade-plans-lkr/upgrade-plans-lkr.tsx
@@ -1,7 +1,7 @@
 import { Button, Card, Col, Form, Input, notification, Row, Tag, Typography } from '@/shared/antd-imports';
 import React, { useState } from 'react';
 import './upgrade-plans-lkr.css';
-import { CheckCircleFilled } from '@ant-design/icons';
+import { CheckCircleFilled } from '@/shared/antd-imports';
 import { RootState } from '@/app/store';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/components/admin-center/billing/drawers/upgrade-plans/upgrade-plans.tsx b/worklenz-frontend/src/components/admin-center/billing/drawers/upgrade-plans/upgrade-plans.tsx
index bc592d09..dd1a6b07 100644
--- a/worklenz-frontend/src/components/admin-center/billing/drawers/upgrade-plans/upgrade-plans.tsx
+++ b/worklenz-frontend/src/components/admin-center/billing/drawers/upgrade-plans/upgrade-plans.tsx
@@ -22,7 +22,7 @@ import {
 import logger from '@/utils/errorLogger';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { IPaddlePlans, SUBSCRIPTION_STATUS } from '@/shared/constants';
-import { CheckCircleFilled, InfoCircleOutlined } from '@ant-design/icons';
+import { CheckCircleFilled, InfoCircleOutlined } from '@/shared/antd-imports';
 import { useAuthService } from '@/hooks/useAuth';
 import { fetchBillingInfo, toggleUpgradeModal } from '@/features/admin-center/admin-center.slice';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
diff --git a/worklenz-frontend/src/components/admin-center/overview/organization-name/organization-name.tsx b/worklenz-frontend/src/components/admin-center/overview/organization-name/organization-name.tsx
index 41ed592c..d86ea72d 100644
--- a/worklenz-frontend/src/components/admin-center/overview/organization-name/organization-name.tsx
+++ b/worklenz-frontend/src/components/admin-center/overview/organization-name/organization-name.tsx
@@ -1,9 +1,8 @@
 import { adminCenterApiService } from '@/api/admin-center/admin-center.api.service';
 import logger from '@/utils/errorLogger';
-import { EnterOutlined, EditOutlined } from '@ant-design/icons';
+import { EnterOutlined, EditOutlined } from '@/shared/antd-imports';
 import { Card, Button, Tooltip, Typography } from '@/shared/antd-imports';
 import TextArea from 'antd/es/input/TextArea';
-import Paragraph from 'antd/es/typography/Paragraph';
 import { TFunction } from 'i18next';
 import { useState, useEffect } from 'react';
 
diff --git a/worklenz-frontend/src/components/admin-center/overview/organization-owner/organization-owner.tsx b/worklenz-frontend/src/components/admin-center/overview/organization-owner/organization-owner.tsx
index de73841c..1a28cc42 100644
--- a/worklenz-frontend/src/components/admin-center/overview/organization-owner/organization-owner.tsx
+++ b/worklenz-frontend/src/components/admin-center/overview/organization-owner/organization-owner.tsx
@@ -1,7 +1,7 @@
 import { adminCenterApiService } from '@/api/admin-center/admin-center.api.service';
 import { IOrganization } from '@/types/admin-center/admin-center.types';
 import logger from '@/utils/errorLogger';
-import { MailOutlined, PhoneOutlined, EditOutlined } from '@ant-design/icons';
+import { MailOutlined, PhoneOutlined, EditOutlined } from '@/shared/antd-imports';
 import { Card, Tooltip, Input, Button, Typography, InputRef } from '@/shared/antd-imports';
 import { TFunction } from 'i18next';
 import { useEffect, useRef, useState } from 'react';
diff --git a/worklenz-frontend/src/components/admin-center/teams/teams-table/teams-table.tsx b/worklenz-frontend/src/components/admin-center/teams/teams-table/teams-table.tsx
index d861dd48..1ea75af2 100644
--- a/worklenz-frontend/src/components/admin-center/teams/teams-table/teams-table.tsx
+++ b/worklenz-frontend/src/components/admin-center/teams/teams-table/teams-table.tsx
@@ -5,7 +5,7 @@ import { toggleSettingDrawer, deleteTeam, fetchTeams } from '@/features/teams/te
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { IOrganizationTeam } from '@/types/admin-center/admin-center.types';
 import logger from '@/utils/errorLogger';
-import { SettingOutlined, DeleteOutlined } from '@ant-design/icons';
+import { SettingOutlined, DeleteOutlined } from '@/shared/antd-imports';
 import { Badge, Button, Card, Popconfirm, Table, TableProps, Tooltip, Typography } from '@/shared/antd-imports';
 import { TFunction } from 'i18next';
 import { useState } from 'react';
diff --git a/worklenz-frontend/src/components/board/board-assignee-selector/board-assignee-selector.tsx b/worklenz-frontend/src/components/board/board-assignee-selector/board-assignee-selector.tsx
index 308b2482..27604a44 100644
--- a/worklenz-frontend/src/components/board/board-assignee-selector/board-assignee-selector.tsx
+++ b/worklenz-frontend/src/components/board/board-assignee-selector/board-assignee-selector.tsx
@@ -15,7 +15,7 @@ import { useAppSelector } from '@/hooks/useAppSelector';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { toggleProjectMemberDrawer } from '../../../features/projects/singleProject/members/projectMembersSlice';
 import { colors } from '../../../styles/colors';
-import { PlusOutlined, UsergroupAddOutlined } from '@ant-design/icons';
+import { PlusOutlined, UsergroupAddOutlined } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 import SingleAvatar from '@/components/common/single-avatar/single-avatar';
 import { CheckboxChangeEvent } from 'antd/es/checkbox';
diff --git a/worklenz-frontend/src/components/board/changeCategoryDropdown/ChangeCategoryDropdown.tsx b/worklenz-frontend/src/components/board/changeCategoryDropdown/ChangeCategoryDropdown.tsx
index 0be131a3..1b5e59ba 100644
--- a/worklenz-frontend/src/components/board/changeCategoryDropdown/ChangeCategoryDropdown.tsx
+++ b/worklenz-frontend/src/components/board/changeCategoryDropdown/ChangeCategoryDropdown.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import { TaskStatusType } from '../../../types/task.types';
 import { colors } from '../../../styles/colors';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
-import { RetweetOutlined, RightOutlined } from '@ant-design/icons';
+import { RetweetOutlined, RightOutlined } from '@/shared/antd-imports';
 import './ChangeCategoryDropdown.css';
 import { updateStatusCategory } from '../../../features/projects/status/StatusSlice';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/components/board/common-members-section/common-members-section.tsx b/worklenz-frontend/src/components/board/common-members-section/common-members-section.tsx
index a34fd64c..c4c0411c 100644
--- a/worklenz-frontend/src/components/board/common-members-section/common-members-section.tsx
+++ b/worklenz-frontend/src/components/board/common-members-section/common-members-section.tsx
@@ -6,7 +6,7 @@ import {
   LoadingOutlined,
   MoreOutlined,
   PlusOutlined,
-} from '@ant-design/icons';
+} from '@/shared/antd-imports';
 import { setTaskCardDisabled, initializeStatus } from '../../../features/board/create-card.slice';
 import { TaskType } from '../../../types/task.types';
 import TaskCreateCard from '../taskCreateCard/TaskCreateCard';
diff --git a/worklenz-frontend/src/components/board/common-phase-section/common-phase-section.tsx b/worklenz-frontend/src/components/board/common-phase-section/common-phase-section.tsx
index 7d241f70..3e1b0333 100644
--- a/worklenz-frontend/src/components/board/common-phase-section/common-phase-section.tsx
+++ b/worklenz-frontend/src/components/board/common-phase-section/common-phase-section.tsx
@@ -6,7 +6,7 @@ import {
   LoadingOutlined,
   MoreOutlined,
   PlusOutlined,
-} from '@ant-design/icons';
+} from '@/shared/antd-imports';
 import { setTaskCardDisabled, initializeStatus } from '../../../features/board/create-card.slice';
 import { TaskType } from '../../../types/task.types';
 import TaskCreateCard from '../taskCreateCard/TaskCreateCard';
diff --git a/worklenz-frontend/src/components/board/common-priority-section/common-priority-section.tsx b/worklenz-frontend/src/components/board/common-priority-section/common-priority-section.tsx
index ce1661c6..f2c04e51 100644
--- a/worklenz-frontend/src/components/board/common-priority-section/common-priority-section.tsx
+++ b/worklenz-frontend/src/components/board/common-priority-section/common-priority-section.tsx
@@ -6,7 +6,7 @@ import {
   LoadingOutlined,
   MoreOutlined,
   PlusOutlined,
-} from '@ant-design/icons';
+} from '@/shared/antd-imports';
 import { setTaskCardDisabled, initializeStatus } from '../../../features/board/create-card.slice';
 import { TaskType } from '../../../types/task.types';
 import TaskCreateCard from '../taskCreateCard/TaskCreateCard';
diff --git a/worklenz-frontend/src/components/board/commonStatusSection/CommonStatusSection.tsx b/worklenz-frontend/src/components/board/commonStatusSection/CommonStatusSection.tsx
index a51ba511..af36a9c5 100644
--- a/worklenz-frontend/src/components/board/commonStatusSection/CommonStatusSection.tsx
+++ b/worklenz-frontend/src/components/board/commonStatusSection/CommonStatusSection.tsx
@@ -6,7 +6,7 @@ import {
   LoadingOutlined,
   MoreOutlined,
   PlusOutlined,
-} from '@ant-design/icons';
+} from '@/shared/antd-imports';
 import { setTaskCardDisabled, initializeStatus } from '../../../features/board/create-card.slice';
 import { TaskType } from '../../../types/task.types';
 import TaskCreateCard from '../taskCreateCard/TaskCreateCard';
diff --git a/worklenz-frontend/src/components/board/custom-due-date-picker.tsx b/worklenz-frontend/src/components/board/custom-due-date-picker.tsx
index 9ca32744..ff68110e 100644
--- a/worklenz-frontend/src/components/board/custom-due-date-picker.tsx
+++ b/worklenz-frontend/src/components/board/custom-due-date-picker.tsx
@@ -1,6 +1,6 @@
 import React, { useState, useRef } from 'react';
 import { DatePicker, Button, Flex } from '@/shared/antd-imports';
-import { CalendarOutlined } from '@ant-design/icons';
+import { CalendarOutlined } from '@/shared/antd-imports';
 import dayjs, { Dayjs } from 'dayjs';
 import { useSocket } from '@/socket/socketContext';
 import { SocketEvents } from '@/shared/socket-events';
diff --git a/worklenz-frontend/src/components/board/kanban-group/kanban-group.tsx b/worklenz-frontend/src/components/board/kanban-group/kanban-group.tsx
index 0b9b6f9a..1f37a56f 100644
--- a/worklenz-frontend/src/components/board/kanban-group/kanban-group.tsx
+++ b/worklenz-frontend/src/components/board/kanban-group/kanban-group.tsx
@@ -6,7 +6,7 @@ import {
   LoadingOutlined,
   MoreOutlined,
   PlusOutlined,
-} from '@ant-design/icons';
+} from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 import { useDroppable } from '@dnd-kit/core';
 import { SortableContext, verticalListSortingStrategy } from '@dnd-kit/sortable';
diff --git a/worklenz-frontend/src/components/board/taskCard/TaskCard.tsx b/worklenz-frontend/src/components/board/taskCard/TaskCard.tsx
index 6c8475ba..7a21184c 100644
--- a/worklenz-frontend/src/components/board/taskCard/TaskCard.tsx
+++ b/worklenz-frontend/src/components/board/taskCard/TaskCard.tsx
@@ -20,7 +20,7 @@ import {
   ForkOutlined,
   CaretRightFilled,
   CaretDownFilled,
-} from '@ant-design/icons';
+} from '@/shared/antd-imports';
 import './TaskCard.css';
 import dayjs, { Dayjs } from 'dayjs';
 import AddMembersDropdown from '../../add-members-dropdown/add-members-dropdown';
diff --git a/worklenz-frontend/src/components/board/taskCard/priority-section/priority-section.tsx b/worklenz-frontend/src/components/board/taskCard/priority-section/priority-section.tsx
index 754279a7..6134536c 100644
--- a/worklenz-frontend/src/components/board/taskCard/priority-section/priority-section.tsx
+++ b/worklenz-frontend/src/components/board/taskCard/priority-section/priority-section.tsx
@@ -4,7 +4,7 @@ import { useAppSelector } from '@/hooks/useAppSelector';
 import { useState, useEffect, useMemo } from 'react';
 import { IProjectTask } from '@/types/project/projectTasksViewModel.types';
 import { ITaskPriority } from '@/types/tasks/taskPriority.types';
-import { DoubleLeftOutlined, MinusOutlined, PauseOutlined } from '@ant-design/icons';
+import { DoubleLeftOutlined, MinusOutlined, PauseOutlined } from '@/shared/antd-imports';
 
 type PrioritySectionProps = {
   task: IProjectTask;
diff --git a/worklenz-frontend/src/components/common/people-dropdown/PeopleDropdown.tsx b/worklenz-frontend/src/components/common/people-dropdown/PeopleDropdown.tsx
index c2f7ac78..dfbc862c 100644
--- a/worklenz-frontend/src/components/common/people-dropdown/PeopleDropdown.tsx
+++ b/worklenz-frontend/src/components/common/people-dropdown/PeopleDropdown.tsx
@@ -1,6 +1,6 @@
 import React, { useState, useRef, useEffect, useMemo, useCallback } from 'react';
 import { createPortal } from 'react-dom';
-import { PlusOutlined, UserAddOutlined } from '@ant-design/icons';
+import { PlusOutlined, UserAddOutlined } from '@/shared/antd-imports';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { toggleProjectMemberDrawer } from '@/features/projects/singleProject/members/projectMembersSlice';
diff --git a/worklenz-frontend/src/components/common/project-status-icon/project-status-icon.tsx b/worklenz-frontend/src/components/common/project-status-icon/project-status-icon.tsx
index 09974db2..919ce401 100644
--- a/worklenz-frontend/src/components/common/project-status-icon/project-status-icon.tsx
+++ b/worklenz-frontend/src/components/common/project-status-icon/project-status-icon.tsx
@@ -4,7 +4,7 @@ import Icon, {
   ClockCircleOutlined,
   CloseCircleOutlined,
   StopOutlined,
-} from '@ant-design/icons';
+} from '@/shared/antd-imports';
 
 const iconMap = {
   'clock-circle': ClockCircleOutlined,
diff --git a/worklenz-frontend/src/components/common/template-drawer/template-drawer.tsx b/worklenz-frontend/src/components/common/template-drawer/template-drawer.tsx
index e6afa440..2250b869 100644
--- a/worklenz-frontend/src/components/common/template-drawer/template-drawer.tsx
+++ b/worklenz-frontend/src/components/common/template-drawer/template-drawer.tsx
@@ -22,7 +22,7 @@ import {
   IWorklenzTemplate,
 } from '@/types/project-templates/project-templates.types';
 import './template-drawer.css';
-import { SearchOutlined } from '@ant-design/icons';
+import { SearchOutlined } from '@/shared/antd-imports';
 import logger from '@/utils/errorLogger';
 
 const { Title, Text } = Typography;
diff --git a/worklenz-frontend/src/components/enhanced-kanban/EnhancedKanbanCreateSection.tsx b/worklenz-frontend/src/components/enhanced-kanban/EnhancedKanbanCreateSection.tsx
index 530ee0c6..7aec4fe7 100644
--- a/worklenz-frontend/src/components/enhanced-kanban/EnhancedKanbanCreateSection.tsx
+++ b/worklenz-frontend/src/components/enhanced-kanban/EnhancedKanbanCreateSection.tsx
@@ -1,9 +1,9 @@
 import React, { useState, useRef, useEffect, useMemo } from 'react';
 import { Button, Flex } from '@/shared/antd-imports';
-import { PlusOutlined } from '@ant-design/icons';
+import { PlusOutlined } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 import { nanoid } from '@reduxjs/toolkit';
-import { DownOutlined } from '@ant-design/icons';
+import { DownOutlined } from '@/shared/antd-imports';
 
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { themeWiseColor } from '@/utils/themeWiseColor';
diff --git a/worklenz-frontend/src/components/enhanced-kanban/EnhancedKanbanTaskCard.tsx b/worklenz-frontend/src/components/enhanced-kanban/EnhancedKanbanTaskCard.tsx
index 0fa3f73a..82f79c55 100644
--- a/worklenz-frontend/src/components/enhanced-kanban/EnhancedKanbanTaskCard.tsx
+++ b/worklenz-frontend/src/components/enhanced-kanban/EnhancedKanbanTaskCard.tsx
@@ -15,10 +15,10 @@ import PrioritySection from '../board/taskCard/priority-section/priority-section
 import Typography from 'antd/es/typography';
 import CustomDueDatePicker from '../board/custom-due-date-picker';
 import { themeWiseColor } from '@/utils/themeWiseColor';
-import { ForkOutlined } from '@ant-design/icons';
+import { ForkOutlined } from '@/shared/antd-imports';
 import { Dayjs } from 'dayjs';
 import dayjs from 'dayjs';
-import { CaretDownFilled, CaretRightFilled } from '@ant-design/icons';
+import { CaretDownFilled, CaretRightFilled } from '@/shared/antd-imports';
 import {
   fetchBoardSubTasks,
   toggleTaskExpansion,
@@ -26,7 +26,7 @@ import {
 import { Divider } from '@/shared/antd-imports';
 import { List } from '@/shared/antd-imports';
 import { Skeleton } from '@/shared/antd-imports';
-import { PlusOutlined } from '@ant-design/icons';
+import { PlusOutlined } from '@/shared/antd-imports';
 import BoardSubTaskCard from '@/pages/projects/projectView/board/board-section/board-sub-task-card/board-sub-task-card';
 import BoardCreateSubtaskCard from '@/pages/projects/projectView/board/board-section/board-sub-task-card/board-create-sub-task-card';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/components/kanban-board-management-v2/kanbanGroup.tsx b/worklenz-frontend/src/components/kanban-board-management-v2/kanbanGroup.tsx
index 3e8ce29d..996653e1 100644
--- a/worklenz-frontend/src/components/kanban-board-management-v2/kanbanGroup.tsx
+++ b/worklenz-frontend/src/components/kanban-board-management-v2/kanbanGroup.tsx
@@ -2,7 +2,7 @@ import React, { useState } from 'react';
 import { useDroppable } from '@dnd-kit/core';
 import { SortableContext, verticalListSortingStrategy } from '@dnd-kit/sortable';
 import { Button, Typography } from '@/shared/antd-imports';
-import { PlusOutlined, MenuOutlined } from '@ant-design/icons';
+import { PlusOutlined, MenuOutlined } from '@/shared/antd-imports';
 import { ITaskListGroup } from '@/types/tasks/taskList.types';
 import { IGroupBy } from '@/features/tasks/tasks.slice';
 import KanbanTaskCard from './kanbanTaskCard';
diff --git a/worklenz-frontend/src/components/kanban-board-management-v2/kanbanTaskCard.tsx b/worklenz-frontend/src/components/kanban-board-management-v2/kanbanTaskCard.tsx
index 1356e3ae..4e35a990 100644
--- a/worklenz-frontend/src/components/kanban-board-management-v2/kanbanTaskCard.tsx
+++ b/worklenz-frontend/src/components/kanban-board-management-v2/kanbanTaskCard.tsx
@@ -7,7 +7,7 @@ import {
   MessageOutlined,
   PaperClipOutlined,
   ClockCircleOutlined,
-} from '@ant-design/icons';
+} from '@/shared/antd-imports';
 import { IProjectTask } from '@/types/project/projectTasksViewModel.types';
 import { IGroupBy } from '@/features/tasks/tasks.slice';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/components/navbar/notifications/notifications-drawer/notification/notification-button.tsx b/worklenz-frontend/src/components/navbar/notifications/notifications-drawer/notification/notification-button.tsx
index 43a5c621..16ae3b3c 100644
--- a/worklenz-frontend/src/components/navbar/notifications/notifications-drawer/notification/notification-button.tsx
+++ b/worklenz-frontend/src/components/navbar/notifications/notifications-drawer/notification/notification-button.tsx
@@ -1,4 +1,4 @@
-import { BellOutlined } from '@ant-design/icons';
+import { BellOutlined } from '@/shared/antd-imports';
 import { Badge, Button, Tooltip } from '@/shared/antd-imports';
 import { toggleDrawer } from '@features/navbar/notificationSlice';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
diff --git a/worklenz-frontend/src/components/navbar/notifications/notifications-drawer/notification/notification-item.tsx b/worklenz-frontend/src/components/navbar/notifications/notifications-drawer/notification/notification-item.tsx
index e6591ab7..39023968 100644
--- a/worklenz-frontend/src/components/navbar/notifications/notifications-drawer/notification/notification-item.tsx
+++ b/worklenz-frontend/src/components/navbar/notifications/notifications-drawer/notification/notification-item.tsx
@@ -1,5 +1,5 @@
 import { IWorklenzNotification } from '@/types/notifications/notifications.types';
-import { BankOutlined } from '@ant-design/icons';
+import { BankOutlined } from '@/shared/antd-imports';
 import { Button, Tag, Typography, theme } from '@/shared/antd-imports';
 import DOMPurify from 'dompurify';
 import React, { useState } from 'react';
diff --git a/worklenz-frontend/src/components/navbar/notifications/notifications-drawer/notification/notification-template.tsx b/worklenz-frontend/src/components/navbar/notifications/notifications-drawer/notification/notification-template.tsx
index bbbe03e2..f4a6e60a 100644
--- a/worklenz-frontend/src/components/navbar/notifications/notifications-drawer/notification/notification-template.tsx
+++ b/worklenz-frontend/src/components/navbar/notifications/notifications-drawer/notification/notification-template.tsx
@@ -1,5 +1,5 @@
 import { Button, Typography, Tag } from '@/shared/antd-imports';
-import { BankOutlined } from '@ant-design/icons';
+import { BankOutlined } from '@/shared/antd-imports';
 import { IWorklenzNotification } from '@/types/notifications/notifications.types';
 import { useNavigate } from 'react-router-dom';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
diff --git a/worklenz-frontend/src/components/navbar/notifications/notifications-drawer/notification/push-notification-template.tsx b/worklenz-frontend/src/components/navbar/notifications/notifications-drawer/notification/push-notification-template.tsx
index 7465ff26..b0bcc7bb 100644
--- a/worklenz-frontend/src/components/navbar/notifications/notifications-drawer/notification/push-notification-template.tsx
+++ b/worklenz-frontend/src/components/navbar/notifications/notifications-drawer/notification/push-notification-template.tsx
@@ -2,7 +2,7 @@ import { notification } from '@/shared/antd-imports';
 import { IWorklenzNotification } from '@/types/notifications/notifications.types';
 import { teamsApiService } from '@/api/teams/teams.api.service';
 import { toQueryString } from '@/utils/toQueryString';
-import { BankOutlined } from '@ant-design/icons';
+import { BankOutlined } from '@/shared/antd-imports';
 import './push-notification-template.css';
 
 const PushNotificationTemplate = ({
diff --git a/worklenz-frontend/src/components/project-list/project-group/project-group-list.tsx b/worklenz-frontend/src/components/project-list/project-group/project-group-list.tsx
index 208802d8..4c742efe 100644
--- a/worklenz-frontend/src/components/project-list/project-group/project-group-list.tsx
+++ b/worklenz-frontend/src/components/project-list/project-group/project-group-list.tsx
@@ -14,7 +14,6 @@ import {
   Divider,
 } from '@/shared/antd-imports';
 import {
-  ClockCircleOutlined,
   TeamOutlined,
   CheckCircleOutlined,
   ProjectOutlined,
@@ -22,7 +21,7 @@ import {
   SettingOutlined,
   InboxOutlined,
   MoreOutlined,
-} from '@ant-design/icons';
+} from '@/shared/antd-imports';
 import { ProjectGroupListProps } from '@/types/project/project.types';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
diff --git a/worklenz-frontend/src/components/project-list/project-list-table/project-list-actions/project-list-actions.tsx b/worklenz-frontend/src/components/project-list/project-list-table/project-list-actions/project-list-actions.tsx
index fe69580a..4a319a44 100644
--- a/worklenz-frontend/src/components/project-list/project-list-table/project-list-actions/project-list-actions.tsx
+++ b/worklenz-frontend/src/components/project-list/project-list-table/project-list-actions/project-list-actions.tsx
@@ -13,7 +13,7 @@ import { useAppSelector } from '@/hooks/useAppSelector';
 import useIsProjectManager from '@/hooks/useIsProjectManager';
 import { IProjectViewModel } from '@/types/project/projectViewModel.types';
 import logger from '@/utils/errorLogger';
-import { SettingOutlined, InboxOutlined } from '@ant-design/icons';
+import { SettingOutlined, InboxOutlined } from '@/shared/antd-imports';
 import { Tooltip, Button, Popconfirm, Space } from '@/shared/antd-imports';
 import {
   evt_projects_archive,
diff --git a/worklenz-frontend/src/components/project-list/project-list-table/project-list-favorite/project-rate-cell.tsx b/worklenz-frontend/src/components/project-list/project-list-table/project-list-favorite/project-rate-cell.tsx
index 64723387..90e8e505 100644
--- a/worklenz-frontend/src/components/project-list/project-list-table/project-list-favorite/project-rate-cell.tsx
+++ b/worklenz-frontend/src/components/project-list/project-list-table/project-list-favorite/project-rate-cell.tsx
@@ -7,7 +7,7 @@ import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { colors } from '@/styles/colors';
 import { IProjectViewModel } from '@/types/project/projectViewModel.types';
-import { StarFilled } from '@ant-design/icons';
+import { StarFilled } from '@/shared/antd-imports';
 import { Button, ConfigProvider, Tooltip } from '@/shared/antd-imports';
 import { TFunction } from 'i18next';
 import { useCallback, useMemo } from 'react';
diff --git a/worklenz-frontend/src/components/project-list/project-list-table/project-name/project-name-cell.tsx b/worklenz-frontend/src/components/project-list/project-list-table/project-name/project-name-cell.tsx
index 27a66287..fc517782 100644
--- a/worklenz-frontend/src/components/project-list/project-list-table/project-name/project-name-cell.tsx
+++ b/worklenz-frontend/src/components/project-list/project-list-table/project-name/project-name-cell.tsx
@@ -6,7 +6,7 @@ import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { IProjectViewModel } from '@/types/project/projectViewModel.types';
 import { formatDateRange } from '@/utils/project-list-utils';
-import { CalendarOutlined } from '@ant-design/icons';
+import { CalendarOutlined } from '@/shared/antd-imports';
 import { Badge, Tooltip } from '@/shared/antd-imports';
 import { TFunction } from 'i18next';
 import { NavigateFunction } from 'react-router-dom';
diff --git a/worklenz-frontend/src/components/project-task-filters/create-status-button/create-status-button.tsx b/worklenz-frontend/src/components/project-task-filters/create-status-button/create-status-button.tsx
index 64ac806b..29aefae5 100644
--- a/worklenz-frontend/src/components/project-task-filters/create-status-button/create-status-button.tsx
+++ b/worklenz-frontend/src/components/project-task-filters/create-status-button/create-status-button.tsx
@@ -1,4 +1,4 @@
-import { SettingOutlined } from '@ant-design/icons';
+import { SettingOutlined } from '@/shared/antd-imports';
 import Tooltip from 'antd/es/tooltip';
 import Button from 'antd/es/button';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
diff --git a/worklenz-frontend/src/components/project-task-filters/delete-status-drawer/delete-status-drawer.tsx b/worklenz-frontend/src/components/project-task-filters/delete-status-drawer/delete-status-drawer.tsx
index bc28501b..3b6b7fd0 100644
--- a/worklenz-frontend/src/components/project-task-filters/delete-status-drawer/delete-status-drawer.tsx
+++ b/worklenz-frontend/src/components/project-task-filters/delete-status-drawer/delete-status-drawer.tsx
@@ -10,7 +10,7 @@ import { fetchTaskGroups } from '@/features/tasks/tasks.slice';
 
 import { deleteStatusToggleDrawer } from '@/features/projects/status/DeleteStatusSlice';
 import { Drawer, Alert, Card, Select, Button, Typography, Badge } from '@/shared/antd-imports';
-import { DownOutlined } from '@ant-design/icons';
+import { DownOutlined } from '@/shared/antd-imports';
 import { useSelector } from 'react-redux';
 import {
     deleteSection,
diff --git a/worklenz-frontend/src/components/project-task-filters/filter-dropdowns/column-configuration-modal.tsx b/worklenz-frontend/src/components/project-task-filters/filter-dropdowns/column-configuration-modal.tsx
index 147c1277..ca56a761 100644
--- a/worklenz-frontend/src/components/project-task-filters/filter-dropdowns/column-configuration-modal.tsx
+++ b/worklenz-frontend/src/components/project-task-filters/filter-dropdowns/column-configuration-modal.tsx
@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from 'react';
 import { Modal, Checkbox, Button, Flex, Typography, Space, Divider, message } from '@/shared/antd-imports';
-import { SettingOutlined, UpOutlined, DownOutlined } from '@ant-design/icons';
+import { SettingOutlined, UpOutlined, DownOutlined } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 
 // Configuration interface for column visibility
diff --git a/worklenz-frontend/src/components/project-task-filters/filter-dropdowns/group-by-filter-dropdown.tsx b/worklenz-frontend/src/components/project-task-filters/filter-dropdowns/group-by-filter-dropdown.tsx
index 7d290026..4969a406 100644
--- a/worklenz-frontend/src/components/project-task-filters/filter-dropdowns/group-by-filter-dropdown.tsx
+++ b/worklenz-frontend/src/components/project-task-filters/filter-dropdowns/group-by-filter-dropdown.tsx
@@ -1,6 +1,6 @@
 import { useEffect, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
-import { CaretDownFilled } from '@ant-design/icons';
+import { CaretDownFilled } from '@/shared/antd-imports';
 import { ConfigProvider, Flex, Dropdown, Button } from 'antd/es';
 import { useSearchParams } from 'react-router-dom';
 
diff --git a/worklenz-frontend/src/components/project-task-filters/filter-dropdowns/labels-filter-dropdown.tsx b/worklenz-frontend/src/components/project-task-filters/filter-dropdowns/labels-filter-dropdown.tsx
index dc63e9be..c4ae5b44 100644
--- a/worklenz-frontend/src/components/project-task-filters/filter-dropdowns/labels-filter-dropdown.tsx
+++ b/worklenz-frontend/src/components/project-task-filters/filter-dropdowns/labels-filter-dropdown.tsx
@@ -1,4 +1,4 @@
-import { CaretDownFilled } from '@ant-design/icons';
+import { CaretDownFilled } from '@/shared/antd-imports';
 import Badge from 'antd/es/badge';
 import Button from 'antd/es/button';
 import Card from 'antd/es/card';
diff --git a/worklenz-frontend/src/components/project-task-filters/filter-dropdowns/members-filter-dropdown.tsx b/worklenz-frontend/src/components/project-task-filters/filter-dropdowns/members-filter-dropdown.tsx
index 755cbdf3..051f4522 100644
--- a/worklenz-frontend/src/components/project-task-filters/filter-dropdowns/members-filter-dropdown.tsx
+++ b/worklenz-frontend/src/components/project-task-filters/filter-dropdowns/members-filter-dropdown.tsx
@@ -1,6 +1,6 @@
 import { useMemo, useRef, useState, useCallback, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
-import { CaretDownFilled } from '@ant-design/icons';
+import { CaretDownFilled } from '@/shared/antd-imports';
 import {
   Badge,
   Button,
diff --git a/worklenz-frontend/src/components/project-task-filters/filter-dropdowns/priority-filter-dropdown.tsx b/worklenz-frontend/src/components/project-task-filters/filter-dropdowns/priority-filter-dropdown.tsx
index 79858de2..d2af5eb3 100644
--- a/worklenz-frontend/src/components/project-task-filters/filter-dropdowns/priority-filter-dropdown.tsx
+++ b/worklenz-frontend/src/components/project-task-filters/filter-dropdowns/priority-filter-dropdown.tsx
@@ -1,4 +1,4 @@
-import { CaretDownFilled } from '@ant-design/icons';
+import { CaretDownFilled } from '@/shared/antd-imports';
 import { useMemo, useEffect, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 
diff --git a/worklenz-frontend/src/components/project-task-filters/filter-dropdowns/search-dropdown.tsx b/worklenz-frontend/src/components/project-task-filters/filter-dropdowns/search-dropdown.tsx
index e8743f39..bc072207 100644
--- a/worklenz-frontend/src/components/project-task-filters/filter-dropdowns/search-dropdown.tsx
+++ b/worklenz-frontend/src/components/project-task-filters/filter-dropdowns/search-dropdown.tsx
@@ -13,7 +13,7 @@ import Space from 'antd/es/space';
 import Dropdown from 'antd/es/dropdown';
 
 import { setSearch } from '@/features/tasks/tasks.slice';
-import { SearchOutlined } from '@ant-design/icons';
+import { SearchOutlined } from '@/shared/antd-imports';
 
 import { setBoardSearch } from '@/features/board/board-slice';
 
diff --git a/worklenz-frontend/src/components/project-task-filters/filter-dropdowns/show-fields-filter-dropdown.tsx b/worklenz-frontend/src/components/project-task-filters/filter-dropdowns/show-fields-filter-dropdown.tsx
index 56d1b7d5..8b76a129 100644
--- a/worklenz-frontend/src/components/project-task-filters/filter-dropdowns/show-fields-filter-dropdown.tsx
+++ b/worklenz-frontend/src/components/project-task-filters/filter-dropdowns/show-fields-filter-dropdown.tsx
@@ -1,4 +1,4 @@
-import { MoreOutlined, SettingOutlined } from '@ant-design/icons';
+import { MoreOutlined, SettingOutlined } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 import Button from 'antd/es/button';
 import Checkbox from 'antd/es/checkbox';
diff --git a/worklenz-frontend/src/components/project-task-filters/filter-dropdowns/sort-filter-dropdown.tsx b/worklenz-frontend/src/components/project-task-filters/filter-dropdowns/sort-filter-dropdown.tsx
index a74f15b5..c86d2ff8 100644
--- a/worklenz-frontend/src/components/project-task-filters/filter-dropdowns/sort-filter-dropdown.tsx
+++ b/worklenz-frontend/src/components/project-task-filters/filter-dropdowns/sort-filter-dropdown.tsx
@@ -1,4 +1,4 @@
-import { CaretDownFilled, SortAscendingOutlined, SortDescendingOutlined } from '@ant-design/icons';
+import { CaretDownFilled, SortAscendingOutlined, SortDescendingOutlined } from '@/shared/antd-imports';
 
 import Badge from 'antd/es/badge';
 import Button from 'antd/es/button';
diff --git a/worklenz-frontend/src/components/projects/project-create-button/project-create-button.tsx b/worklenz-frontend/src/components/projects/project-create-button/project-create-button.tsx
index bdde03c9..2cb2729b 100644
--- a/worklenz-frontend/src/components/projects/project-create-button/project-create-button.tsx
+++ b/worklenz-frontend/src/components/projects/project-create-button/project-create-button.tsx
@@ -1,7 +1,7 @@
 import { Button, Drawer, Dropdown } from '@/shared/antd-imports';
 import { useEffect, useState } from 'react';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
-import { DownOutlined, EditOutlined, ImportOutlined } from '@ant-design/icons';
+import { DownOutlined, EditOutlined, ImportOutlined } from '@/shared/antd-imports';
 import TemplateDrawer from '@/components/common/template-drawer/template-drawer';
 import { useTranslation } from 'react-i18next';
 import { useLocation, useNavigate } from 'react-router-dom';
diff --git a/worklenz-frontend/src/components/projects/project-drawer/project-category-section/project-category-section.tsx b/worklenz-frontend/src/components/projects/project-drawer/project-category-section/project-category-section.tsx
index ccf1a647..a388fdca 100644
--- a/worklenz-frontend/src/components/projects/project-drawer/project-category-section/project-category-section.tsx
+++ b/worklenz-frontend/src/components/projects/project-drawer/project-category-section/project-category-section.tsx
@@ -11,7 +11,7 @@ import {
   Select,
   Typography,
 } from '@/shared/antd-imports';
-import { PlusOutlined } from '@ant-design/icons';
+import { PlusOutlined } from '@/shared/antd-imports';
 
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import {
diff --git a/worklenz-frontend/src/components/projects/project-drawer/project-client-section/project-client-section.tsx b/worklenz-frontend/src/components/projects/project-drawer/project-client-section/project-client-section.tsx
index 67f8daa9..d8e2a4b8 100644
--- a/worklenz-frontend/src/components/projects/project-drawer/project-client-section/project-client-section.tsx
+++ b/worklenz-frontend/src/components/projects/project-drawer/project-client-section/project-client-section.tsx
@@ -2,7 +2,7 @@ import { createClient, fetchClients } from '@/features/settings/client/clientSli
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { IClientsViewModel } from '@/types/client.types';
 import { IProjectViewModel } from '@/types/project/projectViewModel.types';
-import { QuestionCircleOutlined } from '@ant-design/icons';
+import { QuestionCircleOutlined } from '@/shared/antd-imports';
 import { AutoComplete, Flex, Form, FormInstance, Spin, Tooltip, Typography } from '@/shared/antd-imports';
 import { TFunction } from 'i18next';
 import { useState } from 'react';
diff --git a/worklenz-frontend/src/components/projects/project-manager-dropdown/project-manager-dropdown.tsx b/worklenz-frontend/src/components/projects/project-manager-dropdown/project-manager-dropdown.tsx
index 8c2ca57b..f8ac27f3 100644
--- a/worklenz-frontend/src/components/projects/project-manager-dropdown/project-manager-dropdown.tsx
+++ b/worklenz-frontend/src/components/projects/project-manager-dropdown/project-manager-dropdown.tsx
@@ -3,7 +3,7 @@ import { getTeamMembers } from '@/features/team-members/team-members.slice';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { ITeamMemberViewModel } from '@/types/teamMembers/teamMembersGetResponse.types';
-import { CloseCircleFilled, PlusCircleOutlined } from '@ant-design/icons';
+import { CloseCircleFilled, PlusCircleOutlined } from '@/shared/antd-imports';
 import { Button, Dropdown, Flex, Input, InputRef, theme, Typography } from '@/shared/antd-imports';
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/components/projects/project-member-invite-drawer/project-member-invite-drawer.tsx b/worklenz-frontend/src/components/projects/project-member-invite-drawer/project-member-invite-drawer.tsx
index 4d461de4..92f05b50 100644
--- a/worklenz-frontend/src/components/projects/project-member-invite-drawer/project-member-invite-drawer.tsx
+++ b/worklenz-frontend/src/components/projects/project-member-invite-drawer/project-member-invite-drawer.tsx
@@ -12,7 +12,7 @@ import {
   toggleProjectMemberDrawer,
 } from '@/features/projects/singleProject/members/projectMembersSlice';
 import SingleAvatar from '@/components/common/single-avatar/single-avatar';
-import { DeleteOutlined, MailOutlined } from '@ant-design/icons';
+import { DeleteOutlined, MailOutlined } from '@/shared/antd-imports';
 import { getTeamMembers } from '@/features/team-members/team-members.slice';
 import logger from '@/utils/errorLogger';
 import { validateEmail } from '@/utils/validateEmail';
diff --git a/worklenz-frontend/src/components/projects/project-stats-card.tsx b/worklenz-frontend/src/components/projects/project-stats-card.tsx
index 45226ed7..68dd46d1 100644
--- a/worklenz-frontend/src/components/projects/project-stats-card.tsx
+++ b/worklenz-frontend/src/components/projects/project-stats-card.tsx
@@ -1,6 +1,6 @@
 import { ReactNode } from 'react';
 import { Card, Flex, Skeleton, Tooltip, Typography } from '@/shared/antd-imports';
-import { ExclamationCircleOutlined } from '@ant-design/icons';
+import { ExclamationCircleOutlined } from '@/shared/antd-imports';
 import { colors } from '@/styles/colors';
 
 type InsightCardProps = {
diff --git a/worklenz-frontend/src/components/reporting/drawers/overview-team-info/overview-team-info-drawer.tsx b/worklenz-frontend/src/components/reporting/drawers/overview-team-info/overview-team-info-drawer.tsx
index c3eabdca..a0e8301f 100644
--- a/worklenz-frontend/src/components/reporting/drawers/overview-team-info/overview-team-info-drawer.tsx
+++ b/worklenz-frontend/src/components/reporting/drawers/overview-team-info/overview-team-info-drawer.tsx
@@ -1,8 +1,7 @@
 import { Drawer, Typography, Flex, Button, Dropdown } from '@/shared/antd-imports';
-import React, { useState } from 'react';
 import { useAppSelector } from '../../../../hooks/useAppSelector';
 import { useAppDispatch } from '../../../../hooks/useAppDispatch';
-import { BankOutlined, DownOutlined } from '@ant-design/icons';
+import { BankOutlined } from '@/shared/antd-imports';
 import { colors } from '../../../../styles/colors';
 import { useTranslation } from 'react-i18next';
 
@@ -28,7 +27,7 @@ const OverviewTeamInfoDrawer = ({ team }: OverviewTeamInfoDrawerProps) => {
   return (
     <Drawer
       open={isDrawerOpen}
-      destroyOnClose
+      destroyOnHidden
       onClose={handleClose}
       width={900}
       title={
diff --git a/worklenz-frontend/src/components/reporting/drawers/overview-team-info/projects-tab/reporting-overview-projects-table.tsx b/worklenz-frontend/src/components/reporting/drawers/overview-team-info/projects-tab/reporting-overview-projects-table.tsx
index c712b0dc..a6afb9eb 100644
--- a/worklenz-frontend/src/components/reporting/drawers/overview-team-info/projects-tab/reporting-overview-projects-table.tsx
+++ b/worklenz-frontend/src/components/reporting/drawers/overview-team-info/projects-tab/reporting-overview-projects-table.tsx
@@ -2,7 +2,7 @@ import { useEffect, useState, useMemo } from 'react';
 import { Button, ConfigProvider, Flex, PaginationProps, Table, TableColumnsType } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 import { createPortal } from 'react-dom';
-import { ExpandAltOutlined } from '@ant-design/icons';
+import { ExpandAltOutlined } from '@/shared/antd-imports';
 
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
diff --git a/worklenz-frontend/src/components/reporting/time-wise-filter.tsx b/worklenz-frontend/src/components/reporting/time-wise-filter.tsx
index f9e7c72d..80c317ca 100644
--- a/worklenz-frontend/src/components/reporting/time-wise-filter.tsx
+++ b/worklenz-frontend/src/components/reporting/time-wise-filter.tsx
@@ -1,4 +1,4 @@
-import { CaretDownFilled, DownOutlined } from '@ant-design/icons';
+import { DownOutlined } from '@/shared/antd-imports';
 import { Button, Card, DatePicker, Divider, Dropdown, Flex, List, Typography } from '@/shared/antd-imports';
 import { useState, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/components/schedule-old/team/Team.tsx b/worklenz-frontend/src/components/schedule-old/team/Team.tsx
index 4cffd0d3..d0088729 100644
--- a/worklenz-frontend/src/components/schedule-old/team/Team.tsx
+++ b/worklenz-frontend/src/components/schedule-old/team/Team.tsx
@@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react';
 import { AvatarNamesMap } from '@/shared/constants';
 import { Member } from '@/types/schedule/schedule.types';
 import { Avatar, Badge, Button, Col, Flex, Popover, Row, Tooltip } from '@/shared/antd-imports';
-import { CaretDownOutlined, CaretRightFilled } from '@ant-design/icons';
+import { CaretDownOutlined, CaretRightFilled } from '@/shared/antd-imports';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import './Team.css';
 import { useDispatch } from 'react-redux';
diff --git a/worklenz-frontend/src/components/schedule/grant-chart/grantt-members-table.tsx b/worklenz-frontend/src/components/schedule/grant-chart/grantt-members-table.tsx
index 8882decc..1096394a 100644
--- a/worklenz-frontend/src/components/schedule/grant-chart/grantt-members-table.tsx
+++ b/worklenz-frontend/src/components/schedule/grant-chart/grantt-members-table.tsx
@@ -6,7 +6,7 @@ import {
   fetchMemberProjects,
   toggleScheduleDrawer,
 } from '../../../features/schedule/scheduleSlice';
-import { CaretDownOutlined, CaretRightFilled } from '@ant-design/icons';
+import { CaretDownOutlined, CaretRightFilled } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 
diff --git a/worklenz-frontend/src/components/schedule/grant-chart/project-timeline-bar.tsx b/worklenz-frontend/src/components/schedule/grant-chart/project-timeline-bar.tsx
index 57331b97..a581851f 100644
--- a/worklenz-frontend/src/components/schedule/grant-chart/project-timeline-bar.tsx
+++ b/worklenz-frontend/src/components/schedule/grant-chart/project-timeline-bar.tsx
@@ -7,7 +7,7 @@ import { getWorking, toggleScheduleDrawer } from '../../../features/schedule/sch
 import ProjectTimelineModal from '../../../features/schedule/ProjectTimelineModal';
 import { Resizable } from 're-resizable';
 import { themeWiseColor } from '../../../utils/themeWiseColor';
-import { MoreOutlined } from '@ant-design/icons';
+import { MoreOutlined } from '@/shared/antd-imports';
 import { CELL_WIDTH } from '../../../shared/constants';
 import { ScheduleData } from '@/types/schedule/schedule-v2.types';
 
diff --git a/worklenz-frontend/src/components/service-worker-status/ServiceWorkerStatus.tsx b/worklenz-frontend/src/components/service-worker-status/ServiceWorkerStatus.tsx
index d5f20839..d2cd235c 100644
--- a/worklenz-frontend/src/components/service-worker-status/ServiceWorkerStatus.tsx
+++ b/worklenz-frontend/src/components/service-worker-status/ServiceWorkerStatus.tsx
@@ -3,7 +3,7 @@
 
 import React from 'react';
 import { Badge, Button, Space, Tooltip, message } from '@/shared/antd-imports';
-import { WifiOutlined, DisconnectOutlined, ReloadOutlined, DeleteOutlined } from '@ant-design/icons';
+import { WifiOutlined, DisconnectOutlined, ReloadOutlined, DeleteOutlined } from '@/shared/antd-imports';
 import { useServiceWorker } from '../../utils/serviceWorkerRegistration';
 
 interface ServiceWorkerStatusProps {
diff --git a/worklenz-frontend/src/components/task-drawer/shared/activity-log/task-drawer-activity-log.tsx b/worklenz-frontend/src/components/task-drawer/shared/activity-log/task-drawer-activity-log.tsx
index d0d1a7c3..b5e51432 100644
--- a/worklenz-frontend/src/components/task-drawer/shared/activity-log/task-drawer-activity-log.tsx
+++ b/worklenz-frontend/src/components/task-drawer/shared/activity-log/task-drawer-activity-log.tsx
@@ -1,7 +1,7 @@
 import { Timeline, Typography, Flex, ConfigProvider, Tag, Tooltip, Skeleton } from '@/shared/antd-imports';
 import { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { ArrowRightOutlined } from '@ant-design/icons';
+import { ArrowRightOutlined } from '@/shared/antd-imports';
 
 import {
   IActivityLog,
diff --git a/worklenz-frontend/src/components/task-drawer/shared/info-tab/attachments/attachments-grid.tsx b/worklenz-frontend/src/components/task-drawer/shared/info-tab/attachments/attachments-grid.tsx
index bc5d30fc..9373bd4e 100644
--- a/worklenz-frontend/src/components/task-drawer/shared/info-tab/attachments/attachments-grid.tsx
+++ b/worklenz-frontend/src/components/task-drawer/shared/info-tab/attachments/attachments-grid.tsx
@@ -3,8 +3,6 @@ import AttachmentsPreview from './attachments-preview';
 import './attachments-preview.css';
 import type { RcFile, UploadProps } from 'antd/es/upload';
 import { TFunction } from 'i18next';
-import { ReloadOutlined } from '@ant-design/icons';
-import { message } from '@/shared/antd-imports';
 import AttachmentsUpload from './attachments-upload';
 
 interface AttachmentsGridProps {
diff --git a/worklenz-frontend/src/components/task-drawer/shared/info-tab/attachments/attachments-preview.tsx b/worklenz-frontend/src/components/task-drawer/shared/info-tab/attachments/attachments-preview.tsx
index 6ca6bfb5..f0f119b4 100644
--- a/worklenz-frontend/src/components/task-drawer/shared/info-tab/attachments/attachments-preview.tsx
+++ b/worklenz-frontend/src/components/task-drawer/shared/info-tab/attachments/attachments-preview.tsx
@@ -6,8 +6,7 @@ import {
   DownloadOutlined,
   DeleteOutlined,
   QuestionCircleOutlined,
-  LoadingOutlined,
-} from '@ant-design/icons';
+} from '@/shared/antd-imports';
 import { attachmentsApiService } from '@/api/attachments/attachments.api.service';
 import { IconsMap } from '@/shared/constants';
 import './attachments-preview.css';
diff --git a/worklenz-frontend/src/components/task-drawer/shared/info-tab/attachments/attachments-upload.tsx b/worklenz-frontend/src/components/task-drawer/shared/info-tab/attachments/attachments-upload.tsx
index 996821ec..01df2b96 100644
--- a/worklenz-frontend/src/components/task-drawer/shared/info-tab/attachments/attachments-upload.tsx
+++ b/worklenz-frontend/src/components/task-drawer/shared/info-tab/attachments/attachments-upload.tsx
@@ -1,4 +1,4 @@
-import { LoadingOutlined, PlusOutlined } from '@ant-design/icons';
+import { LoadingOutlined, PlusOutlined } from '@/shared/antd-imports';
 import React, { useRef, useState } from 'react';
 import { TFunction } from 'i18next';
 import './attachments-upload.css';
diff --git a/worklenz-frontend/src/components/task-drawer/shared/info-tab/comments/task-comments.tsx b/worklenz-frontend/src/components/task-drawer/shared/info-tab/comments/task-comments.tsx
index 2da440e7..acaac62b 100644
--- a/worklenz-frontend/src/components/task-drawer/shared/info-tab/comments/task-comments.tsx
+++ b/worklenz-frontend/src/components/task-drawer/shared/info-tab/comments/task-comments.tsx
@@ -3,7 +3,7 @@ import { Skeleton, Avatar, Tooltip, Popconfirm } from '@/shared/antd-imports';
 import { Comment } from '@ant-design/compatible';
 import dayjs from 'dayjs';
 
-import { LikeOutlined, LikeTwoTone } from '@ant-design/icons';
+import { LikeOutlined, LikeTwoTone } from '@/shared/antd-imports';
 import { ITaskCommentViewModel } from '@/types/tasks/task-comments.types';
 import taskCommentsApiService from '@/api/tasks/task-comments.api.service';
 import { useAuthService } from '@/hooks/useAuth';
diff --git a/worklenz-frontend/src/components/task-drawer/shared/info-tab/dependencies-table.tsx b/worklenz-frontend/src/components/task-drawer/shared/info-tab/dependencies-table.tsx
index 14028a1b..1816dd7f 100644
--- a/worklenz-frontend/src/components/task-drawer/shared/info-tab/dependencies-table.tsx
+++ b/worklenz-frontend/src/components/task-drawer/shared/info-tab/dependencies-table.tsx
@@ -12,7 +12,7 @@ import {
   Typography,
 } from '@/shared/antd-imports';
 import React, { useState, useEffect } from 'react';
-import { DeleteOutlined, ExclamationCircleFilled } from '@ant-design/icons';
+import { DeleteOutlined, ExclamationCircleFilled } from '@/shared/antd-imports';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { updateTaskCounts } from '@/features/task-management/task-management.slice';
diff --git a/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-assignee-selector/task-drawer-assignee-selector.tsx b/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-assignee-selector/task-drawer-assignee-selector.tsx
index 0d0a1960..c9c71e7f 100644
--- a/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-assignee-selector/task-drawer-assignee-selector.tsx
+++ b/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-assignee-selector/task-drawer-assignee-selector.tsx
@@ -11,7 +11,7 @@ import Button from 'antd/es/button';
 import { useMemo, useRef, useState } from 'react';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
-import { PlusOutlined } from '@ant-design/icons';
+import { PlusOutlined } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 import SingleAvatar from '@/components/common/single-avatar/single-avatar';
 import { CheckboxChangeEvent } from 'antd/es/checkbox';
diff --git a/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-labels/task-drawer-labels.tsx b/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-labels/task-drawer-labels.tsx
index f93e8236..2b70d41f 100644
--- a/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-labels/task-drawer-labels.tsx
+++ b/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-labels/task-drawer-labels.tsx
@@ -1,4 +1,4 @@
-import { PlusOutlined } from '@ant-design/icons';
+import { PlusOutlined } from '@/shared/antd-imports';
 import {
   Badge,
   Button,
diff --git a/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-priority-selector/task-drawer-priority-selector.tsx b/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-priority-selector/task-drawer-priority-selector.tsx
index e2b71e49..b8678de6 100644
--- a/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-priority-selector/task-drawer-priority-selector.tsx
+++ b/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-priority-selector/task-drawer-priority-selector.tsx
@@ -6,7 +6,7 @@ import { ALPHA_CHANNEL } from '@/shared/constants';
 import { useSocket } from '@/socket/socketContext';
 import { SocketEvents } from '@/shared/socket-events';
 import { ITaskPriority } from '@/types/tasks/taskPriority.types';
-import { DoubleLeftOutlined, MinusOutlined, PauseOutlined } from '@ant-design/icons';
+import { DoubleLeftOutlined, MinusOutlined, PauseOutlined } from '@/shared/antd-imports';
 import { ITaskViewModel } from '@/types/tasks/task.types';
 import { useAuthService } from '@/hooks/useAuth';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
diff --git a/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-progress/task-drawer-progress.tsx b/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-progress/task-drawer-progress.tsx
index dc157fa1..f58f7ceb 100644
--- a/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-progress/task-drawer-progress.tsx
+++ b/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-progress/task-drawer-progress.tsx
@@ -1,6 +1,6 @@
 import { Form, InputNumber, Tooltip, Modal } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
-import { QuestionCircleOutlined } from '@ant-design/icons';
+import { QuestionCircleOutlined } from '@/shared/antd-imports';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { ITaskViewModel } from '@/types/tasks/task.types';
 import Flex from 'antd/lib/flex';
diff --git a/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-recurring-config/task-drawer-recurring-config.tsx b/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-recurring-config/task-drawer-recurring-config.tsx
index f1568f21..84ff8d47 100644
--- a/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-recurring-config/task-drawer-recurring-config.tsx
+++ b/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-recurring-config/task-drawer-recurring-config.tsx
@@ -12,7 +12,7 @@ import {
   Row,
   Col,
 } from '@/shared/antd-imports';
-import { SettingOutlined } from '@ant-design/icons';
+import { SettingOutlined } from '@/shared/antd-imports';
 import { useSocket } from '@/socket/socketContext';
 import { SocketEvents } from '@/shared/socket-events';
 import {
diff --git a/worklenz-frontend/src/components/task-drawer/shared/info-tab/info-tab-footer.tsx b/worklenz-frontend/src/components/task-drawer/shared/info-tab/info-tab-footer.tsx
index b4abacc2..62f5383b 100644
--- a/worklenz-frontend/src/components/task-drawer/shared/info-tab/info-tab-footer.tsx
+++ b/worklenz-frontend/src/components/task-drawer/shared/info-tab/info-tab-footer.tsx
@@ -1,7 +1,7 @@
 import { Button, Flex, Form, Mentions, Space, Tooltip, Typography, message } from '@/shared/antd-imports';
 import { useCallback, useEffect, useRef, useState, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
-import { PaperClipOutlined, DeleteOutlined, PlusOutlined } from '@ant-design/icons';
+import { PaperClipOutlined, DeleteOutlined, PlusOutlined } from '@/shared/antd-imports';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { colors } from '@/styles/colors';
diff --git a/worklenz-frontend/src/components/task-drawer/shared/info-tab/notify-member-selector.tsx b/worklenz-frontend/src/components/task-drawer/shared/info-tab/notify-member-selector.tsx
index cf6e0deb..41563380 100644
--- a/worklenz-frontend/src/components/task-drawer/shared/info-tab/notify-member-selector.tsx
+++ b/worklenz-frontend/src/components/task-drawer/shared/info-tab/notify-member-selector.tsx
@@ -1,4 +1,4 @@
-import { PlusOutlined } from '@ant-design/icons';
+import { PlusOutlined } from '@/shared/antd-imports';
 import {
   Button,
   Card,
diff --git a/worklenz-frontend/src/components/task-drawer/shared/info-tab/subtask-table.tsx b/worklenz-frontend/src/components/task-drawer/shared/info-tab/subtask-table.tsx
index 2ed6015c..8bb0fb36 100644
--- a/worklenz-frontend/src/components/task-drawer/shared/info-tab/subtask-table.tsx
+++ b/worklenz-frontend/src/components/task-drawer/shared/info-tab/subtask-table.tsx
@@ -1,6 +1,6 @@
 import { Button, Flex, Input, Popconfirm, Progress, Table, Tag, Tooltip } from '@/shared/antd-imports';
 import { useState, useMemo, useEffect } from 'react';
-import { DeleteOutlined, EditOutlined, ExclamationCircleFilled } from '@ant-design/icons';
+import { DeleteOutlined, EditOutlined, ExclamationCircleFilled } from '@/shared/antd-imports';
 import { nanoid } from '@reduxjs/toolkit';
 import { TFunction } from 'i18next';
 
diff --git a/worklenz-frontend/src/components/task-drawer/shared/info-tab/task-drawer-info-tab.tsx b/worklenz-frontend/src/components/task-drawer/shared/info-tab/task-drawer-info-tab.tsx
index d99da5e9..f4dbd974 100644
--- a/worklenz-frontend/src/components/task-drawer/shared/info-tab/task-drawer-info-tab.tsx
+++ b/worklenz-frontend/src/components/task-drawer/shared/info-tab/task-drawer-info-tab.tsx
@@ -1,6 +1,6 @@
-import { Button, Collapse, CollapseProps, Flex, Skeleton, Tooltip, Typography, Upload } from '@/shared/antd-imports';
+import { Button, Collapse, CollapseProps, Flex, Skeleton, Tooltip, Typography } from '@/shared/antd-imports';
 import React, { useEffect, useState, useRef } from 'react';
-import { ReloadOutlined } from '@ant-design/icons';
+import { ReloadOutlined } from '@/shared/antd-imports';
 import DescriptionEditor from './description-editor';
 import SubTaskTable from './subtask-table';
 import DependenciesTable from './dependencies-table';
diff --git a/worklenz-frontend/src/components/task-drawer/shared/time-log/TaskDrawerTimeLog.tsx b/worklenz-frontend/src/components/task-drawer/shared/time-log/TaskDrawerTimeLog.tsx
index d8c49a45..35f6759d 100644
--- a/worklenz-frontend/src/components/task-drawer/shared/time-log/TaskDrawerTimeLog.tsx
+++ b/worklenz-frontend/src/components/task-drawer/shared/time-log/TaskDrawerTimeLog.tsx
@@ -1,4 +1,4 @@
-import { DownloadOutlined, PlusOutlined } from '@ant-design/icons';
+import { DownloadOutlined, PlusOutlined } from '@/shared/antd-imports';
 import { Button, Divider, Flex, Skeleton, Typography } from '@/shared/antd-imports';
 import { useEffect, useState } from 'react';
 
diff --git a/worklenz-frontend/src/components/task-drawer/shared/time-log/task-drawer-time-log.tsx b/worklenz-frontend/src/components/task-drawer/shared/time-log/task-drawer-time-log.tsx
index 1bb388cc..61f245cf 100644
--- a/worklenz-frontend/src/components/task-drawer/shared/time-log/task-drawer-time-log.tsx
+++ b/worklenz-frontend/src/components/task-drawer/shared/time-log/task-drawer-time-log.tsx
@@ -1,4 +1,4 @@
-import { DownloadOutlined, PlayCircleFilled, PlusOutlined } from '@ant-design/icons';
+import { DownloadOutlined } from '@/shared/antd-imports';
 import { Button, Divider, Flex, Skeleton, Typography } from '@/shared/antd-imports';
 import { useEffect, useState, useCallback } from 'react';
 import { TFunction } from 'i18next';
diff --git a/worklenz-frontend/src/components/task-drawer/shared/time-log/time-log-form.tsx b/worklenz-frontend/src/components/task-drawer/shared/time-log/time-log-form.tsx
index 4bda050c..ed48a922 100644
--- a/worklenz-frontend/src/components/task-drawer/shared/time-log/time-log-form.tsx
+++ b/worklenz-frontend/src/components/task-drawer/shared/time-log/time-log-form.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Button, DatePicker, Form, Input, TimePicker, Flex } from '@/shared/antd-imports';
-import { ClockCircleOutlined } from '@ant-design/icons';
+import { ClockCircleOutlined } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 import dayjs from 'dayjs';
 
diff --git a/worklenz-frontend/src/components/task-drawer/task-drawer-header/task-drawer-header.tsx b/worklenz-frontend/src/components/task-drawer/task-drawer-header/task-drawer-header.tsx
index e5937e6e..cad8d6cb 100644
--- a/worklenz-frontend/src/components/task-drawer/task-drawer-header/task-drawer-header.tsx
+++ b/worklenz-frontend/src/components/task-drawer/task-drawer-header/task-drawer-header.tsx
@@ -1,6 +1,6 @@
 import { Button, Dropdown, Flex, Input, InputRef, MenuProps, Tooltip } from '@/shared/antd-imports';
 import React, { ChangeEvent, useEffect, useRef, useState } from 'react';
-import { EllipsisOutlined } from '@ant-design/icons';
+import { EllipsisOutlined } from '@/shared/antd-imports';
 import { TFunction } from 'i18next';
 
 import './task-drawer-header.css';
diff --git a/worklenz-frontend/src/components/task-drawer/task-drawer.tsx b/worklenz-frontend/src/components/task-drawer/task-drawer.tsx
index 8f6bf924..835a9ab2 100644
--- a/worklenz-frontend/src/components/task-drawer/task-drawer.tsx
+++ b/worklenz-frontend/src/components/task-drawer/task-drawer.tsx
@@ -3,7 +3,7 @@ import Drawer from 'antd/es/drawer';
 import { InputRef } from 'antd/es/input';
 import { useTranslation } from 'react-i18next';
 import { useEffect, useRef, useState } from 'react';
-import { PlusOutlined, CloseOutlined, ArrowLeftOutlined } from '@ant-design/icons';
+import { PlusOutlined, CloseOutlined, ArrowLeftOutlined } from '@/shared/antd-imports';
 
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
diff --git a/worklenz-frontend/src/components/task-drawer/task-hierarchy-breadcrumb/task-hierarchy-breadcrumb.tsx b/worklenz-frontend/src/components/task-drawer/task-hierarchy-breadcrumb/task-hierarchy-breadcrumb.tsx
index c77afc71..2e9b615c 100644
--- a/worklenz-frontend/src/components/task-drawer/task-hierarchy-breadcrumb/task-hierarchy-breadcrumb.tsx
+++ b/worklenz-frontend/src/components/task-drawer/task-hierarchy-breadcrumb/task-hierarchy-breadcrumb.tsx
@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from 'react';
 import { Breadcrumb, Button, Typography, Tooltip } from '@/shared/antd-imports';
-import { HomeOutlined } from '@ant-design/icons';
+import { HomeOutlined } from '@/shared/antd-imports';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { fetchTask, setSelectedTaskId } from '@/features/task-drawer/task-drawer.slice';
diff --git a/worklenz-frontend/src/components/task-list-common/assigneeSelector/AssigneeSelector.tsx b/worklenz-frontend/src/components/task-list-common/assigneeSelector/AssigneeSelector.tsx
index 9e53b949..cda82637 100644
--- a/worklenz-frontend/src/components/task-list-common/assigneeSelector/AssigneeSelector.tsx
+++ b/worklenz-frontend/src/components/task-list-common/assigneeSelector/AssigneeSelector.tsx
@@ -18,7 +18,7 @@ import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { toggleProjectMemberDrawer } from '../../../features/projects/singleProject/members/projectMembersSlice';
 import CustomAvatar from '../../CustomAvatar';
 import { colors } from '../../../styles/colors';
-import { PlusOutlined, UsergroupAddOutlined } from '@ant-design/icons';
+import { PlusOutlined, UsergroupAddOutlined } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 import { ITaskAssignee } from '@/types/tasks/task.types';
 
diff --git a/worklenz-frontend/src/components/task-list-common/convert-to-subtask-drawer/convert-to-subtask-drawer.tsx b/worklenz-frontend/src/components/task-list-common/convert-to-subtask-drawer/convert-to-subtask-drawer.tsx
index b4d53a19..b4398714 100644
--- a/worklenz-frontend/src/components/task-list-common/convert-to-subtask-drawer/convert-to-subtask-drawer.tsx
+++ b/worklenz-frontend/src/components/task-list-common/convert-to-subtask-drawer/convert-to-subtask-drawer.tsx
@@ -9,7 +9,7 @@ import {
   setConvertToSubtaskDrawerOpen,
   updateTaskStatus,
 } from '@/features/tasks/tasks.slice';
-import { RightOutlined } from '@ant-design/icons';
+import { RightOutlined } from '@/shared/antd-imports';
 import CustomSearchbar from '@/components/CustomSearchbar';
 import { ITaskListConfigV2, tasksApiService } from '@/api/tasks/tasks.api.service';
 import { SocketEvents } from '@/shared/socket-events';
diff --git a/worklenz-frontend/src/components/task-list-common/labelsSelector/labels-selector.tsx b/worklenz-frontend/src/components/task-list-common/labelsSelector/labels-selector.tsx
index 49235697..e794ab8b 100644
--- a/worklenz-frontend/src/components/task-list-common/labelsSelector/labels-selector.tsx
+++ b/worklenz-frontend/src/components/task-list-common/labelsSelector/labels-selector.tsx
@@ -1,5 +1,5 @@
 /* eslint-disable react-hooks/exhaustive-deps */
-import { PlusOutlined } from '@ant-design/icons';
+import { PlusOutlined } from '@/shared/antd-imports';
 import {
   Badge,
   Button,
diff --git a/worklenz-frontend/src/components/task-list-common/priorityDropdown/priority-dropdown.tsx b/worklenz-frontend/src/components/task-list-common/priorityDropdown/priority-dropdown.tsx
index 16460876..1829e799 100644
--- a/worklenz-frontend/src/components/task-list-common/priorityDropdown/priority-dropdown.tsx
+++ b/worklenz-frontend/src/components/task-list-common/priorityDropdown/priority-dropdown.tsx
@@ -7,7 +7,7 @@ import { useSocket } from '@/socket/socketContext';
 import { SocketEvents } from '@/shared/socket-events';
 import { IProjectTask } from '@/types/project/projectTasksViewModel.types';
 import { ITaskPriority } from '@/types/tasks/taskPriority.types';
-import { DoubleLeftOutlined, MinusOutlined, PauseOutlined } from '@ant-design/icons';
+import { DoubleLeftOutlined, MinusOutlined, PauseOutlined } from '@/shared/antd-imports';
 
 type PriorityDropdownProps = {
   task: IProjectTask;
diff --git a/worklenz-frontend/src/components/task-list-common/task-row/task-row-name/task-row-name.tsx b/worklenz-frontend/src/components/task-list-common/task-row/task-row-name/task-row-name.tsx
index 373a1410..5d4f8de8 100644
--- a/worklenz-frontend/src/components/task-list-common/task-row/task-row-name/task-row-name.tsx
+++ b/worklenz-frontend/src/components/task-list-common/task-row/task-row-name/task-row-name.tsx
@@ -6,7 +6,7 @@ import {
   DownOutlined,
   RightOutlined,
   ExpandAltOutlined,
-} from '@ant-design/icons';
+} from '@/shared/antd-imports';
 import { colors } from '@/styles/colors';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { setShowTaskDrawer } from '@/features/task-drawer/task-drawer.slice';
diff --git a/worklenz-frontend/src/components/task-list-common/task-row/task-row-time-tracking/task-row-time-tracking.tsx b/worklenz-frontend/src/components/task-list-common/task-row/task-row-time-tracking/task-row-time-tracking.tsx
index f7f6cdb3..2aeafe48 100644
--- a/worklenz-frontend/src/components/task-list-common/task-row/task-row-time-tracking/task-row-time-tracking.tsx
+++ b/worklenz-frontend/src/components/task-list-common/task-row/task-row-time-tracking/task-row-time-tracking.tsx
@@ -1,6 +1,6 @@
 import React, { useMemo } from 'react';
 import { Divider, Empty, Flex, Popover, Typography } from '@/shared/antd-imports';
-import { PlayCircleFilled } from '@ant-design/icons';
+import { PlayCircleFilled } from '@/shared/antd-imports';
 import { colors } from '@/styles/colors';
 import CustomAvatar from '@components/CustomAvatar';
 import { mockTimeLogs } from '@/pages/projects/project-view-1/taskList/taskListTable/taskListTableCells/mockTimeLogs';
diff --git a/worklenz-frontend/src/components/task-list-v2/TaskListV2Table.tsx b/worklenz-frontend/src/components/task-list-v2/TaskListV2Table.tsx
index a336aad4..933a525c 100644
--- a/worklenz-frontend/src/components/task-list-v2/TaskListV2Table.tsx
+++ b/worklenz-frontend/src/components/task-list-v2/TaskListV2Table.tsx
@@ -19,8 +19,7 @@ import {
 import { useTranslation } from 'react-i18next';
 import { useParams } from 'react-router-dom';
 import { createPortal } from 'react-dom';
-import { Skeleton } from '@/shared/antd-imports';
-import { HolderOutlined } from '@ant-design/icons';
+import { HolderOutlined } from '@/shared/antd-imports';
 
 // Redux hooks and selectors
 import { useAppSelector } from '@/hooks/useAppSelector';
diff --git a/worklenz-frontend/src/components/task-list-v2/TaskRowWithSubtasks.tsx b/worklenz-frontend/src/components/task-list-v2/TaskRowWithSubtasks.tsx
index c3535101..70bbaf70 100644
--- a/worklenz-frontend/src/components/task-list-v2/TaskRowWithSubtasks.tsx
+++ b/worklenz-frontend/src/components/task-list-v2/TaskRowWithSubtasks.tsx
@@ -6,7 +6,7 @@ import TaskRow from './TaskRow';
 import SubtaskLoadingSkeleton from './SubtaskLoadingSkeleton';
 import { Task } from '@/types/task-management.types';
 import { Input, Button } from '@/shared/antd-imports';
-import { PlusOutlined } from '@ant-design/icons';
+import { PlusOutlined } from '@/shared/antd-imports';
 import { useSocket } from '@/socket/socketContext';
 import { SocketEvents } from '@/shared/socket-events';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/components/task-list-v2/components/AddTaskRow.tsx b/worklenz-frontend/src/components/task-list-v2/components/AddTaskRow.tsx
index b4275b49..9e517f01 100644
--- a/worklenz-frontend/src/components/task-list-v2/components/AddTaskRow.tsx
+++ b/worklenz-frontend/src/components/task-list-v2/components/AddTaskRow.tsx
@@ -1,6 +1,6 @@
 import React, { useState, useCallback, memo, useRef, useEffect } from 'react';
 import { Input } from '@/shared/antd-imports';
-import { PlusOutlined } from '@ant-design/icons';
+import { PlusOutlined } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 import { useSocket } from '@/socket/socketContext';
 import { SocketEvents } from '@/shared/socket-events';
diff --git a/worklenz-frontend/src/components/task-list-v2/components/CustomColumnComponents.tsx b/worklenz-frontend/src/components/task-list-v2/components/CustomColumnComponents.tsx
index 5133679a..23c5fae6 100644
--- a/worklenz-frontend/src/components/task-list-v2/components/CustomColumnComponents.tsx
+++ b/worklenz-frontend/src/components/task-list-v2/components/CustomColumnComponents.tsx
@@ -1,6 +1,6 @@
 import React, { useState, useCallback, useMemo, memo, useEffect } from 'react';
-import { Button, Tooltip, Flex, Dropdown, DatePicker, Input } from '@/shared/antd-imports';
-import { PlusOutlined, SettingOutlined, UsergroupAddOutlined } from '@ant-design/icons';
+import { Tooltip, Flex, Dropdown, DatePicker, Input } from '@/shared/antd-imports';
+import { PlusOutlined, SettingOutlined } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
diff --git a/worklenz-frontend/src/components/task-list-v2/components/DatePickerColumn.tsx b/worklenz-frontend/src/components/task-list-v2/components/DatePickerColumn.tsx
index f41de431..16dfedc5 100644
--- a/worklenz-frontend/src/components/task-list-v2/components/DatePickerColumn.tsx
+++ b/worklenz-frontend/src/components/task-list-v2/components/DatePickerColumn.tsx
@@ -1,6 +1,6 @@
 import React, { memo, useCallback, useState } from 'react';
 import { DatePicker, Tooltip } from '@/shared/antd-imports';
-import { CloseOutlined } from '@ant-design/icons';
+import { CloseOutlined } from '@/shared/antd-imports';
 import { dayjs, taskManagementAntdConfig } from '@/shared/antd-imports';
 import { Task } from '@/types/task-management.types';
 import { useSocket } from '@/socket/socketContext';
diff --git a/worklenz-frontend/src/components/task-list-v2/components/TaskContextMenu.tsx b/worklenz-frontend/src/components/task-list-v2/components/TaskContextMenu.tsx
index 28b0e119..3509f6c9 100644
--- a/worklenz-frontend/src/components/task-list-v2/components/TaskContextMenu.tsx
+++ b/worklenz-frontend/src/components/task-list-v2/components/TaskContextMenu.tsx
@@ -32,7 +32,7 @@ import {
   RetweetOutlined,
   UserAddOutlined,
   LoadingOutlined,
-} from '@ant-design/icons';
+} from '@/shared/antd-imports';
 
 interface TaskContextMenuProps {
   task: Task;
diff --git a/worklenz-frontend/src/components/task-list-v2/components/TaskRowColumns.tsx b/worklenz-frontend/src/components/task-list-v2/components/TaskRowColumns.tsx
index 62f36984..c5fdadd1 100644
--- a/worklenz-frontend/src/components/task-list-v2/components/TaskRowColumns.tsx
+++ b/worklenz-frontend/src/components/task-list-v2/components/TaskRowColumns.tsx
@@ -1,10 +1,7 @@
-import React, { memo, useCallback, useState, useRef } from 'react';
-import { CheckCircleOutlined, HolderOutlined, CloseOutlined, DownOutlined, RightOutlined, DoubleRightOutlined, ArrowsAltOutlined, CommentOutlined, EyeOutlined, PaperClipOutlined, MinusCircleOutlined, RetweetOutlined } from '@ant-design/icons';
-import { Checkbox, DatePicker, Tooltip, Input } from '@/shared/antd-imports';
-import type { InputRef } from '@/shared/antd-imports';
-import { dayjs, taskManagementAntdConfig } from '@/shared/antd-imports';
+import React, { memo } from 'react';
+import { CheckCircleOutlined, HolderOutlined } from '@/shared/antd-imports';
+import { Checkbox } from '@/shared/antd-imports';
 import { Task } from '@/types/task-management.types';
-import { InlineMember } from '@/types/teamMembers/inlineMember.types';
 import AssigneeSelector from '@/components/AssigneeSelector';
 import { format } from 'date-fns';
 import AvatarGroup from '../../AvatarGroup';
@@ -13,9 +10,6 @@ import TaskProgress from '@/pages/projects/project-view-1/taskList/taskListTable
 import TaskStatusDropdown from '@/components/task-management/task-status-dropdown';
 import TaskPriorityDropdown from '@/components/task-management/task-priority-dropdown';
 import TaskPhaseDropdown from '@/components/task-management/task-phase-dropdown';
-import { useAppDispatch } from '@/hooks/useAppDispatch';
-import { setSelectedTaskId, setShowTaskDrawer } from '@/features/task-drawer/task-drawer.slice';
-import { useTranslation } from 'react-i18next';
 import TaskTimeTracking from '../TaskTimeTracking';
 import { CustomNumberLabel, CustomColordLabel } from '@/components';
 import LabelsSelector from '@/components/LabelsSelector';
diff --git a/worklenz-frontend/src/components/task-list-v2/components/TitleColumn.tsx b/worklenz-frontend/src/components/task-list-v2/components/TitleColumn.tsx
index 860a4df8..0118690e 100644
--- a/worklenz-frontend/src/components/task-list-v2/components/TitleColumn.tsx
+++ b/worklenz-frontend/src/components/task-list-v2/components/TitleColumn.tsx
@@ -1,5 +1,5 @@
 import React, { memo, useCallback, useState, useRef, useEffect } from 'react';
-import { RightOutlined, DoubleRightOutlined, ArrowsAltOutlined, CommentOutlined, EyeOutlined, PaperClipOutlined, MinusCircleOutlined, RetweetOutlined } from '@ant-design/icons';
+import { RightOutlined, DoubleRightOutlined, ArrowsAltOutlined, CommentOutlined, EyeOutlined, PaperClipOutlined, MinusCircleOutlined, RetweetOutlined } from '@/shared/antd-imports';
 import { Input, Tooltip } from '@/shared/antd-imports';
 import type { InputRef } from '@/shared/antd-imports';
 import { createPortal } from 'react-dom';
diff --git a/worklenz-frontend/src/components/task-management/CreateTaskModal.tsx b/worklenz-frontend/src/components/task-management/CreateTaskModal.tsx
index 4be8402a..54d3ad16 100644
--- a/worklenz-frontend/src/components/task-management/CreateTaskModal.tsx
+++ b/worklenz-frontend/src/components/task-management/CreateTaskModal.tsx
@@ -1,6 +1,6 @@
 import React, { useState, useCallback, useRef, useEffect } from 'react';
 import { Modal, Form, Input, Button, Tabs, Space, Divider, Typography, Flex, DatePicker, Select } from '@/shared/antd-imports';
-import { PlusOutlined, DragOutlined } from '@ant-design/icons';
+import { PlusOutlined, DragOutlined } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 import { DndContext, DragEndEvent, PointerSensor, useSensor, useSensors } from '@dnd-kit/core';
 import { SortableContext, useSortable, verticalListSortingStrategy } from '@dnd-kit/sortable';
diff --git a/worklenz-frontend/src/components/task-management/ManagePhaseModal.tsx b/worklenz-frontend/src/components/task-management/ManagePhaseModal.tsx
index 61d2746f..c4896ec5 100644
--- a/worklenz-frontend/src/components/task-management/ManagePhaseModal.tsx
+++ b/worklenz-frontend/src/components/task-management/ManagePhaseModal.tsx
@@ -1,6 +1,6 @@
 import React, { useState, useCallback, useRef, useEffect } from 'react';
 import { Modal, Form, Input, Button, Space, Divider, Typography, Flex, ColorPicker, Tooltip } from '@/shared/antd-imports';
-import { PlusOutlined, HolderOutlined, EditOutlined, DeleteOutlined } from '@ant-design/icons';
+import { PlusOutlined, HolderOutlined, EditOutlined, DeleteOutlined } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 import { DndContext, DragEndEvent, PointerSensor, useSensor, useSensors } from '@dnd-kit/core';
 import { SortableContext, useSortable, verticalListSortingStrategy } from '@dnd-kit/sortable';
diff --git a/worklenz-frontend/src/components/task-management/ManageStatusModal.tsx b/worklenz-frontend/src/components/task-management/ManageStatusModal.tsx
index 4b678d79..d41db552 100644
--- a/worklenz-frontend/src/components/task-management/ManageStatusModal.tsx
+++ b/worklenz-frontend/src/components/task-management/ManageStatusModal.tsx
@@ -1,6 +1,6 @@
 import React, { useState, useCallback, useRef, useEffect } from 'react';
 import { Modal, Form, Input, Button, Space, Divider, Typography, Flex, Select, Tooltip } from '@/shared/antd-imports';
-import { PlusOutlined, HolderOutlined, EditOutlined, DeleteOutlined } from '@ant-design/icons';
+import { PlusOutlined, HolderOutlined, EditOutlined, DeleteOutlined } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 import { DndContext, DragEndEvent, PointerSensor, useSensor, useSensors, DragOverEvent, useDroppable, closestCenter, DragOverlay } from '@dnd-kit/core';
 import { SortableContext, useSortable, verticalListSortingStrategy, arrayMove } from '@dnd-kit/sortable';
diff --git a/worklenz-frontend/src/components/task-management/lazy-assignee-selector.tsx b/worklenz-frontend/src/components/task-management/lazy-assignee-selector.tsx
index aad9af15..25dfc8b6 100644
--- a/worklenz-frontend/src/components/task-management/lazy-assignee-selector.tsx
+++ b/worklenz-frontend/src/components/task-management/lazy-assignee-selector.tsx
@@ -1,5 +1,5 @@
 import React, { useState, useCallback, Suspense } from 'react';
-import { PlusOutlined } from '@ant-design/icons';
+import { PlusOutlined } from '@/shared/antd-imports';
 import { IProjectTask } from '@/types/project/projectTasksViewModel.types';
 
 // Lazy load the existing AssigneeSelector component only when needed (Asana-style)
diff --git a/worklenz-frontend/src/components/task-management/optimized-bulk-action-bar.tsx b/worklenz-frontend/src/components/task-management/optimized-bulk-action-bar.tsx
index 28ea3e83..9bf7ee19 100644
--- a/worklenz-frontend/src/components/task-management/optimized-bulk-action-bar.tsx
+++ b/worklenz-frontend/src/components/task-management/optimized-bulk-action-bar.tsx
@@ -12,7 +12,7 @@ import {
   FlagOutlined,
   BulbOutlined,
   MoreOutlined,
-} from '@ant-design/icons';
+} from '@/shared/antd-imports';
 import { useSelector, useDispatch } from 'react-redux';
 import { RootState } from '@/app/store';
 import { useAppSelector } from '@/hooks/useAppSelector';
diff --git a/worklenz-frontend/src/components/task-management/task-phase-dropdown.tsx b/worklenz-frontend/src/components/task-management/task-phase-dropdown.tsx
index 536215e0..0766f728 100644
--- a/worklenz-frontend/src/components/task-management/task-phase-dropdown.tsx
+++ b/worklenz-frontend/src/components/task-management/task-phase-dropdown.tsx
@@ -4,7 +4,7 @@ import { useAppSelector } from '@/hooks/useAppSelector';
 import { useSocket } from '@/socket/socketContext';
 import { SocketEvents } from '@/shared/socket-events';
 import { Task } from '@/types/task-management.types';
-import { ClearOutlined } from '@ant-design/icons';
+import { ClearOutlined } from '@/shared/antd-imports';
 
 interface TaskPhaseDropdownProps {
   task: Task;
diff --git a/worklenz-frontend/src/components/task-management/task-priority-dropdown.tsx b/worklenz-frontend/src/components/task-management/task-priority-dropdown.tsx
index 75544ddf..e63837ae 100644
--- a/worklenz-frontend/src/components/task-management/task-priority-dropdown.tsx
+++ b/worklenz-frontend/src/components/task-management/task-priority-dropdown.tsx
@@ -4,7 +4,7 @@ import { useAppSelector } from '@/hooks/useAppSelector';
 import { useSocket } from '@/socket/socketContext';
 import { SocketEvents } from '@/shared/socket-events';
 import { Task } from '@/types/task-management.types';
-import { MinusOutlined, PauseOutlined, DoubleRightOutlined } from '@ant-design/icons';
+import { MinusOutlined, PauseOutlined, DoubleRightOutlined } from '@/shared/antd-imports';
 
 interface TaskPriorityDropdownProps {
   task: Task;
diff --git a/worklenz-frontend/src/components/task-management/virtualized-task-list.tsx b/worklenz-frontend/src/components/task-management/virtualized-task-list.tsx
index b6c25932..b8bf3f9e 100644
--- a/worklenz-frontend/src/components/task-management/virtualized-task-list.tsx
+++ b/worklenz-frontend/src/components/task-management/virtualized-task-list.tsx
@@ -4,7 +4,7 @@ import { SortableContext, verticalListSortingStrategy } from '@dnd-kit/sortable'
 import { useSelector, useDispatch } from 'react-redux';
 import { useTranslation } from 'react-i18next';
 import { Empty, Button, Input } from '@/shared/antd-imports';
-import { RightOutlined, DownOutlined } from '@ant-design/icons';
+import { RightOutlined, DownOutlined } from '@/shared/antd-imports';
 import {
   taskManagementSelectors,
   toggleTaskExpansion,
diff --git a/worklenz-frontend/src/components/taskListCommon/assignee-selector/assignee-selector.tsx b/worklenz-frontend/src/components/taskListCommon/assignee-selector/assignee-selector.tsx
index 6e23260a..6fe74b28 100644
--- a/worklenz-frontend/src/components/taskListCommon/assignee-selector/assignee-selector.tsx
+++ b/worklenz-frontend/src/components/taskListCommon/assignee-selector/assignee-selector.tsx
@@ -15,7 +15,7 @@ import { useAppSelector } from '@/hooks/useAppSelector';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { toggleProjectMemberDrawer } from '../../../features/projects/singleProject/members/projectMembersSlice';
 import { colors } from '../../../styles/colors';
-import { PlusOutlined, UsergroupAddOutlined } from '@ant-design/icons';
+import { PlusOutlined, UsergroupAddOutlined } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 import SingleAvatar from '@/components/common/single-avatar/single-avatar';
 import { CheckboxChangeEvent } from 'antd/es/checkbox';
diff --git a/worklenz-frontend/src/components/taskListCommon/labelsSelector/LabelsSelector.tsx b/worklenz-frontend/src/components/taskListCommon/labelsSelector/LabelsSelector.tsx
index 64bd330e..5a711ca8 100644
--- a/worklenz-frontend/src/components/taskListCommon/labelsSelector/LabelsSelector.tsx
+++ b/worklenz-frontend/src/components/taskListCommon/labelsSelector/LabelsSelector.tsx
@@ -1,4 +1,4 @@
-import { PlusOutlined } from '@ant-design/icons';
+import { PlusOutlined } from '@/shared/antd-imports';
 import {
   Badge,
   Button,
diff --git a/worklenz-frontend/src/components/taskListCommon/priorityDropdown/PriorityDropdown.tsx b/worklenz-frontend/src/components/taskListCommon/priorityDropdown/PriorityDropdown.tsx
index 60b5c68f..8c5dac03 100644
--- a/worklenz-frontend/src/components/taskListCommon/priorityDropdown/PriorityDropdown.tsx
+++ b/worklenz-frontend/src/components/taskListCommon/priorityDropdown/PriorityDropdown.tsx
@@ -1,6 +1,6 @@
 import { Card, Dropdown, Flex, Menu, MenuProps, Typography } from '@/shared/antd-imports';
 import React, { useState } from 'react';
-import { DoubleLeftOutlined, DownOutlined, MinusOutlined, PauseOutlined } from '@ant-design/icons';
+import { DoubleLeftOutlined, DownOutlined, MinusOutlined, PauseOutlined } from '@/shared/antd-imports';
 // custom css file
 import './priorityDropdown.css';
 import { colors } from '../../../styles/colors';
diff --git a/worklenz-frontend/src/components/taskListCommon/statusDropdown/StatusDropdown.tsx b/worklenz-frontend/src/components/taskListCommon/statusDropdown/StatusDropdown.tsx
index d85fe078..5e31f36e 100644
--- a/worklenz-frontend/src/components/taskListCommon/statusDropdown/StatusDropdown.tsx
+++ b/worklenz-frontend/src/components/taskListCommon/statusDropdown/StatusDropdown.tsx
@@ -1,6 +1,6 @@
 import { Badge, Card, Dropdown, Flex, Menu, MenuProps, Typography } from '@/shared/antd-imports';
 import React, { useEffect, useState } from 'react';
-import { DownOutlined } from '@ant-design/icons';
+import { DownOutlined } from '@/shared/antd-imports';
 import './statusDropdown.css';
 import { colors } from '../../../styles/colors';
 import { useAppSelector } from '@/hooks/useAppSelector';
diff --git a/worklenz-frontend/src/components/taskListCommon/task-list-bulk-actions-bar/task-list-bulk-actions-bar.tsx b/worklenz-frontend/src/components/taskListCommon/task-list-bulk-actions-bar/task-list-bulk-actions-bar.tsx
index c8043046..7d9569e2 100644
--- a/worklenz-frontend/src/components/taskListCommon/task-list-bulk-actions-bar/task-list-bulk-actions-bar.tsx
+++ b/worklenz-frontend/src/components/taskListCommon/task-list-bulk-actions-bar/task-list-bulk-actions-bar.tsx
@@ -10,7 +10,7 @@ import {
   DeleteOutlined,
   MoreOutlined,
   CloseCircleOutlined,
-} from '@ant-design/icons';
+} from '@/shared/antd-imports';
 
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
diff --git a/worklenz-frontend/src/components/taskListCommon/task-timer/task-timer.tsx b/worklenz-frontend/src/components/taskListCommon/task-timer/task-timer.tsx
index 6e893080..196db7bb 100644
--- a/worklenz-frontend/src/components/taskListCommon/task-timer/task-timer.tsx
+++ b/worklenz-frontend/src/components/taskListCommon/task-timer/task-timer.tsx
@@ -5,8 +5,7 @@ import { ITaskLogViewModel } from '@/types/tasks/task-log-view.types';
 import { calculateTimeGap } from '@/utils/calculate-time-gap';
 import logger from '@/utils/errorLogger';
 import { formatDateTimeWithLocale } from '@/utils/format-date-time-with-locale';
-import { formatDate } from '@/utils/timeUtils';
-import { PlayCircleFilled } from '@ant-design/icons';
+import { PlayCircleFilled } from '@/shared/antd-imports';
 import { Flex, Button, Popover, Typography, Divider, Skeleton } from 'antd/es';
 import React from 'react';
 import { useState } from 'react';
diff --git a/worklenz-frontend/src/features/navbar/help/HelpButton.tsx b/worklenz-frontend/src/features/navbar/help/HelpButton.tsx
index 72b2d90a..aa66e7dc 100644
--- a/worklenz-frontend/src/features/navbar/help/HelpButton.tsx
+++ b/worklenz-frontend/src/features/navbar/help/HelpButton.tsx
@@ -1,4 +1,4 @@
-import { QuestionCircleOutlined } from '@ant-design/icons';
+import { QuestionCircleOutlined } from '@/shared/antd-imports';
 import { Button, Tooltip } from '@/shared/antd-imports';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/features/navbar/invite/InviteButton.tsx b/worklenz-frontend/src/features/navbar/invite/InviteButton.tsx
index 2db618ef..22412822 100644
--- a/worklenz-frontend/src/features/navbar/invite/InviteButton.tsx
+++ b/worklenz-frontend/src/features/navbar/invite/InviteButton.tsx
@@ -1,4 +1,4 @@
-import { UsergroupAddOutlined } from '@ant-design/icons';
+import { UsergroupAddOutlined } from '@/shared/antd-imports';
 import { Button, Tooltip } from '@/shared/antd-imports';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/features/navbar/mobileMenu/MobileMenuButton.tsx b/worklenz-frontend/src/features/navbar/mobileMenu/MobileMenuButton.tsx
index 1d82cb3b..4b6c382d 100644
--- a/worklenz-frontend/src/features/navbar/mobileMenu/MobileMenuButton.tsx
+++ b/worklenz-frontend/src/features/navbar/mobileMenu/MobileMenuButton.tsx
@@ -5,7 +5,7 @@ import {
   ProjectOutlined,
   QuestionCircleOutlined,
   ReadOutlined,
-} from '@ant-design/icons';
+} from '@/shared/antd-imports';
 import { Button, Card, Dropdown, Flex, MenuProps, Space, Typography } from '@/shared/antd-imports';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/features/navbar/switchTeam/SwitchTeamButton.tsx b/worklenz-frontend/src/features/navbar/switchTeam/SwitchTeamButton.tsx
index f3da6cb5..b2dddbc4 100644
--- a/worklenz-frontend/src/features/navbar/switchTeam/SwitchTeamButton.tsx
+++ b/worklenz-frontend/src/features/navbar/switchTeam/SwitchTeamButton.tsx
@@ -1,5 +1,5 @@
 // Ant Design Icons
-import { BankOutlined, CaretDownFilled, CheckCircleFilled } from '@ant-design/icons';
+import { BankOutlined, CaretDownFilled, CheckCircleFilled } from '@/shared/antd-imports';
 
 // Ant Design Components
 import { Card, Divider, Dropdown, Flex, Tooltip, Typography } from '@/shared/antd-imports';
diff --git a/worklenz-frontend/src/features/navbar/timers/timer-button.tsx b/worklenz-frontend/src/features/navbar/timers/timer-button.tsx
index 06a852e3..2735c34a 100644
--- a/worklenz-frontend/src/features/navbar/timers/timer-button.tsx
+++ b/worklenz-frontend/src/features/navbar/timers/timer-button.tsx
@@ -1,4 +1,4 @@
-import { ClockCircleOutlined, StopOutlined } from '@ant-design/icons';
+import { ClockCircleOutlined, StopOutlined } from '@/shared/antd-imports';
 import { Badge, Button, Dropdown, List, Tooltip, Typography, Space, Divider, theme } from '@/shared/antd-imports';
 import React, { useEffect, useState, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/features/navbar/user-profile/profile-button.tsx b/worklenz-frontend/src/features/navbar/user-profile/profile-button.tsx
index 18c153a6..3908d385 100644
--- a/worklenz-frontend/src/features/navbar/user-profile/profile-button.tsx
+++ b/worklenz-frontend/src/features/navbar/user-profile/profile-button.tsx
@@ -1,4 +1,4 @@
-import { UserOutlined } from '@ant-design/icons';
+import { UserOutlined } from '@/shared/antd-imports';
 import { Button, Card, Dropdown, Flex, MenuProps, Tooltip, Typography } from '@/shared/antd-imports';
 
 import { Link } from 'react-router-dom';
diff --git a/worklenz-frontend/src/features/projects/bulkActions/BulkTasksActionContainer.tsx b/worklenz-frontend/src/features/projects/bulkActions/BulkTasksActionContainer.tsx
index 6b5187ae..9455cdaf 100644
--- a/worklenz-frontend/src/features/projects/bulkActions/BulkTasksActionContainer.tsx
+++ b/worklenz-frontend/src/features/projects/bulkActions/BulkTasksActionContainer.tsx
@@ -7,7 +7,7 @@ import {
   TagsOutlined,
   UserAddOutlined,
   UsergroupAddOutlined,
-} from '@ant-design/icons';
+} from '@/shared/antd-imports';
 import { Button, Flex, Tooltip, Typography } from '@/shared/antd-imports';
 import { colors } from '../../../styles/colors';
 
diff --git a/worklenz-frontend/src/features/projects/singleProject/phase/ConfigPhaseButton.tsx b/worklenz-frontend/src/features/projects/singleProject/phase/ConfigPhaseButton.tsx
index c35664d0..e7900e3a 100644
--- a/worklenz-frontend/src/features/projects/singleProject/phase/ConfigPhaseButton.tsx
+++ b/worklenz-frontend/src/features/projects/singleProject/phase/ConfigPhaseButton.tsx
@@ -1,10 +1,9 @@
-import { SettingOutlined } from '@ant-design/icons';
+import { SettingOutlined } from '@/shared/antd-imports';
 import { Button, Tooltip } from '@/shared/antd-imports';
-import React from 'react';
-import { useAppDispatch } from '../../../../hooks/useAppDispatch';
+import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { toggleDrawer } from './phases.slice';
-import { useAppSelector } from '../../../../hooks/useAppSelector';
-import { colors } from '../../../../styles/colors';
+import { useAppSelector } from '@/hooks/useAppSelector';
+import { colors } from '@/styles/colors';
 import { useTranslation } from 'react-i18next';
 
 const ConfigPhaseButton = () => {
diff --git a/worklenz-frontend/src/features/projects/singleProject/phase/PhaseDrawer.tsx b/worklenz-frontend/src/features/projects/singleProject/phase/PhaseDrawer.tsx
index 49de1ac3..af4e2488 100644
--- a/worklenz-frontend/src/features/projects/singleProject/phase/PhaseDrawer.tsx
+++ b/worklenz-frontend/src/features/projects/singleProject/phase/PhaseDrawer.tsx
@@ -1,4 +1,4 @@
-import { Button, Drawer, Flex, Input, Skeleton, Spin, Typography } from '@/shared/antd-imports';
+import { Button, Drawer, Flex, Input, Spin, Typography } from '@/shared/antd-imports';
 import { useState } from 'react';
 import { useAppSelector } from '../../../../hooks/useAppSelector';
 import { useAppDispatch } from '../../../../hooks/useAppDispatch';
@@ -11,7 +11,7 @@ import {
   updateProjectPhaseLabel,
 } from './phases.slice';
 import { Divider } from 'antd/lib';
-import { PlusOutlined } from '@ant-design/icons';
+import { PlusOutlined } from '@/shared/antd-imports';
 import { useParams } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 import PhaseOptionItem from './PhaseOptionItem';
diff --git a/worklenz-frontend/src/features/projects/singleProject/phase/PhaseOptionItem.tsx b/worklenz-frontend/src/features/projects/singleProject/phase/PhaseOptionItem.tsx
index e27e8e1f..61d27ad4 100644
--- a/worklenz-frontend/src/features/projects/singleProject/phase/PhaseOptionItem.tsx
+++ b/worklenz-frontend/src/features/projects/singleProject/phase/PhaseOptionItem.tsx
@@ -1,5 +1,5 @@
 import { Button, ColorPicker, ConfigProvider, Flex, Input } from '@/shared/antd-imports';
-import { CloseCircleOutlined, HolderOutlined } from '@ant-design/icons';
+import { CloseCircleOutlined, HolderOutlined } from '@/shared/antd-imports';
 import { nanoid } from '@reduxjs/toolkit';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import {
diff --git a/worklenz-frontend/src/features/projects/update-project/update-project-drawer.tsx b/worklenz-frontend/src/features/projects/update-project/update-project-drawer.tsx
index d0028a95..46e12815 100644
--- a/worklenz-frontend/src/features/projects/update-project/update-project-drawer.tsx
+++ b/worklenz-frontend/src/features/projects/update-project/update-project-drawer.tsx
@@ -18,7 +18,7 @@ import {
   projectColors,
   statusData,
 } from '../../../lib/project/project-constants';
-import { PlusCircleOutlined, PlusOutlined, QuestionCircleOutlined } from '@ant-design/icons';
+import { PlusCircleOutlined, PlusOutlined, QuestionCircleOutlined } from '@/shared/antd-imports';
 import { colors } from '../../../styles/colors';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
diff --git a/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/members-reports-drawer.tsx b/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/members-reports-drawer.tsx
index fca70984..5ebef482 100644
--- a/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/members-reports-drawer.tsx
+++ b/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/members-reports-drawer.tsx
@@ -2,7 +2,7 @@ import { Drawer, Typography, Flex, Button, Space, Dropdown } from '@/shared/antd
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { toggleMembersReportsDrawer } from '../membersReportsSlice';
-import { DownOutlined } from '@ant-design/icons';
+import { DownOutlined } from '@/shared/antd-imports';
 import MembersReportsDrawerTabs from './members-reports-drawer-tabs';
 import { useTranslation } from 'react-i18next';
 import MembersOverviewTasksStatsDrawer from './overviewTab/members-overview-tasks-stats-drawer/members-overview-tasks-stats-drawer';
diff --git a/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/overviewTab/members-overview-tasks-stats-drawer/members-overview-tasks-stats-table.tsx b/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/overviewTab/members-overview-tasks-stats-drawer/members-overview-tasks-stats-table.tsx
index b740d8aa..104f9265 100644
--- a/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/overviewTab/members-overview-tasks-stats-drawer/members-overview-tasks-stats-table.tsx
+++ b/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/overviewTab/members-overview-tasks-stats-drawer/members-overview-tasks-stats-table.tsx
@@ -3,7 +3,7 @@ import CustomTableTitle from '@components/CustomTableTitle';
 import { colors } from '@/styles/colors';
 import dayjs from 'dayjs';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
-import { DoubleRightOutlined } from '@ant-design/icons';
+import { DoubleRightOutlined } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 import { setShowTaskDrawer } from '@/features/task-drawer/task-drawer.slice';
 
diff --git a/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/overviewTab/members-reports-stat-card.tsx b/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/overviewTab/members-reports-stat-card.tsx
index 34737c4d..4905972a 100644
--- a/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/overviewTab/members-reports-stat-card.tsx
+++ b/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/overviewTab/members-reports-stat-card.tsx
@@ -2,7 +2,7 @@ import {
   ClockCircleOutlined,
   ExclamationCircleOutlined,
   FileExcelOutlined,
-} from '@ant-design/icons';
+} from '@/shared/antd-imports';
 import { Button, Card, Flex } from '@/shared/antd-imports';
 import React, { ReactNode } from 'react';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/taskTab/MembersReportsTasksTable.tsx b/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/taskTab/MembersReportsTasksTable.tsx
index cfd9928f..9c8cdcfe 100644
--- a/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/taskTab/MembersReportsTasksTable.tsx
+++ b/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/taskTab/MembersReportsTasksTable.tsx
@@ -1,7 +1,7 @@
 import { Badge, Flex, Table, TableColumnsType, Tag, Typography } from '@/shared/antd-imports';
 import React from 'react';
 import dayjs from 'dayjs';
-import { DoubleRightOutlined } from '@ant-design/icons';
+import { DoubleRightOutlined } from '@/shared/antd-imports';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { setSelectedTaskId, setShowTaskDrawer } from '@/features/task-drawer/task-drawer.slice';
 import CustomTableTitle from '@/components/CustomTableTitle';
diff --git a/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/time-log-tab/billable-filter.tsx b/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/time-log-tab/billable-filter.tsx
index 1612a4fc..37fc11e4 100644
--- a/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/time-log-tab/billable-filter.tsx
+++ b/worklenz-frontend/src/features/reporting/membersReports/membersReportsDrawer/time-log-tab/billable-filter.tsx
@@ -1,4 +1,4 @@
-import { CaretDownFilled } from '@ant-design/icons';
+import { CaretDownFilled } from '@/shared/antd-imports';
 import { Button, Card, Checkbox, Dropdown, List, Space } from '@/shared/antd-imports';
 import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/ProjectReportsDrawer.tsx b/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/ProjectReportsDrawer.tsx
index 49a71ecd..2355dd5e 100644
--- a/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/ProjectReportsDrawer.tsx
+++ b/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/ProjectReportsDrawer.tsx
@@ -3,7 +3,7 @@ import React, { useState } from 'react';
 import { useAppSelector } from '../../../../hooks/useAppSelector';
 import { useAppDispatch } from '../../../../hooks/useAppDispatch';
 import { setSelectedProject, toggleProjectReportsDrawer } from '../project-reports-slice';
-import { BankOutlined, DownOutlined } from '@ant-design/icons';
+import { BankOutlined, DownOutlined } from '@/shared/antd-imports';
 import ProjectReportsDrawerTabs from './ProjectReportsDrawerTabs';
 import { colors } from '../../../../styles/colors';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/membersTab/projectReportsMembersTaskDrawer/ProjectReportsMembersTaskDrawer.tsx b/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/membersTab/projectReportsMembersTaskDrawer/ProjectReportsMembersTaskDrawer.tsx
index 4059fe3b..29f40154 100644
--- a/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/membersTab/projectReportsMembersTaskDrawer/ProjectReportsMembersTaskDrawer.tsx
+++ b/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/membersTab/projectReportsMembersTaskDrawer/ProjectReportsMembersTaskDrawer.tsx
@@ -1,6 +1,6 @@
 import { Drawer, Typography, Flex, Button } from '@/shared/antd-imports';
 import React, { useMemo, useState } from 'react';
-import { FileOutlined } from '@ant-design/icons';
+import { FileOutlined } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 
 import { useAppDispatch } from '@/hooks/useAppDispatch';
diff --git a/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/membersTab/projectReportsMembersTaskDrawer/ProjectReportsMembersTaskTable.tsx b/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/membersTab/projectReportsMembersTaskDrawer/ProjectReportsMembersTaskTable.tsx
index 06c5da9f..2badfc44 100644
--- a/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/membersTab/projectReportsMembersTaskDrawer/ProjectReportsMembersTaskTable.tsx
+++ b/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/membersTab/projectReportsMembersTaskDrawer/ProjectReportsMembersTaskTable.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import { createPortal } from 'react-dom';
 import { Badge, Flex, Table, TableColumnsType, Tag, Typography } from '@/shared/antd-imports';
 import dayjs from 'dayjs';
-import { DoubleRightOutlined } from '@ant-design/icons';
+import { DoubleRightOutlined } from '@/shared/antd-imports';
 
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { setShowTaskDrawer } from '@/features/task-drawer/task-drawer.slice';
diff --git a/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/overviewTab/ProjectReportsStatCard.tsx b/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/overviewTab/ProjectReportsStatCard.tsx
index fb9cf3ad..f8fd2b87 100644
--- a/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/overviewTab/ProjectReportsStatCard.tsx
+++ b/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/overviewTab/ProjectReportsStatCard.tsx
@@ -3,7 +3,7 @@ import {
   ClockCircleOutlined,
   ExclamationCircleOutlined,
   FileExcelOutlined,
-} from '@ant-design/icons';
+} from '@/shared/antd-imports';
 import { Card, Flex, Typography } from '@/shared/antd-imports';
 import React, { ReactNode } from 'react';
 import { colors } from '../../../../../styles/colors';
diff --git a/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/tasksTab/ProjectReportsTaskTable.tsx b/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/tasksTab/ProjectReportsTaskTable.tsx
index 3fc58c66..6c016562 100644
--- a/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/tasksTab/ProjectReportsTaskTable.tsx
+++ b/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/tasksTab/ProjectReportsTaskTable.tsx
@@ -9,7 +9,7 @@ import {
   fetchTask,
   setSelectedTaskId,
 } from '@/features/task-drawer/task-drawer.slice';
-import { DoubleRightOutlined } from '@ant-design/icons';
+import { DoubleRightOutlined } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 import { fetchPriorities } from '@/features/taskAttributes/taskPrioritySlice';
 import { fetchPhasesByProjectId } from '@/features/projects/singleProject/phase/phases.slice';
diff --git a/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/tasksTab/group-by-filter.tsx b/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/tasksTab/group-by-filter.tsx
index fd6dfda1..d8f8d816 100644
--- a/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/tasksTab/group-by-filter.tsx
+++ b/worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/tasksTab/group-by-filter.tsx
@@ -1,5 +1,5 @@
 import { IGroupBy } from '@/features/board/board-slice';
-import { CaretDownFilled } from '@ant-design/icons';
+import { CaretDownFilled } from '@/shared/antd-imports';
 import { Flex, Select } from '@/shared/antd-imports';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/features/timeReport/projects/ProjectTimeLogDrawer.tsx b/worklenz-frontend/src/features/timeReport/projects/ProjectTimeLogDrawer.tsx
index b6d4a732..512ffaf8 100644
--- a/worklenz-frontend/src/features/timeReport/projects/ProjectTimeLogDrawer.tsx
+++ b/worklenz-frontend/src/features/timeReport/projects/ProjectTimeLogDrawer.tsx
@@ -3,7 +3,7 @@ import React, { useState, useEffect } from 'react';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { toggleTimeLogDrawer } from './timeLogSlice';
-import { DownloadOutlined } from '@ant-design/icons';
+import { DownloadOutlined } from '@/shared/antd-imports';
 import jsonData from './ProjectTimeLog.json';
 import { AvatarNamesMap, durations } from '../../../shared/constants';
 import './ProjectTimeLogDrawer.css';
diff --git a/worklenz-frontend/src/lib/settings/settings-constants.ts b/worklenz-frontend/src/lib/settings/settings-constants.ts
index 8823bd7e..04305a8e 100644
--- a/worklenz-frontend/src/lib/settings/settings-constants.ts
+++ b/worklenz-frontend/src/lib/settings/settings-constants.ts
@@ -12,7 +12,7 @@ import {
   UserOutlined,
   UserSwitchOutlined,
   BulbOutlined,
-} from '@ant-design/icons';
+} from '@/shared/antd-imports';
 import React, { ReactNode, lazy } from 'react';
 const ProfileSettings = lazy(() => import('../../pages/settings/profile/profile-settings'));
 const NotificationsSettings = lazy(() => import('../../pages/settings/notifications/notifications-settings'));
diff --git a/worklenz-frontend/src/pages/admin-center/admin-center-constants.ts b/worklenz-frontend/src/pages/admin-center/admin-center-constants.ts
index 1cee4eb8..7494ff78 100644
--- a/worklenz-frontend/src/pages/admin-center/admin-center-constants.ts
+++ b/worklenz-frontend/src/pages/admin-center/admin-center-constants.ts
@@ -4,7 +4,7 @@ import {
   ProfileOutlined,
   TeamOutlined,
   UserOutlined,
-} from '@ant-design/icons';
+} from '@/shared/antd-imports';
 import React, { ReactNode, lazy } from 'react';
 const Overview = lazy(() => import('./overview/overview'));
 const Users = lazy(() => import('./users/users'));
diff --git a/worklenz-frontend/src/pages/admin-center/overview/overview.tsx b/worklenz-frontend/src/pages/admin-center/overview/overview.tsx
index 077b23ff..dd46d605 100644
--- a/worklenz-frontend/src/pages/admin-center/overview/overview.tsx
+++ b/worklenz-frontend/src/pages/admin-center/overview/overview.tsx
@@ -1,4 +1,4 @@
-import { EditOutlined, MailOutlined, PhoneOutlined } from '@ant-design/icons';
+import { EditOutlined, MailOutlined, PhoneOutlined } from '@/shared/antd-imports';
 import { PageHeader } from '@ant-design/pro-components';
 import { Button, Card, Input, Space, Tooltip, Typography } from '@/shared/antd-imports';
 import React, { useEffect, useState } from 'react';
diff --git a/worklenz-frontend/src/pages/admin-center/projects/projects.tsx b/worklenz-frontend/src/pages/admin-center/projects/projects.tsx
index e76d04bd..46eaf214 100644
--- a/worklenz-frontend/src/pages/admin-center/projects/projects.tsx
+++ b/worklenz-frontend/src/pages/admin-center/projects/projects.tsx
@@ -22,7 +22,7 @@ import {
   Tooltip,
   Typography,
 } from '@/shared/antd-imports';
-import { DeleteOutlined, SearchOutlined, SyncOutlined } from '@ant-design/icons';
+import { DeleteOutlined, SearchOutlined, SyncOutlined } from '@/shared/antd-imports';
 import { PageHeader } from '@ant-design/pro-components';
 import { projectsApiService } from '@/api/projects/projects.api.service';
 
diff --git a/worklenz-frontend/src/pages/admin-center/sidebar/sidebar.tsx b/worklenz-frontend/src/pages/admin-center/sidebar/sidebar.tsx
index 480cb210..8103790c 100644
--- a/worklenz-frontend/src/pages/admin-center/sidebar/sidebar.tsx
+++ b/worklenz-frontend/src/pages/admin-center/sidebar/sidebar.tsx
@@ -1,4 +1,4 @@
-import { RightOutlined } from '@ant-design/icons';
+import { RightOutlined } from '@/shared/antd-imports';
 import { ConfigProvider, Flex, Menu, MenuProps } from '@/shared/antd-imports';
 import React from 'react';
 import { Link, useLocation } from 'react-router-dom';
diff --git a/worklenz-frontend/src/pages/admin-center/teams/teams.tsx b/worklenz-frontend/src/pages/admin-center/teams/teams.tsx
index da2d9eeb..f5043392 100644
--- a/worklenz-frontend/src/pages/admin-center/teams/teams.tsx
+++ b/worklenz-frontend/src/pages/admin-center/teams/teams.tsx
@@ -1,4 +1,4 @@
-import { SearchOutlined, SyncOutlined } from '@ant-design/icons';
+import { SearchOutlined, SyncOutlined } from '@/shared/antd-imports';
 import { PageHeader } from '@ant-design/pro-components';
 import { Button, Flex, Input, Tooltip } from '@/shared/antd-imports';
 
diff --git a/worklenz-frontend/src/pages/admin-center/users/users.tsx b/worklenz-frontend/src/pages/admin-center/users/users.tsx
index f6b298e5..d8db586c 100644
--- a/worklenz-frontend/src/pages/admin-center/users/users.tsx
+++ b/worklenz-frontend/src/pages/admin-center/users/users.tsx
@@ -1,4 +1,4 @@
-import { SearchOutlined, SyncOutlined } from '@ant-design/icons';
+import { SearchOutlined, SyncOutlined } from '@/shared/antd-imports';
 import { PageHeader } from '@ant-design/pro-components';
 import { Button, Card, Flex, Input, Table, TableProps, Tooltip, Typography } from '@/shared/antd-imports';
 import React, { useEffect, useState } from 'react';
diff --git a/worklenz-frontend/src/pages/auth/ForgotPasswordPage.tsx b/worklenz-frontend/src/pages/auth/ForgotPasswordPage.tsx
index 94f2863b..da3e3563 100644
--- a/worklenz-frontend/src/pages/auth/ForgotPasswordPage.tsx
+++ b/worklenz-frontend/src/pages/auth/ForgotPasswordPage.tsx
@@ -2,7 +2,7 @@ import { useCallback, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useMediaQuery } from 'react-responsive';
 import { Link, useNavigate } from 'react-router-dom';
-import { UserOutlined } from '@ant-design/icons';
+import { UserOutlined } from '@/shared/antd-imports';
 import { Form, Card, Input, Flex, Button, Typography, Result } from 'antd/es';
 
 import PageHeader from '@components/AuthPageHeader';
diff --git a/worklenz-frontend/src/pages/auth/LoginPage.tsx b/worklenz-frontend/src/pages/auth/LoginPage.tsx
index df5fa088..1f8b8824 100644
--- a/worklenz-frontend/src/pages/auth/LoginPage.tsx
+++ b/worklenz-frontend/src/pages/auth/LoginPage.tsx
@@ -2,7 +2,7 @@ import React, { useCallback, useEffect, useState } from 'react';
 import { Card, Input, Flex, Checkbox, Button, Typography, Space, Form, message } from 'antd/es';
 import { Rule } from 'antd/es/form';
 
-import { LockOutlined, UserOutlined } from '@ant-design/icons';
+import { LockOutlined, UserOutlined } from '@/shared/antd-imports';
 import { Link, useNavigate } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 import { useMediaQuery } from 'react-responsive';
diff --git a/worklenz-frontend/src/pages/auth/SignupPage.tsx b/worklenz-frontend/src/pages/auth/SignupPage.tsx
index 7f096da2..065989d2 100644
--- a/worklenz-frontend/src/pages/auth/SignupPage.tsx
+++ b/worklenz-frontend/src/pages/auth/SignupPage.tsx
@@ -2,10 +2,10 @@ import { useEffect, useState } from 'react';
 import { Link, useNavigate } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 import { useMediaQuery } from 'react-responsive';
-import { LockOutlined, MailOutlined, UserOutlined } from '@ant-design/icons';
+import { LockOutlined, MailOutlined, UserOutlined } from '@/shared/antd-imports';
 import { Form, Card, Input, Flex, Button, Typography, Space, message } from 'antd/es';
 import { Rule } from 'antd/es/form';
-import { CheckCircleTwoTone, CloseCircleTwoTone } from '@ant-design/icons';
+import { CheckCircleTwoTone, CloseCircleTwoTone } from '@/shared/antd-imports';
 import { useAppSelector } from '@/hooks/useAppSelector';
 
 import googleIcon from '@/assets/images/google-icon.png';
diff --git a/worklenz-frontend/src/pages/auth/VerifyResetEmailPage.tsx b/worklenz-frontend/src/pages/auth/VerifyResetEmailPage.tsx
index 00c48b7d..ba46b465 100644
--- a/worklenz-frontend/src/pages/auth/VerifyResetEmailPage.tsx
+++ b/worklenz-frontend/src/pages/auth/VerifyResetEmailPage.tsx
@@ -1,10 +1,10 @@
 import { useCallback, useEffect, useState } from 'react';
 import { Link, useNavigate, useParams } from 'react-router-dom';
 import { Form, Card, Input, Flex, Button, Typography, Result } from 'antd/es';
-import { LockOutlined } from '@ant-design/icons';
+import { LockOutlined } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 import { useMediaQuery } from 'react-responsive';
-import { CheckCircleTwoTone, CloseCircleTwoTone } from '@ant-design/icons';
+import { CheckCircleTwoTone, CloseCircleTwoTone } from '@/shared/antd-imports';
 import { useAppSelector } from '@/hooks/useAppSelector';
 
 import PageHeader from '@components/AuthPageHeader';
diff --git a/worklenz-frontend/src/pages/home/recent-and-favourite-project-list/add-favourite-project-button.tsx b/worklenz-frontend/src/pages/home/recent-and-favourite-project-list/add-favourite-project-button.tsx
index 410b5b01..ca781ecd 100644
--- a/worklenz-frontend/src/pages/home/recent-and-favourite-project-list/add-favourite-project-button.tsx
+++ b/worklenz-frontend/src/pages/home/recent-and-favourite-project-list/add-favourite-project-button.tsx
@@ -1,4 +1,4 @@
-import { StarFilled } from '@ant-design/icons';
+import { StarFilled } from '@/shared/antd-imports';
 import { Button, ConfigProvider, Tooltip } from '@/shared/antd-imports';
 import { useMemo } from 'react';
 import { colors } from '@/styles/colors';
diff --git a/worklenz-frontend/src/pages/home/recent-and-favourite-project-list/recent-and-favourite-project-list.tsx b/worklenz-frontend/src/pages/home/recent-and-favourite-project-list/recent-and-favourite-project-list.tsx
index 548b9e99..198808a4 100644
--- a/worklenz-frontend/src/pages/home/recent-and-favourite-project-list/recent-and-favourite-project-list.tsx
+++ b/worklenz-frontend/src/pages/home/recent-and-favourite-project-list/recent-and-favourite-project-list.tsx
@@ -1,4 +1,4 @@
-import { SyncOutlined } from '@ant-design/icons';
+import { SyncOutlined } from '@/shared/antd-imports';
 import {
   Badge,
   Button,
diff --git a/worklenz-frontend/src/pages/home/task-list/calendar-view.tsx b/worklenz-frontend/src/pages/home/task-list/calendar-view.tsx
index 4c70ea4e..32a5fdb2 100644
--- a/worklenz-frontend/src/pages/home/task-list/calendar-view.tsx
+++ b/worklenz-frontend/src/pages/home/task-list/calendar-view.tsx
@@ -1,6 +1,6 @@
 import HomeCalendar from '../../../components/calendars/homeCalendar/HomeCalendar';
 import { Tag, Typography } from '@/shared/antd-imports';
-import { ClockCircleOutlined } from '@ant-design/icons';
+import { ClockCircleOutlined } from '@/shared/antd-imports';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import AddTaskInlineForm from './add-task-inline-form';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/pages/home/task-list/tasks-list.tsx b/worklenz-frontend/src/pages/home/task-list/tasks-list.tsx
index 1f8e10ec..d8ce0bed 100644
--- a/worklenz-frontend/src/pages/home/task-list/tasks-list.tsx
+++ b/worklenz-frontend/src/pages/home/task-list/tasks-list.tsx
@@ -1,4 +1,4 @@
-import { ExpandAltOutlined, SyncOutlined } from '@ant-design/icons';
+import { ExpandAltOutlined, SyncOutlined } from '@/shared/antd-imports';
 import {
   Badge,
   Button,
diff --git a/worklenz-frontend/src/pages/home/todo-list/todo-done-button.tsx b/worklenz-frontend/src/pages/home/todo-list/todo-done-button.tsx
index 01437aba..efa48a4b 100644
--- a/worklenz-frontend/src/pages/home/todo-list/todo-done-button.tsx
+++ b/worklenz-frontend/src/pages/home/todo-list/todo-done-button.tsx
@@ -1,4 +1,4 @@
-import { CheckCircleOutlined } from '@ant-design/icons';
+import { CheckCircleOutlined } from '@/shared/antd-imports';
 import ConfigProvider from 'antd/es/config-provider';
 import Button from 'antd/es/button';
 import Tooltip from 'antd/es/tooltip';
diff --git a/worklenz-frontend/src/pages/home/todo-list/todo-list.tsx b/worklenz-frontend/src/pages/home/todo-list/todo-list.tsx
index f8715808..28054667 100644
--- a/worklenz-frontend/src/pages/home/todo-list/todo-list.tsx
+++ b/worklenz-frontend/src/pages/home/todo-list/todo-list.tsx
@@ -1,4 +1,4 @@
-import { CheckCircleOutlined, SyncOutlined } from '@ant-design/icons';
+import { CheckCircleOutlined, SyncOutlined } from '@/shared/antd-imports';
 import { useRef, useState } from 'react';
 import Form from 'antd/es/form';
 import Input, { InputRef } from 'antd/es/input';
diff --git a/worklenz-frontend/src/pages/projects/project-list.tsx b/worklenz-frontend/src/pages/projects/project-list.tsx
index b11c331d..b82688dc 100644
--- a/worklenz-frontend/src/pages/projects/project-list.tsx
+++ b/worklenz-frontend/src/pages/projects/project-list.tsx
@@ -23,7 +23,7 @@ import {
   SyncOutlined,
   UnorderedListOutlined,
   AppstoreOutlined,
-} from '@ant-design/icons';
+} from '@/shared/antd-imports';
 import type { FilterValue, SorterResult } from 'antd/es/table/interface';
 
 import ProjectDrawer from '@/components/projects/project-drawer/project-drawer';
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/board/project-view-board.tsx b/worklenz-frontend/src/pages/projects/project-view-1/board/project-view-board.tsx
index e0acc2ac..cf0a839f 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/board/project-view-board.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/board/project-view-board.tsx
@@ -11,7 +11,7 @@ import {
 import { useAppSelector } from '@/hooks/useAppSelector';
 import TaskListFilters from '../taskList/taskListFilters/TaskListFilters';
 import { Button, Skeleton } from '@/shared/antd-imports';
-import { PlusOutlined } from '@ant-design/icons';
+import { PlusOutlined } from '@/shared/antd-imports';
 import { useDispatch } from 'react-redux';
 import { toggleDrawer } from '@/features/projects/status/StatusSlice';
 import KanbanGroup from '@/components/board/kanban-group/kanban-group';
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/roadmap/roadmap-table/roadmap-task-cell.tsx b/worklenz-frontend/src/pages/projects/project-view-1/roadmap/roadmap-table/roadmap-task-cell.tsx
index c92bf49a..c565414c 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/roadmap/roadmap-table/roadmap-task-cell.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/roadmap/roadmap-table/roadmap-task-cell.tsx
@@ -4,7 +4,7 @@ import {
   DownOutlined,
   RightOutlined,
   ExpandAltOutlined,
-} from '@ant-design/icons';
+} from '@/shared/antd-imports';
 import { NewTaskType, toggleTaskExpansion } from '@features/roadmap/roadmap-slice';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { toggleTaskDrawer } from '@features/tasks/taskSlice';
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/task-list/table-v2.tsx b/worklenz-frontend/src/pages/projects/project-view-1/task-list/table-v2.tsx
index ce722a19..5f90b63b 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/task-list/table-v2.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/task-list/table-v2.tsx
@@ -1,6 +1,6 @@
 import { useCallback, useMemo, useRef, useState } from 'react';
 import { Checkbox, Flex, Tag, Tooltip } from '@/shared/antd-imports';
-import { HolderOutlined } from '@ant-design/icons';
+import { HolderOutlined } from '@/shared/antd-imports';
 import {
   DndContext,
   DragEndEvent,
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/task-list/task-list-columns/task-list-columns.tsx b/worklenz-frontend/src/pages/projects/project-view-1/task-list/task-list-columns/task-list-columns.tsx
index 20728257..23c0ed7a 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/task-list/task-list-columns/task-list-columns.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/task-list/task-list-columns/task-list-columns.tsx
@@ -1,7 +1,7 @@
 import { Avatar, Checkbox, DatePicker, Flex, Select, Tag } from '@/shared/antd-imports';
 import { createColumnHelper, ColumnDef } from '@tanstack/react-table';
 import { IProjectTask } from '@/types/project/projectTasksViewModel.types';
-import { HolderOutlined, PlusOutlined } from '@ant-design/icons';
+import { HolderOutlined, PlusOutlined } from '@/shared/antd-imports';
 import StatusDropdown from '@/components/task-list-common/status-dropdown/status-dropdown';
 import Avatars from '@/components/avatars/avatars';
 import LabelsSelector from '@/components/task-list-common/labelsSelector/labels-selector';
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/task-list/task-list-header/task-list-header.tsx b/worklenz-frontend/src/pages/projects/project-view-1/task-list/task-list-header/task-list-header.tsx
index 358a3a85..db648652 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/task-list/task-list-header/task-list-header.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/task-list/task-list-header/task-list-header.tsx
@@ -6,7 +6,7 @@ import {
   EllipsisOutlined,
   EditOutlined,
   RetweetOutlined,
-} from '@ant-design/icons';
+} from '@/shared/antd-imports';
 import { ITaskListGroup } from '@/types/tasks/taskList.types';
 import { ITaskStatusCategory } from '@/types/status.types';
 import { useAppSelector } from '@/hooks/useAppSelector';
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/task-list/task-list-table-wrapper/task-list-table-wrapper.tsx b/worklenz-frontend/src/pages/projects/project-view-1/task-list/task-list-table-wrapper/task-list-table-wrapper.tsx
index edc63353..e499a99b 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/task-list/task-list-table-wrapper/task-list-table-wrapper.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/task-list/task-list-table-wrapper/task-list-table-wrapper.tsx
@@ -1,7 +1,7 @@
 import { Badge, Button, Collapse, ConfigProvider, Dropdown, Flex, Input, Typography } from '@/shared/antd-imports';
 import { useState } from 'react';
 import { TaskType } from '@/types/task.types';
-import { EditOutlined, EllipsisOutlined, RetweetOutlined, RightOutlined } from '@ant-design/icons';
+import { EditOutlined, EllipsisOutlined, RetweetOutlined, RightOutlined } from '@/shared/antd-imports';
 import { colors } from '@/styles/colors';
 import './task-list-table-wrapper.css';
 import TaskListTable from '../table-v2';
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/GroupByFilterDropdown.tsx b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/GroupByFilterDropdown.tsx
index ebd5ddd8..89dcce16 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/GroupByFilterDropdown.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/GroupByFilterDropdown.tsx
@@ -1,4 +1,4 @@
-import { CaretDownFilled } from '@ant-design/icons';
+import { CaretDownFilled } from '@/shared/antd-imports';
 import { ConfigProvider, Flex, Select } from '@/shared/antd-imports';
 import React, { useState } from 'react';
 import { colors } from '@/styles/colors';
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/LabelsFilterDropdown.tsx b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/LabelsFilterDropdown.tsx
index 53f83fdb..fc398f04 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/LabelsFilterDropdown.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/LabelsFilterDropdown.tsx
@@ -1,4 +1,4 @@
-import { CaretDownFilled } from '@ant-design/icons';
+import { CaretDownFilled } from '@/shared/antd-imports';
 import {
   Badge,
   Button,
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/MembersFilterDropdown.tsx b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/MembersFilterDropdown.tsx
index 0af08d0e..dbdcf027 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/MembersFilterDropdown.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/MembersFilterDropdown.tsx
@@ -1,5 +1,5 @@
 /* eslint-disable react-hooks/exhaustive-deps */
-import { CaretDownFilled } from '@ant-design/icons';
+import { CaretDownFilled } from '@/shared/antd-imports';
 import {
   Badge,
   Button,
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/PriorityFilterDropdown.tsx b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/PriorityFilterDropdown.tsx
index 834f0498..a0b0c002 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/PriorityFilterDropdown.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/PriorityFilterDropdown.tsx
@@ -1,4 +1,4 @@
-import { CaretDownFilled } from '@ant-design/icons';
+import { CaretDownFilled } from '@/shared/antd-imports';
 import { Badge, Button, Card, Checkbox, Dropdown, List, Space } from '@/shared/antd-imports';
 import { useState } from 'react';
 
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/SearchDropdown.tsx b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/SearchDropdown.tsx
index 3480b4f4..f968ec4a 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/SearchDropdown.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/SearchDropdown.tsx
@@ -1,4 +1,4 @@
-import { SearchOutlined } from '@ant-design/icons';
+import { SearchOutlined } from '@/shared/antd-imports';
 import { Button, Card, Dropdown, Flex, Input, InputRef, Space } from '@/shared/antd-imports';
 import { useRef } from 'react';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/ShowFieldsFilterDropdown.tsx b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/ShowFieldsFilterDropdown.tsx
index 301399d4..0ef98fc7 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/ShowFieldsFilterDropdown.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/ShowFieldsFilterDropdown.tsx
@@ -1,4 +1,4 @@
-import { MoreOutlined } from '@ant-design/icons';
+import { MoreOutlined } from '@/shared/antd-imports';
 import { Button, Card, Checkbox, Dropdown, List, Space } from '@/shared/antd-imports';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/SortFilterDropdown.tsx b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/SortFilterDropdown.tsx
index fa3a202b..35612aac 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/SortFilterDropdown.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListFilters/SortFilterDropdown.tsx
@@ -1,4 +1,4 @@
-import { CaretDownFilled, SortAscendingOutlined, SortDescendingOutlined } from '@ant-design/icons';
+import { CaretDownFilled, SortAscendingOutlined, SortDescendingOutlined } from '@/shared/antd-imports';
 import { Badge, Button, Card, Checkbox, Dropdown, List, Space } from '@/shared/antd-imports';
 import React, { useState } from 'react';
 import { colors } from '../../../../../styles/colors';
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/TaskListTable.tsx b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/TaskListTable.tsx
index 257252b1..ea336c4f 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/TaskListTable.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/TaskListTable.tsx
@@ -12,7 +12,7 @@ import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { deselectAll } from '@features/projects/bulkActions/bulkActionSlice';
 import { useTranslation } from 'react-i18next';
 import { IProjectTask } from '@/types/project/projectTasksViewModel.types';
-import { HolderOutlined } from '@ant-design/icons';
+import { HolderOutlined } from '@/shared/antd-imports';
 
 const TaskListTable = ({
   taskList,
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/TaskListTableWrapper.tsx b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/TaskListTableWrapper.tsx
index ad8d6e6f..ecdf01a2 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/TaskListTableWrapper.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/TaskListTableWrapper.tsx
@@ -1,6 +1,6 @@
 import { Badge, Button, Collapse, ConfigProvider, Dropdown, Flex, Input, Typography } from '@/shared/antd-imports';
 import { useState } from 'react';
-import { EditOutlined, EllipsisOutlined, RetweetOutlined, RightOutlined } from '@ant-design/icons';
+import { EditOutlined, EllipsisOutlined, RetweetOutlined, RightOutlined } from '@/shared/antd-imports';
 import { colors } from '../../../../../styles/colors';
 import './taskListTableWrapper.css';
 import TaskListTable from './TaskListTable';
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/contextMenu/TaskContextMenu.tsx b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/contextMenu/TaskContextMenu.tsx
index 88054503..f87955fb 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/contextMenu/TaskContextMenu.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/contextMenu/TaskContextMenu.tsx
@@ -4,7 +4,7 @@ import {
   InboxOutlined,
   RetweetOutlined,
   UserAddOutlined,
-} from '@ant-design/icons';
+} from '@/shared/antd-imports';
 import { Badge, Dropdown, Flex, Typography } from '@/shared/antd-imports';
 import { MenuProps } from 'antd/lib';
 import React from 'react';
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/taskListTableCells/TaskCell.tsx b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/taskListTableCells/TaskCell.tsx
index a9dccbfa..b244796f 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/taskListTableCells/TaskCell.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/taskListTableCells/TaskCell.tsx
@@ -6,7 +6,7 @@ import {
   DownOutlined,
   RightOutlined,
   ExpandAltOutlined,
-} from '@ant-design/icons';
+} from '@/shared/antd-imports';
 import { colors } from '@/styles/colors';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { setShowTaskDrawer } from '@/features/task-drawer/task-drawer.slice';
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/taskListTableCells/TimeTracker.tsx b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/taskListTableCells/TimeTracker.tsx
index f4832223..1f19d6c9 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/taskListTableCells/TimeTracker.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/taskList/taskListTable/taskListTableCells/TimeTracker.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Divider, Empty, Flex, Popover, Typography } from '@/shared/antd-imports';
-import { PlayCircleFilled } from '@ant-design/icons';
+import { PlayCircleFilled } from '@/shared/antd-imports';
 import { colors } from '../../../../../../styles/colors';
 import CustomAvatar from '../../../../../../components/CustomAvatar';
 import { mockTimeLogs } from './mockTimeLogs';
diff --git a/worklenz-frontend/src/pages/projects/project-view-1/updates/project-view-updates.tsx b/worklenz-frontend/src/pages/projects/project-view-1/updates/project-view-updates.tsx
index b46a735d..2a4d0994 100644
--- a/worklenz-frontend/src/pages/projects/project-view-1/updates/project-view-updates.tsx
+++ b/worklenz-frontend/src/pages/projects/project-view-1/updates/project-view-updates.tsx
@@ -29,7 +29,7 @@ import { calculateTimeDifference } from '@/utils/calculate-time-difference';
 import { getUserSession } from '@/utils/session-helper';
 import './project-view-updates.css';
 import { useAppSelector } from '@/hooks/useAppSelector';
-import { DeleteOutlined } from '@ant-design/icons';
+import { DeleteOutlined } from '@/shared/antd-imports';
 
 const MAX_COMMENT_LENGTH = 2000;
 
diff --git a/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-section-card/board-create-section-card.tsx b/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-section-card/board-create-section-card.tsx
index dbe56678..876b1ea0 100644
--- a/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-section-card/board-create-section-card.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-section-card/board-create-section-card.tsx
@@ -1,5 +1,5 @@
 import { Button, Flex } from '@/shared/antd-imports';
-import { PlusOutlined } from '@ant-design/icons';
+import { PlusOutlined } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 import { nanoid } from '@reduxjs/toolkit';
 
diff --git a/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-section-card/board-section-card-header.tsx b/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-section-card/board-section-card-header.tsx
index 3e5483f6..427dfe20 100644
--- a/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-section-card/board-section-card-header.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-section-card/board-section-card-header.tsx
@@ -18,7 +18,7 @@ import {
   MoreOutlined,
   PlusOutlined,
   RetweetOutlined,
-} from '@ant-design/icons';
+} from '@/shared/antd-imports';
 import { MenuProps } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 
diff --git a/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-section-card/board-section-card.tsx b/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-section-card/board-section-card.tsx
index 5a037f9e..14b2b36c 100644
--- a/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-section-card/board-section-card.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-section-card/board-section-card.tsx
@@ -9,7 +9,7 @@ import { CSS } from '@dnd-kit/utilities';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { themeWiseColor } from '@/utils/themeWiseColor';
 import BoardSectionCardHeader from './board-section-card-header';
-import { PlusOutlined } from '@ant-design/icons';
+import { PlusOutlined } from '@/shared/antd-imports';
 import BoardViewTaskCard from '../board-task-card/board-view-task-card';
 import BoardViewCreateTaskCard from '../board-task-card/board-view-create-task-card';
 import { ITaskListGroup } from '@/types/tasks/taskList.types';
diff --git a/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-sub-task-card/board-sub-task-card.tsx b/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-sub-task-card/board-sub-task-card.tsx
index a0af1cdc..a9ba68d0 100644
--- a/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-sub-task-card/board-sub-task-card.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-sub-task-card/board-sub-task-card.tsx
@@ -6,7 +6,7 @@ import {
   DeleteOutlined,
   ExclamationCircleFilled,
   InboxOutlined,
-} from '@ant-design/icons';
+} from '@/shared/antd-imports';
 import CustomAvatarGroup from '@/components/board/custom-avatar-group';
 import CustomDueDatePicker from '@/components/board/custom-due-date-picker';
 import { IProjectTask } from '@/types/project/projectTasksViewModel.types';
diff --git a/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-task-card/board-view-task-card.tsx b/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-task-card/board-view-task-card.tsx
index a067c16f..770cfb2f 100644
--- a/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-task-card/board-view-task-card.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/board/board-section/board-task-card/board-view-task-card.tsx
@@ -25,7 +25,7 @@ import {
   CaretDownFilled,
   ExclamationCircleFilled,
   PlusOutlined,
-} from '@ant-design/icons';
+} from '@/shared/antd-imports';
 import dayjs, { Dayjs } from 'dayjs';
 import { useTranslation } from 'react-i18next';
 import { useSortable } from '@dnd-kit/sortable';
diff --git a/worklenz-frontend/src/pages/projects/projectView/files/project-view-files.tsx b/worklenz-frontend/src/pages/projects/projectView/files/project-view-files.tsx
index f4593fa2..0ec8d85b 100644
--- a/worklenz-frontend/src/pages/projects/projectView/files/project-view-files.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/files/project-view-files.tsx
@@ -18,7 +18,7 @@ import {
   DeleteOutlined,
   ExclamationCircleFilled,
   ExclamationCircleOutlined,
-} from '@ant-design/icons';
+} from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 import { durationDateFormat } from '@utils/durationDateFormat';
 import { DEFAULT_PAGE_SIZE, IconsMap } from '@/shared/constants';
diff --git a/worklenz-frontend/src/pages/projects/projectView/insights/insights-members/tables/tasks-by-members.tsx b/worklenz-frontend/src/pages/projects/projectView/insights/insights-members/tables/tasks-by-members.tsx
index d4408bff..49b39a0a 100644
--- a/worklenz-frontend/src/pages/projects/projectView/insights/insights-members/tables/tasks-by-members.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/insights/insights-members/tables/tasks-by-members.tsx
@@ -3,7 +3,7 @@ import { Flex, Progress } from '@/shared/antd-imports';
 import { colors } from '@/styles/colors';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { themeWiseColor } from '@/utils/themeWiseColor';
-import { DownOutlined, ExclamationCircleOutlined, RightOutlined } from '@ant-design/icons';
+import { DownOutlined, ExclamationCircleOutlined, RightOutlined } from '@/shared/antd-imports';
 import logger from '@/utils/errorLogger';
 import { projectsApiService } from '@/api/projects/projects.api.service';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/pages/projects/projectView/insights/insights-tasks/insights-tasks.tsx b/worklenz-frontend/src/pages/projects/projectView/insights/insights-tasks/insights-tasks.tsx
index 1dd2c3d7..7f027d70 100644
--- a/worklenz-frontend/src/pages/projects/projectView/insights/insights-tasks/insights-tasks.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/insights/insights-tasks/insights-tasks.tsx
@@ -1,5 +1,5 @@
 import { Button, Card, Flex, Tooltip, Typography } from '@/shared/antd-imports';
-import { ExclamationCircleOutlined } from '@ant-design/icons';
+import { ExclamationCircleOutlined } from '@/shared/antd-imports';
 import { colors } from '@/styles/colors';
 import OverdueTasksTable from './tables/overdue-tasks-table';
 import OverLoggedTasksTable from './tables/over-logged-tasks-table';
diff --git a/worklenz-frontend/src/pages/projects/projectView/insights/insights-tasks/tables/over-logged-tasks-table.tsx b/worklenz-frontend/src/pages/projects/projectView/insights/insights-tasks/tables/over-logged-tasks-table.tsx
index 3cc9c390..eb123902 100644
--- a/worklenz-frontend/src/pages/projects/projectView/insights/insights-tasks/tables/over-logged-tasks-table.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/insights/insights-tasks/tables/over-logged-tasks-table.tsx
@@ -2,7 +2,7 @@ import { Avatar, Button, Flex, Table, Typography } from '@/shared/antd-imports';
 import { useState, useEffect } from 'react';
 import { colors } from '@/styles/colors';
 import { TableProps } from 'antd/lib';
-import { PlusOutlined } from '@ant-design/icons';
+import { PlusOutlined } from '@/shared/antd-imports';
 import { IInsightTasks } from '@/types/project/projectInsights.types';
 import logger from '@/utils/errorLogger';
 import { projectInsightsApiService } from '@/api/projects/insights/project-insights.api.service';
diff --git a/worklenz-frontend/src/pages/projects/projectView/insights/project-view-insights.tsx b/worklenz-frontend/src/pages/projects/projectView/insights/project-view-insights.tsx
index ad3c5766..45474ef0 100644
--- a/worklenz-frontend/src/pages/projects/projectView/insights/project-view-insights.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/insights/project-view-insights.tsx
@@ -1,4 +1,4 @@
-import { DownloadOutlined } from '@ant-design/icons';
+import { DownloadOutlined } from '@/shared/antd-imports';
 import { Badge, Button, Checkbox, Flex, Segmented } from '@/shared/antd-imports';
 import { useEffect, useRef, useState } from 'react';
 import { useParams } from 'react-router-dom';
diff --git a/worklenz-frontend/src/pages/projects/projectView/members/project-view-members.tsx b/worklenz-frontend/src/pages/projects/projectView/members/project-view-members.tsx
index 2592aa15..e66ec582 100644
--- a/worklenz-frontend/src/pages/projects/projectView/members/project-view-members.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/members/project-view-members.tsx
@@ -14,7 +14,7 @@ import {
 } from '@/shared/antd-imports';
 
 // Icons
-import { DeleteOutlined, ExclamationCircleFilled, SyncOutlined } from '@ant-design/icons';
+import { DeleteOutlined, ExclamationCircleFilled, SyncOutlined } from '@/shared/antd-imports';
 
 // React & Router
 import { useEffect, useState } from 'react';
diff --git a/worklenz-frontend/src/pages/projects/projectView/project-view-header.tsx b/worklenz-frontend/src/pages/projects/projectView/project-view-header.tsx
index ed604d88..050541e4 100644
--- a/worklenz-frontend/src/pages/projects/projectView/project-view-header.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/project-view-header.tsx
@@ -65,7 +65,7 @@ import { addTaskCardToTheTop, fetchBoardTaskGroups } from '@/features/board/boar
 import { fetchPhasesByProjectId } from '@/features/projects/singleProject/phase/phases.slice';
 import { fetchEnhancedKanbanGroups } from '@/features/enhanced-kanban/enhanced-kanban.slice';
 import { fetchTasksV3 } from '@/features/task-management/task-management.slice';
-import { ShareAltOutlined } from '@ant-design/icons';
+import { ShareAltOutlined } from '@/shared/antd-imports';
 import { fetchStatuses } from '@/features/taskAttributes/taskStatusSlice';
 
 const ProjectViewHeader = memo(() => {
diff --git a/worklenz-frontend/src/pages/projects/projectView/project-view.tsx b/worklenz-frontend/src/pages/projects/projectView/project-view.tsx
index 30bed530..7361fd50 100644
--- a/worklenz-frontend/src/pages/projects/projectView/project-view.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/project-view.tsx
@@ -10,7 +10,6 @@ import {
   Tabs,
   PushpinFilled,
   PushpinOutlined,
-  type TabsProps,
 } from '@/shared/antd-imports';
 
 import { useAppDispatch } from '@/hooks/useAppDispatch';
@@ -41,7 +40,6 @@ import { SuspenseFallback } from '@/components/suspense-fallback/suspense-fallba
 import { useTranslation } from 'react-i18next';
 import { useTimerInitialization } from '@/hooks/useTimerInitialization';
 
-
 // Import critical components synchronously to avoid suspense interruptions
 import TaskDrawer from '@components/task-drawer/task-drawer';
 
diff --git a/worklenz-frontend/src/pages/projects/projectView/taskList/components/task-group/task-group.tsx b/worklenz-frontend/src/pages/projects/projectView/taskList/components/task-group/task-group.tsx
index 87cd04fd..ba1fb4a3 100644
--- a/worklenz-frontend/src/pages/projects/projectView/taskList/components/task-group/task-group.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/taskList/components/task-group/task-group.tsx
@@ -8,7 +8,7 @@ import Dropdown from 'antd/es/dropdown';
 import Input from 'antd/es/input';
 import Typography from 'antd/es/typography';
 import { MenuProps } from 'antd/es/menu';
-import { EditOutlined, EllipsisOutlined, RetweetOutlined, RightOutlined } from '@ant-design/icons';
+import { EditOutlined, EllipsisOutlined, RetweetOutlined, RightOutlined } from '@/shared/antd-imports';
 
 import { colors } from '@/styles/colors';
 import { useAppSelector } from '@/hooks/useAppSelector';
diff --git a/worklenz-frontend/src/pages/projects/projectView/taskList/groupTables/TaskGroupList.tsx b/worklenz-frontend/src/pages/projects/projectView/taskList/groupTables/TaskGroupList.tsx
index b0abc8f9..e672bd83 100644
--- a/worklenz-frontend/src/pages/projects/projectView/taskList/groupTables/TaskGroupList.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/taskList/groupTables/TaskGroupList.tsx
@@ -17,7 +17,7 @@ import {
   DragEndEvent,
   DragStartEvent,
 } from '@dnd-kit/core';
-import { EditOutlined, EllipsisOutlined, RetweetOutlined, RightOutlined } from '@ant-design/icons';
+import { EditOutlined, EllipsisOutlined, RetweetOutlined, RightOutlined } from '@/shared/antd-imports';
 
 import { colors } from '@/styles/colors';
 import { useAppSelector } from '@/hooks/useAppSelector';
diff --git a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/context-menu/task-context-menu.tsx b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/context-menu/task-context-menu.tsx
index 7e18428f..f359ecd8 100644
--- a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/context-menu/task-context-menu.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/context-menu/task-context-menu.tsx
@@ -5,7 +5,7 @@ import {
   LoadingOutlined,
   RetweetOutlined,
   UserAddOutlined,
-} from '@ant-design/icons';
+} from '@/shared/antd-imports';
 import { Badge, Dropdown, Flex, Typography, Modal } from '@/shared/antd-imports';
 import { MenuProps } from 'antd/lib';
 import { useState } from 'react';
diff --git a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-cells/custom-column-label-cell/custom-column-label-cell.tsx b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-cells/custom-column-label-cell/custom-column-label-cell.tsx
index ad9c32d0..117ad3d9 100644
--- a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-cells/custom-column-label-cell/custom-column-label-cell.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-cells/custom-column-label-cell/custom-column-label-cell.tsx
@@ -1,6 +1,6 @@
 import { Badge, Card, Dropdown, Empty, Flex, Menu, MenuProps, Typography } from '@/shared/antd-imports';
 import React, { useState, useEffect } from 'react';
-import { DownOutlined } from '@ant-design/icons';
+import { DownOutlined } from '@/shared/antd-imports';
 // custom css file
 import './custom-column-label-cell.css';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-cells/custom-column-selection-cell/custom-column-selection-cell.tsx b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-cells/custom-column-selection-cell/custom-column-selection-cell.tsx
index 833fd61b..981cc674 100644
--- a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-cells/custom-column-selection-cell/custom-column-selection-cell.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-cells/custom-column-selection-cell/custom-column-selection-cell.tsx
@@ -1,6 +1,6 @@
 import { Badge, Card, Dropdown, Empty, Flex, Menu, MenuProps, Typography } from '@/shared/antd-imports';
 import React, { useState, useEffect } from 'react';
-import { DownOutlined } from '@ant-design/icons';
+import { DownOutlined } from '@/shared/antd-imports';
 // custom css file
 import './custom-column-selection-cell.css';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-header/custom-column-header.tsx b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-header/custom-column-header.tsx
index 1aa9b695..b7401c55 100644
--- a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-header/custom-column-header.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-header/custom-column-header.tsx
@@ -1,4 +1,4 @@
-import { SettingOutlined } from '@ant-design/icons';
+import { SettingOutlined } from '@/shared/antd-imports';
 import { Button, Flex, Tooltip, Typography } from '@/shared/antd-imports';
 import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/add-custom-column-button.tsx b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/add-custom-column-button.tsx
index fb088dba..6b8301c0 100644
--- a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/add-custom-column-button.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/add-custom-column-button.tsx
@@ -1,4 +1,4 @@
-import { PlusOutlined } from '@ant-design/icons';
+import { PlusOutlined } from '@/shared/antd-imports';
 import { Button, Tooltip } from '@/shared/antd-imports';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import {
diff --git a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/custom-column-modal.tsx b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/custom-column-modal.tsx
index 52b8e553..5ebf1ef7 100644
--- a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/custom-column-modal.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/custom-column-modal.tsx
@@ -51,7 +51,7 @@ import {
 } from '@/features/task-management/task-management.slice';
 import { useParams } from 'react-router-dom';
 import { tasksCustomColumnsService } from '@/api/tasks/tasks-custom-columns.service';
-import { ExclamationCircleFilled } from '@ant-design/icons';
+import { ExclamationCircleFilled } from '@/shared/antd-imports';
 
 const CustomColumnModal = () => {
   const [mainForm] = Form.useForm();
diff --git a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/label-type-column/label-type-column.tsx b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/label-type-column/label-type-column.tsx
index 736096f1..84f62455 100644
--- a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/label-type-column/label-type-column.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/label-type-column/label-type-column.tsx
@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { nanoid } from 'nanoid';
 import { PhaseColorCodes } from '../../../../../../../../shared/constants';
 import { Button, Flex, Input, Select, Tag, Typography } from '@/shared/antd-imports';
-import { CloseCircleOutlined, HolderOutlined } from '@ant-design/icons';
+import { CloseCircleOutlined, HolderOutlined } from '@/shared/antd-imports';
 import { useAppDispatch } from '../../../../../../../../hooks/useAppDispatch';
 import { useAppSelector } from '../../../../../../../../hooks/useAppSelector';
 import { setLabelsList } from '../../../../../../../../features/projects/singleProject/task-list-custom-columns/task-list-custom-columns-slice';
diff --git a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/selection-type-column/selection-type-column.tsx b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/selection-type-column/selection-type-column.tsx
index 79d0ce6b..eeb165e9 100644
--- a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/selection-type-column/selection-type-column.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-modal/selection-type-column/selection-type-column.tsx
@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { nanoid } from 'nanoid';
 import { PhaseColorCodes } from '../../../../../../../../shared/constants';
 import { Button, Flex, Input, Select, Tag, Typography } from '@/shared/antd-imports';
-import { CloseCircleOutlined, HolderOutlined } from '@ant-design/icons';
+import { CloseCircleOutlined, HolderOutlined } from '@/shared/antd-imports';
 
 import { useAppDispatch } from '../../../../../../../../hooks/useAppDispatch';
 import { useAppSelector } from '../../../../../../../../hooks/useAppSelector';
diff --git a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-task-cell/task-list-task-cell.tsx b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-task-cell/task-list-task-cell.tsx
index 72410be7..61d3eca5 100644
--- a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-task-cell/task-list-task-cell.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-cells/task-list-task-cell/task-list-task-cell.tsx
@@ -10,7 +10,7 @@ import {
   PaperClipOutlined,
   MinusCircleOutlined,
   RetweetOutlined,
-} from '@ant-design/icons';
+} from '@/shared/antd-imports';
 import { colors } from '@/styles/colors';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-rows/add-task-list-row.tsx b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-rows/add-task-list-row.tsx
index a3761009..c5403162 100644
--- a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-rows/add-task-list-row.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-rows/add-task-list-row.tsx
@@ -1,7 +1,7 @@
 import Input, { InputRef } from 'antd/es/input';
 import { useMemo, useRef, useState, useEffect } from 'react';
 import { Spin } from '@/shared/antd-imports';
-import { LoadingOutlined } from '@ant-design/icons';
+import { LoadingOutlined } from '@/shared/antd-imports';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { colors } from '@/styles/colors';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-wrapper/task-list-table-wrapper.tsx b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-wrapper/task-list-table-wrapper.tsx
index fb7c9fb1..1c445a09 100644
--- a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-wrapper/task-list-table-wrapper.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table-wrapper/task-list-table-wrapper.tsx
@@ -9,7 +9,7 @@ import Dropdown from 'antd/es/dropdown';
 import Input from 'antd/es/input';
 import Typography from 'antd/es/typography';
 import { MenuProps } from 'antd/es/menu';
-import { EditOutlined, EllipsisOutlined, RetweetOutlined, RightOutlined } from '@ant-design/icons';
+import { EditOutlined, EllipsisOutlined, RetweetOutlined, RightOutlined } from '@/shared/antd-imports';
 import { colors } from '@/styles/colors';
 import './task-list-table-wrapper.css';
 import TaskListTable from '../task-list-table';
diff --git a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table.tsx b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table.tsx
index 013dccbd..3a505155 100644
--- a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table.tsx
@@ -11,7 +11,7 @@ import {
   SettingOutlined,
   UsergroupAddOutlined,
   PlusOutlined,
-} from '@ant-design/icons';
+} from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 import { useSortable } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
diff --git a/worklenz-frontend/src/pages/reporting/members-reports/members-reports.tsx b/worklenz-frontend/src/pages/reporting/members-reports/members-reports.tsx
index 8ef5d8fb..192f7dae 100644
--- a/worklenz-frontend/src/pages/reporting/members-reports/members-reports.tsx
+++ b/worklenz-frontend/src/pages/reporting/members-reports/members-reports.tsx
@@ -1,5 +1,5 @@
 import { Button, Card, Checkbox, Dropdown, Flex, Skeleton, Space, Typography } from '@/shared/antd-imports';
-import { DownOutlined } from '@ant-design/icons';
+import { DownOutlined } from '@/shared/antd-imports';
 import MembersReportsTable from './members-reports-table/members-reports-table';
 import TimeWiseFilter from '@/components/reporting/time-wise-filter';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
diff --git a/worklenz-frontend/src/pages/reporting/overview-reports/overview-stats.tsx b/worklenz-frontend/src/pages/reporting/overview-reports/overview-stats.tsx
index 8fb7f3fc..1e7ac239 100644
--- a/worklenz-frontend/src/pages/reporting/overview-reports/overview-stats.tsx
+++ b/worklenz-frontend/src/pages/reporting/overview-reports/overview-stats.tsx
@@ -1,7 +1,7 @@
 import { Flex, Typography, theme } from '@/shared/antd-imports';
 import React, { useEffect, useState, useCallback, useMemo } from 'react';
 import OverviewStatCard from './overview-stat-card';
-import { BankOutlined, FileOutlined, UsergroupAddOutlined } from '@ant-design/icons';
+import { BankOutlined, FileOutlined, UsergroupAddOutlined } from '@/shared/antd-imports';
 import { colors } from '@/styles/colors';
 import { useTranslation } from 'react-i18next';
 import { IRPTOverviewStatistics } from '@/types/reporting/reporting.types';
diff --git a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-filters/project-categories-filter-dropdown.tsx b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-filters/project-categories-filter-dropdown.tsx
index 2a918aa4..b01fda4e 100644
--- a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-filters/project-categories-filter-dropdown.tsx
+++ b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-filters/project-categories-filter-dropdown.tsx
@@ -4,7 +4,7 @@ import { setSelectedProjectCategories } from '@/features/reporting/projectReport
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { IProjectCategoryViewModel } from '@/types/project/projectCategory.types';
-import { CaretDownFilled } from '@ant-design/icons';
+import { CaretDownFilled } from '@/shared/antd-imports';
 import { Badge, Button, Card, Checkbox, Dropdown, Empty, Flex, Input, InputRef, List } from '@/shared/antd-imports';
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-filters/project-health-filter-dropdown.tsx b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-filters/project-health-filter-dropdown.tsx
index 74f68631..9f730e38 100644
--- a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-filters/project-health-filter-dropdown.tsx
+++ b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-filters/project-health-filter-dropdown.tsx
@@ -6,7 +6,7 @@ import {
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { IProjectHealth } from '@/types/project/projectHealth.types';
-import { CaretDownFilled } from '@ant-design/icons';
+import { CaretDownFilled } from '@/shared/antd-imports';
 import { Button, Card, Checkbox, Dropdown, List, Space } from '@/shared/antd-imports';
 import React, { useEffect, useState, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-filters/project-managers-filter-dropdown.tsx b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-filters/project-managers-filter-dropdown.tsx
index f875a042..2a7f13c0 100644
--- a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-filters/project-managers-filter-dropdown.tsx
+++ b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-filters/project-managers-filter-dropdown.tsx
@@ -3,7 +3,7 @@ import { setSelectedProjectManagers } from '@/features/reporting/projectReports/
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { IProjectManager } from '@/types/project/projectManager.types';
-import { CaretDownFilled } from '@ant-design/icons';
+import { CaretDownFilled } from '@/shared/antd-imports';
 import { Button, Card, Checkbox, Dropdown, Empty, Flex, Input, InputRef, List } from '@/shared/antd-imports';
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-filters/project-status-filter-dropdown.tsx b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-filters/project-status-filter-dropdown.tsx
index ad51539b..326eb338 100644
--- a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-filters/project-status-filter-dropdown.tsx
+++ b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-filters/project-status-filter-dropdown.tsx
@@ -6,7 +6,7 @@ import {
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { IProjectStatus } from '@/types/project/projectStatus.types';
-import { CaretDownFilled } from '@ant-design/icons';
+import { CaretDownFilled } from '@/shared/antd-imports';
 import { Button, Card, Checkbox, Dropdown, List, Space } from '@/shared/antd-imports';
 import { debounce } from 'lodash';
 import React, { useCallback, useEffect, useState } from 'react';
diff --git a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-filters/project-table-show-fields-dropdown.tsx b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-filters/project-table-show-fields-dropdown.tsx
index 73349556..1e1ef542 100644
--- a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-filters/project-table-show-fields-dropdown.tsx
+++ b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-filters/project-table-show-fields-dropdown.tsx
@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { MoreOutlined } from '@ant-design/icons';
+import { MoreOutlined } from '@/shared/antd-imports';
 import { Button, Card, Checkbox, Dropdown, List, Space } from '@/shared/antd-imports';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
diff --git a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/projects-reports-table.tsx b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/projects-reports-table.tsx
index d55452fc..ccb2ba1d 100644
--- a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/projects-reports-table.tsx
+++ b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/projects-reports-table.tsx
@@ -2,7 +2,7 @@ import { useEffect, useState, useMemo, useCallback, memo } from 'react';
 import { Button, ConfigProvider, Flex, PaginationProps, Table, TableColumnsType } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 import { createPortal } from 'react-dom';
-import { ExpandAltOutlined } from '@ant-design/icons';
+import { ExpandAltOutlined } from '@/shared/antd-imports';
 
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
diff --git a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/project-category-cell/project-category-cell.tsx b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/project-category-cell/project-category-cell.tsx
index 90a6104c..2024829c 100644
--- a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/project-category-cell/project-category-cell.tsx
+++ b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/project-category-cell/project-category-cell.tsx
@@ -1,5 +1,5 @@
 /* eslint-disable react-hooks/exhaustive-deps */
-import { DownOutlined } from '@ant-design/icons';
+import { DownOutlined } from '@/shared/antd-imports';
 import { Badge, Card, Dropdown, Flex, Input, InputRef, Menu, MenuProps, Typography } from '@/shared/antd-imports';
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { useAppSelector } from '@/hooks/useAppSelector';
diff --git a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/project-health-cell/project-health-cell.tsx b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/project-health-cell/project-health-cell.tsx
index b09e5f5b..194debf1 100644
--- a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/project-health-cell/project-health-cell.tsx
+++ b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports-table/table-cells/project-health-cell/project-health-cell.tsx
@@ -1,6 +1,6 @@
 import { Badge, Card, Dropdown, Flex, Menu, MenuProps, Typography } from '@/shared/antd-imports';
 import { useEffect, useState } from 'react';
-import { DownOutlined } from '@ant-design/icons';
+import { DownOutlined } from '@/shared/antd-imports';
 import { colors } from '@/styles/colors';
 import './project-health-cell.css';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports.tsx b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports.tsx
index d92c270e..acc0541b 100644
--- a/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports.tsx
+++ b/worklenz-frontend/src/pages/reporting/projects-reports/projects-reports.tsx
@@ -1,7 +1,7 @@
 import { Button, Card, Checkbox, Dropdown, Flex, Space, Typography } from '@/shared/antd-imports';
 import { useMemo, useCallback, memo } from 'react';
 import CustomPageHeader from '@/pages/reporting/page-header/custom-page-header';
-import { DownOutlined } from '@ant-design/icons';
+import { DownOutlined } from '@/shared/antd-imports';
 import ProjectReportsTable from './projects-reports-table/projects-reports-table';
 import ProjectsReportsFilters from './projects-reports-filters/project-reports-filters';
 import { useAppSelector } from '@/hooks/useAppSelector';
diff --git a/worklenz-frontend/src/pages/reporting/sidebar/reporting-collapsed-button.tsx b/worklenz-frontend/src/pages/reporting/sidebar/reporting-collapsed-button.tsx
index e6befefa..6bc7dcc6 100644
--- a/worklenz-frontend/src/pages/reporting/sidebar/reporting-collapsed-button.tsx
+++ b/worklenz-frontend/src/pages/reporting/sidebar/reporting-collapsed-button.tsx
@@ -1,4 +1,4 @@
-import { GlobalOutlined, LeftCircleOutlined, RightCircleOutlined } from '@ant-design/icons';
+import { GlobalOutlined, LeftCircleOutlined, RightCircleOutlined } from '@/shared/antd-imports';
 import React, { useEffect, useState } from 'react';
 import { colors } from '@/styles/colors';
 import { Button, Flex, Tooltip, Typography } from '@/shared/antd-imports';
diff --git a/worklenz-frontend/src/pages/reporting/timeReports/page-header/billable.tsx b/worklenz-frontend/src/pages/reporting/timeReports/page-header/billable.tsx
index 5b2bd1c3..8fd29c77 100644
--- a/worklenz-frontend/src/pages/reporting/timeReports/page-header/billable.tsx
+++ b/worklenz-frontend/src/pages/reporting/timeReports/page-header/billable.tsx
@@ -1,7 +1,7 @@
 import { setSelectOrDeselectBillable } from '@/features/reporting/time-reports/time-reports-overview.slice';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { useAppSelector } from '@/hooks/useAppSelector';
-import { CaretDownFilled } from '@ant-design/icons';
+import { CaretDownFilled } from '@/shared/antd-imports';
 import { Button, Checkbox, Dropdown, MenuProps } from '@/shared/antd-imports';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/pages/reporting/timeReports/page-header/categories.tsx b/worklenz-frontend/src/pages/reporting/timeReports/page-header/categories.tsx
index 5f0c673e..064d65d5 100644
--- a/worklenz-frontend/src/pages/reporting/timeReports/page-header/categories.tsx
+++ b/worklenz-frontend/src/pages/reporting/timeReports/page-header/categories.tsx
@@ -6,7 +6,7 @@ import {
 } from '@/features/reporting/time-reports/time-reports-overview.slice';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { useAppSelector } from '@/hooks/useAppSelector';
-import { CaretDownFilled } from '@ant-design/icons';
+import { CaretDownFilled } from '@/shared/antd-imports';
 import { Button, Card, Checkbox, Divider, Dropdown, Input, theme } from '@/shared/antd-imports';
 import { CheckboxChangeEvent } from 'antd/es/checkbox';
 import React, { useState } from 'react';
diff --git a/worklenz-frontend/src/pages/reporting/timeReports/page-header/projects.tsx b/worklenz-frontend/src/pages/reporting/timeReports/page-header/projects.tsx
index 1b5b564d..823461b3 100644
--- a/worklenz-frontend/src/pages/reporting/timeReports/page-header/projects.tsx
+++ b/worklenz-frontend/src/pages/reporting/timeReports/page-header/projects.tsx
@@ -11,7 +11,7 @@ import {
   DownOutlined,
   RightOutlined,
   FilterOutlined,
-} from '@ant-design/icons';
+} from '@/shared/antd-imports';
 import {
   Button,
   Checkbox,
diff --git a/worklenz-frontend/src/pages/reporting/timeReports/page-header/team.tsx b/worklenz-frontend/src/pages/reporting/timeReports/page-header/team.tsx
index cac788ca..0022ab3b 100644
--- a/worklenz-frontend/src/pages/reporting/timeReports/page-header/team.tsx
+++ b/worklenz-frontend/src/pages/reporting/timeReports/page-header/team.tsx
@@ -1,24 +1,19 @@
-import { CaretDownFilled } from '@ant-design/icons';
+import { CaretDownFilled } from '@/shared/antd-imports';
 import { Button, Checkbox, Divider, Dropdown, Input, theme } from '@/shared/antd-imports';
-import React, { useEffect, useState } from 'react';
+import React, { useState } from 'react';
 import type { CheckboxChangeEvent } from 'antd/es/checkbox';
 import { useTranslation } from 'react-i18next';
-import { ISelectableTeam } from '@/types/reporting/reporting-filters.types';
-import { reportingApiService } from '@/api/reporting/reporting.api.service';
-import logger from '@/utils/errorLogger';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import {
   fetchReportingCategories,
   fetchReportingProjects,
-  fetchReportingTeams,
   setSelectOrDeselectAllTeams,
   setSelectOrDeselectTeam,
 } from '@/features/reporting/time-reports/time-reports-overview.slice';
 
 const Team: React.FC = () => {
   const dispatch = useAppDispatch();
-  const [checkedList, setCheckedList] = useState<string[]>([]);
   const [searchText, setSearchText] = useState('');
   const [selectAll, setSelectAll] = useState(true);
   const { t } = useTranslation('time-report');
diff --git a/worklenz-frontend/src/pages/reporting/timeReports/timeReportingRightHeader/TimeReportingRightHeader.tsx b/worklenz-frontend/src/pages/reporting/timeReports/timeReportingRightHeader/TimeReportingRightHeader.tsx
index 36b1ae81..415527a4 100644
--- a/worklenz-frontend/src/pages/reporting/timeReports/timeReportingRightHeader/TimeReportingRightHeader.tsx
+++ b/worklenz-frontend/src/pages/reporting/timeReports/timeReportingRightHeader/TimeReportingRightHeader.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Button, Checkbox, Dropdown, Space, Typography } from '@/shared/antd-imports';
-import { DownOutlined } from '@ant-design/icons';
+import { DownOutlined } from '@/shared/antd-imports';
 import { useTranslation } from 'react-i18next';
 import CustomPageHeader from '../../page-header/custom-page-header';
 import TimeWiseFilter from '../../../../components/reporting/time-wise-filter';
diff --git a/worklenz-frontend/src/pages/schedule-old/schedule.tsx b/worklenz-frontend/src/pages/schedule-old/schedule.tsx
index cdd6599d..f81c7f07 100644
--- a/worklenz-frontend/src/pages/schedule-old/schedule.tsx
+++ b/worklenz-frontend/src/pages/schedule-old/schedule.tsx
@@ -1,7 +1,7 @@
 import { Button, DatePicker, DatePickerProps, Select, Space } from '@/shared/antd-imports';
 import React, { Suspense, useState } from 'react';
 import Team from '../../components/schedule-old/team/Team';
-import { SettingOutlined } from '@ant-design/icons';
+import { SettingOutlined } from '@/shared/antd-imports';
 import { useDispatch } from 'react-redux';
 import { toggleSettingsDrawer } from '@/features/schedule-old/scheduleSlice';
 import ScheduleSettingsDrawer from '@/features/schedule-old/ScheduleSettingsDrawer';
diff --git a/worklenz-frontend/src/pages/schedule/schedule.tsx b/worklenz-frontend/src/pages/schedule/schedule.tsx
index b6f54ead..ba51d28c 100644
--- a/worklenz-frontend/src/pages/schedule/schedule.tsx
+++ b/worklenz-frontend/src/pages/schedule/schedule.tsx
@@ -1,5 +1,5 @@
 import { Button, DatePicker, DatePickerProps, Flex, Select, Space } from '@/shared/antd-imports';
-import React, { useRef, useState } from 'react';
+import React, { useRef } from 'react';
 import { SettingOutlined } from '@ant-design/icons';
 import { useDispatch } from 'react-redux';
 import { setDate, setType, toggleSettingsDrawer } from '@/features/schedule/scheduleSlice';
diff --git a/worklenz-frontend/src/pages/settings/appearance/appearance-settings.tsx b/worklenz-frontend/src/pages/settings/appearance/appearance-settings.tsx
index a0f50758..20e25e5a 100644
--- a/worklenz-frontend/src/pages/settings/appearance/appearance-settings.tsx
+++ b/worklenz-frontend/src/pages/settings/appearance/appearance-settings.tsx
@@ -4,7 +4,7 @@ import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { toggleTheme } from '@/features/theme/themeSlice';
 import { useDocumentTitle } from '@/hooks/useDoumentTItle';
-import { MoonOutlined, SunOutlined } from '@ant-design/icons';
+import { MoonOutlined, SunOutlined } from '@/shared/antd-imports';
 
 const AppearanceSettings = () => {
   const { t } = useTranslation('settings/appearance');
diff --git a/worklenz-frontend/src/pages/settings/categories/categories-settings.tsx b/worklenz-frontend/src/pages/settings/categories/categories-settings.tsx
index 4ac631b4..2f7b5362 100644
--- a/worklenz-frontend/src/pages/settings/categories/categories-settings.tsx
+++ b/worklenz-frontend/src/pages/settings/categories/categories-settings.tsx
@@ -1,4 +1,4 @@
-import { DeleteOutlined, ExclamationCircleFilled, SearchOutlined } from '@ant-design/icons';
+import { DeleteOutlined, ExclamationCircleFilled, SearchOutlined } from '@/shared/antd-imports';
 import {
   Button,
   Card,
@@ -13,7 +13,6 @@ import {
 import { useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { colors } from '@/styles/colors';
-import { CategoryType } from '@/types/categories.types';
 import CustomColorsCategoryTag from '@features/settings/categories/CustomColorsCategoryTag';
 import { deleteCategory } from '@features/settings/categories/categoriesSlice';
 import { categoriesApiService } from '@/api/settings/categories/categories.api.service';
diff --git a/worklenz-frontend/src/pages/settings/change-password/change-password.tsx b/worklenz-frontend/src/pages/settings/change-password/change-password.tsx
index 5086279b..ddc245dc 100644
--- a/worklenz-frontend/src/pages/settings/change-password/change-password.tsx
+++ b/worklenz-frontend/src/pages/settings/change-password/change-password.tsx
@@ -1,4 +1,4 @@
-import { EyeInvisibleOutlined, EyeOutlined } from '@ant-design/icons';
+import { EyeInvisibleOutlined, EyeOutlined } from '@/shared/antd-imports';
 import { Button, Card, Form, Input, notification, Row, Typography } from '@/shared/antd-imports';
 import React, { useState } from 'react';
 import { useDocumentTitle } from '@/hooks/useDoumentTItle';
diff --git a/worklenz-frontend/src/pages/settings/clients/clients-settings.tsx b/worklenz-frontend/src/pages/settings/clients/clients-settings.tsx
index dc468067..161a3df7 100644
--- a/worklenz-frontend/src/pages/settings/clients/clients-settings.tsx
+++ b/worklenz-frontend/src/pages/settings/clients/clients-settings.tsx
@@ -3,7 +3,7 @@ import {
   EditOutlined,
   ExclamationCircleFilled,
   SearchOutlined,
-} from '@ant-design/icons';
+} from '@/shared/antd-imports';
 import {
   Button,
   Card,
diff --git a/worklenz-frontend/src/pages/settings/job-titles/job-titles-settings.tsx b/worklenz-frontend/src/pages/settings/job-titles/job-titles-settings.tsx
index 0db03cf9..896e05bf 100644
--- a/worklenz-frontend/src/pages/settings/job-titles/job-titles-settings.tsx
+++ b/worklenz-frontend/src/pages/settings/job-titles/job-titles-settings.tsx
@@ -3,7 +3,7 @@ import {
   EditOutlined,
   ExclamationCircleFilled,
   SearchOutlined,
-} from '@ant-design/icons';
+} from '@/shared/antd-imports';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { useDocumentTitle } from '@/hooks/useDoumentTItle';
 import { jobTitlesApiService } from '@/api/settings/job-titles/job-titles.api.service';
diff --git a/worklenz-frontend/src/pages/settings/labels/labels-settings.tsx b/worklenz-frontend/src/pages/settings/labels/labels-settings.tsx
index 21687cd5..dffc7eaa 100644
--- a/worklenz-frontend/src/pages/settings/labels/labels-settings.tsx
+++ b/worklenz-frontend/src/pages/settings/labels/labels-settings.tsx
@@ -13,7 +13,7 @@ import { useEffect, useMemo, useState } from 'react';
 
 import PinRouteToNavbarButton from '../../../components/PinRouteToNavbarButton';
 import { useTranslation } from 'react-i18next';
-import { DeleteOutlined, ExclamationCircleFilled, SearchOutlined } from '@ant-design/icons';
+import { DeleteOutlined, ExclamationCircleFilled, SearchOutlined } from '@/shared/antd-imports';
 import { ITaskLabel } from '@/types/label.type';
 import { labelsApiService } from '@/api/taskAttributes/labels/labels.api.service';
 import CustomColorLabel from '@components/task-list-common/labelsSelector/custom-color-label';
diff --git a/worklenz-frontend/src/pages/settings/profile/profile-settings.tsx b/worklenz-frontend/src/pages/settings/profile/profile-settings.tsx
index d590a27f..e238b2dd 100644
--- a/worklenz-frontend/src/pages/settings/profile/profile-settings.tsx
+++ b/worklenz-frontend/src/pages/settings/profile/profile-settings.tsx
@@ -1,4 +1,4 @@
-import { LoadingOutlined, PlusOutlined } from '@ant-design/icons';
+import { LoadingOutlined, PlusOutlined } from '@/shared/antd-imports';
 import {
   Button,
   Card,
diff --git a/worklenz-frontend/src/pages/settings/project-templates/project-templates-settings.tsx b/worklenz-frontend/src/pages/settings/project-templates/project-templates-settings.tsx
index 5cf69782..167b748c 100644
--- a/worklenz-frontend/src/pages/settings/project-templates/project-templates-settings.tsx
+++ b/worklenz-frontend/src/pages/settings/project-templates/project-templates-settings.tsx
@@ -1,8 +1,8 @@
 import { Button, Card, Popconfirm, Table, TableProps, Tooltip, Typography } from '@/shared/antd-imports';
-import React, { useEffect, useState } from 'react';
+import { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useAppSelector } from '@/hooks/useAppSelector';
-import { DeleteOutlined, EditOutlined } from '@ant-design/icons';
+import { DeleteOutlined } from '@/shared/antd-imports';
 import { useNavigate } from 'react-router-dom';
 import { useDocumentTitle } from '@/hooks/useDoumentTItle';
 import { projectTemplatesApiService } from '@/api/project-templates/project-templates.api.service';
diff --git a/worklenz-frontend/src/pages/settings/project-templates/projectTemplateEditView/ProjectTemplateEditView.tsx b/worklenz-frontend/src/pages/settings/project-templates/projectTemplateEditView/ProjectTemplateEditView.tsx
index 3c5c75d5..4c8eee61 100644
--- a/worklenz-frontend/src/pages/settings/project-templates/projectTemplateEditView/ProjectTemplateEditView.tsx
+++ b/worklenz-frontend/src/pages/settings/project-templates/projectTemplateEditView/ProjectTemplateEditView.tsx
@@ -4,7 +4,7 @@ import StatusGroupTables from '../../../projects/project-view-1/taskList/statusT
 import { TaskType } from '../../../../types/task.types';
 import { useAppSelector } from '../../../../hooks/useAppSelector';
 import { PageHeader } from '@ant-design/pro-components';
-import { ArrowLeftOutlined, CaretDownFilled } from '@ant-design/icons';
+import { ArrowLeftOutlined, CaretDownFilled } from '@/shared/antd-imports';
 import { useNavigate, useParams } from 'react-router-dom';
 import SearchDropdown from '../../../projects/project-view-1/taskList/taskListFilters/SearchDropdown';
 import { useSelectedProject } from '../../../../hooks/useSelectedProject';
diff --git a/worklenz-frontend/src/pages/settings/sidebar/settings-sidebar.tsx b/worklenz-frontend/src/pages/settings/sidebar/settings-sidebar.tsx
index 4936c2f1..f39bc8d5 100644
--- a/worklenz-frontend/src/pages/settings/sidebar/settings-sidebar.tsx
+++ b/worklenz-frontend/src/pages/settings/sidebar/settings-sidebar.tsx
@@ -1,4 +1,4 @@
-import { RightOutlined } from '@ant-design/icons';
+import { RightOutlined } from '@/shared/antd-imports';
 import { ConfigProvider, Flex, Menu, MenuProps } from '@/shared/antd-imports';
 import { Link, useLocation } from 'react-router-dom';
 import { colors } from '@/styles/colors';
diff --git a/worklenz-frontend/src/pages/settings/task-templates/task-templates-settings.tsx b/worklenz-frontend/src/pages/settings/task-templates/task-templates-settings.tsx
index 7e55c711..5bf3f18e 100644
--- a/worklenz-frontend/src/pages/settings/task-templates/task-templates-settings.tsx
+++ b/worklenz-frontend/src/pages/settings/task-templates/task-templates-settings.tsx
@@ -2,7 +2,7 @@ import { Button, Card, Popconfirm, Table, TableProps, Tooltip, Typography } from
 import { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import './task-templates-settings.css';
-import { DeleteOutlined, EditOutlined } from '@ant-design/icons';
+import { DeleteOutlined, EditOutlined } from '@/shared/antd-imports';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import TaskTemplateDrawer from '@/components/task-templates/task-template-drawer';
 import { useAppSelector } from '@/hooks/useAppSelector';
diff --git a/worklenz-frontend/src/pages/settings/team-members/team-members-settings.tsx b/worklenz-frontend/src/pages/settings/team-members/team-members-settings.tsx
index f7cce8f9..4087c1c2 100644
--- a/worklenz-frontend/src/pages/settings/team-members/team-members-settings.tsx
+++ b/worklenz-frontend/src/pages/settings/team-members/team-members-settings.tsx
@@ -5,7 +5,7 @@ import {
   SearchOutlined,
   SyncOutlined,
   UserSwitchOutlined,
-} from '@ant-design/icons';
+} from '@/shared/antd-imports';
 import {
   Avatar,
   Badge,
diff --git a/worklenz-frontend/src/pages/settings/teams/teams-settings.tsx b/worklenz-frontend/src/pages/settings/teams/teams-settings.tsx
index 3a94cb5a..e6932d09 100644
--- a/worklenz-frontend/src/pages/settings/teams/teams-settings.tsx
+++ b/worklenz-frontend/src/pages/settings/teams/teams-settings.tsx
@@ -2,7 +2,7 @@ import { Button, Card, Flex, Table, TableProps, Tooltip, Typography } from '@/sh
 import PinRouteToNavbarButton from '@components/PinRouteToNavbarButton';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { durationDateFormat } from '@utils/durationDateFormat';
-import { EditOutlined } from '@ant-design/icons';
+import { EditOutlined } from '@/shared/antd-imports';
 import { useEffect, useState } from 'react';
 import EditTeamModal from '@/components/settings/edit-team-name-modal';
 import { useTranslation } from 'react-i18next';
diff --git a/worklenz-frontend/src/shared/antd-imports.ts b/worklenz-frontend/src/shared/antd-imports.ts
index 680d6e58..9f532aa2 100644
--- a/worklenz-frontend/src/shared/antd-imports.ts
+++ b/worklenz-frontend/src/shared/antd-imports.ts
@@ -117,6 +117,71 @@ export {
   UserAddOutlined,
   ArrowsAltOutlined,
   EllipsisOutlined,
+  ExclamationCircleOutlined,
+  FormatPainterOutlined,
+  CloseCircleOutlined,
+  MailOutlined,
+  InfoCircleTwoTone,
+  ContainerOutlined,
+  CheckCircleFilled,
+  PhoneOutlined,
+  LoadingOutlined,
+  PauseOutlined,
+  MinusOutlined,
+  ForkOutlined,
+  CaretRightFilled,
+  CaretDownFilled,
+  DoubleLeftOutlined,
+  StopOutlined,
+  MenuOutlined,
+  BankOutlined,
+  ProjectOutlined,
+  StarFilled,
+  SortAscendingOutlined,
+  SortDescendingOutlined,
+  CaretDownOutlined,
+  CaretLeftOutlined,
+  CaretRightOutlined,
+  CaretUpOutlined,
+  QuestionCircleOutlined,
+  CloseCircleFilled,
+  PlusCircleOutlined,
+  WifiOutlined,
+  DisconnectOutlined,
+  ReloadOutlined,
+  ArrowRightOutlined,
+  ExclamationCircleFilled,
+  DownloadOutlined,
+  LikeOutlined,
+  LikeTwoTone,
+  HomeOutlined,
+  PlayCircleFilled,
+  CommentOutlined,
+  TagsOutlined,
+  BulbOutlined,
+  ReadOutlined,
+  FileExcelOutlined,
+  FileZipOutlined,
+  GlobalOutlined,
+  IdcardOutlined,
+  LockOutlined,
+  NotificationOutlined,
+  ProfileOutlined,
+  UserSwitchOutlined,
+  LeftCircleOutlined,
+  RightCircleOutlined,
+  ClearOutlined,
+  MoonOutlined,
+  SunOutlined,
+  EyeInvisibleOutlined,
+  CreditCardOutlined,
+  CheckCircleTwoTone,
+  CloseCircleTwoTone,
+  EnterOutlined,
+  InfoCircleOutlined,
+  WarningTwoTone,
+  ShareAltOutlined,
+  CloudDownloadOutlined
 } from '@ant-design/icons';
 
 // Re-export all components with React
@@ -174,7 +239,7 @@ export {
   Breadcrumb,
   Timeline,
   Mentions,
-  Radio
+  Radio,
 };
 
 // TypeScript Types - Import commonly used ones
@@ -195,6 +260,9 @@ export type {
   TabsProps,
   TableProps,
   TableColumnsType,
+  PaginationProps,
+  CollapseProps,
+  TablePaginationConfig,
 } from 'antd/es';
 
 // Dayjs
diff --git a/worklenz-frontend/src/shared/constants.ts b/worklenz-frontend/src/shared/constants.ts
index 7c46718e..a4a5bd6e 100644
--- a/worklenz-frontend/src/shared/constants.ts
+++ b/worklenz-frontend/src/shared/constants.ts
@@ -4,7 +4,7 @@ import {
   ClockCircleOutlined,
   CloseCircleOutlined,
   StopOutlined,
-} from '@ant-design/icons';
+} from '@/shared/antd-imports';
 import dayjs from 'dayjs';
 
 export const avatarNamesMap: { [x: string]: string } = {
diff --git a/worklenz-frontend/src/types/project/project.types.ts b/worklenz-frontend/src/types/project/project.types.ts
index 0f39b125..4c8c3def 100644
--- a/worklenz-frontend/src/types/project/project.types.ts
+++ b/worklenz-frontend/src/types/project/project.types.ts
@@ -3,7 +3,7 @@ import { IProjectStatus } from '@/types/project/projectStatus.types';
 import { IProjectViewModel } from './projectViewModel.types';
 import { NavigateFunction } from 'react-router-dom';
 import { AppDispatch } from '@/app/store';
-import { TablePaginationConfig } from 'antd';
+import { TablePaginationConfig } from '@/shared/antd-imports';
 import { FilterValue, SorterResult } from 'antd/es/table/interface';
 
 export interface IProject {

From 4887383dc4a844d6aefec5044690410d0410e4ec Mon Sep 17 00:00:00 2001
From: chamikaJ <chamika@ceydigital.com>
Date: Wed, 23 Jul 2025 13:03:00 +0530
Subject: [PATCH 4/6] feat(upgrade-plans): add responsive styles and improve
 layout for upgrade plans component

- Introduced a new CSS file for responsive design in the upgrade plans component, enhancing mobile usability.
- Updated the upgrade plans component to utilize the new styles, ensuring a better layout on various screen sizes.
- Refactored seat count options logic for improved clarity and functionality.
---
 .../drawers/upgrade-plans/upgrade-plans.css   | 44 +++++++++++++++++++
 .../drawers/upgrade-plans/upgrade-plans.tsx   | 41 ++++++++---------
 .../configuration/configuration.tsx           | 34 +++++++-------
 3 files changed, 79 insertions(+), 40 deletions(-)
 create mode 100644 worklenz-frontend/src/components/admin-center/billing/drawers/upgrade-plans/upgrade-plans.css

diff --git a/worklenz-frontend/src/components/admin-center/billing/drawers/upgrade-plans/upgrade-plans.css b/worklenz-frontend/src/components/admin-center/billing/drawers/upgrade-plans/upgrade-plans.css
new file mode 100644
index 00000000..6baef71a
--- /dev/null
+++ b/worklenz-frontend/src/components/admin-center/billing/drawers/upgrade-plans/upgrade-plans.css
@@ -0,0 +1,44 @@
+.upgrade-plans-responsive {
+  padding: 24px;
+}
+
+.upgrade-plans-row-responsive {
+  width: 100%;
+  flex-wrap: wrap;
+}
+
+@media (max-width: 900px) {
+  .upgrade-plans-row-responsive .ant-col {
+    flex: 0 0 100%;
+    max-width: 100%;
+    margin-bottom: 16px;
+  }
+  .upgrade-plans-row-responsive .ant-card {
+    width: 100%;
+    min-width: 0;
+  }
+}
+
+@media (max-width: 600px) {
+  .upgrade-plans-responsive {
+    padding: 8px;
+  }
+  .upgrade-plans-row-responsive .ant-col {
+    padding: 0 !important;
+    margin-bottom: 12px;
+  }
+  .upgrade-plans-row-responsive .ant-card {
+    width: 100%;
+    min-width: 0;
+    box-sizing: border-box;
+  }
+  .upgrade-plans-responsive .ant-typography,
+  .upgrade-plans-responsive .ant-btn,
+  .upgrade-plans-responsive .ant-form-item {
+    width: 100%;
+    text-align: center;
+  }
+  .upgrade-plans-responsive .ant-btn {
+    margin-top: 12px;
+  }
+} 
\ No newline at end of file
diff --git a/worklenz-frontend/src/components/admin-center/billing/drawers/upgrade-plans/upgrade-plans.tsx b/worklenz-frontend/src/components/admin-center/billing/drawers/upgrade-plans/upgrade-plans.tsx
index dd1a6b07..48199a16 100644
--- a/worklenz-frontend/src/components/admin-center/billing/drawers/upgrade-plans/upgrade-plans.tsx
+++ b/worklenz-frontend/src/components/admin-center/billing/drawers/upgrade-plans/upgrade-plans.tsx
@@ -30,6 +30,7 @@ import { billingApiService } from '@/api/admin-center/billing.api.service';
 import { authApiService } from '@/api/auth/auth.api.service';
 import { setUser } from '@/features/user/userSlice';
 import { setSession } from '@/utils/session-helper';
+import './upgrade-plans.css';
 
 // Extend Window interface to include Paddle
 declare global {
@@ -65,30 +66,23 @@ const UpgradePlans = () => {
   const [paddleError, setPaddleError] = useState<string | null>(null);
 
   const populateSeatCountOptions = (currentSeats: number) => {
-    if (!currentSeats) return [];
+    if (typeof currentSeats !== 'number') return [];
 
     const step = 5;
     const maxSeats = 90;
-    const minValue = Math.max(1, currentSeats + 1); // Start from 1 or currentSeats + 1, whichever is higher
-    const rangeStart = Math.ceil(minValue / step) * step;
-    const range = Array.from(
-      { length: Math.floor((maxSeats - rangeStart) / step) + 1 },
-      (_, i) => rangeStart + i * step
-    );
+    const minValue = currentSeats + 1;
+    const options: { value: number; disabled: boolean }[] = [];
 
-    // Always include 1 as the first option
-    const options = [1];
-    
-    if (currentSeats < step) {
-      // Add individual numbers from minValue to rangeStart
-      for (let i = Math.max(2, minValue); i < rangeStart; i++) {
-        options.push(i);
-      }
+    // Always show 1-5, but disable if less than minValue
+    for (let i = 1; i <= 5; i++) {
+      options.push({ value: i, disabled: i < minValue });
     }
-    
-    // Add the range of step-based numbers
-    options.push(...range);
-    
+
+    // Show all multiples of 5 from 10 to maxSeats
+    for (let i = 10; i <= maxSeats; i += step) {
+      options.push({ value: i, disabled: i < minValue });
+    }
+
     return options;
   };
 
@@ -350,7 +344,7 @@ const UpgradePlans = () => {
   }, []);
 
   return (
-    <div>
+    <div className="upgrade-plans-responsive">
       <Flex justify="center" align="center">
         <Typography.Title level={2}>
           {billingInfo?.status === SUBSCRIPTION_STATUS.TRIALING
@@ -366,8 +360,9 @@ const UpgradePlans = () => {
               style={{ width: 100 }}
               value={selectedSeatCount}
               options={seatCountOptions.map(option => ({
-                value: option,
-                text: option.toString(),
+                value: option.value,
+                label: option.value.toString(),
+                disabled: option.disabled,
               }))}
               onChange={setSelectedSeatCount}
             />
@@ -376,7 +371,7 @@ const UpgradePlans = () => {
       </Flex>
 
       <Flex>
-        <Row className="w-full">
+        <Row className="w-full upgrade-plans-row-responsive">
           {/* Free Plan */}
           <Col span={8} style={{ padding: '0 4px' }}>
             <Card
diff --git a/worklenz-frontend/src/components/admin-center/configuration/configuration.tsx b/worklenz-frontend/src/components/admin-center/configuration/configuration.tsx
index ffb1e806..c01f82f9 100644
--- a/worklenz-frontend/src/components/admin-center/configuration/configuration.tsx
+++ b/worklenz-frontend/src/components/admin-center/configuration/configuration.tsx
@@ -101,8 +101,8 @@ const Configuration: React.FC = React.memo(() => {
     <div>
       <Card title={<span style={titleStyle}>Billing Details</span>} style={cardStyle}>
         <Form form={form} initialValues={configuration} onFinish={handleSave}>
-          <Row>
-            <Col span={8} style={colStyle}>
+          <Row gutter={[0, 0]}>
+            <Col xs={24} sm={24} md={8} lg={8} xl={8} style={colStyle}>
               <Form.Item
                 name="name"
                 label="Name"
@@ -116,7 +116,7 @@ const Configuration: React.FC = React.memo(() => {
                 <Input placeholder="Name" disabled />
               </Form.Item>
             </Col>
-            <Col span={8} style={colStyle}>
+            <Col xs={24} sm={24} md={8} lg={8} xl={8} style={colStyle}>
               <Form.Item
                 name="email"
                 label="Email Address"
@@ -130,7 +130,7 @@ const Configuration: React.FC = React.memo(() => {
                 <Input placeholder="Email Address" disabled />
               </Form.Item>
             </Col>
-            <Col span={8} style={colStyle}>
+            <Col xs={24} sm={24} md={8} lg={8} xl={8} style={colStyle}>
               <Form.Item
                 name="phone"
                 label="Contact Number"
@@ -147,29 +147,29 @@ const Configuration: React.FC = React.memo(() => {
             </Col>
           </Row>
 
-          <Divider orientation="left" style={dividerStyle}>
+          <Divider orientation="left" style={{ ...dividerStyle, fontSize: '14px' }}>
             <span style={dividerTitleStyle}>Company Details</span>
           </Divider>
 
-          <Row>
-            <Col span={8} style={colStyle}>
+          <Row gutter={[0, 0]}>
+            <Col xs={24} sm={24} md={8} lg={8} xl={8} style={colStyle}>
               <Form.Item name="company_name" label="Company Name" layout="vertical">
                 <Input placeholder="Company Name" />
               </Form.Item>
             </Col>
-            <Col span={8} style={colStyle}>
+            <Col xs={24} sm={24} md={8} lg={8} xl={8} style={colStyle}>
               <Form.Item name="address_line_1" label="Address Line 01" layout="vertical">
                 <Input placeholder="Address Line 01" />
               </Form.Item>
             </Col>
-            <Col span={8} style={colStyle}>
+            <Col xs={24} sm={24} md={8} lg={8} xl={8} style={colStyle}>
               <Form.Item name="address_line_2" label="Address Line 02" layout="vertical">
                 <Input placeholder="Address Line 02" />
               </Form.Item>
             </Col>
           </Row>
-          <Row>
-            <Col span={8} style={colStyle}>
+          <Row gutter={[0, 0]}>
+            <Col xs={24} sm={24} md={8} lg={8} xl={8} style={colStyle}>
               <Form.Item name="country" label="Country" layout="vertical">
                 <Select
                   dropdownStyle={{ maxHeight: 256, overflow: 'auto' }}
@@ -182,28 +182,28 @@ const Configuration: React.FC = React.memo(() => {
                 />
               </Form.Item>
             </Col>
-            <Col span={8} style={colStyle}>
+            <Col xs={24} sm={24} md={8} lg={8} xl={8} style={colStyle}>
               <Form.Item name="city" label="City" layout="vertical">
                 <Input placeholder="City" />
               </Form.Item>
             </Col>
-            <Col span={8} style={colStyle}>
+            <Col xs={24} sm={24} md={8} lg={8} xl={8} style={colStyle}>
               <Form.Item name="state" label="State" layout="vertical">
                 <Input placeholder="State" />
               </Form.Item>
             </Col>
           </Row>
-          <Row>
-            <Col span={8} style={colStyle}>
+          <Row gutter={[0, 0]}>
+            <Col xs={24} sm={24} md={8} lg={8} xl={8} style={colStyle}>
               <Form.Item name="postal_code" label="Postal Code" layout="vertical">
                 <Input placeholder="Postal Code" />
               </Form.Item>
             </Col>
           </Row>
           <Row>
-            <Col style={buttonColStyle}>
+            <Col xs={24} sm={24} md={8} lg={8} xl={8} style={{ ...buttonColStyle, marginTop: 8 }}>
               <Form.Item>
-                <Button type="primary" htmlType="submit" loading={loading}>
+                <Button type="primary" htmlType="submit" loading={loading} block>
                   Save
                 </Button>
               </Form.Item>

From 9946c9a00e1c7e41633ab968b138ea5fb4b38e19 Mon Sep 17 00:00:00 2001
From: chamikaJ <chamika@ceydigital.com>
Date: Wed, 23 Jul 2025 13:24:58 +0530
Subject: [PATCH 5/6] fix(upgrade-plans): adjust minimum seat value logic and
 enhance HubSpot widget dark mode styles

- Updated the minimum seat value logic in the upgrade plans component to allow the current seat count.
- Added CSS overrides for the HubSpot widget to ensure proper display in dark mode, removing unwanted backgrounds and shadows.
---
 .../drawers/upgrade-plans/upgrade-plans.tsx   |  2 +-
 .../src/styles/customOverrides.css            | 39 +++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/worklenz-frontend/src/components/admin-center/billing/drawers/upgrade-plans/upgrade-plans.tsx b/worklenz-frontend/src/components/admin-center/billing/drawers/upgrade-plans/upgrade-plans.tsx
index 48199a16..a9c16efc 100644
--- a/worklenz-frontend/src/components/admin-center/billing/drawers/upgrade-plans/upgrade-plans.tsx
+++ b/worklenz-frontend/src/components/admin-center/billing/drawers/upgrade-plans/upgrade-plans.tsx
@@ -70,7 +70,7 @@ const UpgradePlans = () => {
 
     const step = 5;
     const maxSeats = 90;
-    const minValue = currentSeats + 1;
+    const minValue = currentSeats;
     const options: { value: number; disabled: boolean }[] = [];
 
     // Always show 1-5, but disable if less than minValue
diff --git a/worklenz-frontend/src/styles/customOverrides.css b/worklenz-frontend/src/styles/customOverrides.css
index b4332cfb..b2f9586e 100644
--- a/worklenz-frontend/src/styles/customOverrides.css
+++ b/worklenz-frontend/src/styles/customOverrides.css
@@ -180,3 +180,42 @@ body.dark .overview-stat-card .ant-card-body,
 .ql-snow .ql-stroke {
   stroke: #6c757d !important;
 }
+
+/* HubSpot Widget Dark Mode Fixes */
+html.dark #hubspot-messages-iframe-container {
+  background-color: transparent !important;
+}
+
+html.dark #hubspot-messages-iframe-container iframe {
+  background-color: transparent !important;
+}
+
+/* Target the HubSpot widget container */
+html.dark .hs-messages-widget-open {
+  background-color: transparent !important;
+}
+
+/* Remove white background from HubSpot elements */
+html.dark #hs-messages-iframe-container,
+html.dark .hs-messages-iframe-container {
+  background: transparent !important;
+  background-color: transparent !important;
+}
+
+/* Ensure the iframe wrapper has no background */
+html.dark iframe#hs-messages-iframe {
+  background: transparent !important;
+}
+
+/* Target the widget launcher button area */
+html.dark .hs-messages-widget,
+html.dark .hs-messages-widget-container {
+  background: transparent !important;
+  background-color: transparent !important;
+}
+
+/* Remove any box shadow that might appear white */
+html.dark #hubspot-messages-iframe-container,
+html.dark .hs-messages-widget {
+  box-shadow: none !important;
+}

From 78516d8d6c26fea005e5d5242d3354e05dd1c054 Mon Sep 17 00:00:00 2001
From: chamikaJ <chamika@ceydigital.com>
Date: Wed, 23 Jul 2025 14:36:50 +0530
Subject: [PATCH 6/6] feat(analytics-hubspot): modularize analytics and HubSpot
 integration

- Moved Google Analytics and HubSpot integration scripts to separate modules for better organization and maintainability.
- Implemented an AnalyticsManager class to handle Google Analytics initialization and privacy notice display.
- Created a HubSpotManager class to manage HubSpot widget loading and dark mode theming.
- Updated index.html to reference the new modules, improving code clarity and separation of concerns.
---
 worklenz-frontend/index.html                 | 109 +--------------
 worklenz-frontend/public/js/analytics.js     |  97 +++++++++++++
 worklenz-frontend/public/js/hubspot.js       | 137 +++++++++++++++++++
 worklenz-frontend/src/layouts/MainLayout.tsx |   4 +-
 4 files changed, 239 insertions(+), 108 deletions(-)
 create mode 100644 worklenz-frontend/public/js/analytics.js
 create mode 100644 worklenz-frontend/public/js/hubspot.js

diff --git a/worklenz-frontend/index.html b/worklenz-frontend/index.html
index 5ac671f0..21675992 100644
--- a/worklenz-frontend/index.html
+++ b/worklenz-frontend/index.html
@@ -57,116 +57,15 @@
     <!-- Environment configuration -->
     <script src="/env-config.js"></script>
     
-    <!-- Optimized Google Analytics with reduced blocking -->
-    <script>
-      // Function to initialize Google Analytics asynchronously
-      function initGoogleAnalytics() {
-        // Use requestIdleCallback to defer analytics loading
-        const loadAnalytics = () => {
-          // Determine which tracking ID to use based on the environment
-          const isProduction = window.location.hostname === 'app.worklenz.com';
-
-          const trackingId = isProduction ? 'G-7KSRKQ1397' : 'G-3LM2HGWEXG'; // Open source tracking ID
-
-          // Load the Google Analytics script
-          const script = document.createElement('script');
-          script.async = true;
-          script.src = `https://www.googletagmanager.com/gtag/js?id=${trackingId}`;
-          document.head.appendChild(script);
-
-          // Initialize Google Analytics
-          window.dataLayer = window.dataLayer || [];
-          function gtag() {
-            dataLayer.push(arguments);
-          }
-          gtag('js', new Date());
-          gtag('config', trackingId);
-        };
-
-        // Use requestIdleCallback if available, otherwise setTimeout
-        if ('requestIdleCallback' in window) {
-          requestIdleCallback(loadAnalytics, { timeout: 2000 });
-        } else {
-          setTimeout(loadAnalytics, 1000);
-        }
-      }
-
-      // Initialize analytics after a delay to not block initial render
-      initGoogleAnalytics();
-
-      // Function to show privacy notice
-      function showPrivacyNotice() {
-        const notice = document.createElement('div');
-        notice.style.cssText = `
-          position: fixed;
-          bottom: 16px;
-          right: 16px;
-          background: #222;
-          color: #f5f5f5;
-          padding: 12px 16px 10px 16px;
-          border-radius: 7px;
-          box-shadow: 0 2px 8px rgba(0,0,0,0.18);
-          z-index: 1000;
-          max-width: 320px;
-          font-family: Inter, sans-serif;
-          border: 1px solid #333;
-          font-size: 0.95rem;
-        `;
-        notice.innerHTML = `
-          <div style="margin-bottom: 6px; font-weight: 600; color: #fff; font-size: 1rem;">Analytics Notice</div>
-          <div style="margin-bottom: 8px; color: #f5f5f5;">This app uses Google Analytics for anonymous usage stats. No personal data is tracked.</div>
-          <button id="analytics-notice-btn" style="padding: 5px 14px; background: #1890ff; color: white; border: none; border-radius: 3px; cursor: pointer; font-size: 0.95rem;">Got it</button>
-        `;
-        document.body.appendChild(notice);
-        // Add event listener to button
-        const btn = notice.querySelector('#analytics-notice-btn');
-        btn.addEventListener('click', function (e) {
-          e.preventDefault();
-          localStorage.setItem('privacyNoticeShown', 'true');
-          notice.remove();
-        });
-      }
-
-      // Wait for DOM to be ready
-      document.addEventListener('DOMContentLoaded', function () {
-        // Check if we should show the notice
-        const isProduction =
-          window.location.hostname === 'worklenz.com' ||
-          window.location.hostname === 'app.worklenz.com';
-        const noticeShown = localStorage.getItem('privacyNoticeShown') === 'true';
-
-        // Show notice if not in production and not shown before
-        if (!isProduction && !noticeShown) {
-          showPrivacyNotice();
-        }
-      });
-    </script>
+    <!-- Analytics Module -->
+    <script src="/js/analytics.js"></script>
   </head>
 
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="root"></div>
     <script type="module" src="./src/index.tsx"></script>
-    <script type="text/javascript">
-      // Load HubSpot script asynchronously and only for production
-      if (window.location.hostname === 'app.worklenz.com') {
-        // Use requestIdleCallback to defer HubSpot loading
-        const loadHubSpot = () => {
-          var hs = document.createElement('script');
-          hs.type = 'text/javascript';
-          hs.id = 'hs-script-loader';
-          hs.async = true;
-          hs.defer = true;
-          hs.src = '//js.hs-scripts.com/22348300.js';
-          document.body.appendChild(hs);
-        };
-
-        if ('requestIdleCallback' in window) {
-          requestIdleCallback(loadHubSpot, { timeout: 3000 });
-        } else {
-          setTimeout(loadHubSpot, 2000);
-        }
-      }
-    </script>
+    <!-- HubSpot Integration Module -->
+    <script src="/js/hubspot.js"></script>
   </body>
 </html>
diff --git a/worklenz-frontend/public/js/analytics.js b/worklenz-frontend/public/js/analytics.js
new file mode 100644
index 00000000..90a4f2d7
--- /dev/null
+++ b/worklenz-frontend/public/js/analytics.js
@@ -0,0 +1,97 @@
+/**
+ * Google Analytics initialization module
+ * Handles analytics loading and privacy notices
+ */
+
+class AnalyticsManager {
+  constructor() {
+    this.isProduction = window.location.hostname === 'app.worklenz.com';
+    this.trackingId = this.isProduction ? 'G-7KSRKQ1397' : 'G-3LM2HGWEXG';
+  }
+
+  /**
+   * Initialize Google Analytics asynchronously
+   */
+  init() {
+    const loadAnalytics = () => {
+      // Load the Google Analytics script
+      const script = document.createElement('script');
+      script.async = true;
+      script.src = `https://www.googletagmanager.com/gtag/js?id=${this.trackingId}`;
+      document.head.appendChild(script);
+
+      // Initialize Google Analytics
+      window.dataLayer = window.dataLayer || [];
+      function gtag() {
+        dataLayer.push(arguments);
+      }
+      gtag('js', new Date());
+      gtag('config', this.trackingId);
+    };
+
+    // Use requestIdleCallback if available, otherwise setTimeout
+    if ('requestIdleCallback' in window) {
+      requestIdleCallback(loadAnalytics, { timeout: 2000 });
+    } else {
+      setTimeout(loadAnalytics, 1000);
+    }
+  }
+
+  /**
+   * Show privacy notice for non-production environments
+   */
+  showPrivacyNotice() {
+    const notice = document.createElement('div');
+    notice.style.cssText = `
+      position: fixed;
+      bottom: 16px;
+      right: 16px;
+      background: #222;
+      color: #f5f5f5;
+      padding: 12px 16px 10px 16px;
+      border-radius: 7px;
+      box-shadow: 0 2px 8px rgba(0,0,0,0.18);
+      z-index: 1000;
+      max-width: 320px;
+      font-family: Inter, sans-serif;
+      border: 1px solid #333;
+      font-size: 0.95rem;
+    `;
+    notice.innerHTML = `
+      <div style="margin-bottom: 6px; font-weight: 600; color: #fff; font-size: 1rem;">Analytics Notice</div>
+      <div style="margin-bottom: 8px; color: #f5f5f5;">This app uses Google Analytics for anonymous usage stats. No personal data is tracked.</div>
+      <button id="analytics-notice-btn" style="padding: 5px 14px; background: #1890ff; color: white; border: none; border-radius: 3px; cursor: pointer; font-size: 0.95rem;">Got it</button>
+    `;
+    document.body.appendChild(notice);
+
+    // Add event listener to button
+    const btn = notice.querySelector('#analytics-notice-btn');
+    btn.addEventListener('click', (e) => {
+      e.preventDefault();
+      localStorage.setItem('privacyNoticeShown', 'true');
+      notice.remove();
+    });
+  }
+
+  /**
+   * Check if privacy notice should be shown
+   */
+  checkPrivacyNotice() {
+    const isProduction = 
+      window.location.hostname === 'worklenz.com' ||
+      window.location.hostname === 'app.worklenz.com';
+    const noticeShown = localStorage.getItem('privacyNoticeShown') === 'true';
+
+    // Show notice if not in production and not shown before
+    if (!isProduction && !noticeShown) {
+      this.showPrivacyNotice();
+    }
+  }
+}
+
+// Initialize analytics when DOM is ready
+document.addEventListener('DOMContentLoaded', () => {
+  const analytics = new AnalyticsManager();
+  analytics.init();
+  analytics.checkPrivacyNotice();
+});
\ No newline at end of file
diff --git a/worklenz-frontend/public/js/hubspot.js b/worklenz-frontend/public/js/hubspot.js
new file mode 100644
index 00000000..d1a3afee
--- /dev/null
+++ b/worklenz-frontend/public/js/hubspot.js
@@ -0,0 +1,137 @@
+/**
+ * HubSpot Chat Widget integration module
+ * Handles widget loading and dark mode theming
+ */
+
+class HubSpotManager {
+  constructor() {
+    this.isProduction = window.location.hostname === 'app.worklenz.com';
+    this.scriptId = 'hs-script-loader';
+    this.scriptSrc = '//js.hs-scripts.com/22348300.js';
+    this.styleId = 'hubspot-dark-mode-override';
+  }
+
+  /**
+   * Load HubSpot script with dark mode support
+   */
+  init() {
+    if (!this.isProduction) return;
+
+    const loadHubSpot = () => {
+      const script = document.createElement('script');
+      script.type = 'text/javascript';
+      script.id = this.scriptId;
+      script.async = true;
+      script.defer = true;
+      script.src = this.scriptSrc;
+      
+      // Configure dark mode after script loads
+      script.onload = () => this.setupDarkModeSupport();
+      
+      document.body.appendChild(script);
+    };
+
+    // Use requestIdleCallback for better performance
+    if ('requestIdleCallback' in window) {
+      requestIdleCallback(loadHubSpot, { timeout: 3000 });
+    } else {
+      setTimeout(loadHubSpot, 2000);
+    }
+  }
+
+  /**
+   * Setup dark mode theme switching for HubSpot widget
+   */
+  setupDarkModeSupport() {
+    const applyTheme = () => {
+      const isDark = document.documentElement.classList.contains('dark');
+      
+      // Remove existing theme styles
+      const existingStyle = document.getElementById(this.styleId);
+      if (existingStyle) {
+        existingStyle.remove();
+      }
+      
+      if (isDark) {
+        this.injectDarkModeCSS();
+      }
+    };
+    
+    // Apply initial theme after delay to ensure widget is loaded
+    setTimeout(applyTheme, 1000);
+    
+    // Watch for theme changes
+    const observer = new MutationObserver(applyTheme);
+    observer.observe(document.documentElement, {
+      attributes: true,
+      attributeFilter: ['class']
+    });
+  }
+
+  /**
+   * Inject CSS for dark mode styling
+   */
+  injectDarkModeCSS() {
+    const style = document.createElement('style');
+    style.id = this.styleId;
+    style.textContent = `
+      /* HubSpot Chat Widget Dark Mode Override */
+      #hubspot-conversations-inline-parent,
+      #hubspot-conversations-iframe-container,
+      .shadow-2xl.widget-align-right.widget-align-bottom,
+      [data-test-id="chat-widget"],
+      [class*="VizExCollapsedChat"],
+      [class*="VizExExpandedChat"],
+      iframe[src*="hubspot"] {
+        filter: invert(1) hue-rotate(180deg) !important;
+        background: transparent !important;
+      }
+      
+      /* Target HubSpot widget container backgrounds */
+      #hubspot-conversations-inline-parent div,
+      #hubspot-conversations-iframe-container div,
+      [data-test-id="chat-widget"] div {
+        background-color: transparent !important;
+      }
+      
+      /* Prevent double inversion of images, avatars, and icons */
+      #hubspot-conversations-iframe-container img,
+      #hubspot-conversations-iframe-container [style*="background-image"],
+      #hubspot-conversations-iframe-container svg,
+      iframe[src*="hubspot"] img,
+      iframe[src*="hubspot"] svg,
+      [data-test-id="chat-widget"] img,
+      [data-test-id="chat-widget"] svg {
+        filter: invert(1) hue-rotate(180deg) !important;
+      }
+      
+      /* Additional targeting for widget launcher and chat bubble */
+      div[class*="shadow-2xl"],
+      div[class*="widget-align"],
+      div[style*="position: fixed"] {
+        filter: invert(1) hue-rotate(180deg) !important;
+      }
+    `;
+    document.head.appendChild(style);
+  }
+
+  /**
+   * Remove HubSpot widget and associated styles
+   */
+  cleanup() {
+    const script = document.getElementById(this.scriptId);
+    const style = document.getElementById(this.styleId);
+    
+    if (script) script.remove();
+    if (style) style.remove();
+  }
+}
+
+// Initialize HubSpot integration
+document.addEventListener('DOMContentLoaded', () => {
+  const hubspot = new HubSpotManager();
+  hubspot.init();
+  
+  // Make available globally for potential cleanup
+  window.HubSpotManager = hubspot;
+});
\ No newline at end of file
diff --git a/worklenz-frontend/src/layouts/MainLayout.tsx b/worklenz-frontend/src/layouts/MainLayout.tsx
index d861be23..b1c6a7d3 100644
--- a/worklenz-frontend/src/layouts/MainLayout.tsx
+++ b/worklenz-frontend/src/layouts/MainLayout.tsx
@@ -1,15 +1,13 @@
 import { Col, ConfigProvider, Layout } from '@/shared/antd-imports';
-import { Outlet, useNavigate } from 'react-router-dom';
+import { Outlet } from 'react-router-dom';
 import { memo, useMemo, useEffect, useRef } from 'react';
 import { useMediaQuery } from 'react-responsive';
 
 import Navbar from '../features/navbar/navbar';
 import { useAppSelector } from '../hooks/useAppSelector';
-import { useAppDispatch } from '../hooks/useAppDispatch';
 import { colors } from '../styles/colors';
 
 import { useRenderPerformance } from '@/utils/performance';
-import HubSpot from '@/components/HubSpot';
 import { DynamicCSSLoader, LayoutStabilizer } from '@/utils/css-optimizations';
 
 const MainLayout = memo(() => {