diff --git a/apps/space/core/components/account/user-logged-in.tsx b/apps/space/core/components/account/user-logged-in.tsx
index 76ab06fcf..51175c16a 100644
--- a/apps/space/core/components/account/user-logged-in.tsx
+++ b/apps/space/core/components/account/user-logged-in.tsx
@@ -2,7 +2,7 @@
import { observer } from "mobx-react";
import Image from "next/image";
-import { PlaneLockup } from "@plane/ui";
+import { PlaneLockup } from "@plane/propel/icons";
// components
import { PoweredBy } from "@/components/common/powered-by";
import { UserAvatar } from "@/components/issues/navbar/user-avatar";
diff --git a/apps/space/core/components/common/powered-by.tsx b/apps/space/core/components/common/powered-by.tsx
index 073937e83..be4e5bf73 100644
--- a/apps/space/core/components/common/powered-by.tsx
+++ b/apps/space/core/components/common/powered-by.tsx
@@ -3,7 +3,7 @@
import { FC } from "react";
import { WEBSITE_URL } from "@plane/constants";
// assets
-import { PlaneLogo } from "@plane/ui";
+import { PlaneLogo } from "@plane/propel/icons";
type TPoweredBy = {
disabled?: boolean;
diff --git a/apps/space/core/components/issues/filters/applied-filters/priority.tsx b/apps/space/core/components/issues/filters/applied-filters/priority.tsx
index 33af39e21..7fdf900bb 100644
--- a/apps/space/core/components/issues/filters/applied-filters/priority.tsx
+++ b/apps/space/core/components/issues/filters/applied-filters/priority.tsx
@@ -1,7 +1,7 @@
"use client";
import { X } from "lucide-react";
-import { PriorityIcon, type TIssuePriorities } from "@plane/ui";
+import { PriorityIcon, type TIssuePriorities } from "@plane/propel/icons";
type Props = {
handleRemove: (val: string) => void;
diff --git a/apps/space/core/components/issues/filters/applied-filters/state.tsx b/apps/space/core/components/issues/filters/applied-filters/state.tsx
index 70ebd14dd..c80c8688a 100644
--- a/apps/space/core/components/issues/filters/applied-filters/state.tsx
+++ b/apps/space/core/components/issues/filters/applied-filters/state.tsx
@@ -4,7 +4,7 @@ import { observer } from "mobx-react";
import { X } from "lucide-react";
// plane imports
import { EIconSize } from "@plane/constants";
-import { StateGroupIcon } from "@plane/ui";
+import { StateGroupIcon } from "@plane/propel/icons";
// hooks
import { useStates } from "@/hooks/store/use-state";
diff --git a/apps/space/core/components/issues/filters/priority.tsx b/apps/space/core/components/issues/filters/priority.tsx
index 76851ee0a..674b052f5 100644
--- a/apps/space/core/components/issues/filters/priority.tsx
+++ b/apps/space/core/components/issues/filters/priority.tsx
@@ -5,7 +5,7 @@ import { observer } from "mobx-react";
// plane imports
import { ISSUE_PRIORITY_FILTERS } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
-import { PriorityIcon } from "@plane/ui";
+import { PriorityIcon } from "@plane/propel/icons";
// local imports
import { FilterHeader } from "./helpers/filter-header";
import { FilterOption } from "./helpers/filter-option";
diff --git a/apps/space/core/components/issues/filters/state.tsx b/apps/space/core/components/issues/filters/state.tsx
index 865878c52..a794d532a 100644
--- a/apps/space/core/components/issues/filters/state.tsx
+++ b/apps/space/core/components/issues/filters/state.tsx
@@ -4,7 +4,8 @@ import React, { useState } from "react";
import { observer } from "mobx-react";
// ui
import { EIconSize } from "@plane/constants";
-import { Loader, StateGroupIcon } from "@plane/ui";
+import { StateGroupIcon } from "@plane/propel/icons";
+import { Loader } from "@plane/ui";
// hooks
import { useStates } from "@/hooks/store/use-state";
// local imports
diff --git a/apps/space/core/components/issues/issue-layouts/properties/cycle.tsx b/apps/space/core/components/issues/issue-layouts/properties/cycle.tsx
index d9bc971a9..c58badcf9 100644
--- a/apps/space/core/components/issues/issue-layouts/properties/cycle.tsx
+++ b/apps/space/core/components/issues/issue-layouts/properties/cycle.tsx
@@ -2,8 +2,8 @@
import { observer } from "mobx-react";
// plane ui
+import { ContrastIcon } from "@plane/propel/icons";
import { Tooltip } from "@plane/propel/tooltip";
-import { ContrastIcon } from "@plane/ui";
// plane utils
import { cn } from "@plane/utils";
//hooks
diff --git a/apps/space/core/components/issues/issue-layouts/properties/modules.tsx b/apps/space/core/components/issues/issue-layouts/properties/modules.tsx
index 834cdc4ae..c5e250f08 100644
--- a/apps/space/core/components/issues/issue-layouts/properties/modules.tsx
+++ b/apps/space/core/components/issues/issue-layouts/properties/modules.tsx
@@ -2,8 +2,8 @@
import { observer } from "mobx-react";
// plane ui
+import { DiceIcon } from "@plane/propel/icons";
import { Tooltip } from "@plane/propel/tooltip";
-import { DiceIcon } from "@plane/ui";
// plane utils
import { cn } from "@plane/utils";
// hooks
diff --git a/apps/space/core/components/issues/issue-layouts/properties/priority.tsx b/apps/space/core/components/issues/issue-layouts/properties/priority.tsx
index 36b132ea0..8514c0595 100644
--- a/apps/space/core/components/issues/issue-layouts/properties/priority.tsx
+++ b/apps/space/core/components/issues/issue-layouts/properties/priority.tsx
@@ -3,9 +3,9 @@
import { SignalHigh } from "lucide-react";
import { useTranslation } from "@plane/i18n";
// types
+import { PriorityIcon } from "@plane/propel/icons";
import { Tooltip } from "@plane/propel/tooltip";
import { TIssuePriorities } from "@plane/types";
-import { PriorityIcon } from "@plane/ui";
// constants
import { cn, getIssuePriorityFilters } from "@plane/utils";
diff --git a/apps/space/core/components/issues/issue-layouts/properties/state.tsx b/apps/space/core/components/issues/issue-layouts/properties/state.tsx
index 76754be3d..2613adc4d 100644
--- a/apps/space/core/components/issues/issue-layouts/properties/state.tsx
+++ b/apps/space/core/components/issues/issue-layouts/properties/state.tsx
@@ -2,8 +2,8 @@
import { observer } from "mobx-react";
// plane ui
+import { StateGroupIcon } from "@plane/propel/icons";
import { Tooltip } from "@plane/propel/tooltip";
-import { StateGroupIcon } from "@plane/ui";
// plane utils
import { cn } from "@plane/utils";
//hooks
diff --git a/apps/space/core/components/issues/issue-layouts/utils.tsx b/apps/space/core/components/issues/issue-layouts/utils.tsx
index 335c8f210..4733dc78a 100644
--- a/apps/space/core/components/issues/issue-layouts/utils.tsx
+++ b/apps/space/core/components/issues/issue-layouts/utils.tsx
@@ -4,6 +4,7 @@ import isNil from "lodash/isNil";
import { ContrastIcon } from "lucide-react";
// types
import { EIconSize, ISSUE_PRIORITIES } from "@plane/constants";
+import { CycleGroupIcon, DiceIcon, PriorityIcon, StateGroupIcon } from "@plane/propel/icons";
import {
GroupByColumnTypes,
IGroupByColumn,
@@ -12,7 +13,7 @@ import {
TGroupedIssues,
} from "@plane/types";
// ui
-import { Avatar, CycleGroupIcon, DiceIcon, PriorityIcon, StateGroupIcon } from "@plane/ui";
+import { Avatar } from "@plane/ui";
// components
// constants
// stores
diff --git a/apps/space/core/components/issues/peek-overview/header.tsx b/apps/space/core/components/issues/peek-overview/header.tsx
index 9795e530f..4791f1749 100644
--- a/apps/space/core/components/issues/peek-overview/header.tsx
+++ b/apps/space/core/components/issues/peek-overview/header.tsx
@@ -5,7 +5,8 @@ import { observer } from "mobx-react";
import { Link2, MoveRight } from "lucide-react";
import { Listbox, Transition } from "@headlessui/react";
// ui
-import { CenterPanelIcon, FullScreenPanelIcon, setToast, SidePanelIcon, TOAST_TYPE } from "@plane/ui";
+import { CenterPanelIcon, FullScreenPanelIcon, SidePanelIcon } from "@plane/propel/icons";
+import { setToast, TOAST_TYPE } from "@plane/ui";
// helpers
import { copyTextToClipboard } from "@/helpers/string.helper";
// hooks
diff --git a/apps/space/core/components/issues/peek-overview/issue-properties.tsx b/apps/space/core/components/issues/peek-overview/issue-properties.tsx
index f0e7eb77c..3bee765ca 100644
--- a/apps/space/core/components/issues/peek-overview/issue-properties.tsx
+++ b/apps/space/core/components/issues/peek-overview/issue-properties.tsx
@@ -5,7 +5,8 @@ import { useParams } from "next/navigation";
import { CalendarCheck2, Signal } from "lucide-react";
// plane imports
import { useTranslation } from "@plane/i18n";
-import { DoubleCircleIcon, StateGroupIcon, TOAST_TYPE, setToast } from "@plane/ui";
+import { DoubleCircleIcon, StateGroupIcon } from "@plane/propel/icons";
+import { TOAST_TYPE, setToast } from "@plane/ui";
import { cn, getIssuePriorityFilters } from "@plane/utils";
// components
import { Icon } from "@/components/ui";
diff --git a/apps/space/core/components/views/header.tsx b/apps/space/core/components/views/header.tsx
index 13f037e5b..80ba76de9 100644
--- a/apps/space/core/components/views/header.tsx
+++ b/apps/space/core/components/views/header.tsx
@@ -2,7 +2,7 @@
import React from "react";
import Link from "next/link";
-import { PlaneLockup } from "@plane/ui";
+import { PlaneLockup } from "@plane/propel/icons";
export const AuthHeader = () => (
diff --git a/apps/web/app/(all)/[workspaceSlug]/(projects)/active-cycles/header.tsx b/apps/web/app/(all)/[workspaceSlug]/(projects)/active-cycles/header.tsx
index 6215ec328..d147d0ed1 100644
--- a/apps/web/app/(all)/[workspaceSlug]/(projects)/active-cycles/header.tsx
+++ b/apps/web/app/(all)/[workspaceSlug]/(projects)/active-cycles/header.tsx
@@ -2,7 +2,8 @@
import { observer } from "mobx-react";
import { useTranslation } from "@plane/i18n";
// ui
-import { Breadcrumbs, ContrastIcon, Header } from "@plane/ui";
+import { ContrastIcon } from "@plane/propel/icons";
+import { Breadcrumbs, Header } from "@plane/ui";
// components
import { BreadcrumbLink } from "@/components/common/breadcrumb-link";
// plane web components
diff --git a/apps/web/app/(all)/[workspaceSlug]/(projects)/profile/[userId]/header.tsx b/apps/web/app/(all)/[workspaceSlug]/(projects)/profile/[userId]/header.tsx
index 545ad9ed3..8e839c0ee 100644
--- a/apps/web/app/(all)/[workspaceSlug]/(projects)/profile/[userId]/header.tsx
+++ b/apps/web/app/(all)/[workspaceSlug]/(projects)/profile/[userId]/header.tsx
@@ -8,8 +8,9 @@ import { useParams } from "next/navigation";
import { ChevronDown, PanelRight } from "lucide-react";
import { PROFILE_VIEWER_TAB, PROFILE_ADMINS_TAB, EUserPermissions, EUserPermissionsLevel } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
+import { UserActivityIcon } from "@plane/propel/icons";
import { IUserProfileProjectSegregation } from "@plane/types";
-import { Breadcrumbs, Header, CustomMenu, UserActivityIcon } from "@plane/ui";
+import { Breadcrumbs, Header, CustomMenu } from "@plane/ui";
import { cn } from "@plane/utils";
// components
import { BreadcrumbLink } from "@/components/common/breadcrumb-link";
diff --git a/apps/web/app/(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/archives/header.tsx b/apps/web/app/(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/archives/header.tsx
index 466eb0f71..0f6606ba3 100644
--- a/apps/web/app/(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/archives/header.tsx
+++ b/apps/web/app/(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/archives/header.tsx
@@ -3,10 +3,11 @@
import { FC } from "react";
import { observer } from "mobx-react";
import { useParams } from "next/navigation";
+import { ArchiveIcon, ContrastIcon, DiceIcon, LayersIcon } from "@plane/propel/icons";
import { Tooltip } from "@plane/propel/tooltip";
import { EIssuesStoreType } from "@plane/types";
// ui
-import { ArchiveIcon, Breadcrumbs, Header, ContrastIcon, DiceIcon, LayersIcon } from "@plane/ui";
+import { Breadcrumbs, Header } from "@plane/ui";
// components
import { BreadcrumbLink } from "@/components/common/breadcrumb-link";
// hooks
diff --git a/apps/web/app/(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/archives/issues/(detail)/header.tsx b/apps/web/app/(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/archives/issues/(detail)/header.tsx
index c2e0e9c42..fbfce0d00 100644
--- a/apps/web/app/(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/archives/issues/(detail)/header.tsx
+++ b/apps/web/app/(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/archives/issues/(detail)/header.tsx
@@ -4,7 +4,8 @@ import { observer } from "mobx-react";
import { useParams } from "next/navigation";
import useSWR from "swr";
// ui
-import { ArchiveIcon, Breadcrumbs, LayersIcon, Header } from "@plane/ui";
+import { ArchiveIcon, LayersIcon } from "@plane/propel/icons";
+import { Breadcrumbs, Header } from "@plane/ui";
// components
import { BreadcrumbLink } from "@/components/common/breadcrumb-link";
import { IssueDetailQuickActions } from "@/components/issues/issue-detail/issue-detail-quick-actions";
diff --git a/apps/web/app/(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(detail)/header.tsx b/apps/web/app/(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(detail)/header.tsx
index 1d8964322..7fe963c84 100644
--- a/apps/web/app/(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(detail)/header.tsx
+++ b/apps/web/app/(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(detail)/header.tsx
@@ -16,6 +16,7 @@ import {
} from "@plane/constants";
import { usePlatformOS } from "@plane/hooks";
import { useTranslation } from "@plane/i18n";
+import { ContrastIcon } from "@plane/propel/icons";
import { Tooltip } from "@plane/propel/tooltip";
import {
EIssuesStoreType,
@@ -25,7 +26,7 @@ import {
IIssueFilterOptions,
EIssueLayoutTypes,
} from "@plane/types";
-import { Breadcrumbs, Button, ContrastIcon, BreadcrumbNavigationSearchDropdown, Header } from "@plane/ui";
+import { Breadcrumbs, Button, BreadcrumbNavigationSearchDropdown, Header } from "@plane/ui";
import { cn, isIssueFilterActive } from "@plane/utils";
// components
import { WorkItemsModal } from "@/components/analytics/work-items/modal";
diff --git a/apps/web/app/(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/modules/(detail)/header.tsx b/apps/web/app/(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/modules/(detail)/header.tsx
index fdeb77449..3a1b477b5 100644
--- a/apps/web/app/(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/modules/(detail)/header.tsx
+++ b/apps/web/app/(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/modules/(detail)/header.tsx
@@ -14,6 +14,7 @@ import {
EProjectFeatureKey,
WORK_ITEM_TRACKER_ELEMENTS,
} from "@plane/constants";
+import { DiceIcon } from "@plane/propel/icons";
import { Tooltip } from "@plane/propel/tooltip";
import {
EIssuesStoreType,
@@ -23,7 +24,7 @@ import {
IIssueFilterOptions,
EIssueLayoutTypes,
} from "@plane/types";
-import { Breadcrumbs, Button, DiceIcon, Header, BreadcrumbNavigationSearchDropdown } from "@plane/ui";
+import { Breadcrumbs, Button, Header, BreadcrumbNavigationSearchDropdown } from "@plane/ui";
import { cn, isIssueFilterActive } from "@plane/utils";
// components
import { WorkItemsModal } from "@/components/analytics/work-items/modal";
diff --git a/apps/web/app/(all)/[workspaceSlug]/(projects)/stickies/header.tsx b/apps/web/app/(all)/[workspaceSlug]/(projects)/stickies/header.tsx
index 1b4b1a236..08a216ab1 100644
--- a/apps/web/app/(all)/[workspaceSlug]/(projects)/stickies/header.tsx
+++ b/apps/web/app/(all)/[workspaceSlug]/(projects)/stickies/header.tsx
@@ -3,7 +3,8 @@
import { observer } from "mobx-react";
import { useParams } from "next/navigation";
// plane imports
-import { Breadcrumbs, Button, Header, RecentStickyIcon } from "@plane/ui";
+import { RecentStickyIcon } from "@plane/propel/icons";
+import { Breadcrumbs, Button, Header } from "@plane/ui";
// components
import { BreadcrumbLink } from "@/components/common/breadcrumb-link";
import { StickySearch } from "@/components/stickies/modal/search";
diff --git a/apps/web/app/(all)/create-workspace/page.tsx b/apps/web/app/(all)/create-workspace/page.tsx
index e715f8379..92c2ba3e1 100644
--- a/apps/web/app/(all)/create-workspace/page.tsx
+++ b/apps/web/app/(all)/create-workspace/page.tsx
@@ -6,8 +6,9 @@ import Image from "next/image";
import Link from "next/link";
// plane imports
import { useTranslation } from "@plane/i18n";
+import { PlaneLogo } from "@plane/propel/icons";
import { IWorkspace } from "@plane/types";
-import { Button, getButtonStyling, PlaneLogo } from "@plane/ui";
+import { Button, getButtonStyling } from "@plane/ui";
// components
import { CreateWorkspaceForm } from "@/components/workspace/create-workspace-form";
// hooks
diff --git a/apps/web/app/(all)/invitations/page.tsx b/apps/web/app/(all)/invitations/page.tsx
index 3ac1ce86e..82201b0f2 100644
--- a/apps/web/app/(all)/invitations/page.tsx
+++ b/apps/web/app/(all)/invitations/page.tsx
@@ -10,9 +10,10 @@ import { CheckCircle2 } from "lucide-react";
import { ROLE, MEMBER_TRACKER_EVENTS, MEMBER_TRACKER_ELEMENTS, GROUP_WORKSPACE_TRACKER_EVENT } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
// types
+import { PlaneLogo } from "@plane/propel/icons";
import type { IWorkspaceMemberInvitation } from "@plane/types";
// ui
-import { Button, TOAST_TYPE, setToast, PlaneLogo } from "@plane/ui";
+import { Button, TOAST_TYPE, setToast } from "@plane/ui";
import { truncateText } from "@plane/utils";
// components
import { EmptyState } from "@/components/common/empty-state";
diff --git a/apps/web/ce/components/breadcrumbs/project-feature.tsx b/apps/web/ce/components/breadcrumbs/project-feature.tsx
index db51f3e85..ba67aa9cb 100644
--- a/apps/web/ce/components/breadcrumbs/project-feature.tsx
+++ b/apps/web/ce/components/breadcrumbs/project-feature.tsx
@@ -4,7 +4,8 @@ import { FC } from "react";
import { observer } from "mobx-react";
// plane imports
import { EProjectFeatureKey } from "@plane/constants";
-import { BreadcrumbNavigationDropdown, Breadcrumbs, ISvgIcons } from "@plane/ui";
+import { ISvgIcons } from "@plane/propel/icons";
+import { BreadcrumbNavigationDropdown, Breadcrumbs } from "@plane/ui";
// components
import { SwitcherLabel } from "@/components/common/switcher-label";
import type { TNavigationItem } from "@/components/workspace/sidebar/project-navigation";
diff --git a/apps/web/ce/components/command-palette/actions/work-item-actions/change-state-list.tsx b/apps/web/ce/components/command-palette/actions/work-item-actions/change-state-list.tsx
index d5bc3aba1..fb3595d56 100644
--- a/apps/web/ce/components/command-palette/actions/work-item-actions/change-state-list.tsx
+++ b/apps/web/ce/components/command-palette/actions/work-item-actions/change-state-list.tsx
@@ -3,7 +3,8 @@ import { observer } from "mobx-react";
import { Check } from "lucide-react";
// plane imports
import { EIconSize } from "@plane/constants";
-import { Spinner, StateGroupIcon } from "@plane/ui";
+import { StateGroupIcon } from "@plane/propel/icons";
+import { Spinner } from "@plane/ui";
// store hooks
import { useProjectState } from "@/hooks/store/use-project-state";
diff --git a/apps/web/ce/components/command-palette/helpers.tsx b/apps/web/ce/components/command-palette/helpers.tsx
index 7a5eb6802..d098b1a48 100644
--- a/apps/web/ce/components/command-palette/helpers.tsx
+++ b/apps/web/ce/components/command-palette/helpers.tsx
@@ -2,6 +2,7 @@
// types
import { Briefcase, FileText, Layers, LayoutGrid } from "lucide-react";
+import { ContrastIcon, DiceIcon } from "@plane/propel/icons";
import {
IWorkspaceDefaultSearchResult,
IWorkspaceIssueSearchResult,
@@ -10,7 +11,6 @@ import {
IWorkspaceSearchResult,
} from "@plane/types";
// ui
-import { ContrastIcon, DiceIcon } from "@plane/ui";
// helpers
import { generateWorkItemLink } from "@plane/utils";
// plane web components
diff --git a/apps/web/ce/components/global/product-updates-header.tsx b/apps/web/ce/components/global/product-updates-header.tsx
index 418a940a7..26d4ebbde 100644
--- a/apps/web/ce/components/global/product-updates-header.tsx
+++ b/apps/web/ce/components/global/product-updates-header.tsx
@@ -1,6 +1,6 @@
import { observer } from "mobx-react";
import { useTranslation } from "@plane/i18n";
-import { PlaneLogo } from "@plane/ui";
+import { PlaneLogo } from "@plane/propel/icons";
// helpers
import { cn } from "@plane/utils";
// package.json
diff --git a/apps/web/ce/components/issues/issue-layouts/utils.tsx b/apps/web/ce/components/issues/issue-layouts/utils.tsx
index c0b82ae95..fcf1cd91b 100644
--- a/apps/web/ce/components/issues/issue-layouts/utils.tsx
+++ b/apps/web/ce/components/issues/issue-layouts/utils.tsx
@@ -13,8 +13,8 @@ import {
Users,
} from "lucide-react";
// types
+import { DiceIcon, DoubleCircleIcon, ISvgIcons } from "@plane/propel/icons";
import { IGroupByColumn, IIssueDisplayProperties, TGetColumns, TSpreadsheetColumn } from "@plane/types";
-import { DiceIcon, DoubleCircleIcon, ISvgIcons } from "@plane/ui";
// components
import {
SpreadsheetAssigneeColumn,
diff --git a/apps/web/ce/components/projects/navigation/helper.tsx b/apps/web/ce/components/projects/navigation/helper.tsx
index ad3d4dd3b..b48668415 100644
--- a/apps/web/ce/components/projects/navigation/helper.tsx
+++ b/apps/web/ce/components/projects/navigation/helper.tsx
@@ -1,7 +1,7 @@
import { FileText, Layers } from "lucide-react";
// plane imports
import { EUserPermissions, EProjectFeatureKey } from "@plane/constants";
-import { ContrastIcon, DiceIcon, Intake, LayersIcon } from "@plane/ui";
+import { ContrastIcon, DiceIcon, LayersIcon, Intake } from "@plane/propel/icons";
// components
import type { TNavigationItem } from "@/components/workspace/sidebar/project-navigation";
diff --git a/apps/web/ce/components/relations/index.tsx b/apps/web/ce/components/relations/index.tsx
index b259a38d7..2a7ebf0eb 100644
--- a/apps/web/ce/components/relations/index.tsx
+++ b/apps/web/ce/components/relations/index.tsx
@@ -1,5 +1,5 @@
import { CircleDot, CopyPlus, XCircle } from "lucide-react";
-import { RelatedIcon } from "@plane/ui";
+import { RelatedIcon } from "@plane/propel/icons";
import type { TRelationObject } from "@/components/issues/issue-detail-widgets/relations";
import type { TIssueRelationTypes } from "../../types";
diff --git a/apps/web/ce/components/workspace/sidebar/helper.tsx b/apps/web/ce/components/workspace/sidebar/helper.tsx
index d00b0c361..0821a0ef4 100644
--- a/apps/web/ce/components/workspace/sidebar/helper.tsx
+++ b/apps/web/ce/components/workspace/sidebar/helper.tsx
@@ -1,5 +1,5 @@
import { BarChart2, Briefcase, Home, Inbox, Layers, PenSquare } from "lucide-react";
-import { ArchiveIcon, ContrastIcon, UserActivityIcon } from "@plane/ui";
+import { ArchiveIcon, ContrastIcon, UserActivityIcon } from "@plane/propel/icons";
import { cn } from "@plane/utils";
export const getSidebarNavigationItemIcon = (key: string, className: string = "") => {
diff --git a/apps/web/ce/constants/project/settings/features.tsx b/apps/web/ce/constants/project/settings/features.tsx
index 1441c70e2..3ad27ddbb 100644
--- a/apps/web/ce/constants/project/settings/features.tsx
+++ b/apps/web/ce/constants/project/settings/features.tsx
@@ -1,8 +1,8 @@
import { ReactNode } from "react";
import { FileText, Layers, Timer } from "lucide-react";
// plane imports
+import { ContrastIcon, DiceIcon, Intake } from "@plane/propel/icons";
import { IProject } from "@plane/types";
-import { ContrastIcon, DiceIcon, Intake } from "@plane/ui";
export type TProperties = {
key: string;
diff --git a/apps/web/ce/constants/sidebar-favorites.ts b/apps/web/ce/constants/sidebar-favorites.ts
index a6f49f8aa..4ad0c0463 100644
--- a/apps/web/ce/constants/sidebar-favorites.ts
+++ b/apps/web/ce/constants/sidebar-favorites.ts
@@ -1,7 +1,7 @@
import { Briefcase, FileText, Layers, LucideIcon } from "lucide-react";
// plane imports
+import { ContrastIcon, DiceIcon, FavoriteFolderIcon, ISvgIcons } from "@plane/propel/icons";
import { IFavorite } from "@plane/types";
-import { ContrastIcon, DiceIcon, FavoriteFolderIcon, ISvgIcons } from "@plane/ui";
export const FAVORITE_ITEM_ICONS: Record
| LucideIcon> = {
page: FileText,
diff --git a/apps/web/core/components/auth-screens/footer.tsx b/apps/web/core/components/auth-screens/footer.tsx
index 30ff878b5..fac043b3b 100644
--- a/apps/web/core/components/auth-screens/footer.tsx
+++ b/apps/web/core/components/auth-screens/footer.tsx
@@ -1,6 +1,6 @@
"use client";
import React from "react";
-import { AccentureLogo, DolbyLogo, SonyLogo, ZerodhaLogo } from "@plane/ui";
+import { AccentureLogo, DolbyLogo, SonyLogo, ZerodhaLogo } from "@plane/propel/icons";
const BRAND_LOGOS: {
id: string;
diff --git a/apps/web/core/components/auth-screens/header.tsx b/apps/web/core/components/auth-screens/header.tsx
index 7abaa79b0..c55265235 100644
--- a/apps/web/core/components/auth-screens/header.tsx
+++ b/apps/web/core/components/auth-screens/header.tsx
@@ -5,7 +5,7 @@ import { observer } from "mobx-react";
import Link from "next/link";
import { AUTH_TRACKER_ELEMENTS } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
-import { PlaneLockup } from "@plane/ui";
+import { PlaneLockup } from "@plane/propel/icons";
import { PageHead } from "@/components/core/page-title";
import { EAuthModes } from "@/helpers/authentication.helper";
import { useInstance } from "@/hooks/store/use-instance";
diff --git a/apps/web/core/components/automation/auto-close-automation.tsx b/apps/web/core/components/automation/auto-close-automation.tsx
index 82473a7a9..d223ddf3c 100644
--- a/apps/web/core/components/automation/auto-close-automation.tsx
+++ b/apps/web/core/components/automation/auto-close-automation.tsx
@@ -15,9 +15,10 @@ import {
PROJECT_SETTINGS_TRACKER_EVENTS,
} from "@plane/constants";
import { useTranslation } from "@plane/i18n";
+import { StateGroupIcon, DoubleCircleIcon } from "@plane/propel/icons";
import { IProject } from "@plane/types";
// ui
-import { CustomSelect, CustomSearchSelect, ToggleSwitch, StateGroupIcon, DoubleCircleIcon, Loader } from "@plane/ui";
+import { CustomSelect, CustomSearchSelect, ToggleSwitch, Loader } from "@plane/ui";
// component
import { SelectMonthModal } from "@/components/automation";
// constants
diff --git a/apps/web/core/components/command-palette/actions/help-actions.tsx b/apps/web/core/components/command-palette/actions/help-actions.tsx
index f68164f50..26eb13e29 100644
--- a/apps/web/core/components/command-palette/actions/help-actions.tsx
+++ b/apps/web/core/components/command-palette/actions/help-actions.tsx
@@ -3,7 +3,7 @@ import { Command } from "cmdk";
import { observer } from "mobx-react";
import { FileText, GithubIcon, MessageSquare, Rocket } from "lucide-react";
// ui
-import { DiscordIcon } from "@plane/ui";
+import { DiscordIcon } from "@plane/propel/icons";
// hooks
import { useCommandPalette } from "@/hooks/store/use-command-palette";
import { useTransient } from "@/hooks/store/use-transient";
diff --git a/apps/web/core/components/command-palette/actions/issue-actions/actions-list.tsx b/apps/web/core/components/command-palette/actions/issue-actions/actions-list.tsx
index 009f4fa8e..7b75fc1bd 100644
--- a/apps/web/core/components/command-palette/actions/issue-actions/actions-list.tsx
+++ b/apps/web/core/components/command-palette/actions/issue-actions/actions-list.tsx
@@ -4,9 +4,10 @@ import { Command } from "cmdk";
import { observer } from "mobx-react";
import { useParams } from "next/navigation";
import { LinkIcon, Signal, Trash2, UserMinus2, UserPlus2, Users } from "lucide-react";
+import { DoubleCircleIcon } from "@plane/propel/icons";
import { EIssueServiceType, TIssue } from "@plane/types";
// hooks
-import { DoubleCircleIcon, TOAST_TYPE, setToast } from "@plane/ui";
+import { TOAST_TYPE, setToast } from "@plane/ui";
// helpers
import { copyTextToClipboard } from "@plane/utils";
// hooks
diff --git a/apps/web/core/components/command-palette/actions/issue-actions/change-priority.tsx b/apps/web/core/components/command-palette/actions/issue-actions/change-priority.tsx
index 1eea7a3ce..ef89a0706 100644
--- a/apps/web/core/components/command-palette/actions/issue-actions/change-priority.tsx
+++ b/apps/web/core/components/command-palette/actions/issue-actions/change-priority.tsx
@@ -7,9 +7,9 @@ import { Check } from "lucide-react";
// plane constants
import { ISSUE_PRIORITIES } from "@plane/constants";
// plane types
+import { PriorityIcon } from "@plane/propel/icons";
import { EIssueServiceType, TIssue, TIssuePriorities } from "@plane/types";
// mobx store
-import { PriorityIcon } from "@plane/ui";
import { useIssueDetail } from "@/hooks/store/use-issue-detail";
// ui
// types
diff --git a/apps/web/core/components/command-palette/actions/project-actions.tsx b/apps/web/core/components/command-palette/actions/project-actions.tsx
index 59f77a3d6..9776db33d 100644
--- a/apps/web/core/components/command-palette/actions/project-actions.tsx
+++ b/apps/web/core/components/command-palette/actions/project-actions.tsx
@@ -9,7 +9,7 @@ import {
PROJECT_PAGE_TRACKER_ELEMENTS,
PROJECT_VIEW_TRACKER_ELEMENTS,
} from "@plane/constants";
-import { DiceIcon } from "@plane/ui";
+import { DiceIcon } from "@plane/propel/icons";
// hooks
import { useCommandPalette } from "@/hooks/store/use-command-palette";
// ui
diff --git a/apps/web/core/components/command-palette/command-modal.tsx b/apps/web/core/components/command-palette/command-modal.tsx
index 5cf56620a..e482438f6 100644
--- a/apps/web/core/components/command-palette/command-modal.tsx
+++ b/apps/web/core/components/command-palette/command-modal.tsx
@@ -16,8 +16,9 @@ import {
WORKSPACE_DEFAULT_SEARCH_RESULT,
} from "@plane/constants";
import { useTranslation } from "@plane/i18n";
+import { LayersIcon } from "@plane/propel/icons";
import { IWorkspaceSearchResults } from "@plane/types";
-import { LayersIcon, Loader, ToggleSwitch } from "@plane/ui";
+import { Loader, ToggleSwitch } from "@plane/ui";
import { cn, getTabIndex } from "@plane/utils";
// components
import {
diff --git a/apps/web/core/components/common/activity/helper.tsx b/apps/web/core/components/common/activity/helper.tsx
index b3d16e7d0..8ce307597 100644
--- a/apps/web/core/components/common/activity/helper.tsx
+++ b/apps/web/core/components/common/activity/helper.tsx
@@ -25,7 +25,7 @@ import {
} from "lucide-react";
// components
-import { ArchiveIcon, DoubleCircleIcon, ContrastIcon, DiceIcon, Intake } from "@plane/ui";
+import { ArchiveIcon, DoubleCircleIcon, ContrastIcon, DiceIcon, Intake } from "@plane/propel/icons";
import { store } from "@/lib/store-context";
import { TProjectActivity } from "@/plane-web/types";
diff --git a/apps/web/core/components/common/switcher-label.tsx b/apps/web/core/components/common/switcher-label.tsx
index 97f403f55..14ed1bb54 100644
--- a/apps/web/core/components/common/switcher-label.tsx
+++ b/apps/web/core/components/common/switcher-label.tsx
@@ -1,6 +1,6 @@
import { FC } from "react";
+import { ISvgIcons } from "@plane/propel/icons";
import { TLogoProps } from "@plane/types";
-import { ISvgIcons } from "@plane/ui";
import { getFileURL, truncateText } from "@plane/utils";
import { Logo } from "@/components/common/logo";
diff --git a/apps/web/core/components/core/activity.tsx b/apps/web/core/components/core/activity.tsx
index e0116958a..3c773899e 100644
--- a/apps/web/core/components/core/activity.tsx
+++ b/apps/web/core/components/core/activity.tsx
@@ -20,9 +20,9 @@ import {
MessageSquareIcon,
UsersIcon,
} from "lucide-react";
+import { BlockedIcon, BlockerIcon, RelatedIcon, LayersIcon, DiceIcon, EpicIcon, Intake } from "@plane/propel/icons";
import { Tooltip } from "@plane/propel/tooltip";
import { IIssueActivity } from "@plane/types";
-import { BlockedIcon, BlockerIcon, RelatedIcon, LayersIcon, DiceIcon, Intake, EpicIcon } from "@plane/ui";
import { renderFormattedDate, generateWorkItemLink, capitalizeFirstLetter } from "@plane/utils";
// helpers
import { useLabel } from "@/hooks/store/use-label";
diff --git a/apps/web/core/components/core/filters/date-filter-select.tsx b/apps/web/core/components/core/filters/date-filter-select.tsx
index 45c38c1c3..b3955d4ea 100644
--- a/apps/web/core/components/core/filters/date-filter-select.tsx
+++ b/apps/web/core/components/core/filters/date-filter-select.tsx
@@ -2,7 +2,8 @@
import React from "react";
import { CalendarDays } from "lucide-react";
// ui
-import { CustomSelect, CalendarAfterIcon, CalendarBeforeIcon } from "@plane/ui";
+import { CalendarAfterIcon, CalendarBeforeIcon } from "@plane/propel/icons";
+import { CustomSelect } from "@plane/ui";
type Props = {
title: string;
diff --git a/apps/web/core/components/cycles/active-cycle/cycle-stats.tsx b/apps/web/core/components/cycles/active-cycle/cycle-stats.tsx
index 2423abfbd..e0f71dc3d 100644
--- a/apps/web/core/components/cycles/active-cycle/cycle-stats.tsx
+++ b/apps/web/core/components/cycles/active-cycle/cycle-stats.tsx
@@ -8,10 +8,11 @@ import { CalendarCheck } from "lucide-react";
import { Tab } from "@headlessui/react";
// plane imports
import { useTranslation } from "@plane/i18n";
+import { PriorityIcon } from "@plane/propel/icons";
import { Tooltip } from "@plane/propel/tooltip";
import { EIssuesStoreType, ICycle, IIssueFilterOptions } from "@plane/types";
// ui
-import { Loader, PriorityIcon, Avatar } from "@plane/ui";
+import { Loader, Avatar } from "@plane/ui";
import { cn, renderFormattedDate, renderFormattedDateWithoutYear, getFileURL } from "@plane/utils";
// components
import { SingleProgressStats } from "@/components/core/sidebar/single-progress-stats";
diff --git a/apps/web/core/components/cycles/analytics-sidebar/progress-stats.tsx b/apps/web/core/components/cycles/analytics-sidebar/progress-stats.tsx
index b0de0ce24..65a1cd10f 100644
--- a/apps/web/core/components/cycles/analytics-sidebar/progress-stats.tsx
+++ b/apps/web/core/components/cycles/analytics-sidebar/progress-stats.tsx
@@ -6,6 +6,7 @@ import Image from "next/image";
import { Tab } from "@headlessui/react";
// plane imports
import { useTranslation } from "@plane/i18n";
+import { StateGroupIcon } from "@plane/propel/icons";
import {
IIssueFilterOptions,
IIssueFilters,
@@ -14,7 +15,7 @@ import {
TCyclePlotType,
TStateGroups,
} from "@plane/types";
-import { Avatar, StateGroupIcon } from "@plane/ui";
+import { Avatar } from "@plane/ui";
import { cn, getFileURL } from "@plane/utils";
// components
import { SingleProgressStats } from "@/components/core/sidebar/single-progress-stats";
diff --git a/apps/web/core/components/cycles/list/cycle-list-group-header.tsx b/apps/web/core/components/cycles/list/cycle-list-group-header.tsx
index 0d51a28ee..11e2f3968 100644
--- a/apps/web/core/components/cycles/list/cycle-list-group-header.tsx
+++ b/apps/web/core/components/cycles/list/cycle-list-group-header.tsx
@@ -3,9 +3,10 @@
import React, { FC } from "react";
import { ChevronDown } from "lucide-react";
// types
+import { CycleGroupIcon } from "@plane/propel/icons";
import { TCycleGroups } from "@plane/types";
// icons
-import { Row, CycleGroupIcon } from "@plane/ui";
+import { Row } from "@plane/ui";
// helpers
import { cn } from "@plane/utils";
diff --git a/apps/web/core/components/cycles/list/cycle-list-item-action.tsx b/apps/web/core/components/cycles/list/cycle-list-item-action.tsx
index 4bb048a7d..457854a3b 100644
--- a/apps/web/core/components/cycles/list/cycle-list-item-action.tsx
+++ b/apps/web/core/components/cycles/list/cycle-list-item-action.tsx
@@ -15,9 +15,10 @@ import {
} from "@plane/constants";
import { useLocalStorage } from "@plane/hooks";
import { useTranslation } from "@plane/i18n";
+import { LayersIcon, TransferIcon } from "@plane/propel/icons";
import { Tooltip } from "@plane/propel/tooltip";
import { ICycle, TCycleGroups } from "@plane/types";
-import { Avatar, AvatarGroup, FavoriteStar, LayersIcon, TransferIcon, setPromiseToast } from "@plane/ui";
+import { Avatar, AvatarGroup, FavoriteStar, setPromiseToast } from "@plane/ui";
import { getDate, getFileURL, generateQueryParams } from "@plane/utils";
// components
import { DateRangeDropdown } from "@/components/dropdowns/date-range";
diff --git a/apps/web/core/components/cycles/quick-actions.tsx b/apps/web/core/components/cycles/quick-actions.tsx
index e3d8e500b..778e78115 100644
--- a/apps/web/core/components/cycles/quick-actions.tsx
+++ b/apps/web/core/components/cycles/quick-actions.tsx
@@ -13,7 +13,8 @@ import {
CYCLE_TRACKER_ELEMENTS,
} from "@plane/constants";
import { useTranslation } from "@plane/i18n";
-import { ArchiveIcon, ContextMenu, CustomMenu, TContextMenuItem, TOAST_TYPE, setToast } from "@plane/ui";
+import { ArchiveIcon } from "@plane/propel/icons";
+import { ContextMenu, CustomMenu, TContextMenuItem, TOAST_TYPE, setToast } from "@plane/ui";
import { copyUrlToClipboard, cn } from "@plane/utils";
// helpers
// hooks
diff --git a/apps/web/core/components/cycles/transfer-issues-modal.tsx b/apps/web/core/components/cycles/transfer-issues-modal.tsx
index 9a96d0efe..e3a322eec 100644
--- a/apps/web/core/components/cycles/transfer-issues-modal.tsx
+++ b/apps/web/core/components/cycles/transfer-issues-modal.tsx
@@ -5,11 +5,12 @@ import { observer } from "mobx-react";
import { useParams } from "next/navigation";
import { AlertCircle, Search, X } from "lucide-react";
import { Dialog, Transition } from "@headlessui/react";
+import { ContrastIcon, TransferIcon } from "@plane/propel/icons";
import { EIssuesStoreType } from "@plane/types";
// hooks
// ui
//icons
-import { ContrastIcon, TransferIcon, TOAST_TYPE, setToast } from "@plane/ui";
+import { TOAST_TYPE, setToast } from "@plane/ui";
import { useCycle } from "@/hooks/store/use-cycle";
import { useIssues } from "@/hooks/store/use-issues";
//icons
diff --git a/apps/web/core/components/cycles/transfer-issues.tsx b/apps/web/core/components/cycles/transfer-issues.tsx
index bf5be1e74..467ec3082 100644
--- a/apps/web/core/components/cycles/transfer-issues.tsx
+++ b/apps/web/core/components/cycles/transfer-issues.tsx
@@ -2,7 +2,8 @@
import React from "react";
import { AlertCircle } from "lucide-react";
// ui
-import { Button, TransferIcon } from "@plane/ui";
+import { TransferIcon } from "@plane/propel/icons";
+import { Button } from "@plane/ui";
type Props = {
handleClick: () => void;
diff --git a/apps/web/core/components/dropdowns/cycle/cycle-options.tsx b/apps/web/core/components/dropdowns/cycle/cycle-options.tsx
index b6cf96d65..4c3a0effd 100644
--- a/apps/web/core/components/dropdowns/cycle/cycle-options.tsx
+++ b/apps/web/core/components/dropdowns/cycle/cycle-options.tsx
@@ -11,9 +11,9 @@ import { Combobox } from "@headlessui/react";
// i18n
import { useTranslation } from "@plane/i18n";
// icon
+import { ContrastIcon, CycleGroupIcon } from "@plane/propel/icons";
import { TCycleGroups } from "@plane/types";
// ui
-import { ContrastIcon, CycleGroupIcon } from "@plane/ui";
// store hooks
import { useCycle } from "@/hooks/store/use-cycle";
import { usePlatformOS } from "@/hooks/use-platform-os";
diff --git a/apps/web/core/components/dropdowns/cycle/index.tsx b/apps/web/core/components/dropdowns/cycle/index.tsx
index 7a30b583b..4326064e6 100644
--- a/apps/web/core/components/dropdowns/cycle/index.tsx
+++ b/apps/web/core/components/dropdowns/cycle/index.tsx
@@ -5,7 +5,8 @@ import { observer } from "mobx-react";
import { ChevronDown } from "lucide-react";
import { useTranslation } from "@plane/i18n";
// ui
-import { ComboDropDown, ContrastIcon } from "@plane/ui";
+import { ContrastIcon } from "@plane/propel/icons";
+import { ComboDropDown } from "@plane/ui";
// helpers
import { cn } from "@plane/utils";
// hooks
diff --git a/apps/web/core/components/dropdowns/module/button-content.tsx b/apps/web/core/components/dropdowns/module/button-content.tsx
index 7cf714be9..6b8ecc176 100644
--- a/apps/web/core/components/dropdowns/module/button-content.tsx
+++ b/apps/web/core/components/dropdowns/module/button-content.tsx
@@ -2,8 +2,8 @@
import { ChevronDown, X } from "lucide-react";
// plane imports
+import { DiceIcon } from "@plane/propel/icons";
import { Tooltip } from "@plane/propel/tooltip";
-import { DiceIcon } from "@plane/ui";
import { cn } from "@plane/utils";
// hooks
import { useModule } from "@/hooks/store/use-module";
diff --git a/apps/web/core/components/dropdowns/module/module-options.tsx b/apps/web/core/components/dropdowns/module/module-options.tsx
index 28f16839b..aab6568a2 100644
--- a/apps/web/core/components/dropdowns/module/module-options.tsx
+++ b/apps/web/core/components/dropdowns/module/module-options.tsx
@@ -8,8 +8,8 @@ import { Check, Search } from "lucide-react";
import { Combobox } from "@headlessui/react";
// plane imports
import { useTranslation } from "@plane/i18n";
+import { DiceIcon } from "@plane/propel/icons";
import { IModule } from "@plane/types";
-import { DiceIcon } from "@plane/ui";
import { cn } from "@plane/utils";
// hooks
import { usePlatformOS } from "@/hooks/use-platform-os";
diff --git a/apps/web/core/components/dropdowns/priority.tsx b/apps/web/core/components/dropdowns/priority.tsx
index 74e75d61c..d2485d112 100644
--- a/apps/web/core/components/dropdowns/priority.tsx
+++ b/apps/web/core/components/dropdowns/priority.tsx
@@ -8,10 +8,11 @@ import { Combobox } from "@headlessui/react";
import { ISSUE_PRIORITIES } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
// types
+import { PriorityIcon } from "@plane/propel/icons";
import { Tooltip } from "@plane/propel/tooltip";
import { TIssuePriorities } from "@plane/types";
// ui
-import { ComboDropDown, PriorityIcon } from "@plane/ui";
+import { ComboDropDown } from "@plane/ui";
// helpers
import { cn } from "@plane/utils";
// hooks
diff --git a/apps/web/core/components/dropdowns/state/base.tsx b/apps/web/core/components/dropdowns/state/base.tsx
index 3d17c0e27..0fd654d91 100644
--- a/apps/web/core/components/dropdowns/state/base.tsx
+++ b/apps/web/core/components/dropdowns/state/base.tsx
@@ -7,8 +7,9 @@ import { ChevronDown, Search } from "lucide-react";
import { Combobox } from "@headlessui/react";
// plane imports
import { useTranslation } from "@plane/i18n";
+import { StateGroupIcon } from "@plane/propel/icons";
import { IState } from "@plane/types";
-import { ComboDropDown, Spinner, StateGroupIcon } from "@plane/ui";
+import { ComboDropDown, Spinner } from "@plane/ui";
import { cn } from "@plane/utils";
// components
import { DropdownButton } from "@/components/dropdowns/buttons";
diff --git a/apps/web/core/components/global/product-updates/footer.tsx b/apps/web/core/components/global/product-updates/footer.tsx
index 7e361b251..ab679d56a 100644
--- a/apps/web/core/components/global/product-updates/footer.tsx
+++ b/apps/web/core/components/global/product-updates/footer.tsx
@@ -1,7 +1,8 @@
import { USER_TRACKER_ELEMENTS } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
// ui
-import { getButtonStyling, PlaneLogo } from "@plane/ui";
+import { PlaneLogo } from "@plane/propel/icons";
+import { getButtonStyling } from "@plane/ui";
// helpers
import { cn } from "@plane/utils";
diff --git a/apps/web/core/components/home/widgets/empty-states/recents.tsx b/apps/web/core/components/home/widgets/empty-states/recents.tsx
index 5d48d2956..c939cae61 100644
--- a/apps/web/core/components/home/widgets/empty-states/recents.tsx
+++ b/apps/web/core/components/home/widgets/empty-states/recents.tsx
@@ -1,6 +1,6 @@
import { Briefcase, FileText, History } from "lucide-react";
import { useTranslation } from "@plane/i18n";
-import { LayersIcon } from "@plane/ui";
+import { LayersIcon } from "@plane/propel/icons";
const getDisplayContent = (type: string) => {
switch (type) {
diff --git a/apps/web/core/components/home/widgets/empty-states/stickies.tsx b/apps/web/core/components/home/widgets/empty-states/stickies.tsx
index 1210ea096..5a639ceef 100644
--- a/apps/web/core/components/home/widgets/empty-states/stickies.tsx
+++ b/apps/web/core/components/home/widgets/empty-states/stickies.tsx
@@ -1,6 +1,6 @@
// plane ui
import { useTranslation } from "@plane/i18n";
-import { RecentStickyIcon } from "@plane/ui";
+import { RecentStickyIcon } from "@plane/propel/icons";
export const StickiesEmptyState = () => {
const { t } = useTranslation();
diff --git a/apps/web/core/components/home/widgets/recents/index.tsx b/apps/web/core/components/home/widgets/recents/index.tsx
index 5622a2541..f02317aa8 100644
--- a/apps/web/core/components/home/widgets/recents/index.tsx
+++ b/apps/web/core/components/home/widgets/recents/index.tsx
@@ -6,9 +6,9 @@ import useSWR from "swr";
import { Briefcase, FileText } from "lucide-react";
import { useTranslation } from "@plane/i18n";
// plane types
+import { LayersIcon } from "@plane/propel/icons";
import { TActivityEntityData, THomeWidgetProps, TRecentActivityFilterKeys } from "@plane/types";
// plane ui
-import { LayersIcon } from "@plane/ui";
// components
import { ContentOverflowWrapper } from "@/components/core/content-overflow-HOC";
// plane web services
diff --git a/apps/web/core/components/home/widgets/recents/issue.tsx b/apps/web/core/components/home/widgets/recents/issue.tsx
index ea1cadfef..8cad58785 100644
--- a/apps/web/core/components/home/widgets/recents/issue.tsx
+++ b/apps/web/core/components/home/widgets/recents/issue.tsx
@@ -1,9 +1,9 @@
import { observer } from "mobx-react";
// plane types
+import { LayersIcon, PriorityIcon, StateGroupIcon } from "@plane/propel/icons";
import { Tooltip } from "@plane/propel/tooltip";
import { EIssueServiceType, TActivityEntityData, TIssueEntityData } from "@plane/types";
// plane ui
-import { LayersIcon, PriorityIcon, StateGroupIcon } from "@plane/ui";
import { calculateTimeAgo, generateWorkItemLink } from "@plane/utils";
// components
import { ListItem } from "@/components/core/list";
diff --git a/apps/web/core/components/inbox/content/issue-properties.tsx b/apps/web/core/components/inbox/content/issue-properties.tsx
index 8aeac5e95..47ea8f6ae 100644
--- a/apps/web/core/components/inbox/content/issue-properties.tsx
+++ b/apps/web/core/components/inbox/content/issue-properties.tsx
@@ -3,9 +3,10 @@
import React from "react";
import { observer } from "mobx-react";
import { CalendarCheck2, CopyPlus, Signal, Tag, Users } from "lucide-react";
+import { DoubleCircleIcon } from "@plane/propel/icons";
import { Tooltip } from "@plane/propel/tooltip";
import { TInboxDuplicateIssueDetails, TIssue } from "@plane/types";
-import { ControlLink, DoubleCircleIcon } from "@plane/ui";
+import { ControlLink } from "@plane/ui";
import { getDate, renderFormattedPayloadDate, generateWorkItemLink } from "@plane/utils";
// components
import { DateDropdown } from "@/components/dropdowns/date";
diff --git a/apps/web/core/components/inbox/inbox-filter/applied-filters/priority.tsx b/apps/web/core/components/inbox/inbox-filter/applied-filters/priority.tsx
index a2eb5246b..d6886eaf4 100644
--- a/apps/web/core/components/inbox/inbox-filter/applied-filters/priority.tsx
+++ b/apps/web/core/components/inbox/inbox-filter/applied-filters/priority.tsx
@@ -5,8 +5,9 @@ import { observer } from "mobx-react";
import { X } from "lucide-react";
import { ISSUE_PRIORITIES } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
+import { PriorityIcon } from "@plane/propel/icons";
import { TIssuePriorities } from "@plane/types";
-import { PriorityIcon, Tag } from "@plane/ui";
+import { Tag } from "@plane/ui";
// hooks
import { useProjectInbox } from "@/hooks/store/use-project-inbox";
diff --git a/apps/web/core/components/inbox/inbox-filter/applied-filters/state.tsx b/apps/web/core/components/inbox/inbox-filter/applied-filters/state.tsx
index b5114ccd7..0871a17da 100644
--- a/apps/web/core/components/inbox/inbox-filter/applied-filters/state.tsx
+++ b/apps/web/core/components/inbox/inbox-filter/applied-filters/state.tsx
@@ -4,7 +4,8 @@ import { FC } from "react";
import { observer } from "mobx-react";
import { X } from "lucide-react";
import { EIconSize } from "@plane/constants";
-import { StateGroupIcon, Tag } from "@plane/ui";
+import { StateGroupIcon } from "@plane/propel/icons";
+import { Tag } from "@plane/ui";
// hooks
import { useProjectInbox } from "@/hooks/store/use-project-inbox";
import { useProjectState } from "@/hooks/store/use-project-state";
diff --git a/apps/web/core/components/inbox/inbox-filter/filters/priority.tsx b/apps/web/core/components/inbox/inbox-filter/filters/priority.tsx
index a3174f51c..580fa3978 100644
--- a/apps/web/core/components/inbox/inbox-filter/filters/priority.tsx
+++ b/apps/web/core/components/inbox/inbox-filter/filters/priority.tsx
@@ -4,8 +4,8 @@ import { FC, useState } from "react";
import { observer } from "mobx-react";
import { ISSUE_PRIORITIES } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
+import { PriorityIcon } from "@plane/propel/icons";
import { TIssuePriorities } from "@plane/types";
-import { PriorityIcon } from "@plane/ui";
// plane constants
// components
import { FilterHeader, FilterOption } from "@/components/issues/issue-layouts/filters";
diff --git a/apps/web/core/components/inbox/inbox-filter/filters/state.tsx b/apps/web/core/components/inbox/inbox-filter/filters/state.tsx
index 7c2778db2..4180ec363 100644
--- a/apps/web/core/components/inbox/inbox-filter/filters/state.tsx
+++ b/apps/web/core/components/inbox/inbox-filter/filters/state.tsx
@@ -3,8 +3,9 @@
import { FC, useState } from "react";
import { observer } from "mobx-react";
import { EIconSize } from "@plane/constants";
+import { StateGroupIcon } from "@plane/propel/icons";
import { IState } from "@plane/types";
-import { Loader, StateGroupIcon } from "@plane/ui";
+import { Loader } from "@plane/ui";
// components
import { FilterHeader, FilterOption } from "@/components/issues/issue-layouts/filters";
// hooks
diff --git a/apps/web/core/components/inbox/root.tsx b/apps/web/core/components/inbox/root.tsx
index aefb68861..2b7dbe443 100644
--- a/apps/web/core/components/inbox/root.tsx
+++ b/apps/web/core/components/inbox/root.tsx
@@ -3,8 +3,8 @@ import { observer } from "mobx-react";
import { PanelLeft } from "lucide-react";
// plane imports
import { useTranslation } from "@plane/i18n";
+import { Intake } from "@plane/propel/icons";
import { EInboxIssueCurrentTab } from "@plane/types";
-import { Intake } from "@plane/ui";
import { cn } from "@plane/utils";
// components
import { SimpleEmptyState } from "@/components/empty-state/simple-empty-state-root";
diff --git a/apps/web/core/components/inbox/sidebar/inbox-list-item.tsx b/apps/web/core/components/inbox/sidebar/inbox-list-item.tsx
index 5e6da4f46..a99e459e4 100644
--- a/apps/web/core/components/inbox/sidebar/inbox-list-item.tsx
+++ b/apps/web/core/components/inbox/sidebar/inbox-list-item.tsx
@@ -5,8 +5,9 @@ import { observer } from "mobx-react";
import Link from "next/link";
import { useSearchParams } from "next/navigation";
// plane imports
+import { PriorityIcon } from "@plane/propel/icons";
import { Tooltip } from "@plane/propel/tooltip";
-import { PriorityIcon, Row, Avatar } from "@plane/ui";
+import { Row, Avatar } from "@plane/ui";
import { cn, renderFormattedDate, getFileURL } from "@plane/utils";
// components
import { ButtonAvatars } from "@/components/dropdowns/member/avatar";
diff --git a/apps/web/core/components/issues/issue-detail/issue-activity/activity/actions/archived-at.tsx b/apps/web/core/components/issues/issue-detail/issue-activity/activity/actions/archived-at.tsx
index 22e18556e..2c0cc96fd 100644
--- a/apps/web/core/components/issues/issue-detail/issue-activity/activity/actions/archived-at.tsx
+++ b/apps/web/core/components/issues/issue-detail/issue-activity/activity/actions/archived-at.tsx
@@ -4,7 +4,7 @@ import { FC } from "react";
import { observer } from "mobx-react";
import { RotateCcw } from "lucide-react";
// hooks
-import { ArchiveIcon } from "@plane/ui";
+import { ArchiveIcon } from "@plane/propel/icons";
import { useIssueDetail } from "@/hooks/store/use-issue-detail";
// components
import { IssueActivityBlockComponent } from "./";
diff --git a/apps/web/core/components/issues/issue-detail/issue-activity/activity/actions/cycle.tsx b/apps/web/core/components/issues/issue-detail/issue-activity/activity/actions/cycle.tsx
index f24c9056b..2297ccccd 100644
--- a/apps/web/core/components/issues/issue-detail/issue-activity/activity/actions/cycle.tsx
+++ b/apps/web/core/components/issues/issue-detail/issue-activity/activity/actions/cycle.tsx
@@ -3,7 +3,7 @@
import { FC } from "react";
import { observer } from "mobx-react";
// hooks
-import { ContrastIcon } from "@plane/ui";
+import { ContrastIcon } from "@plane/propel/icons";
import { useIssueDetail } from "@/hooks/store/use-issue-detail";
// components
import { IssueActivityBlockComponent } from "./";
diff --git a/apps/web/core/components/issues/issue-detail/issue-activity/activity/actions/default.tsx b/apps/web/core/components/issues/issue-detail/issue-activity/activity/actions/default.tsx
index 7ef63f96e..39272c6ca 100644
--- a/apps/web/core/components/issues/issue-detail/issue-activity/activity/actions/default.tsx
+++ b/apps/web/core/components/issues/issue-detail/issue-activity/activity/actions/default.tsx
@@ -3,8 +3,8 @@
import { FC } from "react";
import { observer } from "mobx-react";
// plane imports
+import { LayersIcon } from "@plane/propel/icons";
import { EInboxIssueSource } from "@plane/types";
-import { LayersIcon } from "@plane/ui";
// hooks
import { capitalizeFirstLetter } from "@plane/utils";
import { useIssueDetail } from "@/hooks/store/use-issue-detail";
diff --git a/apps/web/core/components/issues/issue-detail/issue-activity/activity/actions/inbox.tsx b/apps/web/core/components/issues/issue-detail/issue-activity/activity/actions/inbox.tsx
index 5f3012c0e..86f54c00c 100644
--- a/apps/web/core/components/issues/issue-detail/issue-activity/activity/actions/inbox.tsx
+++ b/apps/web/core/components/issues/issue-detail/issue-activity/activity/actions/inbox.tsx
@@ -1,7 +1,7 @@
import { FC } from "react";
import { observer } from "mobx-react";
// hooks
-import { Intake } from "@plane/ui";
+import { Intake } from "@plane/propel/icons";
import { useIssueDetail } from "@/hooks/store/use-issue-detail";
// components
import { IssueActivityBlockComponent } from "./";
diff --git a/apps/web/core/components/issues/issue-detail/issue-activity/activity/actions/module.tsx b/apps/web/core/components/issues/issue-detail/issue-activity/activity/actions/module.tsx
index e59b52b09..63d748b35 100644
--- a/apps/web/core/components/issues/issue-detail/issue-activity/activity/actions/module.tsx
+++ b/apps/web/core/components/issues/issue-detail/issue-activity/activity/actions/module.tsx
@@ -3,7 +3,7 @@
import { FC } from "react";
import { observer } from "mobx-react";
// hooks
-import { DiceIcon } from "@plane/ui";
+import { DiceIcon } from "@plane/propel/icons";
import { useIssueDetail } from "@/hooks/store/use-issue-detail";
// components
import { IssueActivityBlockComponent } from "./";
diff --git a/apps/web/core/components/issues/issue-detail/issue-activity/activity/actions/state.tsx b/apps/web/core/components/issues/issue-detail/issue-activity/activity/actions/state.tsx
index b441304ee..5af66eede 100644
--- a/apps/web/core/components/issues/issue-detail/issue-activity/activity/actions/state.tsx
+++ b/apps/web/core/components/issues/issue-detail/issue-activity/activity/actions/state.tsx
@@ -3,7 +3,7 @@
import { FC } from "react";
import { observer } from "mobx-react";
// hooks
-import { DoubleCircleIcon } from "@plane/ui";
+import { DoubleCircleIcon } from "@plane/propel/icons";
import { useIssueDetail } from "@/hooks/store/use-issue-detail";
// components
import { IssueActivityBlockComponent, IssueLink } from "./";
diff --git a/apps/web/core/components/issues/issue-detail/sidebar.tsx b/apps/web/core/components/issues/issue-detail/sidebar.tsx
index 65c5803e1..141f3ed19 100644
--- a/apps/web/core/components/issues/issue-detail/sidebar.tsx
+++ b/apps/web/core/components/issues/issue-detail/sidebar.tsx
@@ -6,7 +6,7 @@ import { CalendarCheck2, CalendarClock, LayoutPanelTop, Signal, Tag, Triangle, U
// i18n
import { useTranslation } from "@plane/i18n";
// ui
-import { ContrastIcon, DiceIcon, DoubleCircleIcon } from "@plane/ui";
+import { ContrastIcon, DiceIcon, DoubleCircleIcon } from "@plane/propel/icons";
import { cn, getDate, renderFormattedPayloadDate, shouldHighlightIssueDueDate } from "@plane/utils";
// components
import { DateDropdown } from "@/components/dropdowns/date";
diff --git a/apps/web/core/components/issues/issue-layouts/filters/applied-filters/cycle.tsx b/apps/web/core/components/issues/issue-layouts/filters/applied-filters/cycle.tsx
index 0a08aec5f..3be676baf 100644
--- a/apps/web/core/components/issues/issue-layouts/filters/applied-filters/cycle.tsx
+++ b/apps/web/core/components/issues/issue-layouts/filters/applied-filters/cycle.tsx
@@ -2,9 +2,9 @@
import { observer } from "mobx-react";
import { X } from "lucide-react";
+import { CycleGroupIcon } from "@plane/propel/icons";
import { TCycleGroups } from "@plane/types";
// hooks
-import { CycleGroupIcon } from "@plane/ui";
import { useCycle } from "@/hooks/store/use-cycle";
// ui
// types
diff --git a/apps/web/core/components/issues/issue-layouts/filters/applied-filters/module.tsx b/apps/web/core/components/issues/issue-layouts/filters/applied-filters/module.tsx
index 524938c47..84e92d633 100644
--- a/apps/web/core/components/issues/issue-layouts/filters/applied-filters/module.tsx
+++ b/apps/web/core/components/issues/issue-layouts/filters/applied-filters/module.tsx
@@ -3,7 +3,7 @@
import { observer } from "mobx-react";
import { X } from "lucide-react";
// hooks
-import { DiceIcon } from "@plane/ui";
+import { DiceIcon } from "@plane/propel/icons";
import { useModule } from "@/hooks/store/use-module";
// ui
diff --git a/apps/web/core/components/issues/issue-layouts/filters/applied-filters/priority.tsx b/apps/web/core/components/issues/issue-layouts/filters/applied-filters/priority.tsx
index 9735d2446..2dc81c2e9 100644
--- a/apps/web/core/components/issues/issue-layouts/filters/applied-filters/priority.tsx
+++ b/apps/web/core/components/issues/issue-layouts/filters/applied-filters/priority.tsx
@@ -4,8 +4,8 @@ import { observer } from "mobx-react";
// icons
import { X } from "lucide-react";
+import { PriorityIcon } from "@plane/propel/icons";
import { TIssuePriorities } from "@plane/types";
-import { PriorityIcon } from "@plane/ui";
// types
type Props = {
diff --git a/apps/web/core/components/issues/issue-layouts/filters/applied-filters/state-group.tsx b/apps/web/core/components/issues/issue-layouts/filters/applied-filters/state-group.tsx
index 807a5b233..6072bc92b 100644
--- a/apps/web/core/components/issues/issue-layouts/filters/applied-filters/state-group.tsx
+++ b/apps/web/core/components/issues/issue-layouts/filters/applied-filters/state-group.tsx
@@ -5,8 +5,8 @@ import { observer } from "mobx-react";
// icons
import { X } from "lucide-react";
import { EIconSize } from "@plane/constants";
+import { StateGroupIcon } from "@plane/propel/icons";
import { TStateGroups } from "@plane/types";
-import { StateGroupIcon } from "@plane/ui";
type Props = {
handleRemove: (val: string) => void;
diff --git a/apps/web/core/components/issues/issue-layouts/filters/applied-filters/state.tsx b/apps/web/core/components/issues/issue-layouts/filters/applied-filters/state.tsx
index d02fd6dad..f55aca434 100644
--- a/apps/web/core/components/issues/issue-layouts/filters/applied-filters/state.tsx
+++ b/apps/web/core/components/issues/issue-layouts/filters/applied-filters/state.tsx
@@ -5,8 +5,8 @@ import { observer } from "mobx-react";
// icons
import { X } from "lucide-react";
import { EIconSize } from "@plane/constants";
+import { StateGroupIcon } from "@plane/propel/icons";
import { IState } from "@plane/types";
-import { StateGroupIcon } from "@plane/ui";
// types
type Props = {
diff --git a/apps/web/core/components/issues/issue-layouts/filters/header/filters/cycle.tsx b/apps/web/core/components/issues/issue-layouts/filters/header/filters/cycle.tsx
index bfb5dfe04..0e4b17b45 100644
--- a/apps/web/core/components/issues/issue-layouts/filters/header/filters/cycle.tsx
+++ b/apps/web/core/components/issues/issue-layouts/filters/header/filters/cycle.tsx
@@ -4,9 +4,10 @@ import React, { useMemo, useState } from "react";
import sortBy from "lodash/sortBy";
import { observer } from "mobx-react";
import { useParams } from "next/navigation";
+import { CycleGroupIcon } from "@plane/propel/icons";
import { TCycleGroups } from "@plane/types";
// components
-import { Loader, CycleGroupIcon } from "@plane/ui";
+import { Loader } from "@plane/ui";
import { FilterHeader, FilterOption } from "@/components/issues/issue-layouts/filters";
import { useCycle } from "@/hooks/store/use-cycle";
// ui
diff --git a/apps/web/core/components/issues/issue-layouts/filters/header/filters/module.tsx b/apps/web/core/components/issues/issue-layouts/filters/header/filters/module.tsx
index 7b02e9536..ca4b4c63b 100644
--- a/apps/web/core/components/issues/issue-layouts/filters/header/filters/module.tsx
+++ b/apps/web/core/components/issues/issue-layouts/filters/header/filters/module.tsx
@@ -5,7 +5,8 @@ import sortBy from "lodash/sortBy";
import { observer } from "mobx-react";
import { useParams } from "next/navigation";
// components
-import { Loader, DiceIcon } from "@plane/ui";
+import { DiceIcon } from "@plane/propel/icons";
+import { Loader } from "@plane/ui";
import { FilterHeader, FilterOption } from "@/components/issues/issue-layouts/filters";
import { useModule } from "@/hooks/store/use-module";
// ui
diff --git a/apps/web/core/components/issues/issue-layouts/filters/header/filters/priority.tsx b/apps/web/core/components/issues/issue-layouts/filters/header/filters/priority.tsx
index d519f6384..36bb16991 100644
--- a/apps/web/core/components/issues/issue-layouts/filters/header/filters/priority.tsx
+++ b/apps/web/core/components/issues/issue-layouts/filters/header/filters/priority.tsx
@@ -6,7 +6,7 @@ import { observer } from "mobx-react";
import { ISSUE_PRIORITIES } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
// ui
-import { PriorityIcon } from "@plane/ui";
+import { PriorityIcon } from "@plane/propel/icons";
// components
import { FilterHeader, FilterOption } from "@/components/issues/issue-layouts/filters";
diff --git a/apps/web/core/components/issues/issue-layouts/filters/header/filters/state-group.tsx b/apps/web/core/components/issues/issue-layouts/filters/header/filters/state-group.tsx
index be38f0c73..4896b0d72 100644
--- a/apps/web/core/components/issues/issue-layouts/filters/header/filters/state-group.tsx
+++ b/apps/web/core/components/issues/issue-layouts/filters/header/filters/state-group.tsx
@@ -4,7 +4,7 @@ import React, { useState } from "react";
import { observer } from "mobx-react";
// plane imports
import { STATE_GROUPS } from "@plane/constants";
-import { StateGroupIcon } from "@plane/ui";
+import { StateGroupIcon } from "@plane/propel/icons";
// components
import { FilterHeader, FilterOption } from "@/components/issues/issue-layouts/filters";
diff --git a/apps/web/core/components/issues/issue-layouts/filters/header/filters/state.tsx b/apps/web/core/components/issues/issue-layouts/filters/header/filters/state.tsx
index f8506c817..c7f0206b8 100644
--- a/apps/web/core/components/issues/issue-layouts/filters/header/filters/state.tsx
+++ b/apps/web/core/components/issues/issue-layouts/filters/header/filters/state.tsx
@@ -4,9 +4,10 @@ import React, { useMemo, useState } from "react";
import sortBy from "lodash/sortBy";
import { observer } from "mobx-react";
import { EIconSize } from "@plane/constants";
+import { StateGroupIcon } from "@plane/propel/icons";
import { IState } from "@plane/types";
// components
-import { Loader, StateGroupIcon } from "@plane/ui";
+import { Loader } from "@plane/ui";
import { FilterHeader, FilterOption } from "@/components/issues/issue-layouts/filters";
// ui
// types
diff --git a/apps/web/core/components/issues/issue-layouts/quick-action-dropdowns/helper.tsx b/apps/web/core/components/issues/issue-layouts/quick-action-dropdowns/helper.tsx
index 80c4ae4f3..32e114e6e 100644
--- a/apps/web/core/components/issues/issue-layouts/quick-action-dropdowns/helper.tsx
+++ b/apps/web/core/components/issues/issue-layouts/quick-action-dropdowns/helper.tsx
@@ -2,8 +2,9 @@ import { useMemo } from "react";
import { Copy, ExternalLink, Link, Pencil, Trash2, XCircle, ArchiveRestoreIcon } from "lucide-react";
// plane imports
import { useTranslation } from "@plane/i18n";
+import { ArchiveIcon } from "@plane/propel/icons";
import { EIssuesStoreType, TIssue } from "@plane/types";
-import { ArchiveIcon, TContextMenuItem, TOAST_TYPE, setToast } from "@plane/ui";
+import { TContextMenuItem, TOAST_TYPE, setToast } from "@plane/ui";
import { copyUrlToClipboard, generateWorkItemLink } from "@plane/utils";
// types
import { createCopyMenuWithDuplication } from "@/plane-web/components/issues/issue-layouts/quick-action-dropdowns";
diff --git a/apps/web/core/components/issues/issue-layouts/utils.tsx b/apps/web/core/components/issues/issue-layouts/utils.tsx
index c63ce1b0f..a7b0b9fc7 100644
--- a/apps/web/core/components/issues/issue-layouts/utils.tsx
+++ b/apps/web/core/components/issues/issue-layouts/utils.tsx
@@ -12,6 +12,7 @@ import scrollIntoView from "smooth-scroll-into-view-if-needed";
import { ContrastIcon } from "lucide-react";
// plane types
import { EIconSize, ISSUE_PRIORITIES, STATE_GROUPS } from "@plane/constants";
+import { CycleGroupIcon, DiceIcon, PriorityIcon, StateGroupIcon, ISvgIcons } from "@plane/propel/icons";
import {
EIssuesStoreType,
GroupByColumnTypes,
@@ -30,7 +31,7 @@ import {
TGetColumns,
} from "@plane/types";
// plane ui
-import { Avatar, CycleGroupIcon, DiceIcon, ISvgIcons, PriorityIcon, StateGroupIcon } from "@plane/ui";
+import { Avatar } from "@plane/ui";
import { renderFormattedDate, getFileURL } from "@plane/utils";
// components
import { Logo } from "@/components/common/logo";
diff --git a/apps/web/core/components/issues/peek-overview/header.tsx b/apps/web/core/components/issues/peek-overview/header.tsx
index b6ced1a96..99c79ced4 100644
--- a/apps/web/core/components/issues/peek-overview/header.tsx
+++ b/apps/web/core/components/issues/peek-overview/header.tsx
@@ -7,9 +7,10 @@ import { Link2, MoveDiagonal, MoveRight } from "lucide-react";
// plane imports
import { WORK_ITEM_TRACKER_EVENTS } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
+import { CenterPanelIcon, FullScreenPanelIcon, SidePanelIcon } from "@plane/propel/icons";
import { Tooltip } from "@plane/propel/tooltip";
import { EIssuesStoreType, TNameDescriptionLoader } from "@plane/types";
-import { CenterPanelIcon, CustomSelect, FullScreenPanelIcon, SidePanelIcon, TOAST_TYPE, setToast } from "@plane/ui";
+import { CustomSelect, TOAST_TYPE, setToast } from "@plane/ui";
import { copyUrlToClipboard, generateWorkItemLink } from "@plane/utils";
// helpers
import { captureError, captureSuccess } from "@/helpers/event-tracker.helper";
diff --git a/apps/web/core/components/issues/peek-overview/properties.tsx b/apps/web/core/components/issues/peek-overview/properties.tsx
index 25a33a221..2017de059 100644
--- a/apps/web/core/components/issues/peek-overview/properties.tsx
+++ b/apps/web/core/components/issues/peek-overview/properties.tsx
@@ -6,7 +6,7 @@ import { Signal, Tag, Triangle, LayoutPanelTop, CalendarClock, CalendarCheck2, U
// i18n
import { useTranslation } from "@plane/i18n";
// ui icons
-import { DiceIcon, DoubleCircleIcon, ContrastIcon } from "@plane/ui";
+import { DiceIcon, DoubleCircleIcon, ContrastIcon } from "@plane/propel/icons";
import { cn, getDate, renderFormattedPayloadDate, shouldHighlightIssueDueDate } from "@plane/utils";
// components
import { DateDropdown } from "@/components/dropdowns/date";
diff --git a/apps/web/core/components/modules/analytics-sidebar/progress-stats.tsx b/apps/web/core/components/modules/analytics-sidebar/progress-stats.tsx
index 555e7e32b..d64c54210 100644
--- a/apps/web/core/components/modules/analytics-sidebar/progress-stats.tsx
+++ b/apps/web/core/components/modules/analytics-sidebar/progress-stats.tsx
@@ -5,6 +5,7 @@ import { observer } from "mobx-react";
import Image from "next/image";
import { Tab } from "@headlessui/react";
import { useTranslation } from "@plane/i18n";
+import { StateGroupIcon } from "@plane/propel/icons";
import {
IIssueFilterOptions,
IIssueFilters,
@@ -13,7 +14,7 @@ import {
TModulePlotType,
TStateGroups,
} from "@plane/types";
-import { Avatar, StateGroupIcon } from "@plane/ui";
+import { Avatar } from "@plane/ui";
import { cn, getFileURL } from "@plane/utils";
// components
import { SingleProgressStats } from "@/components/core/sidebar/single-progress-stats";
diff --git a/apps/web/core/components/modules/analytics-sidebar/root.tsx b/apps/web/core/components/modules/analytics-sidebar/root.tsx
index a99bfb57f..ab402b97f 100644
--- a/apps/web/core/components/modules/analytics-sidebar/root.tsx
+++ b/apps/web/core/components/modules/analytics-sidebar/root.tsx
@@ -16,9 +16,10 @@ import {
} from "@plane/constants";
// plane types
import { useTranslation } from "@plane/i18n";
+import { LayersIcon, ModuleStatusIcon } from "@plane/propel/icons";
import { ILinkDetails, IModule, ModuleLink } from "@plane/types";
// plane ui
-import { Loader, LayersIcon, CustomSelect, ModuleStatusIcon, TOAST_TYPE, setToast, TextArea } from "@plane/ui";
+import { Loader, CustomSelect, TOAST_TYPE, setToast, TextArea } from "@plane/ui";
// components
// helpers
import { getDate, renderFormattedPayloadDate } from "@plane/utils";
diff --git a/apps/web/core/components/modules/applied-filters/status.tsx b/apps/web/core/components/modules/applied-filters/status.tsx
index 15a2e8b6e..d5c10eea1 100644
--- a/apps/web/core/components/modules/applied-filters/status.tsx
+++ b/apps/web/core/components/modules/applied-filters/status.tsx
@@ -5,7 +5,7 @@ import { X } from "lucide-react";
// ui
import { MODULE_STATUS } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
-import { ModuleStatusIcon } from "@plane/ui";
+import { ModuleStatusIcon } from "@plane/propel/icons";
// constants
type Props = {
diff --git a/apps/web/core/components/modules/dropdowns/filters/root.tsx b/apps/web/core/components/modules/dropdowns/filters/root.tsx
index d2537868a..df2f52dbf 100644
--- a/apps/web/core/components/modules/dropdowns/filters/root.tsx
+++ b/apps/web/core/components/modules/dropdowns/filters/root.tsx
@@ -4,8 +4,8 @@ import { useState } from "react";
import { observer } from "mobx-react";
import { Search, X } from "lucide-react";
// plane imports
+import { TModuleStatus } from "@plane/propel/icons";
import { TModuleDisplayFilters, TModuleFilters } from "@plane/types";
-import { TModuleStatus } from "@plane/ui";
// components
import { FilterOption } from "@/components/issues/issue-layouts/filters";
import { FilterLead, FilterMembers, FilterStartDate, FilterStatus, FilterTargetDate } from "@/components/modules";
diff --git a/apps/web/core/components/modules/dropdowns/filters/status.tsx b/apps/web/core/components/modules/dropdowns/filters/status.tsx
index f1aa3b14d..09ee9e494 100644
--- a/apps/web/core/components/modules/dropdowns/filters/status.tsx
+++ b/apps/web/core/components/modules/dropdowns/filters/status.tsx
@@ -4,9 +4,9 @@ import React, { useState } from "react";
import { observer } from "mobx-react";
import { MODULE_STATUS } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
+import { ModuleStatusIcon } from "@plane/propel/icons";
import { TModuleStatus } from "@plane/types";
// components
-import { ModuleStatusIcon } from "@plane/ui";
import { FilterHeader, FilterOption } from "@/components/issues/issue-layouts/filters";
type Props = {
diff --git a/apps/web/core/components/modules/gantt-chart/blocks.tsx b/apps/web/core/components/modules/gantt-chart/blocks.tsx
index dfaeb067e..6fc10df6d 100644
--- a/apps/web/core/components/modules/gantt-chart/blocks.tsx
+++ b/apps/web/core/components/modules/gantt-chart/blocks.tsx
@@ -5,8 +5,8 @@ import Link from "next/link";
import { useParams } from "next/navigation";
// ui
import { MODULE_STATUS } from "@plane/constants";
+import { ModuleStatusIcon } from "@plane/propel/icons";
import { Tooltip } from "@plane/propel/tooltip";
-import { ModuleStatusIcon } from "@plane/ui";
// components
import { SIDEBAR_WIDTH } from "@/components/gantt-chart/constants";
import { getBlockViewDetails } from "@/components/issues/issue-layouts/utils";
diff --git a/apps/web/core/components/modules/module-card-item.tsx b/apps/web/core/components/modules/module-card-item.tsx
index beb4e9198..39bed0337 100644
--- a/apps/web/core/components/modules/module-card-item.tsx
+++ b/apps/web/core/components/modules/module-card-item.tsx
@@ -16,17 +16,10 @@ import {
MODULE_TRACKER_ELEMENTS,
} from "@plane/constants";
import { useLocalStorage } from "@plane/hooks";
+import { LayersIcon } from "@plane/propel/icons";
import { Tooltip } from "@plane/propel/tooltip";
import { IModule } from "@plane/types";
-import {
- Card,
- FavoriteStar,
- LayersIcon,
- LinearProgressIndicator,
- TOAST_TYPE,
- setPromiseToast,
- setToast,
-} from "@plane/ui";
+import { Card, FavoriteStar, LinearProgressIndicator, TOAST_TYPE, setPromiseToast, setToast } from "@plane/ui";
import { getDate, renderFormattedPayloadDate, generateQueryParams } from "@plane/utils";
// components
import { DateRangeDropdown } from "@/components/dropdowns/date-range";
diff --git a/apps/web/core/components/modules/module-status-dropdown.tsx b/apps/web/core/components/modules/module-status-dropdown.tsx
index a3b2d5881..fa7be76fc 100644
--- a/apps/web/core/components/modules/module-status-dropdown.tsx
+++ b/apps/web/core/components/modules/module-status-dropdown.tsx
@@ -2,8 +2,9 @@ import React, { FC } from "react";
import { observer } from "mobx-react";
import { MODULE_STATUS } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
+import { ModuleStatusIcon, TModuleStatus } from "@plane/propel/icons";
import { IModule } from "@plane/types";
-import { CustomSelect, TModuleStatus, ModuleStatusIcon } from "@plane/ui";
+import { CustomSelect } from "@plane/ui";
type Props = {
isDisabled: boolean;
diff --git a/apps/web/core/components/modules/quick-actions.tsx b/apps/web/core/components/modules/quick-actions.tsx
index 026479cfb..2b79316ed 100644
--- a/apps/web/core/components/modules/quick-actions.tsx
+++ b/apps/web/core/components/modules/quick-actions.tsx
@@ -14,7 +14,8 @@ import {
} from "@plane/constants";
import { useTranslation } from "@plane/i18n";
// ui
-import { ArchiveIcon, ContextMenu, CustomMenu, TContextMenuItem, TOAST_TYPE, setToast } from "@plane/ui";
+import { ArchiveIcon } from "@plane/propel/icons";
+import { ContextMenu, CustomMenu, TContextMenuItem, TOAST_TYPE, setToast } from "@plane/ui";
import { copyUrlToClipboard, cn } from "@plane/utils";
// components
import { ArchiveModuleModal, CreateUpdateModuleModal, DeleteModuleModal } from "@/components/modules";
diff --git a/apps/web/core/components/modules/select/status.tsx b/apps/web/core/components/modules/select/status.tsx
index 7da437946..38aee57a1 100644
--- a/apps/web/core/components/modules/select/status.tsx
+++ b/apps/web/core/components/modules/select/status.tsx
@@ -6,9 +6,10 @@ import React from "react";
import { Controller, FieldError, Control } from "react-hook-form";
import { MODULE_STATUS } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
+import { DoubleCircleIcon, ModuleStatusIcon } from "@plane/propel/icons";
import type { IModule } from "@plane/types";
// ui
-import { CustomSelect, DoubleCircleIcon, ModuleStatusIcon } from "@plane/ui";
+import { CustomSelect } from "@plane/ui";
// types
// constants
diff --git a/apps/web/core/components/modules/sidebar-select/select-status.tsx b/apps/web/core/components/modules/sidebar-select/select-status.tsx
index 9d7a7fda9..c1bf48c07 100644
--- a/apps/web/core/components/modules/sidebar-select/select-status.tsx
+++ b/apps/web/core/components/modules/sidebar-select/select-status.tsx
@@ -6,9 +6,10 @@ import React from "react";
import { Control, Controller, UseFormWatch } from "react-hook-form";
import { MODULE_STATUS } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
+import { DoubleCircleIcon } from "@plane/propel/icons";
import { IModule } from "@plane/types";
// ui
-import { CustomSelect, DoubleCircleIcon } from "@plane/ui";
+import { CustomSelect } from "@plane/ui";
// types
// common
// constants
diff --git a/apps/web/core/components/onboarding/header.tsx b/apps/web/core/components/onboarding/header.tsx
index 0ab68fea3..bdba2cc00 100644
--- a/apps/web/core/components/onboarding/header.tsx
+++ b/apps/web/core/components/onboarding/header.tsx
@@ -4,9 +4,9 @@ import { FC } from "react";
import { observer } from "mobx-react";
import { ChevronLeft } from "lucide-react";
// plane imports
+import { PlaneLockup } from "@plane/propel/icons";
import { Tooltip } from "@plane/propel/tooltip";
import { EOnboardingSteps, TOnboardingStep } from "@plane/types";
-import { PlaneLockup } from "@plane/ui";
import { cn } from "@plane/utils";
// hooks
import { useUser } from "@/hooks/store/user";
diff --git a/apps/web/core/components/onboarding/tour/root.tsx b/apps/web/core/components/onboarding/tour/root.tsx
index 9c7c33cf0..86fe84c10 100644
--- a/apps/web/core/components/onboarding/tour/root.tsx
+++ b/apps/web/core/components/onboarding/tour/root.tsx
@@ -6,7 +6,8 @@ import Image, { StaticImageData } from "next/image";
import { X } from "lucide-react";
// plane imports
import { PRODUCT_TOUR_TRACKER_ELEMENTS } from "@plane/constants";
-import { Button, PlaneLockup } from "@plane/ui";
+import { PlaneLockup } from "@plane/propel/icons";
+import { Button } from "@plane/ui";
// helpers
import { captureClick } from "@/helpers/event-tracker.helper";
// hooks
diff --git a/apps/web/core/components/onboarding/tour/sidebar.tsx b/apps/web/core/components/onboarding/tour/sidebar.tsx
index bfc3fa09e..b416eacb1 100644
--- a/apps/web/core/components/onboarding/tour/sidebar.tsx
+++ b/apps/web/core/components/onboarding/tour/sidebar.tsx
@@ -2,7 +2,7 @@
// icons
import { FileText, Layers } from "lucide-react";
-import { ContrastIcon, DiceIcon, LayersIcon } from "@plane/ui";
+import { ContrastIcon, DiceIcon, LayersIcon } from "@plane/propel/icons";
// types
import { TTourSteps } from "./root";
diff --git a/apps/web/core/components/pages/dropdowns/actions.tsx b/apps/web/core/components/pages/dropdowns/actions.tsx
index 3b08dbef4..5ad00a6c9 100644
--- a/apps/web/core/components/pages/dropdowns/actions.tsx
+++ b/apps/web/core/components/pages/dropdowns/actions.tsx
@@ -20,7 +20,8 @@ import { EPageAccess, PROJECT_PAGE_TRACKER_ELEMENTS } from "@plane/constants";
// plane editor
import type { EditorRefApi } from "@plane/editor";
// plane ui
-import { ArchiveIcon, ContextMenu, CustomMenu, TContextMenuItem } from "@plane/ui";
+import { ArchiveIcon } from "@plane/propel/icons";
+import { ContextMenu, CustomMenu, TContextMenuItem } from "@plane/ui";
// components
import { cn } from "@plane/utils";
import { DeletePageModal } from "@/components/pages/modals/delete-page-modal";
diff --git a/apps/web/core/components/pages/header/archived-badge.tsx b/apps/web/core/components/pages/header/archived-badge.tsx
index afe24fd59..34e812eb9 100644
--- a/apps/web/core/components/pages/header/archived-badge.tsx
+++ b/apps/web/core/components/pages/header/archived-badge.tsx
@@ -1,6 +1,6 @@
import { observer } from "mobx-react";
// plane imports
-import { ArchiveIcon } from "@plane/ui";
+import { ArchiveIcon } from "@plane/propel/icons";
import { renderFormattedDate } from "@plane/utils";
// store
import type { TPageInstance } from "@/store/pages/base-page";
diff --git a/apps/web/core/components/profile/overview/stats.tsx b/apps/web/core/components/profile/overview/stats.tsx
index cf0f15d3e..34da37fd3 100644
--- a/apps/web/core/components/profile/overview/stats.tsx
+++ b/apps/web/core/components/profile/overview/stats.tsx
@@ -6,8 +6,9 @@ import { useParams } from "next/navigation";
// ui
import { UserCircle2 } from "lucide-react";
import { useTranslation } from "@plane/i18n";
+import { CreateIcon, LayerStackIcon } from "@plane/propel/icons";
import { IUserProfileData } from "@plane/types";
-import { CreateIcon, LayerStackIcon, Loader, Card, ECardSpacing, ECardDirection } from "@plane/ui";
+import { Loader, Card, ECardSpacing, ECardDirection } from "@plane/ui";
// types
type Props = {
diff --git a/apps/web/core/components/project-states/group-item.tsx b/apps/web/core/components/project-states/group-item.tsx
index 82a68a4d6..459863197 100644
--- a/apps/web/core/components/project-states/group-item.tsx
+++ b/apps/web/core/components/project-states/group-item.tsx
@@ -6,8 +6,8 @@ import { ChevronDown, Plus } from "lucide-react";
// plane imports
import { EIconSize, STATE_TRACKER_ELEMENTS } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
+import { StateGroupIcon } from "@plane/propel/icons";
import { IState, TStateGroups, TStateOperationsCallbacks } from "@plane/types";
-import { StateGroupIcon } from "@plane/ui";
import { cn } from "@plane/utils";
// components
import { StateList, StateCreate } from "@/components/project-states";
diff --git a/apps/web/core/components/project-states/state-item-title.tsx b/apps/web/core/components/project-states/state-item-title.tsx
index 7bfe7fc6f..80027cee7 100644
--- a/apps/web/core/components/project-states/state-item-title.tsx
+++ b/apps/web/core/components/project-states/state-item-title.tsx
@@ -3,8 +3,8 @@ import { observer } from "mobx-react";
import { GripVertical, Pencil } from "lucide-react";
// plane imports
import { EIconSize, STATE_TRACKER_ELEMENTS } from "@plane/constants";
+import { StateGroupIcon } from "@plane/propel/icons";
import { IState, TStateOperationsCallbacks } from "@plane/types";
-import { StateGroupIcon } from "@plane/ui";
// local imports
import { useProjectState } from "@/hooks/store/use-project-state";
import { StateDelete, StateMarksAsDefault } from "./options";
diff --git a/apps/web/core/components/stickies/action-bar.tsx b/apps/web/core/components/stickies/action-bar.tsx
index 9b6e1ed92..640f615a3 100644
--- a/apps/web/core/components/stickies/action-bar.tsx
+++ b/apps/web/core/components/stickies/action-bar.tsx
@@ -6,8 +6,8 @@ import { Plus, StickyNote as StickyIcon, X } from "lucide-react";
// plane hooks
import { useOutsideClickDetector } from "@plane/hooks";
// plane ui
+import { RecentStickyIcon, StickyNoteIcon } from "@plane/propel/icons";
import { Tooltip } from "@plane/propel/tooltip";
-import { RecentStickyIcon, StickyNoteIcon } from "@plane/ui";
// plane utils
import { cn } from "@plane/utils";
// hooks
diff --git a/apps/web/core/components/stickies/modal/stickies.tsx b/apps/web/core/components/stickies/modal/stickies.tsx
index 1cc16bfc6..c70665e36 100644
--- a/apps/web/core/components/stickies/modal/stickies.tsx
+++ b/apps/web/core/components/stickies/modal/stickies.tsx
@@ -2,7 +2,7 @@ import { observer } from "mobx-react";
import { useParams } from "next/navigation";
import { Plus, X } from "lucide-react";
// plane ui
-import { RecentStickyIcon } from "@plane/ui";
+import { RecentStickyIcon } from "@plane/propel/icons";
// hooks
import { useSticky } from "@/hooks/use-stickies";
// components
diff --git a/apps/web/core/components/workspace-notifications/sidebar/header/options/menu-option/root.tsx b/apps/web/core/components/workspace-notifications/sidebar/header/options/menu-option/root.tsx
index d7a298145..fde618e70 100644
--- a/apps/web/core/components/workspace-notifications/sidebar/header/options/menu-option/root.tsx
+++ b/apps/web/core/components/workspace-notifications/sidebar/header/options/menu-option/root.tsx
@@ -5,8 +5,9 @@ import { observer } from "mobx-react";
import { Check, CheckCircle, Clock } from "lucide-react";
// plane imports
import { useTranslation } from "@plane/i18n";
+import { ArchiveIcon } from "@plane/propel/icons";
import { TNotificationFilter } from "@plane/types";
-import { ArchiveIcon, PopoverMenu } from "@plane/ui";
+import { PopoverMenu } from "@plane/ui";
// hooks
import { useWorkspaceNotifications } from "@/hooks/store/notifications";
// local imports
diff --git a/apps/web/core/components/workspace-notifications/sidebar/notification-card/options/archive.tsx b/apps/web/core/components/workspace-notifications/sidebar/notification-card/options/archive.tsx
index 0c6a8ab21..b5134495c 100644
--- a/apps/web/core/components/workspace-notifications/sidebar/notification-card/options/archive.tsx
+++ b/apps/web/core/components/workspace-notifications/sidebar/notification-card/options/archive.tsx
@@ -6,7 +6,8 @@ import { ArchiveRestore } from "lucide-react";
// plane imports
import { NOTIFICATION_TRACKER_ELEMENTS, NOTIFICATION_TRACKER_EVENTS } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
-import { ArchiveIcon, TOAST_TYPE, setToast } from "@plane/ui";
+import { ArchiveIcon } from "@plane/propel/icons";
+import { TOAST_TYPE, setToast } from "@plane/ui";
// helpers
import { captureError, captureSuccess } from "@/helpers/event-tracker.helper";
// hooks
diff --git a/apps/web/core/components/workspace/sidebar/favorites/favorite-folder.tsx b/apps/web/core/components/workspace/sidebar/favorites/favorite-folder.tsx
index 14a9e9e52..f9f5c881f 100644
--- a/apps/web/core/components/workspace/sidebar/favorites/favorite-folder.tsx
+++ b/apps/web/core/components/workspace/sidebar/favorites/favorite-folder.tsx
@@ -20,9 +20,10 @@ import { Disclosure, Transition } from "@headlessui/react";
// plane imports
import { useOutsideClickDetector } from "@plane/hooks";
import { useTranslation } from "@plane/i18n";
+import { FavoriteFolderIcon } from "@plane/propel/icons";
import { Tooltip } from "@plane/propel/tooltip";
import { IFavorite, InstructionType } from "@plane/types";
-import { CustomMenu, DropIndicator, FavoriteFolderIcon, DragHandle } from "@plane/ui";
+import { CustomMenu, DropIndicator, DragHandle } from "@plane/ui";
// helpers
import { cn } from "@plane/utils";
// hooks
diff --git a/apps/web/core/components/workspace/sidebar/favorites/new-fav-folder.tsx b/apps/web/core/components/workspace/sidebar/favorites/new-fav-folder.tsx
index 5412196b5..160a820ee 100644
--- a/apps/web/core/components/workspace/sidebar/favorites/new-fav-folder.tsx
+++ b/apps/web/core/components/workspace/sidebar/favorites/new-fav-folder.tsx
@@ -6,7 +6,8 @@ import { useOutsideClickDetector } from "@plane/hooks";
import { useTranslation } from "@plane/i18n";
// plane helpers
// plane ui
-import { FavoriteFolderIcon, Input, setToast, TOAST_TYPE } from "@plane/ui";
+import { FavoriteFolderIcon } from "@plane/propel/icons";
+import { Input, setToast, TOAST_TYPE } from "@plane/ui";
// hooks
import { useFavorite } from "@/hooks/store/use-favorite";
diff --git a/apps/web/core/components/workspace/sidebar/project-navigation.tsx b/apps/web/core/components/workspace/sidebar/project-navigation.tsx
index f90f5d65a..593137634 100644
--- a/apps/web/core/components/workspace/sidebar/project-navigation.tsx
+++ b/apps/web/core/components/workspace/sidebar/project-navigation.tsx
@@ -7,9 +7,9 @@ import { useParams, usePathname } from "next/navigation";
import { FileText, Layers } from "lucide-react";
import { EUserPermissionsLevel, EUserPermissions } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
+import { DiceIcon, ContrastIcon, LayersIcon, Intake } from "@plane/propel/icons";
import { EUserProjectRoles } from "@plane/types";
// plane ui
-import { DiceIcon, ContrastIcon, LayersIcon, Intake } from "@plane/ui";
// components
import { SidebarNavItem } from "@/components/sidebar/sidebar-navigation";
// hooks
diff --git a/apps/web/core/components/workspace/sidebar/projects-list-item.tsx b/apps/web/core/components/workspace/sidebar/projects-list-item.tsx
index 09bcbec99..3ae47541b 100644
--- a/apps/web/core/components/workspace/sidebar/projects-list-item.tsx
+++ b/apps/web/core/components/workspace/sidebar/projects-list-item.tsx
@@ -15,8 +15,9 @@ import { Disclosure, Transition } from "@headlessui/react";
import { EUserPermissions, EUserPermissionsLevel, MEMBER_TRACKER_ELEMENTS } from "@plane/constants";
import { useOutsideClickDetector } from "@plane/hooks";
import { useTranslation } from "@plane/i18n";
+import { ArchiveIcon } from "@plane/propel/icons";
import { Tooltip } from "@plane/propel/tooltip";
-import { CustomMenu, ArchiveIcon, DropIndicator, DragHandle, ControlLink } from "@plane/ui";
+import { CustomMenu, DropIndicator, DragHandle, ControlLink } from "@plane/ui";
import { cn } from "@plane/utils";
// components
import { Logo } from "@/components/common/logo";
diff --git a/apps/web/core/components/workspace/sidebar/user-menu.tsx b/apps/web/core/components/workspace/sidebar/user-menu.tsx
index 2b9bcfcee..17d2dbe61 100644
--- a/apps/web/core/components/workspace/sidebar/user-menu.tsx
+++ b/apps/web/core/components/workspace/sidebar/user-menu.tsx
@@ -5,8 +5,8 @@ import { observer } from "mobx-react";
import { useParams } from "next/navigation";
import { Home, Inbox, PenSquare } from "lucide-react";
// plane imports
+import { UserActivityIcon } from "@plane/propel/icons";
import { EUserWorkspaceRoles } from "@plane/types";
-import { UserActivityIcon } from "@plane/ui";
// hooks
import { useUserPermissions, useUser } from "@/hooks/store/user";
// local imports
diff --git a/apps/web/core/components/workspace/sidebar/workspace-menu.tsx b/apps/web/core/components/workspace/sidebar/workspace-menu.tsx
index a1fde4936..81f595d9e 100644
--- a/apps/web/core/components/workspace/sidebar/workspace-menu.tsx
+++ b/apps/web/core/components/workspace/sidebar/workspace-menu.tsx
@@ -6,8 +6,8 @@ import { useParams } from "next/navigation";
import { BarChart2, Briefcase, Layers } from "lucide-react";
import { Disclosure, Transition } from "@headlessui/react";
// plane imports
+import { ContrastIcon } from "@plane/propel/icons";
import { EUserWorkspaceRoles } from "@plane/types";
-import { ContrastIcon } from "@plane/ui";
// hooks
import useLocalStorage from "@/hooks/use-local-storage";
// local imports
diff --git a/apps/web/core/constants/editor.ts b/apps/web/core/constants/editor.ts
index 57ef821f3..ff046b917 100644
--- a/apps/web/core/constants/editor.ts
+++ b/apps/web/core/constants/editor.ts
@@ -25,7 +25,7 @@ import {
} from "lucide-react";
// plane imports
import type { TCommandExtraProps, TEditorCommands, TEditorFontStyle } from "@plane/editor";
-import { MonospaceIcon, SansSerifIcon, SerifIcon } from "@plane/ui";
+import { MonospaceIcon, SansSerifIcon, SerifIcon } from "@plane/propel/icons";
import { convertRemToPixel } from "@plane/utils";
type TEditorTypes = "lite" | "document" | "sticky";
diff --git a/apps/web/core/constants/plans.tsx b/apps/web/core/constants/plans.tsx
index 3946f1c26..717e2ac7d 100644
--- a/apps/web/core/constants/plans.tsx
+++ b/apps/web/core/constants/plans.tsx
@@ -1,7 +1,7 @@
import { Mail, MessageCircle } from "lucide-react";
+import { DiscordIcon } from "@plane/propel/icons";
import { EProductSubscriptionEnum } from "@plane/types";
// plane imports
-import { DiscordIcon } from "@plane/ui";
import { cn } from "@plane/utils";
export type TPlanFeatureData = React.ReactNode | boolean | null;
diff --git a/apps/web/core/layouts/auth-layout/workspace-wrapper.tsx b/apps/web/core/layouts/auth-layout/workspace-wrapper.tsx
index cc1f4c1d6..dfe7748a4 100644
--- a/apps/web/core/layouts/auth-layout/workspace-wrapper.tsx
+++ b/apps/web/core/layouts/auth-layout/workspace-wrapper.tsx
@@ -11,8 +11,9 @@ import useSWRImmutable from "swr/immutable";
// ui
import { LogOut } from "lucide-react";
import { EUserPermissions, EUserPermissionsLevel } from "@plane/constants";
+import { PlaneLogo } from "@plane/propel/icons";
import { Tooltip } from "@plane/propel/tooltip";
-import { Button, getButtonStyling, PlaneLogo, setToast, TOAST_TYPE } from "@plane/ui";
+import { Button, getButtonStyling, setToast, TOAST_TYPE } from "@plane/ui";
// components
import { cn } from "@plane/utils";
import { LogoSpinner } from "@/components/common/logo-spinner";
diff --git a/packages/propel/package.json b/packages/propel/package.json
index f5f5e39b4..d8887a77b 100644
--- a/packages/propel/package.json
+++ b/packages/propel/package.json
@@ -24,6 +24,7 @@
"./command": "./dist/command/index.js",
"./dialog": "./dist/dialog/index.js",
"./emoji-icon-picker": "./dist/emoji-icon-picker/index.js",
+ "./icons": "./dist/icons/index.js",
"./menu": "./dist/menu/index.js",
"./popover": "./dist/popover/index.js",
"./styles/fonts": "./dist/styles/fonts/index.css",
diff --git a/packages/ui/src/icons/activity-icon.tsx b/packages/propel/src/icons/activity-icon.tsx
similarity index 100%
rename from packages/ui/src/icons/activity-icon.tsx
rename to packages/propel/src/icons/activity-icon.tsx
diff --git a/packages/ui/src/icons/ai-icon.tsx b/packages/propel/src/icons/ai-icon.tsx
similarity index 100%
rename from packages/ui/src/icons/ai-icon.tsx
rename to packages/propel/src/icons/ai-icon.tsx
diff --git a/packages/ui/src/icons/archive-icon.tsx b/packages/propel/src/icons/archive-icon.tsx
similarity index 100%
rename from packages/ui/src/icons/archive-icon.tsx
rename to packages/propel/src/icons/archive-icon.tsx
diff --git a/packages/ui/src/icons/at-risk-icon.tsx b/packages/propel/src/icons/at-risk-icon.tsx
similarity index 100%
rename from packages/ui/src/icons/at-risk-icon.tsx
rename to packages/propel/src/icons/at-risk-icon.tsx
diff --git a/packages/ui/src/icons/bar-icon.tsx b/packages/propel/src/icons/bar-icon.tsx
similarity index 100%
rename from packages/ui/src/icons/bar-icon.tsx
rename to packages/propel/src/icons/bar-icon.tsx
diff --git a/packages/ui/src/icons/blocked-icon.tsx b/packages/propel/src/icons/blocked-icon.tsx
similarity index 100%
rename from packages/ui/src/icons/blocked-icon.tsx
rename to packages/propel/src/icons/blocked-icon.tsx
diff --git a/packages/ui/src/icons/blocker-icon.tsx b/packages/propel/src/icons/blocker-icon.tsx
similarity index 100%
rename from packages/ui/src/icons/blocker-icon.tsx
rename to packages/propel/src/icons/blocker-icon.tsx
diff --git a/packages/ui/src/icons/brand/accenture-logo.tsx b/packages/propel/src/icons/brand/accenture-logo.tsx
similarity index 100%
rename from packages/ui/src/icons/brand/accenture-logo.tsx
rename to packages/propel/src/icons/brand/accenture-logo.tsx
diff --git a/packages/ui/src/icons/brand/dolby-logo.tsx b/packages/propel/src/icons/brand/dolby-logo.tsx
similarity index 100%
rename from packages/ui/src/icons/brand/dolby-logo.tsx
rename to packages/propel/src/icons/brand/dolby-logo.tsx
diff --git a/packages/ui/src/icons/brand/index.ts b/packages/propel/src/icons/brand/index.ts
similarity index 100%
rename from packages/ui/src/icons/brand/index.ts
rename to packages/propel/src/icons/brand/index.ts
diff --git a/packages/ui/src/icons/brand/plane-lockup.tsx b/packages/propel/src/icons/brand/plane-lockup.tsx
similarity index 100%
rename from packages/ui/src/icons/brand/plane-lockup.tsx
rename to packages/propel/src/icons/brand/plane-lockup.tsx
diff --git a/packages/ui/src/icons/brand/plane-logo.tsx b/packages/propel/src/icons/brand/plane-logo.tsx
similarity index 100%
rename from packages/ui/src/icons/brand/plane-logo.tsx
rename to packages/propel/src/icons/brand/plane-logo.tsx
diff --git a/packages/ui/src/icons/brand/plane-wordmark.tsx b/packages/propel/src/icons/brand/plane-wordmark.tsx
similarity index 100%
rename from packages/ui/src/icons/brand/plane-wordmark.tsx
rename to packages/propel/src/icons/brand/plane-wordmark.tsx
diff --git a/packages/ui/src/icons/brand/sony-logo.tsx b/packages/propel/src/icons/brand/sony-logo.tsx
similarity index 100%
rename from packages/ui/src/icons/brand/sony-logo.tsx
rename to packages/propel/src/icons/brand/sony-logo.tsx
diff --git a/packages/ui/src/icons/brand/zerodha-logo.tsx b/packages/propel/src/icons/brand/zerodha-logo.tsx
similarity index 100%
rename from packages/ui/src/icons/brand/zerodha-logo.tsx
rename to packages/propel/src/icons/brand/zerodha-logo.tsx
diff --git a/packages/ui/src/icons/calendar-after-icon.tsx b/packages/propel/src/icons/calendar-after-icon.tsx
similarity index 100%
rename from packages/ui/src/icons/calendar-after-icon.tsx
rename to packages/propel/src/icons/calendar-after-icon.tsx
diff --git a/packages/ui/src/icons/calendar-before-icon.tsx b/packages/propel/src/icons/calendar-before-icon.tsx
similarity index 100%
rename from packages/ui/src/icons/calendar-before-icon.tsx
rename to packages/propel/src/icons/calendar-before-icon.tsx
diff --git a/packages/ui/src/icons/center-panel-icon.tsx b/packages/propel/src/icons/center-panel-icon.tsx
similarity index 100%
rename from packages/ui/src/icons/center-panel-icon.tsx
rename to packages/propel/src/icons/center-panel-icon.tsx
diff --git a/packages/ui/src/icons/comment-fill-icon.tsx b/packages/propel/src/icons/comment-fill-icon.tsx
similarity index 100%
rename from packages/ui/src/icons/comment-fill-icon.tsx
rename to packages/propel/src/icons/comment-fill-icon.tsx
diff --git a/packages/ui/src/icons/create-icon.tsx b/packages/propel/src/icons/create-icon.tsx
similarity index 100%
rename from packages/ui/src/icons/create-icon.tsx
rename to packages/propel/src/icons/create-icon.tsx
diff --git a/packages/ui/src/icons/cycle/circle-dot-full-icon.tsx b/packages/propel/src/icons/cycle/circle-dot-full-icon.tsx
similarity index 100%
rename from packages/ui/src/icons/cycle/circle-dot-full-icon.tsx
rename to packages/propel/src/icons/cycle/circle-dot-full-icon.tsx
diff --git a/packages/ui/src/icons/cycle/contrast-icon.tsx b/packages/propel/src/icons/cycle/contrast-icon.tsx
similarity index 100%
rename from packages/ui/src/icons/cycle/contrast-icon.tsx
rename to packages/propel/src/icons/cycle/contrast-icon.tsx
diff --git a/packages/ui/src/icons/cycle/cycle-group-icon.tsx b/packages/propel/src/icons/cycle/cycle-group-icon.tsx
similarity index 100%
rename from packages/ui/src/icons/cycle/cycle-group-icon.tsx
rename to packages/propel/src/icons/cycle/cycle-group-icon.tsx
index 00c52f611..3fc97c2a7 100644
--- a/packages/ui/src/icons/cycle/cycle-group-icon.tsx
+++ b/packages/propel/src/icons/cycle/cycle-group-icon.tsx
@@ -1,5 +1,5 @@
-import { CircleDotDashed, Circle } from "lucide-react";
import * as React from "react";
+import { CircleDotDashed, Circle } from "lucide-react";
import { CircleDotFullIcon } from "./circle-dot-full-icon";
import { ContrastIcon } from "./contrast-icon";
diff --git a/packages/ui/src/icons/cycle/double-circle-icon.tsx b/packages/propel/src/icons/cycle/double-circle-icon.tsx
similarity index 100%
rename from packages/ui/src/icons/cycle/double-circle-icon.tsx
rename to packages/propel/src/icons/cycle/double-circle-icon.tsx
diff --git a/packages/ui/src/icons/cycle/helper.tsx b/packages/propel/src/icons/cycle/helper.tsx
similarity index 100%
rename from packages/ui/src/icons/cycle/helper.tsx
rename to packages/propel/src/icons/cycle/helper.tsx
diff --git a/packages/ui/src/icons/cycle/index.ts b/packages/propel/src/icons/cycle/index.ts
similarity index 100%
rename from packages/ui/src/icons/cycle/index.ts
rename to packages/propel/src/icons/cycle/index.ts
diff --git a/packages/ui/src/icons/dice-icon.tsx b/packages/propel/src/icons/dice-icon.tsx
similarity index 100%
rename from packages/ui/src/icons/dice-icon.tsx
rename to packages/propel/src/icons/dice-icon.tsx
diff --git a/packages/ui/src/icons/discord-icon.tsx b/packages/propel/src/icons/discord-icon.tsx
similarity index 100%
rename from packages/ui/src/icons/discord-icon.tsx
rename to packages/propel/src/icons/discord-icon.tsx
diff --git a/packages/ui/src/icons/display-properties.tsx b/packages/propel/src/icons/display-properties.tsx
similarity index 100%
rename from packages/ui/src/icons/display-properties.tsx
rename to packages/propel/src/icons/display-properties.tsx
diff --git a/packages/ui/src/icons/done-icon.tsx b/packages/propel/src/icons/done-icon.tsx
similarity index 94%
rename from packages/ui/src/icons/done-icon.tsx
rename to packages/propel/src/icons/done-icon.tsx
index 82783ea1d..36fc491f3 100644
--- a/packages/ui/src/icons/done-icon.tsx
+++ b/packages/propel/src/icons/done-icon.tsx
@@ -2,7 +2,7 @@ import * as React from "react";
import { ISvgIcons } from "./type";
-export const DoneState: React.FC = ({ width = "10", height = "11", className, color }) => (
+export const DoneState: React.FC = ({ width = "10", height = "11", className }) => (