diff --git a/packages/frontend/component/package.json b/packages/frontend/component/package.json
index 55051b8e53..82a7a2b763 100644
--- a/packages/frontend/component/package.json
+++ b/packages/frontend/component/package.json
@@ -78,7 +78,7 @@
     "@blocksuite/block-std": "0.15.0-canary-202406180357-838ef08",
     "@blocksuite/blocks": "0.15.0-canary-202406180357-838ef08",
     "@blocksuite/global": "0.15.0-canary-202406180357-838ef08",
-    "@blocksuite/icons": "2.1.55",
+    "@blocksuite/icons": "2.1.58",
     "@blocksuite/presets": "0.15.0-canary-202406180357-838ef08",
     "@blocksuite/store": "0.15.0-canary-202406180357-838ef08",
     "@storybook/addon-actions": "^7.6.17",
diff --git a/packages/frontend/component/src/components/affine-banner/browser-warning.tsx b/packages/frontend/component/src/components/affine-banner/browser-warning.tsx
index 4a6cbbb5f9..cc277d539f 100644
--- a/packages/frontend/component/src/components/affine-banner/browser-warning.tsx
+++ b/packages/frontend/component/src/components/affine-banner/browser-warning.tsx
@@ -1,4 +1,4 @@
-import { CloseIcon } from '@blocksuite/icons';
+import { CloseIcon } from '@blocksuite/icons/rc';
 import type { ReactNode } from 'react';
 
 import {
diff --git a/packages/frontend/component/src/components/affine-banner/local-demo-tips.tsx b/packages/frontend/component/src/components/affine-banner/local-demo-tips.tsx
index 770ab3340a..56a82848c4 100644
--- a/packages/frontend/component/src/components/affine-banner/local-demo-tips.tsx
+++ b/packages/frontend/component/src/components/affine-banner/local-demo-tips.tsx
@@ -1,6 +1,6 @@
 import { Button, IconButton } from '@affine/component/ui/button';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { CloseIcon } from '@blocksuite/icons';
+import { CloseIcon } from '@blocksuite/icons/rc';
 import { useCallback } from 'react';
 
 import * as styles from './index.css';
diff --git a/packages/frontend/component/src/components/affine-other-page-layout/layout.tsx b/packages/frontend/component/src/components/affine-other-page-layout/layout.tsx
index f5128aad39..b42b099fa3 100644
--- a/packages/frontend/component/src/components/affine-other-page-layout/layout.tsx
+++ b/packages/frontend/component/src/components/affine-other-page-layout/layout.tsx
@@ -1,6 +1,6 @@
 import { Button } from '@affine/component/ui/button';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { Logo1Icon } from '@blocksuite/icons';
+import { Logo1Icon } from '@blocksuite/icons/rc';
 import { useCallback } from 'react';
 
 import { DesktopNavbar } from './desktop-navbar';
diff --git a/packages/frontend/component/src/components/affine-other-page-layout/mobile-navbar.tsx b/packages/frontend/component/src/components/affine-other-page-layout/mobile-navbar.tsx
index 5cebda88d7..c3d3d43aa7 100644
--- a/packages/frontend/component/src/components/affine-other-page-layout/mobile-navbar.tsx
+++ b/packages/frontend/component/src/components/affine-other-page-layout/mobile-navbar.tsx
@@ -1,6 +1,6 @@
 import { IconButton } from '@affine/component/ui/button';
 import { Menu, MenuItem } from '@affine/component/ui/menu';
-import { CloseIcon, PropertyIcon } from '@blocksuite/icons';
+import { CloseIcon, PropertyIcon } from '@blocksuite/icons/rc';
 import { useState } from 'react';
 
 import * as styles from './index.css';
diff --git a/packages/frontend/component/src/components/auth-components/back-button.tsx b/packages/frontend/component/src/components/auth-components/back-button.tsx
index 0b09d16426..668e611c7c 100644
--- a/packages/frontend/component/src/components/auth-components/back-button.tsx
+++ b/packages/frontend/component/src/components/auth-components/back-button.tsx
@@ -1,5 +1,5 @@
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { ArrowLeftSmallIcon } from '@blocksuite/icons';
+import { ArrowLeftSmallIcon } from '@blocksuite/icons/rc';
 import type { FC } from 'react';
 
 import type { ButtonProps } from '../../ui/button';
diff --git a/packages/frontend/component/src/components/auth-components/modal-header.tsx b/packages/frontend/component/src/components/auth-components/modal-header.tsx
index 3cd90eaa99..2cf9be056c 100644
--- a/packages/frontend/component/src/components/auth-components/modal-header.tsx
+++ b/packages/frontend/component/src/components/auth-components/modal-header.tsx
@@ -1,4 +1,4 @@
-import { Logo1Icon } from '@blocksuite/icons';
+import { Logo1Icon } from '@blocksuite/icons/rc';
 import type { FC } from 'react';
 
 import { modalHeaderWrapper } from './share.css';
diff --git a/packages/frontend/component/src/components/auth-components/onboarding-page.tsx b/packages/frontend/component/src/components/auth-components/onboarding-page.tsx
index eb1e04c640..d0166240c3 100644
--- a/packages/frontend/component/src/components/auth-components/onboarding-page.tsx
+++ b/packages/frontend/component/src/components/auth-components/onboarding-page.tsx
@@ -1,5 +1,5 @@
 import { apis } from '@affine/electron-api';
-import { ArrowRightSmallIcon } from '@blocksuite/icons';
+import { ArrowRightSmallIcon } from '@blocksuite/icons/rc';
 import clsx from 'clsx';
 import { useEffect, useMemo, useState } from 'react';
 import type { Location } from 'react-router-dom';
diff --git a/packages/frontend/component/src/components/card/workspace-card/index.tsx b/packages/frontend/component/src/components/card/workspace-card/index.tsx
index 529b712c8e..e6cb52729b 100644
--- a/packages/frontend/component/src/components/card/workspace-card/index.tsx
+++ b/packages/frontend/component/src/components/card/workspace-card/index.tsx
@@ -1,7 +1,7 @@
 import { WorkspaceAvatar } from '@affine/component/workspace-avatar';
 import { UNTITLED_WORKSPACE_NAME } from '@affine/env/constant';
 import { WorkspaceFlavour } from '@affine/env/workspace';
-import { CollaborationIcon, SettingsIcon } from '@blocksuite/icons';
+import { CollaborationIcon, SettingsIcon } from '@blocksuite/icons/rc';
 import type { WorkspaceMetadata } from '@toeverything/infra';
 import clsx from 'clsx';
 import { type MouseEvent, useCallback } from 'react';
diff --git a/packages/frontend/component/src/components/import-page/index.tsx b/packages/frontend/component/src/components/import-page/index.tsx
index 53784b1af7..341201a610 100644
--- a/packages/frontend/component/src/components/import-page/index.tsx
+++ b/packages/frontend/component/src/components/import-page/index.tsx
@@ -5,7 +5,7 @@ import {
   HelpIcon,
   NewIcon,
   NotionIcon,
-} from '@blocksuite/icons';
+} from '@blocksuite/icons/rc';
 
 import { IconButton } from '../../ui/button';
 import { Tooltip } from '../../ui/tooltip';
diff --git a/packages/frontend/component/src/components/member-components/pagination.tsx b/packages/frontend/component/src/components/member-components/pagination.tsx
index 9c9273db4d..136aa413bc 100644
--- a/packages/frontend/component/src/components/member-components/pagination.tsx
+++ b/packages/frontend/component/src/components/member-components/pagination.tsx
@@ -1,4 +1,4 @@
-import { ArrowLeftSmallIcon, ArrowRightSmallIcon } from '@blocksuite/icons';
+import { ArrowLeftSmallIcon, ArrowRightSmallIcon } from '@blocksuite/icons/rc';
 import clsx from 'clsx';
 import { useCallback, useMemo } from 'react';
 import ReactPaginate from 'react-paginate';
diff --git a/packages/frontend/component/src/components/not-found-page/not-found-page.tsx b/packages/frontend/component/src/components/not-found-page/not-found-page.tsx
index 08e6434f79..e9c832d9f2 100644
--- a/packages/frontend/component/src/components/not-found-page/not-found-page.tsx
+++ b/packages/frontend/component/src/components/not-found-page/not-found-page.tsx
@@ -1,5 +1,5 @@
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { SignOutIcon } from '@blocksuite/icons';
+import { SignOutIcon } from '@blocksuite/icons/rc';
 
 import { Avatar } from '../../ui/avatar';
 import { Button, IconButton } from '../../ui/button';
diff --git a/packages/frontend/component/src/components/notification-center/index.tsx b/packages/frontend/component/src/components/notification-center/index.tsx
index 1534f11bef..0cf0022398 100644
--- a/packages/frontend/component/src/components/notification-center/index.tsx
+++ b/packages/frontend/component/src/components/notification-center/index.tsx
@@ -3,7 +3,7 @@
 // https://github.com/emilkowalski/sonner/blob/5cb703edc108a23fd74979235c2f3c4005edd2a7/src/index.tsx
 
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { CloseIcon, InformationFillDuotoneIcon } from '@blocksuite/icons';
+import { CloseIcon, InformationFillDuotoneIcon } from '@blocksuite/icons/rc';
 import * as Toast from '@radix-ui/react-toast';
 import clsx from 'clsx';
 import { useAtom, useAtomValue, useSetAtom } from 'jotai';
diff --git a/packages/frontend/component/src/ui/avatar/avatar.stories.tsx b/packages/frontend/component/src/ui/avatar/avatar.stories.tsx
index 9ed8367352..c8a11b082e 100644
--- a/packages/frontend/component/src/ui/avatar/avatar.stories.tsx
+++ b/packages/frontend/component/src/ui/avatar/avatar.stories.tsx
@@ -1,4 +1,4 @@
-import { CameraIcon } from '@blocksuite/icons';
+import { CameraIcon } from '@blocksuite/icons/rc';
 import type { Meta, StoryFn } from '@storybook/react';
 
 import type { AvatarProps } from './avatar';
