diff --git a/packages/frontend/component/src/ui/loading/styles.css.ts b/packages/frontend/component/src/ui/loading/styles.css.ts
index 94f92627c4..11e4d366d9 100644
--- a/packages/frontend/component/src/ui/loading/styles.css.ts
+++ b/packages/frontend/component/src/ui/loading/styles.css.ts
@@ -12,7 +12,6 @@ export const loading = style({
     [speedVar]: '1.5s',
   },
   textRendering: 'optimizeLegibility',
-  WebkitFontSmoothing: 'antialiased',
   transform: 'rotate(-90deg)',
   animation: `${rotate} ${speedVar} infinite linear`,
 });
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 31e344396f..4c359206c2 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
@@ -3,7 +3,6 @@ import {
   AppearanceIcon,
   InformationIcon,
   KeyboardIcon,
-  PluginIcon,
 } from '@blocksuite/icons';
 import type { ReactElement, SVGProps } from 'react';
 
@@ -14,13 +13,11 @@ import { AppearanceSettings } from './appearance';
 import { BillingSettings } from './billing';
 import { PaymentIcon, UpgradeIcon } from './icons';
 import { AFFiNECloudPlans } from './plans';
-import { Plugins } from './plugins';
 import { Shortcuts } from './shortcuts';
 
 export type GeneralSettingKeys =
   | 'shortcuts'
   | 'appearance'
-  | 'plugins'
   | 'about'
   | 'plans'
   | 'billing';
@@ -52,12 +49,6 @@ export const useGeneralSettingList = (): GeneralSettingList => {
       icon: KeyboardIcon,
       testId: 'shortcuts-panel-trigger',
     },