diff --git a/packages/frontend/component/src/ui/avatar/avatar.tsx b/packages/frontend/component/src/ui/avatar/avatar.tsx
index f81612f163..66adb927b6 100644
--- a/packages/frontend/component/src/ui/avatar/avatar.tsx
+++ b/packages/frontend/component/src/ui/avatar/avatar.tsx
@@ -1,4 +1,4 @@
-import { CloseIcon } from '@blocksuite/icons';
+import { CloseIcon } from '@blocksuite/icons/rc';
 import type {
   AvatarFallbackProps,
   AvatarImageProps,
diff --git a/packages/frontend/component/src/ui/button/button.stories.tsx b/packages/frontend/component/src/ui/button/button.stories.tsx
index a62b44bc3b..44c218b8ba 100644
--- a/packages/frontend/component/src/ui/button/button.stories.tsx
+++ b/packages/frontend/component/src/ui/button/button.stories.tsx
@@ -1,4 +1,4 @@
-import { InformationIcon } from '@blocksuite/icons';
+import { InformationIcon } from '@blocksuite/icons/rc';
 import type { Meta, StoryFn } from '@storybook/react';
 
 import type { ButtonProps } from './button';
diff --git a/packages/frontend/component/src/ui/button/dropdown-button.tsx b/packages/frontend/component/src/ui/button/dropdown-button.tsx
index b51e913b21..c20dfb6647 100644
--- a/packages/frontend/component/src/ui/button/dropdown-button.tsx
+++ b/packages/frontend/component/src/ui/button/dropdown-button.tsx
@@ -1,4 +1,4 @@
-import { ArrowDownSmallIcon } from '@blocksuite/icons';
+import { ArrowDownSmallIcon } from '@blocksuite/icons/rc';
 import type { ButtonHTMLAttributes, MouseEventHandler } from 'react';
 import { forwardRef } from 'react';
 
diff --git a/packages/frontend/component/src/ui/button/icon-button.stories.tsx b/packages/frontend/component/src/ui/button/icon-button.stories.tsx
index 279faac1c2..6509ea4052 100644
--- a/packages/frontend/component/src/ui/button/icon-button.stories.tsx
+++ b/packages/frontend/component/src/ui/button/icon-button.stories.tsx
@@ -1,4 +1,4 @@
-import { InformationIcon } from '@blocksuite/icons';
+import { InformationIcon } from '@blocksuite/icons/rc';
 import type { Meta, StoryFn } from '@storybook/react';
 
 import type { IconButtonProps } from './icon-button';
diff --git a/packages/frontend/component/src/ui/date-picker/calendar/items.tsx b/packages/frontend/component/src/ui/date-picker/calendar/items.tsx
index a934f43444..ec35aa4dc0 100644
--- a/packages/frontend/component/src/ui/date-picker/calendar/items.tsx
+++ b/packages/frontend/component/src/ui/date-picker/calendar/items.tsx
@@ -1,4 +1,4 @@
-import { ArrowLeftSmallIcon, ArrowRightSmallIcon } from '@blocksuite/icons';
+import { ArrowLeftSmallIcon, ArrowRightSmallIcon } from '@blocksuite/icons/rc';
 import { assignInlineVars } from '@vanilla-extract/dynamic';
 import clsx from 'clsx';
 import type { HTMLAttributes, PropsWithChildren, ReactNode } from 'react';
diff --git a/packages/frontend/component/src/ui/date-picker/week-date-picker.tsx b/packages/frontend/component/src/ui/date-picker/week-date-picker.tsx
index 365909d4c1..7a188fd0ea 100644
--- a/packages/frontend/component/src/ui/date-picker/week-date-picker.tsx
+++ b/packages/frontend/component/src/ui/date-picker/week-date-picker.tsx
@@ -1,4 +1,4 @@
-import { ArrowLeftSmallIcon, ArrowRightSmallIcon } from '@blocksuite/icons';
+import { ArrowLeftSmallIcon, ArrowRightSmallIcon } from '@blocksuite/icons/rc';
 import clsx from 'clsx';
 import dayjs from 'dayjs';
 import type { ForwardedRef, HTMLAttributes } from 'react';
diff --git a/packages/frontend/component/src/ui/input/input.stories.tsx b/packages/frontend/component/src/ui/input/input.stories.tsx
index c04238e60d..bca54dbeca 100644
--- a/packages/frontend/component/src/ui/input/input.stories.tsx
+++ b/packages/frontend/component/src/ui/input/input.stories.tsx
@@ -1,4 +1,4 @@
-import { InformationIcon } from '@blocksuite/icons';
+import { InformationIcon } from '@blocksuite/icons/rc';
 import type { Meta, StoryFn } from '@storybook/react';
 
 import type { InputProps } from './index';
diff --git a/packages/frontend/component/src/ui/menu/menu-sub.tsx b/packages/frontend/component/src/ui/menu/menu-sub.tsx
index 6b947feece..34c9083993 100644
--- a/packages/frontend/component/src/ui/menu/menu-sub.tsx
+++ b/packages/frontend/component/src/ui/menu/menu-sub.tsx
@@ -1,4 +1,4 @@
-import { ArrowRightSmallIcon } from '@blocksuite/icons';
+import { ArrowRightSmallIcon } from '@blocksuite/icons/rc';
 import type {
   DropdownMenuSubProps,
   MenuPortalProps,
diff --git a/packages/frontend/component/src/ui/menu/menu-trigger.tsx b/packages/frontend/component/src/ui/menu/menu-trigger.tsx
index 58bfc1aa7b..61856005d8 100644
--- a/packages/frontend/component/src/ui/menu/menu-trigger.tsx
+++ b/packages/frontend/component/src/ui/menu/menu-trigger.tsx
@@ -1,4 +1,4 @@
-import { ArrowDownSmallIcon } from '@blocksuite/icons';
+import { ArrowDownSmallIcon } from '@blocksuite/icons/rc';
 import { assignInlineVars } from '@vanilla-extract/dynamic';
 import clsx from 'clsx';
 import type {
diff --git a/packages/frontend/component/src/ui/menu/menu.stories.tsx b/packages/frontend/component/src/ui/menu/menu.stories.tsx
index 1a59585e6a..90a7ffcf2b 100644
--- a/packages/frontend/component/src/ui/menu/menu.stories.tsx
+++ b/packages/frontend/component/src/ui/menu/menu.stories.tsx
@@ -1,4 +1,4 @@
-import { InformationIcon } from '@blocksuite/icons';
+import { InformationIcon } from '@blocksuite/icons/rc';
 import type { Meta, StoryFn } from '@storybook/react';
 import type { ReactNode } from 'react';
 import { useCallback, useState } from 'react';
diff --git a/packages/frontend/component/src/ui/menu/use-menu-item.tsx b/packages/frontend/component/src/ui/menu/use-menu-item.tsx
index b690d5e3fe..0ae890426d 100644
--- a/packages/frontend/component/src/ui/menu/use-menu-item.tsx
+++ b/packages/frontend/component/src/ui/menu/use-menu-item.tsx
@@ -1,4 +1,4 @@
-import { DoneIcon } from '@blocksuite/icons';
+import { DoneIcon } from '@blocksuite/icons/rc';
 import clsx from 'clsx';
 import { useMemo } from 'react';
 
diff --git a/packages/frontend/component/src/ui/modal/modal.tsx b/packages/frontend/component/src/ui/modal/modal.tsx
index c2d9856141..6d03d3fc42 100644
--- a/packages/frontend/component/src/ui/modal/modal.tsx
+++ b/packages/frontend/component/src/ui/modal/modal.tsx
@@ -1,4 +1,4 @@
-import { CloseIcon } from '@blocksuite/icons';
+import { CloseIcon } from '@blocksuite/icons/rc';
 import type {
   DialogContentProps,
   DialogOverlayProps,
diff --git a/packages/frontend/component/src/ui/notification/notification-card.tsx b/packages/frontend/component/src/ui/notification/notification-card.tsx
index 816c674234..0217ebd59f 100644
--- a/packages/frontend/component/src/ui/notification/notification-card.tsx
+++ b/packages/frontend/component/src/ui/notification/notification-card.tsx
@@ -1,4 +1,4 @@
-import { CloseIcon, InformationFillDuotoneIcon } from '@blocksuite/icons';
+import { CloseIcon, InformationFillDuotoneIcon } from '@blocksuite/icons/rc';
 import { assignInlineVars } from '@vanilla-extract/dynamic';
 import clsx from 'clsx';
 import { type HTMLAttributes, useCallback } from 'react';
diff --git a/packages/frontend/component/src/ui/notification/notification-center.stories.tsx b/packages/frontend/component/src/ui/notification/notification-center.stories.tsx
index 61ad4ea079..04a890a8be 100644
--- a/packages/frontend/component/src/ui/notification/notification-center.stories.tsx
+++ b/packages/frontend/component/src/ui/notification/notification-center.stories.tsx
@@ -1,4 +1,4 @@
-import { SingleSelectSelectSolidIcon } from '@blocksuite/icons';
+import { SingleSelectSelectSolidIcon } from '@blocksuite/icons/rc';
 import type { StoryFn } from '@storybook/react';
 import { cssVar } from '@toeverything/theme';
 import { type HTMLAttributes, useState } from 'react';
diff --git a/packages/frontend/component/src/ui/notification/notification-center.tsx b/packages/frontend/component/src/ui/notification/notification-center.tsx
index d17fb13ca9..c8765da3bd 100644
--- a/packages/frontend/component/src/ui/notification/notification-center.tsx
+++ b/packages/frontend/component/src/ui/notification/notification-center.tsx
@@ -1,7 +1,7 @@
 import {
   InformationFillDuotoneIcon,
   SingleSelectSelectSolidIcon,
-} from '@blocksuite/icons';
+} from '@blocksuite/icons/rc';
 import { assignInlineVars } from '@vanilla-extract/dynamic';
 import { type CSSProperties, type FC, useMemo } from 'react';
 import { type ExternalToast, toast, Toaster } from 'sonner';
diff --git a/packages/frontend/core/package.json b/packages/frontend/core/package.json
index 9f947efec3..8ee336011f 100644
--- a/packages/frontend/core/package.json
+++ b/packages/frontend/core/package.json
@@ -25,7 +25,7 @@
     "@blocksuite/block-std": "0.15.0-canary-202406180357-838ef08",
     "@blocksuite/blocks": "0.15.0-canary-202406180357-838ef08",
     "@blocksuite/global": "0.15.0-canary-202406180357-838ef08",
-    "@blocksuite/icons": "2.1.55",
+    "@blocksuite/icons": "2.1.58",
     "@blocksuite/inline": "0.15.0-canary-202406180357-838ef08",
     "@blocksuite/presets": "0.15.0-canary-202406180357-838ef08",
     "@blocksuite/store": "0.15.0-canary-202406180357-838ef08",
diff --git a/packages/frontend/core/src/commands/affine-creation.tsx b/packages/frontend/core/src/commands/affine-creation.tsx
index 2f7cdd4b02..0f63c055d5 100644
--- a/packages/frontend/core/src/commands/affine-creation.tsx
+++ b/packages/frontend/core/src/commands/affine-creation.tsx
@@ -1,5 +1,5 @@
 import type { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { ImportIcon, PlusIcon } from '@blocksuite/icons';
+import { ImportIcon, PlusIcon } from '@blocksuite/icons/rc';
 import type { createStore } from 'jotai';
 
 import { openCreateWorkspaceModalAtom } from '../atoms';
diff --git a/packages/frontend/core/src/commands/affine-help.tsx b/packages/frontend/core/src/commands/affine-help.tsx
index 7edb5708e4..6e34b36ead 100644
--- a/packages/frontend/core/src/commands/affine-help.tsx
+++ b/packages/frontend/core/src/commands/affine-help.tsx
@@ -1,5 +1,5 @@
 import type { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { ContactWithUsIcon, NewIcon } from '@blocksuite/icons';
+import { ContactWithUsIcon, NewIcon } from '@blocksuite/icons/rc';
 import type { createStore } from 'jotai';
 
 import { openSettingModalAtom } from '../atoms';
diff --git a/packages/frontend/core/src/commands/affine-layout.tsx b/packages/frontend/core/src/commands/affine-layout.tsx
index 748accb072..618773696a 100644
--- a/packages/frontend/core/src/commands/affine-layout.tsx
+++ b/packages/frontend/core/src/commands/affine-layout.tsx
@@ -1,5 +1,5 @@
 import type { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { SidebarIcon } from '@blocksuite/icons';
+import { SidebarIcon } from '@blocksuite/icons/rc';
 import type { createStore } from 'jotai';
 
 import { appSidebarOpenAtom } from '../components/app-sidebar';
diff --git a/packages/frontend/core/src/commands/affine-navigation.tsx b/packages/frontend/core/src/commands/affine-navigation.tsx
index 8ae99bd285..afbae8e84e 100644
--- a/packages/frontend/core/src/commands/affine-navigation.tsx
+++ b/packages/frontend/core/src/commands/affine-navigation.tsx
@@ -1,6 +1,6 @@
 import { WorkspaceSubPath } from '@affine/core/shared';
 import type { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { ArrowRightBigIcon } from '@blocksuite/icons';
+import { ArrowRightBigIcon } from '@blocksuite/icons/rc';
 import type { DocCollection } from '@blocksuite/store';
 import type { createStore } from 'jotai';
 
diff --git a/packages/frontend/core/src/commands/affine-settings.tsx b/packages/frontend/core/src/commands/affine-settings.tsx
index e6c52aef04..cf5a961ef7 100644
--- a/packages/frontend/core/src/commands/affine-settings.tsx
+++ b/packages/frontend/core/src/commands/affine-settings.tsx
@@ -1,5 +1,5 @@
 import type { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { SettingsIcon } from '@blocksuite/icons';
+import { SettingsIcon } from '@blocksuite/icons/rc';
 import type { AffineEditorContainer } from '@blocksuite/presets';
 import { appSettingAtom } from '@toeverything/infra';
 import type { createStore } from 'jotai';
diff --git a/packages/frontend/core/src/commands/affine-updates.tsx b/packages/frontend/core/src/commands/affine-updates.tsx
index 28092f10f4..7dd78060c7 100644
--- a/packages/frontend/core/src/commands/affine-updates.tsx
+++ b/packages/frontend/core/src/commands/affine-updates.tsx
@@ -1,7 +1,7 @@
 import { updateReadyAtom } from '@affine/core/hooks/use-app-updater';
 import { apis } from '@affine/electron-api';
 import type { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { ResetIcon } from '@blocksuite/icons';
+import { ResetIcon } from '@blocksuite/icons/rc';
 import type { createStore } from 'jotai';
 
 import { registerAffineCommand } from './registry';
diff --git a/packages/frontend/core/src/components/admin-panel/admin-panel-header.tsx b/packages/frontend/core/src/components/admin-panel/admin-panel-header.tsx
index 4bd323bc57..dcd1c6f66f 100644
--- a/packages/frontend/core/src/components/admin-panel/admin-panel-header.tsx
+++ b/packages/frontend/core/src/components/admin-panel/admin-panel-header.tsx
@@ -1,6 +1,6 @@
 import { Button, useConfirmModal } from '@affine/component';
 import { useNavigateHelper } from '@affine/core/hooks/use-navigate-helper';
-import { ArrowRightBigIcon, Logo1Icon } from '@blocksuite/icons';
+import { ArrowRightBigIcon, Logo1Icon } from '@blocksuite/icons/rc';
 import { useCallback } from 'react';
 
 import * as styles from './index.css';
diff --git a/packages/frontend/core/src/components/admin-panel/collapsible-item.tsx b/packages/frontend/core/src/components/admin-panel/collapsible-item.tsx
index 196bac76fb..4522506885 100644
--- a/packages/frontend/core/src/components/admin-panel/collapsible-item.tsx
+++ b/packages/frontend/core/src/components/admin-panel/collapsible-item.tsx
@@ -1,4 +1,4 @@
-import { ArrowDownSmallIcon } from '@blocksuite/icons';
+import { ArrowDownSmallIcon } from '@blocksuite/icons/rc';
 import * as Collapsible from '@radix-ui/react-collapsible';
 import { useCallback, useState } from 'react';
 
diff --git a/packages/frontend/core/src/components/affine/ai-onboarding/edgeless.dialog.tsx b/packages/frontend/core/src/components/affine/ai-onboarding/edgeless.dialog.tsx
index c2495154db..cb55217523 100644
--- a/packages/frontend/core/src/components/affine/ai-onboarding/edgeless.dialog.tsx
+++ b/packages/frontend/core/src/components/affine/ai-onboarding/edgeless.dialog.tsx
@@ -3,7 +3,7 @@ import { openSettingModalAtom } from '@affine/core/atoms';
 import { SubscriptionService } from '@affine/core/modules/cloud';
 import { mixpanel } from '@affine/core/utils';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { AiIcon } from '@blocksuite/icons';
+import { AiIcon } from '@blocksuite/icons/rc';
 import {
   DocService,
   useLiveData,
diff --git a/packages/frontend/core/src/components/affine/ai-onboarding/general.dialog.tsx b/packages/frontend/core/src/components/affine/ai-onboarding/general.dialog.tsx
index 48438333fc..c0ce72e86c 100644
--- a/packages/frontend/core/src/components/affine/ai-onboarding/general.dialog.tsx
+++ b/packages/frontend/core/src/components/affine/ai-onboarding/general.dialog.tsx
@@ -5,7 +5,7 @@ import { AuthService, SubscriptionService } from '@affine/core/modules/cloud';
 import { mixpanel } from '@affine/core/utils';
 import { Trans } from '@affine/i18n';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { ArrowLeftSmallIcon } from '@blocksuite/icons';
+import { ArrowLeftSmallIcon } from '@blocksuite/icons/rc';
 import { useLiveData, useServices } from '@toeverything/infra';
 import { useAtom } from 'jotai';
 import type { ReactNode } from 'react';
diff --git a/packages/frontend/core/src/components/affine/ai-onboarding/local.dialog.tsx b/packages/frontend/core/src/components/affine/ai-onboarding/local.dialog.tsx
index 2793ed6d9d..3a638bd021 100644
--- a/packages/frontend/core/src/components/affine/ai-onboarding/local.dialog.tsx
+++ b/packages/frontend/core/src/components/affine/ai-onboarding/local.dialog.tsx
@@ -5,7 +5,7 @@ import {
 } from '@affine/core/hooks/use-navigate-helper';
 import { AuthService } from '@affine/core/modules/cloud';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { AiIcon } from '@blocksuite/icons';
+import { AiIcon } from '@blocksuite/icons/rc';
 import { useLiveData, useService } from '@toeverything/infra';
 import { cssVar } from '@toeverything/theme';
 import { useEffect, useRef } from 'react';
diff --git a/packages/frontend/core/src/components/affine/auth/oauth.tsx b/packages/frontend/core/src/components/affine/auth/oauth.tsx
index f8a7e3ac00..a133920c2e 100644
--- a/packages/frontend/core/src/components/affine/auth/oauth.tsx
+++ b/packages/frontend/core/src/components/affine/auth/oauth.tsx
@@ -2,7 +2,7 @@ import { notify, Skeleton } from '@affine/component';
 import { Button } from '@affine/component/ui/button';
 import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks';
 import { OAuthProviderType } from '@affine/graphql';
-import { GithubIcon, GoogleDuotoneIcon } from '@blocksuite/icons';
+import { GithubIcon, GoogleDuotoneIcon } from '@blocksuite/icons/rc';
 import { useLiveData, useService } from '@toeverything/infra';
 import type { ReactElement } from 'react';
 import { useState } from 'react';
diff --git a/packages/frontend/core/src/components/affine/auth/sign-in.tsx b/packages/frontend/core/src/components/affine/auth/sign-in.tsx
index 665250e754..3db1304ac6 100644
--- a/packages/frontend/core/src/components/affine/auth/sign-in.tsx
+++ b/packages/frontend/core/src/components/affine/auth/sign-in.tsx
@@ -4,7 +4,7 @@ import { Button } from '@affine/component/ui/button';
 import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks';
 import { Trans } from '@affine/i18n';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { ArrowDownBigIcon } from '@blocksuite/icons';
+import { ArrowDownBigIcon } from '@blocksuite/icons/rc';
 import { useLiveData, useService } from '@toeverything/infra';
 import type { FC } from 'react';
 import { useCallback, useEffect, useState } from 'react';
diff --git a/packages/frontend/core/src/components/affine/language-menu/index.tsx b/packages/frontend/core/src/components/affine/language-menu/index.tsx
index db715e1625..23176d26f7 100644
--- a/packages/frontend/core/src/components/affine/language-menu/index.tsx
+++ b/packages/frontend/core/src/components/affine/language-menu/index.tsx
@@ -1,5 +1,5 @@
 import { Menu, MenuItem, MenuTrigger } from '@affine/component/ui/menu';
-import { DoneIcon } from '@blocksuite/icons';
+import { DoneIcon } from '@blocksuite/icons/rc';
 import type { ReactElement } from 'react';
 import { memo } from 'react';
 
diff --git a/packages/frontend/core/src/components/affine/onboarding/switch-widgets/page-link.tsx b/packages/frontend/core/src/components/affine/onboarding/switch-widgets/page-link.tsx
index fb36cb3922..8fb3e80bc7 100644
--- a/packages/frontend/core/src/components/affine/onboarding/switch-widgets/page-link.tsx
+++ b/packages/frontend/core/src/components/affine/onboarding/switch-widgets/page-link.tsx
@@ -1,4 +1,4 @@
-import { LinkedPageIcon } from '@blocksuite/icons';
+import { LinkedPageIcon } from '@blocksuite/icons/rc';
 import type { PropsWithChildren } from 'react';
 
 import { pageLink, pageLinkIcon, pageLinkLabel } from '../articles/blocks.css';
diff --git a/packages/frontend/core/src/components/affine/page-history-modal/history-modal.tsx b/packages/frontend/core/src/components/affine/page-history-modal/history-modal.tsx
index 6995c844f5..57626618d6 100644
--- a/packages/frontend/core/src/components/affine/page-history-modal/history-modal.tsx
+++ b/packages/frontend/core/src/components/affine/page-history-modal/history-modal.tsx
@@ -8,7 +8,7 @@ import { WorkspacePermissionService } from '@affine/core/modules/permissions';
 import { WorkspaceQuotaService } from '@affine/core/modules/quota';
 import { Trans } from '@affine/i18n';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { CloseIcon, ToggleCollapseIcon } from '@blocksuite/icons';
+import { CloseIcon, ToggleCollapseIcon } from '@blocksuite/icons/rc';
 import type { Doc as BlockSuiteDoc, DocCollection } from '@blocksuite/store';
 import * as Collapsible from '@radix-ui/react-collapsible';
 import type { DialogContentProps } from '@radix-ui/react-dialog';
diff --git a/packages/frontend/core/src/components/affine/page-properties/icons-mapping.tsx b/packages/frontend/core/src/components/affine/page-properties/icons-mapping.tsx
index b5b8a72d76..ba192afa6f 100644
--- a/packages/frontend/core/src/components/affine/page-properties/icons-mapping.tsx
+++ b/packages/frontend/core/src/components/affine/page-properties/icons-mapping.tsx
@@ -1,5 +1,5 @@
 import { PagePropertyType } from '@affine/core/modules/properties/services/schema';
-import * as icons from '@blocksuite/icons';
+import * as icons from '@blocksuite/icons/rc';
 import type { SVGProps } from 'react';
 
 type IconType = (props: SVGProps<SVGSVGElement>) => JSX.Element;
diff --git a/packages/frontend/core/src/components/affine/page-properties/table.tsx b/packages/frontend/core/src/components/affine/page-properties/table.tsx
index 096e24fde3..4b17c2e2ed 100644
--- a/packages/frontend/core/src/components/affine/page-properties/table.tsx
+++ b/packages/frontend/core/src/components/affine/page-properties/table.tsx
@@ -30,7 +30,7 @@ import {
   TagsIcon,
   ToggleExpandIcon,
   ViewIcon,
-} from '@blocksuite/icons';
+} from '@blocksuite/icons/rc';
 import type { Doc } from '@blocksuite/store';
 import type { DragEndEvent, DraggableAttributes } from '@dnd-kit/core';
 import {
diff --git a/packages/frontend/core/src/components/affine/page-properties/tags-inline-editor.tsx b/packages/frontend/core/src/components/affine/page-properties/tags-inline-editor.tsx
index 3fc5cdf006..2d6a627a4b 100644
--- a/packages/frontend/core/src/components/affine/page-properties/tags-inline-editor.tsx
+++ b/packages/frontend/core/src/components/affine/page-properties/tags-inline-editor.tsx
@@ -4,7 +4,7 @@ import { useNavigateHelper } from '@affine/core/hooks/use-navigate-helper';
 import { WorkspaceLegacyProperties } from '@affine/core/modules/properties';
 import { DeleteTagConfirmModal, TagService } from '@affine/core/modules/tag';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { DeleteIcon, MoreHorizontalIcon, TagsIcon } from '@blocksuite/icons';
+import { DeleteIcon, MoreHorizontalIcon, TagsIcon } from '@blocksuite/icons/rc';
 import { useLiveData, useService } from '@toeverything/infra';
 import clsx from 'clsx';
 import type { HTMLAttributes, PropsWithChildren } from 'react';
diff --git a/packages/frontend/core/src/components/affine/reference-link/index.tsx b/packages/frontend/core/src/components/affine/reference-link/index.tsx
index 03335956bd..ed6d203b5f 100644
--- a/packages/frontend/core/src/components/affine/reference-link/index.tsx
+++ b/packages/frontend/core/src/components/affine/reference-link/index.tsx
@@ -6,7 +6,7 @@ import {
 } from '@affine/core/modules/peek-view';
 import { WorkbenchLink } from '@affine/core/modules/workbench';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { LinkedPageIcon, TodayIcon } from '@blocksuite/icons';
+import { LinkedPageIcon, TodayIcon } from '@blocksuite/icons/rc';
 import type { DocCollection } from '@blocksuite/store';
 import { useService } from '@toeverything/infra';
 import { type PropsWithChildren, useCallback, useRef } from 'react';
diff --git a/packages/frontend/core/src/components/affine/setting-modal/account-setting/index.tsx b/packages/frontend/core/src/components/affine/setting-modal/account-setting/index.tsx
index b2fe64c866..c63eecfe1c 100644
--- a/packages/frontend/core/src/components/affine/setting-modal/account-setting/index.tsx
+++ b/packages/frontend/core/src/components/affine/setting-modal/account-setting/index.tsx
@@ -7,7 +7,7 @@ import { Avatar } from '@affine/component/ui/avatar';
 import { Button } from '@affine/component/ui/button';
 import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { ArrowRightSmallIcon, CameraIcon } from '@blocksuite/icons';
+import { ArrowRightSmallIcon, CameraIcon } from '@blocksuite/icons/rc';
 import {
   useEnsureLiveData,
   useLiveData,
diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/about/icons.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/about/icons.tsx
index f0e048e752..c9e26e1187 100644
--- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/about/icons.tsx
+++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/about/icons.tsx
@@ -1,6 +1,6 @@
-// The icons here have been specially adjusted, they’re different from the ones in the @blocksuite/icons.
+// The icons here have been specially adjusted, they’re different from the ones in the @blocksuite/icons/rc.
 
-export { TwitterIcon } from '@blocksuite/icons';
+export { TwitterIcon } from '@blocksuite/icons/rc';
 export const LogoIcon = () => {
   return (
     <svg
diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/about/index.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/about/index.tsx
index b5fcca1655..573a765d7d 100644
--- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/about/index.tsx
+++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/about/index.tsx
@@ -6,7 +6,7 @@ import {
 } from '@affine/component/setting-components';
 import { useAppUpdater } from '@affine/core/hooks/use-app-updater';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { ArrowRightSmallIcon, OpenInNewIcon } from '@blocksuite/icons';
+import { ArrowRightSmallIcon, OpenInNewIcon } from '@blocksuite/icons/rc';
 import { useCallback } from 'react';
 
 import { useAppSettingHelper } from '../../../../../hooks/affine/use-app-setting-helper';
diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/billing/index.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/billing/index.tsx
index e85cc10d30..3940499ec2 100644
--- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/billing/index.tsx
+++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/billing/index.tsx
@@ -20,7 +20,7 @@ import {
 } from '@affine/graphql';
 import { Trans } from '@affine/i18n';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { ArrowRightSmallIcon } from '@blocksuite/icons';
+import { ArrowRightSmallIcon } from '@blocksuite/icons/rc';
 import { useLiveData, useService } from '@toeverything/infra';
 import { useSetAtom } from 'jotai';
 import { Suspense, useCallback, useEffect, useState } from 'react';
diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/index.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/index.tsx
index b85df46bc8..139288c4ac 100644
--- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/index.tsx
+++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/index.tsx
@@ -5,7 +5,7 @@ import {
   ExperimentIcon,
   InformationIcon,
   KeyboardIcon,
-} from '@blocksuite/icons';
+} from '@blocksuite/icons/rc';
 import { useLiveData, useServices } from '@toeverything/infra';
 import type { ReactElement, SVGProps } from 'react';
 import { useEffect } from 'react';
diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/ai/actions/resume.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/ai/actions/resume.tsx
index 3f6399b4b9..53e8123f9f 100644
--- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/ai/actions/resume.tsx
+++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/ai/actions/resume.tsx
@@ -8,7 +8,7 @@ import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks';
 import { SubscriptionService } from '@affine/core/modules/cloud';
 import { SubscriptionPlan } from '@affine/graphql';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { SingleSelectSelectSolidIcon } from '@blocksuite/icons';
+import { SingleSelectSelectSolidIcon } from '@blocksuite/icons/rc';
 import { useService } from '@toeverything/infra';
 import { cssVar } from '@toeverything/theme';
 import { nanoid } from 'nanoid';
diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/ai/benefits.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/ai/benefits.tsx
index 620c15709b..6c7b471bed 100644
--- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/ai/benefits.tsx
+++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/ai/benefits.tsx
@@ -1,5 +1,9 @@
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { CheckBoxCheckLinearIcon, PenIcon, TextIcon } from '@blocksuite/icons';
+import {
+  CheckBoxCheckLinearIcon,
+  PenIcon,
+  TextIcon,
+} from '@blocksuite/icons/rc';
 import { useMemo } from 'react';
 
 import * as styles from './ai-plan.css';
diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/cloud-plans.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/cloud-plans.tsx
index 0cb23b582e..c6f2bc9e1c 100644
--- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/cloud-plans.tsx
+++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/cloud-plans.tsx
@@ -2,7 +2,7 @@
 // it's better to manage all equity at server side
 import { SubscriptionPlan, SubscriptionRecurring } from '@affine/graphql';
 import type { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { AfFiNeIcon } from '@blocksuite/icons';
+import { AfFiNeIcon } from '@blocksuite/icons/rc';
 import type { ReactNode } from 'react';
 
 import { planTitleTitleCaption } from './style.css';
diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/layout.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/layout.tsx
index 8459d171d2..cb0dd7c5c1 100644
--- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/layout.tsx
+++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/layout.tsx
@@ -6,7 +6,7 @@ import {
   ArrowDownBigIcon,
   ArrowRightBigIcon,
   ArrowUpSmallIcon,
-} from '@blocksuite/icons';
+} from '@blocksuite/icons/rc';
 import * as Collapsible from '@radix-ui/react-collapsible';
 import * as ScrollArea from '@radix-ui/react-scroll-area';
 import { cssVar } from '@toeverything/theme';
diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/plan-card.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/plan-card.tsx
index 021998fe2c..66f77473e2 100644
--- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/plan-card.tsx
+++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/plan-card.tsx
@@ -7,7 +7,7 @@ import type { SubscriptionRecurring } from '@affine/graphql';
 import { SubscriptionPlan, SubscriptionStatus } from '@affine/graphql';
 import { Trans } from '@affine/i18n';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { DoneIcon } from '@blocksuite/icons';
+import { DoneIcon } from '@blocksuite/icons/rc';
 import { useLiveData, useService } from '@toeverything/infra';
 import { useAtom, useSetAtom } from 'jotai';
 import { nanoid } from 'nanoid';
diff --git a/packages/frontend/core/src/components/affine/setting-modal/index.tsx b/packages/frontend/core/src/components/affine/setting-modal/index.tsx
index 846f82e9b8..6609e9429e 100644
--- a/packages/frontend/core/src/components/affine/setting-modal/index.tsx
+++ b/packages/frontend/core/src/components/affine/setting-modal/index.tsx
@@ -8,7 +8,7 @@ import {
 } from '@affine/core/atoms';
 import { AuthService } from '@affine/core/modules/cloud';
 import { Trans } from '@affine/i18n';
-import { ContactWithUsIcon } from '@blocksuite/icons';
+import { ContactWithUsIcon } from '@blocksuite/icons/rc';
 import {
   useLiveData,
   useService,
diff --git a/packages/frontend/core/src/components/affine/setting-modal/setting-sidebar/index.tsx b/packages/frontend/core/src/components/affine/setting-modal/setting-sidebar/index.tsx
index 7fa5a75651..b3e58f6334 100644
--- a/packages/frontend/core/src/components/affine/setting-modal/setting-sidebar/index.tsx
+++ b/packages/frontend/core/src/components/affine/setting-modal/setting-sidebar/index.tsx
@@ -10,7 +10,7 @@ import { AuthService } from '@affine/core/modules/cloud';
 import { UserFeatureService } from '@affine/core/modules/cloud/services/user-feature';
 import { UNTITLED_WORKSPACE_NAME } from '@affine/env/constant';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { Logo1Icon } from '@blocksuite/icons';
+import { Logo1Icon } from '@blocksuite/icons/rc';
 import type { WorkspaceMetadata } from '@toeverything/infra';
 import {
   useLiveData,
diff --git a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/delete-leave-workspace/index.tsx b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/delete-leave-workspace/index.tsx
index 271bcc5b90..bb89060575 100644
--- a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/delete-leave-workspace/index.tsx
+++ b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/delete-leave-workspace/index.tsx
@@ -4,7 +4,7 @@ import { ConfirmModal } from '@affine/component/ui/modal';
 import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks';
 import { WorkspacePermissionService } from '@affine/core/modules/permissions';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { ArrowRightSmallIcon } from '@blocksuite/icons';
+import { ArrowRightSmallIcon } from '@blocksuite/icons/rc';
 import {
   GlobalContextService,
   useLiveData,
diff --git a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/index.tsx b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/index.tsx
index 45c591765b..85cf62553c 100644
--- a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/index.tsx
+++ b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/index.tsx
@@ -7,7 +7,7 @@ import { useWorkspace } from '@affine/core/hooks/use-workspace';
 import { useWorkspaceInfo } from '@affine/core/hooks/use-workspace-info';
 import { UNTITLED_WORKSPACE_NAME } from '@affine/env/constant';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { ArrowRightSmallIcon } from '@blocksuite/icons';
+import { ArrowRightSmallIcon } from '@blocksuite/icons/rc';
 import { FrameworkScope } from '@toeverything/infra';
 import { useCallback } from 'react';
 
diff --git a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/members.tsx b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/members.tsx
index 3e862f0ee8..2d7f7538ea 100644
--- a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/members.tsx
+++ b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/members.tsx
@@ -27,7 +27,7 @@ import { mixpanel } from '@affine/core/utils';
 import { WorkspaceFlavour } from '@affine/env/workspace';
 import { Permission } from '@affine/graphql';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { MoreVerticalIcon } from '@blocksuite/icons';
+import { MoreVerticalIcon } from '@blocksuite/icons/rc';
 import {
   useEnsureLiveData,
   useLiveData,
diff --git a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/profile.tsx b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/profile.tsx
index 6c47a29ac0..6f3d7bb111 100644
--- a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/profile.tsx
+++ b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/profile.tsx
@@ -7,7 +7,7 @@ import { WorkspacePermissionService } from '@affine/core/modules/permissions';
 import { validateAndReduceImage } from '@affine/core/utils/reduce-image';
 import { UNTITLED_WORKSPACE_NAME } from '@affine/env/constant';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { CameraIcon } from '@blocksuite/icons';
+import { CameraIcon } from '@blocksuite/icons/rc';
 import { useLiveData, useService, WorkspaceService } from '@toeverything/infra';
 import type { KeyboardEvent, MouseEvent } from 'react';
 import { useCallback, useEffect, useState } from 'react';
diff --git a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/properties/index.tsx b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/properties/index.tsx
index 9b2ce83857..a2d01fcde4 100644
--- a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/properties/index.tsx
+++ b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/properties/index.tsx
@@ -4,7 +4,11 @@ import { useWorkspaceInfo } from '@affine/core/hooks/use-workspace-info';
 import type { PageInfoCustomPropertyMeta } from '@affine/core/modules/properties/services/schema';
 import { Trans } from '@affine/i18n';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { DeleteIcon, FilterIcon, MoreHorizontalIcon } from '@blocksuite/icons';
+import {
+  DeleteIcon,
+  FilterIcon,
+  MoreHorizontalIcon,
+} from '@blocksuite/icons/rc';
 import { FrameworkScope, type WorkspaceMetadata } from '@toeverything/infra';
 import type { MouseEvent } from 'react';
 import {
diff --git a/packages/frontend/core/src/components/affine/share-page-modal/share-menu/share-export.tsx b/packages/frontend/core/src/components/affine/share-page-modal/share-menu/share-export.tsx
index 8a26f5f24a..47aa2c7eee 100644
--- a/packages/frontend/core/src/components/affine/share-page-modal/share-menu/share-export.tsx
+++ b/packages/frontend/core/src/components/affine/share-page-modal/share-menu/share-export.tsx
@@ -5,7 +5,7 @@ import { useExportPage } from '@affine/core/hooks/affine/use-export-page';
 import { useSharingUrl } from '@affine/core/hooks/affine/use-share-url';
 import { WorkspaceFlavour } from '@affine/env/workspace';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { CopyIcon } from '@blocksuite/icons';
+import { CopyIcon } from '@blocksuite/icons/rc';
 import { DocService, useLiveData, useService } from '@toeverything/infra';
 
 import * as styles from './index.css';
diff --git a/packages/frontend/core/src/components/affine/share-page-modal/share-menu/share-menu.tsx b/packages/frontend/core/src/components/affine/share-page-modal/share-menu/share-menu.tsx
index bb9fde300e..d312e7095b 100644
--- a/packages/frontend/core/src/components/affine/share-page-modal/share-menu/share-menu.tsx
+++ b/packages/frontend/core/src/components/affine/share-page-modal/share-menu/share-menu.tsx
@@ -5,7 +5,7 @@ import { useRegisterCopyLinkCommands } from '@affine/core/hooks/affine/use-regis
 import { useIsActiveView } from '@affine/core/modules/workbench';
 import { WorkspaceFlavour } from '@affine/env/workspace';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { WebIcon } from '@blocksuite/icons';
+import { WebIcon } from '@blocksuite/icons/rc';
 import type { Doc } from '@blocksuite/store';
 import type { WorkspaceMetadata } from '@toeverything/infra';
 import clsx from 'clsx';
diff --git a/packages/frontend/core/src/components/affine/share-page-modal/share-menu/share-page.tsx b/packages/frontend/core/src/components/affine/share-page-modal/share-menu/share-page.tsx
index a12a259c51..f5ce6c5b99 100644
--- a/packages/frontend/core/src/components/affine/share-page-modal/share-menu/share-page.tsx
+++ b/packages/frontend/core/src/components/affine/share-page-modal/share-menu/share-page.tsx
@@ -20,7 +20,7 @@ import { useAFFiNEI18N } from '@affine/i18n/hooks';
 import {
   ArrowRightSmallIcon,
   SingleSelectSelectSolidIcon,
-} from '@blocksuite/icons';
+} from '@blocksuite/icons/rc';
 import {
   type DocMode,
   DocService,
diff --git a/packages/frontend/core/src/components/app-sidebar/add-page-button/index.tsx b/packages/frontend/core/src/components/app-sidebar/add-page-button/index.tsx
index 405e111d4b..3d3be166bc 100644
--- a/packages/frontend/core/src/components/app-sidebar/add-page-button/index.tsx
+++ b/packages/frontend/core/src/components/app-sidebar/add-page-button/index.tsx
@@ -1,5 +1,5 @@
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { PlusIcon } from '@blocksuite/icons';
+import { PlusIcon } from '@blocksuite/icons/rc';
 import clsx from 'clsx';
 import type React from 'react';
 
diff --git a/packages/frontend/core/src/components/app-sidebar/app-download-button/index.tsx b/packages/frontend/core/src/components/app-sidebar/app-download-button/index.tsx
index b01c7f1425..6dea93b44e 100644
--- a/packages/frontend/core/src/components/app-sidebar/app-download-button/index.tsx
+++ b/packages/frontend/core/src/components/app-sidebar/app-download-button/index.tsx
@@ -1,4 +1,4 @@
-import { CloseIcon, DownloadIcon } from '@blocksuite/icons';
+import { CloseIcon, DownloadIcon } from '@blocksuite/icons/rc';
 import clsx from 'clsx';
 import { useCallback, useState } from 'react';
 
diff --git a/packages/frontend/core/src/components/app-sidebar/app-updater-button/index.tsx b/packages/frontend/core/src/components/app-sidebar/app-updater-button/index.tsx
index 08a5c85f42..eb57475aa9 100644
--- a/packages/frontend/core/src/components/app-sidebar/app-updater-button/index.tsx
+++ b/packages/frontend/core/src/components/app-sidebar/app-updater-button/index.tsx
@@ -2,7 +2,7 @@ import { Tooltip } from '@affine/component';
 import { popupWindow } from '@affine/core/utils';
 import { Unreachable } from '@affine/env/constant';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { CloseIcon, NewIcon, ResetIcon } from '@blocksuite/icons';
+import { CloseIcon, NewIcon, ResetIcon } from '@blocksuite/icons/rc';
 import clsx from 'clsx';
 import { useCallback, useMemo } from 'react';
 
diff --git a/packages/frontend/core/src/components/app-sidebar/menu-item/index.stories.tsx b/packages/frontend/core/src/components/app-sidebar/menu-item/index.stories.tsx
index 9c3bb7d788..d2147b19c1 100644
--- a/packages/frontend/core/src/components/app-sidebar/menu-item/index.stories.tsx
+++ b/packages/frontend/core/src/components/app-sidebar/menu-item/index.stories.tsx
@@ -1,4 +1,4 @@
-import { SettingsIcon } from '@blocksuite/icons';
+import { SettingsIcon } from '@blocksuite/icons/rc';
 import type { Meta, StoryFn } from '@storybook/react';
 import { useState } from 'react';
 
diff --git a/packages/frontend/core/src/components/app-sidebar/menu-item/index.tsx b/packages/frontend/core/src/components/app-sidebar/menu-item/index.tsx
index 31ec755168..31d153d4c5 100644
--- a/packages/frontend/core/src/components/app-sidebar/menu-item/index.tsx
+++ b/packages/frontend/core/src/components/app-sidebar/menu-item/index.tsx
@@ -1,4 +1,4 @@
-import { ArrowDownSmallIcon } from '@blocksuite/icons';
+import { ArrowDownSmallIcon } from '@blocksuite/icons/rc';
 import clsx from 'clsx';
 import React from 'react';
 import type { To } from 'react-router-dom';
diff --git a/packages/frontend/core/src/components/app-sidebar/quick-search-input/index.tsx b/packages/frontend/core/src/components/app-sidebar/quick-search-input/index.tsx
index 78debff213..d97c08f0c2 100644
--- a/packages/frontend/core/src/components/app-sidebar/quick-search-input/index.tsx
+++ b/packages/frontend/core/src/components/app-sidebar/quick-search-input/index.tsx
@@ -1,5 +1,5 @@
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { SearchIcon } from '@blocksuite/icons';
+import { SearchIcon } from '@blocksuite/icons/rc';
 import clsx from 'clsx';
 import type { HTMLAttributes } from 'react';
 
diff --git a/packages/frontend/core/src/components/app-sidebar/sidebar-header/sidebar-switch.tsx b/packages/frontend/core/src/components/app-sidebar/sidebar-header/sidebar-switch.tsx
index 70e584d9ed..dd8b7ce548 100644
--- a/packages/frontend/core/src/components/app-sidebar/sidebar-header/sidebar-switch.tsx
+++ b/packages/frontend/core/src/components/app-sidebar/sidebar-header/sidebar-switch.tsx
@@ -1,6 +1,6 @@
 import { IconButton, Tooltip } from '@affine/component';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { SidebarIcon } from '@blocksuite/icons';
+import { SidebarIcon } from '@blocksuite/icons/rc';
 import clsx from 'clsx';
 import { useAtom } from 'jotai';
 
diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-header/menu/index.tsx b/packages/frontend/core/src/components/blocksuite/block-suite-header/menu/index.tsx
index 23aa98e600..b9980811ae 100644
--- a/packages/frontend/core/src/components/blocksuite/block-suite-header/menu/index.tsx
+++ b/packages/frontend/core/src/components/blocksuite/block-suite-header/menu/index.tsx
@@ -24,7 +24,7 @@ import {
   HistoryIcon,
   ImportIcon,
   PageIcon,
-} from '@blocksuite/icons';
+} from '@blocksuite/icons/rc';
 import {
   DocService,
   useLiveData,
diff --git a/packages/frontend/core/src/components/cloud/share-header-right-item/present.tsx b/packages/frontend/core/src/components/cloud/share-header-right-item/present.tsx
index 1db94b4764..6908dc495e 100644
--- a/packages/frontend/core/src/components/cloud/share-header-right-item/present.tsx
+++ b/packages/frontend/core/src/components/cloud/share-header-right-item/present.tsx
@@ -2,7 +2,7 @@ import { Button } from '@affine/component/ui/button';
 import { useActiveBlocksuiteEditor } from '@affine/core/hooks/use-block-suite-editor';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
 import type { EdgelessRootService } from '@blocksuite/blocks';
-import { PresentationIcon } from '@blocksuite/icons';
+import { PresentationIcon } from '@blocksuite/icons/rc';
 import { useCallback, useEffect, useState } from 'react';
 
 import * as styles from './styles.css';
diff --git a/packages/frontend/core/src/components/cloud/share-header-right-item/user-avatar.tsx b/packages/frontend/core/src/components/cloud/share-header-right-item/user-avatar.tsx
index c0116d9e0f..b128cb116b 100644
--- a/packages/frontend/core/src/components/cloud/share-header-right-item/user-avatar.tsx
+++ b/packages/frontend/core/src/components/cloud/share-header-right-item/user-avatar.tsx
@@ -7,7 +7,7 @@ import {
 } from '@affine/component/ui/menu';
 import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { SignOutIcon } from '@blocksuite/icons';
+import { SignOutIcon } from '@blocksuite/icons/rc';
 import { useLiveData, useService } from '@toeverything/infra';
 import { useEffect, useMemo } from 'react';
 
diff --git a/packages/frontend/core/src/components/image-preview/index.tsx b/packages/frontend/core/src/components/image-preview/index.tsx
index 21e35e5443..48ea91697e 100644
--- a/packages/frontend/core/src/components/image-preview/index.tsx
+++ b/packages/frontend/core/src/components/image-preview/index.tsx
@@ -12,7 +12,7 @@ import {
   MinusIcon,
   PlusIcon,
   ViewBarIcon,
-} from '@blocksuite/icons';
+} from '@blocksuite/icons/rc';
 import type { BlockModel, DocCollection } from '@blocksuite/store';
 import clsx from 'clsx';
 import { useErrorBoundary } from 'foxact/use-error-boundary';
diff --git a/packages/frontend/core/src/components/page-list/components/favorite-tag.tsx b/packages/frontend/core/src/components/page-list/components/favorite-tag.tsx
index e7fa9be8ec..ca550700b6 100644
--- a/packages/frontend/core/src/components/page-list/components/favorite-tag.tsx
+++ b/packages/frontend/core/src/components/page-list/components/favorite-tag.tsx
@@ -1,7 +1,7 @@
 import type { IconButtonProps } from '@affine/component';
 import { IconButton, Tooltip } from '@affine/component';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { FavoritedIcon, FavoriteIcon } from '@blocksuite/icons';
+import { FavoritedIcon, FavoriteIcon } from '@blocksuite/icons/rc';
 import Lottie from 'lottie-react';
 import { forwardRef, useCallback, useState } from 'react';
 
diff --git a/packages/frontend/core/src/components/page-list/components/list-floating-toolbar.tsx b/packages/frontend/core/src/components/page-list/components/list-floating-toolbar.tsx
index 68e4928e52..e6421af68f 100644
--- a/packages/frontend/core/src/components/page-list/components/list-floating-toolbar.tsx
+++ b/packages/frontend/core/src/components/page-list/components/list-floating-toolbar.tsx
@@ -3,7 +3,7 @@ import {
   DeleteIcon,
   DeletePermanentlyIcon,
   ResetIcon,
-} from '@blocksuite/icons';
+} from '@blocksuite/icons/rc';
 import type { ReactNode } from 'react';
 
 import { FloatingToolbar } from './floating-toolbar';
diff --git a/packages/frontend/core/src/components/page-list/components/list-header-cell.tsx b/packages/frontend/core/src/components/page-list/components/list-header-cell.tsx
index 5edde593ec..c9f981bc8f 100644
--- a/packages/frontend/core/src/components/page-list/components/list-header-cell.tsx
+++ b/packages/frontend/core/src/components/page-list/components/list-header-cell.tsx
@@ -1,4 +1,4 @@
-import { SortDownIcon, SortUpIcon } from '@blocksuite/icons';
+import { SortDownIcon, SortUpIcon } from '@blocksuite/icons/rc';
 import { useCallback } from 'react';
 
 import type { ColWrapperProps, ListItem } from '../types';
diff --git a/packages/frontend/core/src/components/page-list/components/new-page-button.tsx b/packages/frontend/core/src/components/page-list/components/new-page-button.tsx
index e8688c4479..c8c88adf2e 100644
--- a/packages/frontend/core/src/components/page-list/components/new-page-button.tsx
+++ b/packages/frontend/core/src/components/page-list/components/new-page-button.tsx
@@ -2,7 +2,7 @@ import { DropdownButton, Menu } from '@affine/component';
 import { BlockCard } from '@affine/component/card/block-card';
 import { mixpanel } from '@affine/core/utils';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { EdgelessIcon, ImportIcon, PageIcon } from '@blocksuite/icons';
+import { EdgelessIcon, ImportIcon, PageIcon } from '@blocksuite/icons/rc';
 import type { PropsWithChildren } from 'react';
 import { useCallback, useState } from 'react';
 
diff --git a/packages/frontend/core/src/components/page-list/components/page-display-menu.tsx b/packages/frontend/core/src/components/page-list/components/page-display-menu.tsx
index 6c91cfedfc..d54255216c 100644
--- a/packages/frontend/core/src/components/page-list/components/page-display-menu.tsx
+++ b/packages/frontend/core/src/components/page-list/components/page-display-menu.tsx
@@ -6,7 +6,7 @@ import {
   MenuSub,
 } from '@affine/component';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { ArrowDownSmallIcon, DoneIcon } from '@blocksuite/icons';
+import { ArrowDownSmallIcon, DoneIcon } from '@blocksuite/icons/rc';
 import { useCallback, useMemo } from 'react';
 
 import type { PageDisplayProperties, PageGroupByType } from '../types';
diff --git a/packages/frontend/core/src/components/page-list/docs/page-list-header.tsx b/packages/frontend/core/src/components/page-list/docs/page-list-header.tsx
index 9ed0453a1e..668cbc65b8 100644
--- a/packages/frontend/core/src/components/page-list/docs/page-list-header.tsx
+++ b/packages/frontend/core/src/components/page-list/docs/page-list-header.tsx
@@ -16,7 +16,7 @@ import {
   ArrowDownSmallIcon,
   SearchIcon,
   ViewLayersIcon,
-} from '@blocksuite/icons';
+} from '@blocksuite/icons/rc';
 import type { Doc as BlockSuiteDoc } from '@blocksuite/store';
 import { useLiveData, useService, WorkspaceService } from '@toeverything/infra';
 import clsx from 'clsx';
diff --git a/packages/frontend/core/src/components/page-list/docs/page-tags.tsx b/packages/frontend/core/src/components/page-list/docs/page-tags.tsx
index 628c56d2f5..2cbd7eb896 100644
--- a/packages/frontend/core/src/components/page-list/docs/page-tags.tsx
+++ b/packages/frontend/core/src/components/page-list/docs/page-tags.tsx
@@ -1,6 +1,6 @@
 import { Menu } from '@affine/component';
 import type { Tag } from '@affine/core/modules/tag';
-import { CloseIcon, MoreHorizontalIcon } from '@blocksuite/icons';
+import { CloseIcon, MoreHorizontalIcon } from '@blocksuite/icons/rc';
 import { LiveData, useLiveData } from '@toeverything/infra';
 import { assignInlineVars } from '@vanilla-extract/dynamic';
 import clsx from 'clsx';
diff --git a/packages/frontend/core/src/components/page-list/filter/filter-list.tsx b/packages/frontend/core/src/components/page-list/filter/filter-list.tsx
index 7caa983d6c..ad24c98e65 100644
--- a/packages/frontend/core/src/components/page-list/filter/filter-list.tsx
+++ b/packages/frontend/core/src/components/page-list/filter/filter-list.tsx
@@ -1,7 +1,7 @@
 import { Button, IconButton, Menu } from '@affine/component';
 import type { Filter, PropertiesMeta } from '@affine/env/filter';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { CloseIcon, PlusIcon } from '@blocksuite/icons';
+import { CloseIcon, PlusIcon } from '@blocksuite/icons/rc';
 
 import { Condition } from './condition';
 import * as styles from './index.css';
diff --git a/packages/frontend/core/src/components/page-list/filter/shared-types.tsx b/packages/frontend/core/src/components/page-list/filter/shared-types.tsx
index 29d1eedd34..0b8f10f0e7 100644
--- a/packages/frontend/core/src/components/page-list/filter/shared-types.tsx
+++ b/packages/frontend/core/src/components/page-list/filter/shared-types.tsx
@@ -10,7 +10,7 @@ import {
   FavoriteIcon,
   TagsIcon,
   UpdatedIcon,
-} from '@blocksuite/icons';
+} from '@blocksuite/icons/rc';
 import type { ReactElement } from 'react';
 
 import { tBoolean, tDate, tTag } from './logical/custom-type';
diff --git a/packages/frontend/core/src/components/page-list/group-definitions.tsx b/packages/frontend/core/src/components/page-list/group-definitions.tsx
index 6d30fdb698..66f05451f0 100644
--- a/packages/frontend/core/src/components/page-list/group-definitions.tsx
+++ b/packages/frontend/core/src/components/page-list/group-definitions.tsx
@@ -2,7 +2,7 @@ import { FavoriteItemsAdapter } from '@affine/core/modules/properties';
 import type { Tag } from '@affine/core/modules/tag';
 import { TagService } from '@affine/core/modules/tag';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { FavoritedIcon, FavoriteIcon } from '@blocksuite/icons';
+import { FavoritedIcon, FavoriteIcon } from '@blocksuite/icons/rc';
 import type { DocMeta } from '@blocksuite/store';
 import { LiveData, useLiveData, useService } from '@toeverything/infra';
 import { type ReactNode, useMemo } from 'react';
diff --git a/packages/frontend/core/src/components/page-list/operation-cell.tsx b/packages/frontend/core/src/components/page-list/operation-cell.tsx
index 33d06e8ade..81c1e813b4 100644
--- a/packages/frontend/core/src/components/page-list/operation-cell.tsx
+++ b/packages/frontend/core/src/components/page-list/operation-cell.tsx
@@ -29,7 +29,7 @@ import {
   PlusIcon,
   ResetIcon,
   SplitViewIcon,
-} from '@blocksuite/icons';
+} from '@blocksuite/icons/rc';
 import type { DocMeta } from '@blocksuite/store';
 import { useLiveData, useService, WorkspaceService } from '@toeverything/infra';
 import { useCallback, useState } from 'react';
diff --git a/packages/frontend/core/src/components/page-list/operation-menu-items/disable-public-sharing.tsx b/packages/frontend/core/src/components/page-list/operation-menu-items/disable-public-sharing.tsx
index 923853d510..99bd29f7df 100644
--- a/packages/frontend/core/src/components/page-list/operation-menu-items/disable-public-sharing.tsx
+++ b/packages/frontend/core/src/components/page-list/operation-menu-items/disable-public-sharing.tsx
@@ -2,7 +2,7 @@ import type { MenuItemProps } from '@affine/component';
 import { MenuIcon, MenuItem } from '@affine/component';
 import { PublicLinkDisableModal } from '@affine/component/disable-public-link';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { ShareIcon } from '@blocksuite/icons';
+import { ShareIcon } from '@blocksuite/icons/rc';
 
 export const DisablePublicSharing = (props: MenuItemProps) => {
   const t = useAFFiNEI18N();
diff --git a/packages/frontend/core/src/components/page-list/operation-menu-items/export.tsx b/packages/frontend/core/src/components/page-list/operation-menu-items/export.tsx
index 4a1698638f..16bedc5aef 100644
--- a/packages/frontend/core/src/components/page-list/operation-menu-items/export.tsx
+++ b/packages/frontend/core/src/components/page-list/operation-menu-items/export.tsx
@@ -6,7 +6,7 @@ import {
   ExportToMarkdownIcon,
   ExportToPdfIcon,
   ExportToPngIcon,
-} from '@blocksuite/icons';
+} from '@blocksuite/icons/rc';
 import type { ReactNode } from 'react';
 import { useMemo } from 'react';
 
diff --git a/packages/frontend/core/src/components/page-list/operation-menu-items/move-to-trash.tsx b/packages/frontend/core/src/components/page-list/operation-menu-items/move-to-trash.tsx
index 2d5c74ea3e..39fd27d8e4 100644
--- a/packages/frontend/core/src/components/page-list/operation-menu-items/move-to-trash.tsx
+++ b/packages/frontend/core/src/components/page-list/operation-menu-items/move-to-trash.tsx
@@ -1,7 +1,7 @@
 import type { ConfirmModalProps, MenuItemProps } from '@affine/component';
 import { ConfirmModal, MenuIcon, MenuItem } from '@affine/component';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { DeleteIcon } from '@blocksuite/icons';
+import { DeleteIcon } from '@blocksuite/icons/rc';
 
 export const MoveToTrash = (props: MenuItemProps) => {
   const t = useAFFiNEI18N();
diff --git a/packages/frontend/core/src/components/page-list/page-group.tsx b/packages/frontend/core/src/components/page-list/page-group.tsx
index 7375f9f817..1c77e033ce 100644
--- a/packages/frontend/core/src/components/page-list/page-group.tsx
+++ b/packages/frontend/core/src/components/page-list/page-group.tsx
@@ -8,7 +8,7 @@ import {
   TodayIcon,
   ToggleCollapseIcon,
   ViewLayersIcon,
-} from '@blocksuite/icons';
+} from '@blocksuite/icons/rc';
 import type { DocCollection, DocMeta } from '@blocksuite/store';
 import * as Collapsible from '@radix-ui/react-collapsible';
 import { DocsService, useLiveData, useService } from '@toeverything/infra';
diff --git a/packages/frontend/core/src/components/page-list/page-header.tsx b/packages/frontend/core/src/components/page-list/page-header.tsx
index f9f3225035..12438b7c0a 100644
--- a/packages/frontend/core/src/components/page-list/page-header.tsx
+++ b/packages/frontend/core/src/components/page-list/page-header.tsx
@@ -1,7 +1,7 @@
 import type { CheckboxProps } from '@affine/component';
 import { Checkbox } from '@affine/component';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { MultiSelectIcon } from '@blocksuite/icons';
+import { MultiSelectIcon } from '@blocksuite/icons/rc';
 import clsx from 'clsx';
 import { selectAtom } from 'jotai/utils';
 import type { MouseEventHandler } from 'react';
diff --git a/packages/frontend/core/src/components/page-list/view/collection-list.tsx b/packages/frontend/core/src/components/page-list/view/collection-list.tsx
index 4ca5d57c76..f9c34a0dc3 100644
--- a/packages/frontend/core/src/components/page-list/view/collection-list.tsx
+++ b/packages/frontend/core/src/components/page-list/view/collection-list.tsx
@@ -1,7 +1,7 @@
 import { Button, FlexWrapper, Menu } from '@affine/component';
 import type { Collection, Filter, PropertiesMeta } from '@affine/env/filter';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { FilterIcon } from '@blocksuite/icons';
+import { FilterIcon } from '@blocksuite/icons/rc';
 
 import { CreateFilterMenu } from '../filter/vars';
 import * as styles from './collection-list.css';
diff --git a/packages/frontend/core/src/components/page-list/view/collection-operations.tsx b/packages/frontend/core/src/components/page-list/view/collection-operations.tsx
index 76356e66d9..3af4496079 100644
--- a/packages/frontend/core/src/components/page-list/view/collection-operations.tsx
+++ b/packages/frontend/core/src/components/page-list/view/collection-operations.tsx
@@ -14,7 +14,7 @@ import {
   FilterIcon,
   PlusIcon,
   SplitViewIcon,
-} from '@blocksuite/icons';
+} from '@blocksuite/icons/rc';
 import { useLiveData, useService } from '@toeverything/infra';
 import type { PropsWithChildren, ReactElement } from 'react';
 import { useCallback, useMemo } from 'react';
diff --git a/packages/frontend/core/src/components/page-list/view/edit-collection/pages-mode.tsx b/packages/frontend/core/src/components/page-list/view/edit-collection/pages-mode.tsx
index 406f8e4131..7ebf4b7cf5 100644
--- a/packages/frontend/core/src/components/page-list/view/edit-collection/pages-mode.tsx
+++ b/packages/frontend/core/src/components/page-list/view/edit-collection/pages-mode.tsx
@@ -2,7 +2,7 @@ import { Menu } from '@affine/component';
 import { FavoriteItemsAdapter } from '@affine/core/modules/properties';
 import type { Collection } from '@affine/env/filter';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { FilterIcon } from '@blocksuite/icons';
+import { FilterIcon } from '@blocksuite/icons/rc';
 import type { DocMeta } from '@blocksuite/store';
 import { useLiveData, useService } from '@toeverything/infra';
 import clsx from 'clsx';
diff --git a/packages/frontend/core/src/components/page-list/view/edit-collection/rules-mode.tsx b/packages/frontend/core/src/components/page-list/view/edit-collection/rules-mode.tsx
index d7a9cea382..15ee49bcda 100644
--- a/packages/frontend/core/src/components/page-list/view/edit-collection/rules-mode.tsx
+++ b/packages/frontend/core/src/components/page-list/view/edit-collection/rules-mode.tsx
@@ -9,7 +9,7 @@ import {
   PageIcon,
   PlusIcon,
   ToggleCollapseIcon,
-} from '@blocksuite/icons';
+} from '@blocksuite/icons/rc';
 import type { DocMeta } from '@blocksuite/store';
 import { useLiveData, useService } from '@toeverything/infra';
 import clsx from 'clsx';
diff --git a/packages/frontend/core/src/components/page-list/view/edit-collection/select-page.tsx b/packages/frontend/core/src/components/page-list/view/edit-collection/select-page.tsx
index f95bf3736d..262482e1e1 100644
--- a/packages/frontend/core/src/components/page-list/view/edit-collection/select-page.tsx
+++ b/packages/frontend/core/src/components/page-list/view/edit-collection/select-page.tsx
@@ -2,7 +2,7 @@ import { Button, Menu } from '@affine/component';
 import { FavoriteItemsAdapter } from '@affine/core/modules/properties';
 import { Trans } from '@affine/i18n';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { FilterIcon } from '@blocksuite/icons';
+import { FilterIcon } from '@blocksuite/icons/rc';
 import type { DocMeta } from '@blocksuite/store';
 import { useLiveData, useService } from '@toeverything/infra';
 import clsx from 'clsx';
diff --git a/packages/frontend/core/src/components/page-list/view/save-as-collection-button.tsx b/packages/frontend/core/src/components/page-list/view/save-as-collection-button.tsx
index 91045c6815..962e14e077 100644
--- a/packages/frontend/core/src/components/page-list/view/save-as-collection-button.tsx
+++ b/packages/frontend/core/src/components/page-list/view/save-as-collection-button.tsx
@@ -1,7 +1,7 @@
 import { Button } from '@affine/component';
 import type { Collection } from '@affine/env/filter';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { SaveIcon } from '@blocksuite/icons';
+import { SaveIcon } from '@blocksuite/icons/rc';
 import { nanoid } from 'nanoid';
 import { useCallback } from 'react';
 
diff --git a/packages/frontend/core/src/components/page-list/view/use-action.tsx b/packages/frontend/core/src/components/page-list/view/use-action.tsx
index afe5e3cf8a..1a028651f8 100644
--- a/packages/frontend/core/src/components/page-list/view/use-action.tsx
+++ b/packages/frontend/core/src/components/page-list/view/use-action.tsx
@@ -1,6 +1,6 @@
 import type { Collection } from '@affine/env/filter';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { DeleteIcon, FilterIcon } from '@blocksuite/icons';
+import { DeleteIcon, FilterIcon } from '@blocksuite/icons/rc';
 import type { ReactNode } from 'react';
 import { useMemo } from 'react';
 
diff --git a/packages/frontend/core/src/components/pure/header-drop-down-button/index.tsx b/packages/frontend/core/src/components/pure/header-drop-down-button/index.tsx
index c17f909b1d..10b1aef4eb 100644
--- a/packages/frontend/core/src/components/pure/header-drop-down-button/index.tsx
+++ b/packages/frontend/core/src/components/pure/header-drop-down-button/index.tsx
@@ -1,6 +1,6 @@
 import type { IconButtonProps } from '@affine/component/ui/button';
 import { IconButton } from '@affine/component/ui/button';
-import { MoreHorizontalIcon } from '@blocksuite/icons';
+import { MoreHorizontalIcon } from '@blocksuite/icons/rc';
 import { forwardRef } from 'react';
 
 import { headerMenuTrigger } from './styles.css';
diff --git a/packages/frontend/core/src/components/pure/help-island/index.tsx b/packages/frontend/core/src/components/pure/help-island/index.tsx
index 40b3a9a557..c95c92c8f0 100644
--- a/packages/frontend/core/src/components/pure/help-island/index.tsx
+++ b/packages/frontend/core/src/components/pure/help-island/index.tsx
@@ -1,7 +1,7 @@
 import { Tooltip } from '@affine/component/ui/tooltip';
 import { popupWindow } from '@affine/core/utils';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { CloseIcon, NewIcon } from '@blocksuite/icons';
+import { CloseIcon, NewIcon } from '@blocksuite/icons/rc';
 import {
   DocsService,
   GlobalContextService,
diff --git a/packages/frontend/core/src/components/pure/icons/index.tsx b/packages/frontend/core/src/components/pure/icons/index.tsx
index 095b63503b..a102549c2c 100644
--- a/packages/frontend/core/src/components/pure/icons/index.tsx
+++ b/packages/frontend/core/src/components/pure/icons/index.tsx
@@ -4,7 +4,7 @@ import {
   LocalDataIcon as DefaultLocalDataIcon,
   LocalWorkspaceIcon as DefaultLocalWorkspaceIcon,
   PublishIcon as DefaultPublishIcon,
-} from '@blocksuite/icons';
+} from '@blocksuite/icons/rc';
 
 // Here are some icons with special color or size
 
diff --git a/packages/frontend/core/src/components/pure/trash-page-footer/index.tsx b/packages/frontend/core/src/components/pure/trash-page-footer/index.tsx
index 72f7f6929a..2ef60a87b8 100644
--- a/packages/frontend/core/src/components/pure/trash-page-footer/index.tsx
+++ b/packages/frontend/core/src/components/pure/trash-page-footer/index.tsx
@@ -2,7 +2,7 @@ import { Button } from '@affine/component/ui/button';
 import { ConfirmModal } from '@affine/component/ui/modal';
 import { Tooltip } from '@affine/component/ui/tooltip';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { DeleteIcon, ResetIcon } from '@blocksuite/icons';
+import { DeleteIcon, ResetIcon } from '@blocksuite/icons/rc';
 import { DocService, useService, WorkspaceService } from '@toeverything/infra';
 import { useCallback, useState } from 'react';
 
diff --git a/packages/frontend/core/src/components/pure/workspace-slider-bar/collections/add-collection-button.tsx b/packages/frontend/core/src/components/pure/workspace-slider-bar/collections/add-collection-button.tsx
index de36f070b4..0df309fe38 100644
--- a/packages/frontend/core/src/components/pure/workspace-slider-bar/collections/add-collection-button.tsx
+++ b/packages/frontend/core/src/components/pure/workspace-slider-bar/collections/add-collection-button.tsx
@@ -1,5 +1,5 @@
 import { IconButton } from '@affine/component/ui/button';
-import { PlusIcon } from '@blocksuite/icons';
+import { PlusIcon } from '@blocksuite/icons/rc';
 import type { ReactElement } from 'react';
 
 export const AddCollectionButton = ({
diff --git a/packages/frontend/core/src/components/pure/workspace-slider-bar/collections/collections-list.tsx b/packages/frontend/core/src/components/pure/workspace-slider-bar/collections/collections-list.tsx
index 5bd59107f0..f1bbd5e8ad 100644
--- a/packages/frontend/core/src/components/pure/workspace-slider-bar/collections/collections-list.tsx
+++ b/packages/frontend/core/src/components/pure/workspace-slider-bar/collections/collections-list.tsx
@@ -25,7 +25,7 @@ import {
   MoreHorizontalIcon,
   PlusIcon,
   ViewLayersIcon,
-} from '@blocksuite/icons';
+} from '@blocksuite/icons/rc';
 import type { DocCollection } from '@blocksuite/store';
 import { type AnimateLayoutChanges, useSortable } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
diff --git a/packages/frontend/core/src/components/pure/workspace-slider-bar/collections/doc.tsx b/packages/frontend/core/src/components/pure/workspace-slider-bar/collections/doc.tsx
index 76b0a454b9..9ee9b4ed9a 100644
--- a/packages/frontend/core/src/components/pure/workspace-slider-bar/collections/doc.tsx
+++ b/packages/frontend/core/src/components/pure/workspace-slider-bar/collections/doc.tsx
@@ -4,7 +4,7 @@ import {
   WorkbenchService,
 } from '@affine/core/modules/workbench';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { EdgelessIcon, PageIcon } from '@blocksuite/icons';
+import { EdgelessIcon, PageIcon } from '@blocksuite/icons/rc';
 import type { DocCollection, DocMeta } from '@blocksuite/store';
 import { useDraggable } from '@dnd-kit/core';
 import * as Collapsible from '@radix-ui/react-collapsible';
diff --git a/packages/frontend/core/src/components/pure/workspace-slider-bar/components/operation-item.tsx b/packages/frontend/core/src/components/pure/workspace-slider-bar/components/operation-item.tsx
index 4a3b760a84..6ed3d98a19 100644
--- a/packages/frontend/core/src/components/pure/workspace-slider-bar/components/operation-item.tsx
+++ b/packages/frontend/core/src/components/pure/workspace-slider-bar/components/operation-item.tsx
@@ -9,7 +9,7 @@ import {
   FilterMinusIcon,
   LinkedPageIcon,
   SplitViewIcon,
-} from '@blocksuite/icons';
+} from '@blocksuite/icons/rc';
 import type { ReactElement } from 'react';
 import { useMemo } from 'react';
 
diff --git a/packages/frontend/core/src/components/pure/workspace-slider-bar/components/operation-menu-button.tsx b/packages/frontend/core/src/components/pure/workspace-slider-bar/components/operation-menu-button.tsx
index a0dae1826d..ba5ce6d795 100644
--- a/packages/frontend/core/src/components/pure/workspace-slider-bar/components/operation-menu-button.tsx
+++ b/packages/frontend/core/src/components/pure/workspace-slider-bar/components/operation-menu-button.tsx
@@ -4,7 +4,7 @@ import { Menu } from '@affine/component/ui/menu';
 import { FavoriteItemsAdapter } from '@affine/core/modules/properties';
 import { WorkbenchService } from '@affine/core/modules/workbench';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { MoreHorizontalIcon } from '@blocksuite/icons';
+import { MoreHorizontalIcon } from '@blocksuite/icons/rc';
 import type { DocCollection } from '@blocksuite/store';
 import { useService } from '@toeverything/infra';
 import { useCallback } from 'react';
diff --git a/packages/frontend/core/src/components/pure/workspace-slider-bar/components/reference-page.tsx b/packages/frontend/core/src/components/pure/workspace-slider-bar/components/reference-page.tsx
index b4bbb1c4fa..c54de034b1 100644
--- a/packages/frontend/core/src/components/pure/workspace-slider-bar/components/reference-page.tsx
+++ b/packages/frontend/core/src/components/pure/workspace-slider-bar/components/reference-page.tsx
@@ -4,7 +4,7 @@ import {
   WorkbenchService,
 } from '@affine/core/modules/workbench';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { EdgelessIcon, PageIcon } from '@blocksuite/icons';
+import { EdgelessIcon, PageIcon } from '@blocksuite/icons/rc';
 import type { DocCollection, DocMeta } from '@blocksuite/store';
 import * as Collapsible from '@radix-ui/react-collapsible';
 import { DocsService, useLiveData, useService } from '@toeverything/infra';
diff --git a/packages/frontend/core/src/components/pure/workspace-slider-bar/favorite/add-favourite-button.tsx b/packages/frontend/core/src/components/pure/workspace-slider-bar/favorite/add-favourite-button.tsx
index d3f0dfbfd8..67cb92666e 100644
--- a/packages/frontend/core/src/components/pure/workspace-slider-bar/favorite/add-favourite-button.tsx
+++ b/packages/frontend/core/src/components/pure/workspace-slider-bar/favorite/add-favourite-button.tsx
@@ -2,7 +2,7 @@ import { IconButton } from '@affine/component/ui/button';
 import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks';
 import { FavoriteItemsAdapter } from '@affine/core/modules/properties';
 import { mixpanel } from '@affine/core/utils';
-import { PlusIcon } from '@blocksuite/icons';
+import { PlusIcon } from '@blocksuite/icons/rc';
 import type { DocCollection } from '@blocksuite/store';
 import { useService } from '@toeverything/infra';
 
diff --git a/packages/frontend/core/src/components/pure/workspace-slider-bar/favorite/empty-item.tsx b/packages/frontend/core/src/components/pure/workspace-slider-bar/favorite/empty-item.tsx
index 4098c74c01..925856d640 100644
--- a/packages/frontend/core/src/components/pure/workspace-slider-bar/favorite/empty-item.tsx
+++ b/packages/frontend/core/src/components/pure/workspace-slider-bar/favorite/empty-item.tsx
@@ -1,5 +1,5 @@
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { FavoriteIcon } from '@blocksuite/icons';
+import { FavoriteIcon } from '@blocksuite/icons/rc';
 
 import * as styles from './styles.css';
 export const EmptyItem = () => {
diff --git a/packages/frontend/core/src/components/pure/workspace-slider-bar/favorite/favourite-nav-item.tsx b/packages/frontend/core/src/components/pure/workspace-slider-bar/favorite/favourite-nav-item.tsx
index cea313e4c1..254e827419 100644
--- a/packages/frontend/core/src/components/pure/workspace-slider-bar/favorite/favourite-nav-item.tsx
+++ b/packages/frontend/core/src/components/pure/workspace-slider-bar/favorite/favourite-nav-item.tsx
@@ -8,7 +8,7 @@ import {
   WorkbenchService,
 } from '@affine/core/modules/workbench';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { EdgelessIcon, PageIcon } from '@blocksuite/icons';
+import { EdgelessIcon, PageIcon } from '@blocksuite/icons/rc';
 import { type AnimateLayoutChanges, useSortable } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
 import * as Collapsible from '@radix-ui/react-collapsible';
diff --git a/packages/frontend/core/src/components/pure/workspace-slider-bar/user-with-workspace-list/add-workspace/index.tsx b/packages/frontend/core/src/components/pure/workspace-slider-bar/user-with-workspace-list/add-workspace/index.tsx
index 3d363840a9..e0c077f76f 100644
--- a/packages/frontend/core/src/components/pure/workspace-slider-bar/user-with-workspace-list/add-workspace/index.tsx
+++ b/packages/frontend/core/src/components/pure/workspace-slider-bar/user-with-workspace-list/add-workspace/index.tsx
@@ -1,6 +1,6 @@
 import { MenuItem } from '@affine/component/ui/menu';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { ImportIcon, PlusIcon } from '@blocksuite/icons';
+import { ImportIcon, PlusIcon } from '@blocksuite/icons/rc';
 
 import * as styles from './index.css';
 
diff --git a/packages/frontend/core/src/components/pure/workspace-slider-bar/user-with-workspace-list/index.tsx b/packages/frontend/core/src/components/pure/workspace-slider-bar/user-with-workspace-list/index.tsx
index 6fa55ef885..c77c1db150 100644
--- a/packages/frontend/core/src/components/pure/workspace-slider-bar/user-with-workspace-list/index.tsx
+++ b/packages/frontend/core/src/components/pure/workspace-slider-bar/user-with-workspace-list/index.tsx
@@ -3,7 +3,7 @@ import { Divider } from '@affine/component/ui/divider';
 import { MenuItem } from '@affine/component/ui/menu';
 import { AuthService } from '@affine/core/modules/cloud';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { Logo1Icon } from '@blocksuite/icons';
+import { Logo1Icon } from '@blocksuite/icons/rc';
 import {
   useLiveData,
   useService,
diff --git a/packages/frontend/core/src/components/pure/workspace-slider-bar/user-with-workspace-list/workspace-list/index.tsx b/packages/frontend/core/src/components/pure/workspace-slider-bar/user-with-workspace-list/workspace-list/index.tsx
index e4a4d8b3f8..14e5a0fc61 100644
--- a/packages/frontend/core/src/components/pure/workspace-slider-bar/user-with-workspace-list/workspace-list/index.tsx
+++ b/packages/frontend/core/src/components/pure/workspace-slider-bar/user-with-workspace-list/workspace-list/index.tsx
@@ -9,7 +9,7 @@ import {
 import { AuthService } from '@affine/core/modules/cloud';
 import { WorkspaceFlavour } from '@affine/env/workspace';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { CloudWorkspaceIcon, LocalWorkspaceIcon } from '@blocksuite/icons';
+import { CloudWorkspaceIcon, LocalWorkspaceIcon } from '@blocksuite/icons/rc';
 import type { WorkspaceMetadata } from '@toeverything/infra';
 import {
   GlobalContextService,
diff --git a/packages/frontend/core/src/components/pure/workspace-slider-bar/workspace-card/index.tsx b/packages/frontend/core/src/components/pure/workspace-slider-bar/workspace-card/index.tsx
index afc1e14c0a..7cc745e3d1 100644
--- a/packages/frontend/core/src/components/pure/workspace-slider-bar/workspace-card/index.tsx
+++ b/packages/frontend/core/src/components/pure/workspace-slider-bar/workspace-card/index.tsx
@@ -15,7 +15,7 @@ import {
   LocalWorkspaceIcon,
   NoNetworkIcon,
   UnsyncIcon,
-} from '@blocksuite/icons';
+} from '@blocksuite/icons/rc';
 import { useLiveData, useService, WorkspaceService } from '@toeverything/infra';
 import { cssVar } from '@toeverything/theme';
 import { useSetAtom } from 'jotai';
diff --git a/packages/frontend/core/src/components/root-app-sidebar/import-page.tsx b/packages/frontend/core/src/components/root-app-sidebar/import-page.tsx
index 7026b06753..893c83fa53 100644
--- a/packages/frontend/core/src/components/root-app-sidebar/import-page.tsx
+++ b/packages/frontend/core/src/components/root-app-sidebar/import-page.tsx
@@ -1,7 +1,7 @@
 import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks';
 import { mixpanel } from '@affine/core/utils';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { ImportIcon } from '@blocksuite/icons';
+import { ImportIcon } from '@blocksuite/icons/rc';
 
 import type { DocCollection } from '../../shared';
 import { MenuItem } from '../app-sidebar';
diff --git a/packages/frontend/core/src/components/root-app-sidebar/index.tsx b/packages/frontend/core/src/components/root-app-sidebar/index.tsx
index 786db2dafb..a11214f009 100644
--- a/packages/frontend/core/src/components/root-app-sidebar/index.tsx
+++ b/packages/frontend/core/src/components/root-app-sidebar/index.tsx
@@ -5,7 +5,7 @@ import { CollectionService } from '@affine/core/modules/collection';
 import { mixpanel } from '@affine/core/utils';
 import { apis, events } from '@affine/electron-api';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { FolderIcon, SettingsIcon } from '@blocksuite/icons';
+import { FolderIcon, SettingsIcon } from '@blocksuite/icons/rc';
 import type { Doc } from '@blocksuite/store';
 import { useDroppable } from '@dnd-kit/core';
 import type { Workspace } from '@toeverything/infra';
diff --git a/packages/frontend/core/src/components/root-app-sidebar/journal-button.tsx b/packages/frontend/core/src/components/root-app-sidebar/journal-button.tsx
index b0fbc2fe67..eeb01df82e 100644
--- a/packages/frontend/core/src/components/root-app-sidebar/journal-button.tsx
+++ b/packages/frontend/core/src/components/root-app-sidebar/journal-button.tsx
@@ -5,7 +5,7 @@ import {
 import { WorkbenchService } from '@affine/core/modules/workbench';
 import type { DocCollection } from '@affine/core/shared';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { TodayIcon, TomorrowIcon, YesterdayIcon } from '@blocksuite/icons';
+import { TodayIcon, TomorrowIcon, YesterdayIcon } from '@blocksuite/icons/rc';
 import { useLiveData, useService } from '@toeverything/infra';
 
 import { MenuItem } from '../app-sidebar';
diff --git a/packages/frontend/core/src/components/root-app-sidebar/user-info.tsx b/packages/frontend/core/src/components/root-app-sidebar/user-info.tsx
index e4e5044bef..d6fd5efaa1 100644
--- a/packages/frontend/core/src/components/root-app-sidebar/user-info.tsx
+++ b/packages/frontend/core/src/components/root-app-sidebar/user-info.tsx
@@ -16,7 +16,7 @@ import {
 } from '@affine/core/atoms';
 import { mixpanel } from '@affine/core/utils';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { AccountIcon, SignOutIcon } from '@blocksuite/icons';
+import { AccountIcon, SignOutIcon } from '@blocksuite/icons/rc';
 import { useLiveData, useService } from '@toeverything/infra';
 import { assignInlineVars } from '@vanilla-extract/dynamic';
 import { useSetAtom } from 'jotai';
diff --git a/packages/frontend/core/src/components/share-page-not-found-error.tsx b/packages/frontend/core/src/components/share-page-not-found-error.tsx
index 064a62c256..441e38cb32 100644
--- a/packages/frontend/core/src/components/share-page-not-found-error.tsx
+++ b/packages/frontend/core/src/components/share-page-not-found-error.tsx
@@ -1,5 +1,5 @@
 import { Empty } from '@affine/component';
-import { Logo1Icon } from '@blocksuite/icons';
+import { Logo1Icon } from '@blocksuite/icons/rc';
 
 export const SharePageNotFoundError = () => {
   return (
diff --git a/packages/frontend/core/src/hooks/affine/use-is-shared-page.tsx b/packages/frontend/core/src/hooks/affine/use-is-shared-page.tsx
index 73ebd4d687..104d8a8405 100644
--- a/packages/frontend/core/src/hooks/affine/use-is-shared-page.tsx
+++ b/packages/frontend/core/src/hooks/affine/use-is-shared-page.tsx
@@ -7,7 +7,7 @@ import {
   revokePublicPageMutation,
 } from '@affine/graphql';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { SingleSelectSelectSolidIcon } from '@blocksuite/icons';
+import { SingleSelectSelectSolidIcon } from '@blocksuite/icons/rc';
 import type { DocMode, Workspace } from '@toeverything/infra';
 import { cssVar } from '@toeverything/theme';
 import { useCallback, useMemo } from 'react';
diff --git a/packages/frontend/core/src/hooks/affine/use-register-blocksuite-editor-commands.tsx b/packages/frontend/core/src/hooks/affine/use-register-blocksuite-editor-commands.tsx
index f7704eda4e..b7fb6269c5 100644
--- a/packages/frontend/core/src/hooks/affine/use-register-blocksuite-editor-commands.tsx
+++ b/packages/frontend/core/src/hooks/affine/use-register-blocksuite-editor-commands.tsx
@@ -9,7 +9,7 @@ import { mixpanel } from '@affine/core/utils';
 import { WorkspaceFlavour } from '@affine/env/workspace';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
 import { assertExists } from '@blocksuite/global/utils';
-import { EdgelessIcon, HistoryIcon, PageIcon } from '@blocksuite/icons';
+import { EdgelessIcon, HistoryIcon, PageIcon } from '@blocksuite/icons/rc';
 import {
   DocService,
   useLiveData,
diff --git a/packages/frontend/core/src/modules/cmdk/views/data-hooks.tsx b/packages/frontend/core/src/modules/cmdk/views/data-hooks.tsx
index 24ca3061a7..cee321666d 100644
--- a/packages/frontend/core/src/modules/cmdk/views/data-hooks.tsx
+++ b/packages/frontend/core/src/modules/cmdk/views/data-hooks.tsx
@@ -24,7 +24,7 @@ import {
   PageIcon,
   TodayIcon,
   ViewLayersIcon,
-} from '@blocksuite/icons';
+} from '@blocksuite/icons/rc';
 import type { DocRecord, Workspace } from '@toeverything/infra';
 import {
   GlobalContextService,
diff --git a/packages/frontend/core/src/modules/cmdk/views/not-found.tsx b/packages/frontend/core/src/modules/cmdk/views/not-found.tsx
index c65ea16a3d..487eed1a7a 100644
--- a/packages/frontend/core/src/modules/cmdk/views/not-found.tsx
+++ b/packages/frontend/core/src/modules/cmdk/views/not-found.tsx
@@ -1,6 +1,6 @@
 import { QuickSearchService } from '@affine/core/modules/cmdk';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { SearchIcon } from '@blocksuite/icons';
+import { SearchIcon } from '@blocksuite/icons/rc';
 import { useLiveData, useService } from '@toeverything/infra';
 import { useCommandState } from 'cmdk';
 
diff --git a/packages/frontend/core/src/modules/find-in-page/view/find-in-page-modal.tsx b/packages/frontend/core/src/modules/find-in-page/view/find-in-page-modal.tsx
index 60d6dbdef5..9ad9020051 100644
--- a/packages/frontend/core/src/modules/find-in-page/view/find-in-page-modal.tsx
+++ b/packages/frontend/core/src/modules/find-in-page/view/find-in-page-modal.tsx
@@ -4,7 +4,7 @@ import {
   ArrowUpSmallIcon,
   CloseIcon,
   SearchIcon,
-} from '@blocksuite/icons';
+} from '@blocksuite/icons/rc';
 import * as Dialog from '@radix-ui/react-dialog';
 import { useLiveData, useService } from '@toeverything/infra';
 import { assignInlineVars } from '@vanilla-extract/dynamic';
diff --git a/packages/frontend/core/src/modules/multi-tab-sidebar/multi-tabs/tabs/chat.tsx b/packages/frontend/core/src/modules/multi-tab-sidebar/multi-tabs/tabs/chat.tsx
index bfeaedb553..d35a11f05b 100644
--- a/packages/frontend/core/src/modules/multi-tab-sidebar/multi-tabs/tabs/chat.tsx
+++ b/packages/frontend/core/src/modules/multi-tab-sidebar/multi-tabs/tabs/chat.tsx
@@ -1,6 +1,6 @@
 import { ChatPanel } from '@affine/core/blocksuite/presets/ai';
 import { assertExists } from '@blocksuite/global/utils';
-import { AiIcon } from '@blocksuite/icons';
+import { AiIcon } from '@blocksuite/icons/rc';
 import { useCallback, useEffect, useRef } from 'react';
 
 import type { SidebarTab, SidebarTabProps } from '../sidebar-tab';
diff --git a/packages/frontend/core/src/modules/multi-tab-sidebar/multi-tabs/tabs/frame.tsx b/packages/frontend/core/src/modules/multi-tab-sidebar/multi-tabs/tabs/frame.tsx
index e886a5a1e5..70e6b0a420 100644
--- a/packages/frontend/core/src/modules/multi-tab-sidebar/multi-tabs/tabs/frame.tsx
+++ b/packages/frontend/core/src/modules/multi-tab-sidebar/multi-tabs/tabs/frame.tsx
@@ -1,5 +1,5 @@
 import { assertExists } from '@blocksuite/global/utils';
-import { FrameIcon } from '@blocksuite/icons';
+import { FrameIcon } from '@blocksuite/icons/rc';
 import { FramePanel } from '@blocksuite/presets';
 import { useCallback, useRef } from 'react';
 
diff --git a/packages/frontend/core/src/modules/multi-tab-sidebar/multi-tabs/tabs/journal.tsx b/packages/frontend/core/src/modules/multi-tab-sidebar/multi-tabs/tabs/journal.tsx
index 5b7c4c175d..1db38c4f82 100644
--- a/packages/frontend/core/src/modules/multi-tab-sidebar/multi-tabs/tabs/journal.tsx
+++ b/packages/frontend/core/src/modules/multi-tab-sidebar/multi-tabs/tabs/journal.tsx
@@ -14,7 +14,7 @@ import {
   MoreHorizontalIcon,
   PageIcon,
   TodayIcon,
-} from '@blocksuite/icons';
+} from '@blocksuite/icons/rc';
 import type { DocRecord } from '@toeverything/infra';
 import {
   DocService,
diff --git a/packages/frontend/core/src/modules/multi-tab-sidebar/multi-tabs/tabs/outline.tsx b/packages/frontend/core/src/modules/multi-tab-sidebar/multi-tabs/tabs/outline.tsx
index 0c5586c629..69c153ed52 100644
--- a/packages/frontend/core/src/modules/multi-tab-sidebar/multi-tabs/tabs/outline.tsx
+++ b/packages/frontend/core/src/modules/multi-tab-sidebar/multi-tabs/tabs/outline.tsx
@@ -1,5 +1,5 @@
 import { assertExists } from '@blocksuite/global/utils';
-import { TocIcon } from '@blocksuite/icons';
+import { TocIcon } from '@blocksuite/icons/rc';
 import { OutlinePanel } from '@blocksuite/presets';
 import { useCallback, useRef } from 'react';
 
diff --git a/packages/frontend/core/src/modules/navigation/view/navigation-buttons.tsx b/packages/frontend/core/src/modules/navigation/view/navigation-buttons.tsx
index e1389deedc..aad143c9ce 100644
--- a/packages/frontend/core/src/modules/navigation/view/navigation-buttons.tsx
+++ b/packages/frontend/core/src/modules/navigation/view/navigation-buttons.tsx
@@ -1,6 +1,6 @@
 import { IconButton, Tooltip } from '@affine/component';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { ArrowLeftSmallIcon, ArrowRightSmallIcon } from '@blocksuite/icons';
+import { ArrowLeftSmallIcon, ArrowRightSmallIcon } from '@blocksuite/icons/rc';
 import { useLiveData, useService } from '@toeverything/infra';
 import { useCallback, useEffect, useMemo } from 'react';
 
diff --git a/packages/frontend/core/src/modules/peek-view/view/doc-peek-controls.tsx b/packages/frontend/core/src/modules/peek-view/view/doc-peek-controls.tsx
index 5d989132bb..d4b72bb444 100644
--- a/packages/frontend/core/src/modules/peek-view/view/doc-peek-controls.tsx
+++ b/packages/frontend/core/src/modules/peek-view/view/doc-peek-controls.tsx
@@ -6,7 +6,7 @@ import {
   DualLinkIcon,
   ExpandFullIcon,
   SplitViewIcon,
-} from '@blocksuite/icons';
+} from '@blocksuite/icons/rc';
 import { type DocMode, useService } from '@toeverything/infra';
 import { clsx } from 'clsx';
 import {
diff --git a/packages/frontend/core/src/modules/right-sidebar/view/header.tsx b/packages/frontend/core/src/modules/right-sidebar/view/header.tsx
index 520980ea98..94511df564 100644
--- a/packages/frontend/core/src/modules/right-sidebar/view/header.tsx
+++ b/packages/frontend/core/src/modules/right-sidebar/view/header.tsx
@@ -1,5 +1,5 @@
 import { IconButton } from '@affine/component';
-import { RightSidebarIcon } from '@blocksuite/icons';
+import { RightSidebarIcon } from '@blocksuite/icons/rc';
 
 import { WindowsAppControls } from '../../../components/pure/header/windows-app-controls';
 import type { RightSidebarView } from '../entities/right-sidebar-view';
diff --git a/packages/frontend/core/src/modules/workbench/view/route-container.tsx b/packages/frontend/core/src/modules/workbench/view/route-container.tsx
index 31f6562f8b..5882d952ee 100644
--- a/packages/frontend/core/src/modules/workbench/view/route-container.tsx
+++ b/packages/frontend/core/src/modules/workbench/view/route-container.tsx
@@ -1,6 +1,6 @@
 import { IconButton } from '@affine/component';
 import { WindowsAppControls } from '@affine/core/components/pure/header/windows-app-controls';
-import { RightSidebarIcon } from '@blocksuite/icons';
+import { RightSidebarIcon } from '@blocksuite/icons/rc';
 import { useLiveData, useService } from '@toeverything/infra';
 import { useAtomValue } from 'jotai';
 import { Suspense, useCallback } from 'react';
diff --git a/packages/frontend/core/src/modules/workbench/view/split-view/panel.tsx b/packages/frontend/core/src/modules/workbench/view/split-view/panel.tsx
index 9c7f263e44..0ada2064b7 100644
--- a/packages/frontend/core/src/modules/workbench/view/split-view/panel.tsx
+++ b/packages/frontend/core/src/modules/workbench/view/split-view/panel.tsx
@@ -5,7 +5,7 @@ import {
   MoveToLeftDuotoneIcon,
   MoveToRightDuotoneIcon,
   SoloViewIcon,
-} from '@blocksuite/icons';
+} from '@blocksuite/icons/rc';
 import { useSortable } from '@dnd-kit/sortable';
 import { useLiveData, useService } from '@toeverything/infra';
 import { assignInlineVars } from '@vanilla-extract/dynamic';
diff --git a/packages/frontend/core/src/pages/open-app.tsx b/packages/frontend/core/src/pages/open-app.tsx
index 1dd829d8c8..63ce9458f1 100644
--- a/packages/frontend/core/src/pages/open-app.tsx
+++ b/packages/frontend/core/src/pages/open-app.tsx
@@ -3,7 +3,7 @@ import type { GetCurrentUserQuery } from '@affine/graphql';
 import { fetcher, getCurrentUserQuery } from '@affine/graphql';
 import { Trans } from '@affine/i18n';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { Logo1Icon } from '@blocksuite/icons';
+import { Logo1Icon } from '@blocksuite/icons/rc';
 import { useCallback, useMemo } from 'react';
 import type { LoaderFunction } from 'react-router-dom';
 import { useLoaderData, useSearchParams } from 'react-router-dom';
diff --git a/packages/frontend/core/src/pages/share/share-detail-page.tsx b/packages/frontend/core/src/pages/share/share-detail-page.tsx
index 7e92aaf5c9..f3ae10a20e 100644
--- a/packages/frontend/core/src/pages/share/share-detail-page.tsx
+++ b/packages/frontend/core/src/pages/share/share-detail-page.tsx
@@ -5,7 +5,7 @@ import { AuthService } from '@affine/core/modules/cloud';
 import { WorkspaceFlavour } from '@affine/env/workspace';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
 import { noop } from '@blocksuite/global/utils';
-import { Logo1Icon } from '@blocksuite/icons';
+import { Logo1Icon } from '@blocksuite/icons/rc';
 import type { AffineEditorContainer } from '@blocksuite/presets';
 import type { Doc as BlockSuiteDoc } from '@blocksuite/store';
 import type { Doc, DocMode, Workspace } from '@toeverything/infra';
diff --git a/packages/frontend/core/src/pages/share/share-footer.tsx b/packages/frontend/core/src/pages/share/share-footer.tsx
index 39a0a86ece..625311c910 100644
--- a/packages/frontend/core/src/pages/share/share-footer.tsx
+++ b/packages/frontend/core/src/pages/share/share-footer.tsx
@@ -1,5 +1,5 @@
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { ArrowRightBigIcon } from '@blocksuite/icons';
+import { ArrowRightBigIcon } from '@blocksuite/icons/rc';
 
 import * as styles from './share-footer.css';
 
diff --git a/packages/frontend/core/src/pages/workspace/all-collection/header.tsx b/packages/frontend/core/src/pages/workspace/all-collection/header.tsx
index 34be6e3ff4..bb90a65999 100644
--- a/packages/frontend/core/src/pages/workspace/all-collection/header.tsx
+++ b/packages/frontend/core/src/pages/workspace/all-collection/header.tsx
@@ -1,7 +1,7 @@
 import { IconButton } from '@affine/component';
 import { Header } from '@affine/core/components/pure/header';
 import { WorkspaceModeFilterTab } from '@affine/core/components/pure/workspace-mode-filter-tab';
-import { PlusIcon } from '@blocksuite/icons';
+import { PlusIcon } from '@blocksuite/icons/rc';
 import clsx from 'clsx';
 
 import * as styles from './header.css';
diff --git a/packages/frontend/core/src/pages/workspace/all-page/all-page-header.tsx b/packages/frontend/core/src/pages/workspace/all-page/all-page-header.tsx
index e9a5a6e84e..e7ebdc0a2b 100644
--- a/packages/frontend/core/src/pages/workspace/all-page/all-page-header.tsx
+++ b/packages/frontend/core/src/pages/workspace/all-page/all-page-header.tsx
@@ -9,7 +9,7 @@ import { WorkspaceModeFilterTab } from '@affine/core/components/pure/workspace-m
 import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks';
 import { mixpanel } from '@affine/core/utils';
 import type { Filter } from '@affine/env/filter';
-import { PlusIcon } from '@blocksuite/icons';
+import { PlusIcon } from '@blocksuite/icons/rc';
 import { useService, WorkspaceService } from '@toeverything/infra';
 import clsx from 'clsx';
 
diff --git a/packages/frontend/core/src/pages/workspace/collection/header.tsx b/packages/frontend/core/src/pages/workspace/collection/header.tsx
index 01f6cfc36c..2249c1337c 100644
--- a/packages/frontend/core/src/pages/workspace/collection/header.tsx
+++ b/packages/frontend/core/src/pages/workspace/collection/header.tsx
@@ -2,7 +2,7 @@ import { IconButton } from '@affine/component';
 import { PageDisplayMenu } from '@affine/core/components/page-list';
 import { Header } from '@affine/core/components/pure/header';
 import { WorkspaceModeFilterTab } from '@affine/core/components/pure/workspace-mode-filter-tab';
-import { PlusIcon } from '@blocksuite/icons';
+import { PlusIcon } from '@blocksuite/icons/rc';
 import clsx from 'clsx';
 
 import * as styles from './collection.css';
diff --git a/packages/frontend/core/src/pages/workspace/collection/index.tsx b/packages/frontend/core/src/pages/workspace/collection/index.tsx
index d5cdfcf8f6..939fae9648 100644
--- a/packages/frontend/core/src/pages/workspace/collection/index.tsx
+++ b/packages/frontend/core/src/pages/workspace/collection/index.tsx
@@ -15,7 +15,7 @@ import {
   FilterIcon,
   PageIcon,
   ViewLayersIcon,
-} from '@blocksuite/icons';
+} from '@blocksuite/icons/rc';
 import { useLiveData, useService, WorkspaceService } from '@toeverything/infra';
 import { useCallback, useEffect, useState } from 'react';
 import { useParams } from 'react-router-dom';
diff --git a/packages/frontend/core/src/pages/workspace/trash-page.tsx b/packages/frontend/core/src/pages/workspace/trash-page.tsx
index f533d1c17e..aa01862bbe 100644
--- a/packages/frontend/core/src/pages/workspace/trash-page.tsx
+++ b/packages/frontend/core/src/pages/workspace/trash-page.tsx
@@ -6,7 +6,7 @@ import { Header } from '@affine/core/components/pure/header';
 import { useBlockSuiteDocMeta } from '@affine/core/hooks/use-block-suite-page-meta';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
 import { assertExists } from '@blocksuite/global/utils';
-import { DeleteIcon } from '@blocksuite/icons';
+import { DeleteIcon } from '@blocksuite/icons/rc';
 import { useService, WorkspaceService } from '@toeverything/infra';
 
 import { ViewBodyIsland, ViewHeaderIsland } from '../../modules/workbench';
diff --git a/yarn.lock b/yarn.lock
index a4c795e4c8..42c38b5a4a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -285,7 +285,7 @@ __metadata:
     "@blocksuite/block-std": "npm:0.15.0-canary-202406180357-838ef08"
     "@blocksuite/blocks": "npm:0.15.0-canary-202406180357-838ef08"
     "@blocksuite/global": "npm:0.15.0-canary-202406180357-838ef08"
-    "@blocksuite/icons": "npm:2.1.55"
+    "@blocksuite/icons": "npm:2.1.58"
     "@blocksuite/presets": "npm:0.15.0-canary-202406180357-838ef08"
     "@blocksuite/store": "npm:0.15.0-canary-202406180357-838ef08"
     "@dnd-kit/core": "npm:^6.1.0"
@@ -386,7 +386,7 @@ __metadata:
     "@blocksuite/block-std": "npm:0.15.0-canary-202406180357-838ef08"
     "@blocksuite/blocks": "npm:0.15.0-canary-202406180357-838ef08"
     "@blocksuite/global": "npm:0.15.0-canary-202406180357-838ef08"
-    "@blocksuite/icons": "npm:2.1.55"
+    "@blocksuite/icons": "npm:2.1.58"
     "@blocksuite/inline": "npm:0.15.0-canary-202406180357-838ef08"
     "@blocksuite/presets": "npm:0.15.0-canary-202406180357-838ef08"
     "@blocksuite/store": "npm:0.15.0-canary-202406180357-838ef08"
@@ -3726,13 +3726,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@blocksuite/icons@npm:2.1.55":
-  version: 2.1.55
-  resolution: "@blocksuite/icons@npm:2.1.55"
+"@blocksuite/icons@npm:2.1.58":
+  version: 2.1.58
+  resolution: "@blocksuite/icons@npm:2.1.58"
   peerDependencies:
     "@types/react": ^18.0.25
+    lit: ^2.6.1
     react: ^18.2.0
-  checksum: 10/2009dfec4bf0cf0893c733407627105bcac39562126a8311c8c07a14ed7aabd98a56273799e3474e20e4b8733c5b6f84a20b467d7d822970fc3bf95e148d5ee1
+  peerDependenciesMeta:
+    lit:
+      optional: true
+    react:
+      optional: true
+  checksum: 10/5984b1cf7023c09d67b0dd161c5e4f6cbd96a2310a75fa9ea334a6cc75bdaf5dd1dc51d35c6c38e353498d94c06de324c1a3a2bb822e9dad05d50f34621fa8d9
   languageName: node
   linkType: hard