-    {
-      key: 'plugins',
-      title: 'Plugins',
-      icon: PluginIcon,
-      testId: 'plugins-panel-trigger',
-    },
     {
       key: 'about',
       title: t['com.affine.aboutAFFiNE.title'](),
@@ -96,8 +87,6 @@ export const GeneralSetting = ({ generalKey }: GeneralSettingProps) => {
       return <Shortcuts />;
     case 'appearance':
       return <AppearanceSettings />;
-    case 'plugins':
-      return <Plugins />;
     case 'about':
       return <AboutAffine />;
     case 'plans':
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 8c0c3a8735..dab5785095 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
@@ -127,9 +127,6 @@ export const SettingSidebar = ({
       </div>
       <div className={sidebarItemsWrapper}>
         {generalSettingList.map(({ title, icon, key, testId }) => {
-          if (!runtimeConfig.enablePlugin && key === 'plugins') {
-            return null;
-          }
           return (
             <div
               className={clsx(sidebarSelectItem, {
diff --git a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/index.tsx b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/index.tsx
index be9c6dd83a..f28d62e7e7 100644
--- a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/index.tsx
+++ b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/index.tsx
@@ -1,7 +1,7 @@
 import type { WorkspaceMetadata } from '@affine/workspace/metadata';
 
 import { useIsWorkspaceOwner } from '../../../../hooks/affine/use-is-workspace-owner';
-import { WorkspaceSettingDetail } from '../../new-workspace-setting-detail';
+import { WorkspaceSettingDetail } from './new-workspace-setting-detail';
 
 export const WorkspaceSetting = ({
   workspaceMetadata,
diff --git a/packages/frontend/core/src/components/affine/new-workspace-setting-detail/delete-leave-workspace/delete/index.tsx b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/delete-leave-workspace/delete/index.tsx
similarity index 100%
rename from packages/frontend/core/src/components/affine/new-workspace-setting-detail/delete-leave-workspace/delete/index.tsx
rename to packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/delete-leave-workspace/delete/index.tsx
diff --git a/packages/frontend/core/src/components/affine/new-workspace-setting-detail/delete-leave-workspace/delete/style.css.ts b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/delete-leave-workspace/delete/style.css.ts
similarity index 100%
rename from packages/frontend/core/src/components/affine/new-workspace-setting-detail/delete-leave-workspace/delete/style.css.ts
rename to packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/delete-leave-workspace/delete/style.css.ts
diff --git a/packages/frontend/core/src/components/affine/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
similarity index 97%
rename from packages/frontend/core/src/components/affine/new-workspace-setting-detail/delete-leave-workspace/index.tsx
rename to packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/delete-leave-workspace/index.tsx
index 38d974b6b2..9c0abd06b6 100644
--- a/packages/frontend/core/src/components/affine/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
@@ -13,11 +13,11 @@ import { useAsyncCallback } from '@toeverything/hooks/affine-async-hooks';
 import { useAtomValue, useSetAtom } from 'jotai';
 import { useCallback, useState } from 'react';
 
-import { openSettingModalAtom } from '../../../../atoms';
+import { openSettingModalAtom } from '../../../../../../atoms';
 import {
   RouteLogic,
   useNavigateHelper,
-} from '../../../../hooks/use-navigate-helper';
+} from '../../../../../../hooks/use-navigate-helper';
 import type { WorkspaceSettingDetailProps } from '../types';
 import { WorkspaceDeleteModal } from './delete';
 
diff --git a/packages/frontend/core/src/components/affine/new-workspace-setting-detail/enable-cloud.tsx b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/enable-cloud.tsx
similarity index 89%
rename from packages/frontend/core/src/components/affine/new-workspace-setting-detail/enable-cloud.tsx
rename to packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/enable-cloud.tsx
index de246466c2..a20935ec9f 100644
--- a/packages/frontend/core/src/components/affine/new-workspace-setting-detail/enable-cloud.tsx
+++ b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/enable-cloud.tsx
@@ -10,10 +10,10 @@ import { useWorkspaceInfo } from '@toeverything/hooks/use-workspace-info';
 import { useAtomValue, useSetAtom } from 'jotai';
 import { useState } from 'react';
 
-import { openSettingModalAtom } from '../../../atoms';
-import { useNavigateHelper } from '../../../hooks/use-navigate-helper';
-import { EnableAffineCloudModal } from '../enable-affine-cloud-modal';
-import { TmpDisableAffineCloudModal } from '../tmp-disable-affine-cloud-modal';
+import { openSettingModalAtom } from '../../../../../atoms';
+import { useNavigateHelper } from '../../../../../hooks/use-navigate-helper';
+import { EnableAffineCloudModal } from '../../../enable-affine-cloud-modal';
+import { TmpDisableAffineCloudModal } from '../../../tmp-disable-affine-cloud-modal';
 import type { WorkspaceSettingDetailProps } from './types';
 
 export interface PublishPanelProps extends WorkspaceSettingDetailProps {
diff --git a/packages/frontend/core/src/components/affine/new-workspace-setting-detail/export.tsx b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/export.tsx
similarity index 100%
rename from packages/frontend/core/src/components/affine/new-workspace-setting-detail/export.tsx
rename to packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/export.tsx
diff --git a/packages/frontend/core/src/components/affine/new-workspace-setting-detail/index.tsx b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/index.tsx
similarity index 97%
rename from packages/frontend/core/src/components/affine/new-workspace-setting-detail/index.tsx
rename to packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/index.tsx
index 6a1acc2299..003e1079b1 100644
--- a/packages/frontend/core/src/components/affine/new-workspace-setting-detail/index.tsx
+++ b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/index.tsx
@@ -3,12 +3,12 @@ import {
   SettingRow,
   SettingWrapper,
 } from '@affine/component/setting-components';
+import { useSelfHosted } from '@affine/core/hooks/affine/use-server-config';
 import { UNTITLED_WORKSPACE_NAME } from '@affine/env/constant';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
 import { useWorkspace } from '@toeverything/hooks/use-workspace';
 import { useWorkspaceInfo } from '@toeverything/hooks/use-workspace-info';
 
-import { useSelfHosted } from '../../../hooks/affine/use-server-config';
 import { DeleteLeaveWorkspace } from './delete-leave-workspace';
 import { EnableCloudPanel } from './enable-cloud';
 import { ExportPanel } from './export';
diff --git a/packages/frontend/core/src/components/affine/new-workspace-setting-detail/labels.tsx b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/labels.tsx
similarity index 100%
rename from packages/frontend/core/src/components/affine/new-workspace-setting-detail/labels.tsx
rename to packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/labels.tsx
diff --git a/packages/frontend/core/src/components/affine/new-workspace-setting-detail/members.tsx b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/members.tsx
similarity index 92%
rename from packages/frontend/core/src/components/affine/new-workspace-setting-detail/members.tsx
rename to packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/members.tsx
index 95f8081681..43150ae02a 100644
--- a/packages/frontend/core/src/components/affine/new-workspace-setting-detail/members.tsx
+++ b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/members.tsx
@@ -29,15 +29,18 @@ import {
   useState,
 } from 'react';
 
-import { openSettingModalAtom } from '../../../atoms';
-import type { CheckedUser } from '../../../hooks/affine/use-current-user';
-import { useCurrentUser } from '../../../hooks/affine/use-current-user';
-import { useInviteMember } from '../../../hooks/affine/use-invite-member';
-import { useMemberCount } from '../../../hooks/affine/use-member-count';
-import { type Member, useMembers } from '../../../hooks/affine/use-members';
-import { useRevokeMemberPermission } from '../../../hooks/affine/use-revoke-member-permission';
-import { useUserQuota } from '../../../hooks/use-quota';
-import { AffineErrorBoundary } from '../affine-error-boundary';
+import { openSettingModalAtom } from '../../../../../atoms';
+import type { CheckedUser } from '../../../../../hooks/affine/use-current-user';
+import { useCurrentUser } from '../../../../../hooks/affine/use-current-user';
+import { useInviteMember } from '../../../../../hooks/affine/use-invite-member';
+import { useMemberCount } from '../../../../../hooks/affine/use-member-count';
+import {
+  type Member,
+  useMembers,
+} from '../../../../../hooks/affine/use-members';
+import { useRevokeMemberPermission } from '../../../../../hooks/affine/use-revoke-member-permission';
+import { useUserQuota } from '../../../../../hooks/use-quota';
+import { AffineErrorBoundary } from '../../../affine-error-boundary';
 import * as style from './style.css';
 import type { WorkspaceSettingDetailProps } from './types';
 
diff --git a/packages/frontend/core/src/components/affine/new-workspace-setting-detail/profile.tsx b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/profile.tsx
similarity index 95%
rename from packages/frontend/core/src/components/affine/new-workspace-setting-detail/profile.tsx
rename to packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/profile.tsx
index f9a7629cce..c07bf177c5 100644
--- a/packages/frontend/core/src/components/affine/new-workspace-setting-detail/profile.tsx
+++ b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/profile.tsx
@@ -2,6 +2,8 @@ import { FlexWrapper, Input, Wrapper } from '@affine/component';
 import { pushNotificationAtom } from '@affine/component/notification-center';
 import { Avatar } from '@affine/component/ui/avatar';
 import { Button } from '@affine/component/ui/button';
+import { Upload } from '@affine/core/components/pure/file-upload';
+import { validateAndReduceImage } from '@affine/core/utils/reduce-image';
 import { UNTITLED_WORKSPACE_NAME } from '@affine/env/constant';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
 import type { Workspace } from '@affine/workspace';
@@ -19,9 +21,7 @@ import {
   useState,
 } from 'react';
 
-import { validateAndReduceImage } from '../../../utils/reduce-image';
-import { Upload } from '../../pure/file-upload';
-import * as styles from './style.css';
+import * as style from './style.css';
 import type { WorkspaceSettingDetailProps } from './types';
 
 export interface ProfilePanelProps extends WorkspaceSettingDetailProps {
@@ -165,7 +165,7 @@ export const ProfilePanel = ({ isOwner, workspace }: ProfilePanelProps) => {
   const canAdjustAvatar = !workspaceIsLoading && avatarUrl && isOwner;
 
   return (
-    <div className={styles.profileWrapper}>
+    <div className={style.profileWrapper}>
       <Upload
         accept="image/gif,image/jpeg,image/jpg,image/png,image/svg"
         fileChange={handleUploadAvatar}
@@ -195,7 +195,7 @@ export const ProfilePanel = ({ isOwner, workspace }: ProfilePanelProps) => {
       </Upload>
 
       <Wrapper marginLeft={20}>
-        <div className={styles.label}>{t['Workspace Name']()}</div>
+        <div className={style.label}>{t['Workspace Name']()}</div>
         <FlexWrapper alignItems="center" flexGrow="1">
           <Input
             disabled={workspaceIsLoading || !isOwner}
diff --git a/packages/frontend/core/src/components/affine/new-workspace-setting-detail/storage.tsx b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/storage.tsx
similarity index 100%
rename from packages/frontend/core/src/components/affine/new-workspace-setting-detail/storage.tsx
rename to packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/storage.tsx
diff --git a/packages/frontend/core/src/components/affine/new-workspace-setting-detail/style.css.ts b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/style.css.ts
similarity index 100%
rename from packages/frontend/core/src/components/affine/new-workspace-setting-detail/style.css.ts
rename to packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/style.css.ts
diff --git a/packages/frontend/core/src/components/affine/new-workspace-setting-detail/types.ts b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/types.ts
similarity index 100%
rename from packages/frontend/core/src/components/affine/new-workspace-setting-detail/types.ts
rename to packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/types.ts
diff --git a/packages/frontend/core/src/components/cloud/login-card.tsx b/packages/frontend/core/src/components/cloud/login-card.tsx
deleted file mode 100644
index a871ee3396..0000000000
--- a/packages/frontend/core/src/components/cloud/login-card.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import { Avatar } from '@affine/component/ui/avatar';
-import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { CloudWorkspaceIcon } from '@blocksuite/icons';
-import { useAsyncCallback } from '@toeverything/hooks/affine-async-hooks';
-
-import { useCurrentLoginStatus } from '../../hooks/affine/use-current-login-status';
-import { useCurrentUser } from '../../hooks/affine/use-current-user';
-import { signInCloud } from '../../utils/cloud-utils';
-import { StyledSignInButton } from '../pure/footer/styles';
-
-export const LoginCard = () => {
-  const t = useAFFiNEI18N();
-  const loginStatus = useCurrentLoginStatus();
-
-  const onSignInClick = useAsyncCallback(async () => {
-    await signInCloud();
-  }, []);
-
-  if (loginStatus === 'authenticated') {
-    return <UserCard />;
-  }
-  return (
-    <StyledSignInButton data-testid="sign-in-button" onClick={onSignInClick}>
-      <div className="circle">
-        <CloudWorkspaceIcon />
-      </div>{' '}
-      {t['Sign in']()}
-    </StyledSignInButton>
-  );
-};
-
-const UserCard = () => {
-  const user = useCurrentUser();
-  return (
-    <div
-      style={{
-        display: 'flex',
-        alignItems: 'center',
-      }}
-    >
-      <Avatar size={28} name={user.name} url={user.image} />
-      <div style={{ marginLeft: '15px' }}>
-        <div>{user.name}</div>
-        <div>{user.email}</div>
-      </div>
-    </div>
-  );
-};
diff --git a/tests/affine-local/e2e/settings.spec.ts b/tests/affine-local/e2e/settings.spec.ts
index ba5e866aa2..6a0f2d0383 100644
--- a/tests/affine-local/e2e/settings.spec.ts
+++ b/tests/affine-local/e2e/settings.spec.ts
@@ -4,7 +4,6 @@ import { waitForEditorLoad } from '@affine-test/kit/utils/page-logic';
 import {
   openAboutPanel,
   openAppearancePanel,
-  openPluginsPanel,
   openSettingModal,
   openShortcutsPanel,
 } from '@affine-test/kit/utils/setting';
@@ -79,15 +78,6 @@ test('Open shortcuts panel', async ({ page }) => {
   await expect(title).toBeVisible();
 });
 
-test('Open plugins panel', async ({ page }) => {
-  await openHomePage(page);
-  await waitForEditorLoad(page);
-  await openSettingModal(page);
-  await openPluginsPanel(page);
-  const title = page.getByTestId('plugins-title');
-  await expect(title).toBeVisible();
-});
-
 test('Open about panel', async ({ page }) => {
   await openHomePage(page);
   await waitForEditorLoad(page);
diff --git a/tests/kit/utils/setting.ts b/tests/kit/utils/setting.ts
index 94d1c2e598..07d709613d 100644
--- a/tests/kit/utils/setting.ts
+++ b/tests/kit/utils/setting.ts
@@ -19,9 +19,6 @@ export async function openAppearancePanel(page: Page) {
 export async function openShortcutsPanel(page: Page) {
   await page.getByTestId('shortcuts-panel-trigger').click();
 }
-export async function openPluginsPanel(page: Page) {
-  await page.getByTestId('plugins-panel-trigger').click();
-}
 
 export async function openAboutPanel(page: Page) {
   await page.getByTestId('about-panel-trigger').click();